Sämtliche Logik und Grafiken zur Vergabe und Verwaltung von Berechtigungen eingeführt. Kleinere Bugs sind bekannt, werden aktuell behoben

1 files changed, 207 insertions, 177 deletions

diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index f9835738..1247c432 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -31,8 +31,6 @@ import com.mysql.jdbc.StringUtils;
 import sql.SQL;
 import util.XMLCreator;
 
-
-
 public class ServerHandler implements Server.Iface {
 	static SQL sql = new SQL();
 
@@ -97,7 +95,7 @@ public class ServerHandler implements Server.Iface {
 		}
 
 	}// end folderTempExists()
-	
+
 	public boolean folderProdExists() {
 		// check if folder temp exists, otherwise create it
 		Path path = null;
@@ -134,8 +132,6 @@ public class ServerHandler implements Server.Iface {
 		}
 
 	}// end folderProdExists()
-	
-	
 
 	public String getEncodedSha1Sum(String key) {
 		try {
@@ -164,57 +160,62 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public String setInstitution(String university){
+	public String setInstitution(String university) {
 		return sql.setInstitution(university);
 	}
-	
+
 	@Override
-	public boolean writeVLdata(String imagename, String desc ,String login,
+	public boolean writeVLdata(String imagename, String desc, String login,
 			String firstname, String lastname, String university, String Mail,
 			String Tel, String Fak, boolean license, boolean internet,
 			long ram, long cpu, String imagePath, boolean isTemplate,
 			long filesize, long shareMode, String os) throws TException {
-		
-		String mode=null;
-	
-		if(shareMode==0)
-		{
-			mode="only_local";
-		}
-		else{
-			mode="to_be_published";
+
+		String mode = null;
+
+		if (shareMode == 0) {
+			mode = "only_local";
+		} else {
+			mode = "to_be_published";
 		}
 
-		//String pk_institution = sql.setInstitution(university);
-		//String pk_person = sql.setPerson(login, lastname, firstname, Mail, new Date(), pk_institution);
-		
-		//OS impl Select and write
-		//ACHTUNG: Anzahl der Leerzeichen muss eingehalten werden: 'Windows 7 32 bit"
-		String pk_os=sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),os.substring(nthIndexOf(os," ", 2), os.lastIndexOf(" ")).replace(" ", ""));
-		
-		//sql.setImageData(pk_person, license, internet, cpu, ram, imagename,desc, imagePath, filesize,mode,pk_os);
-		
-		sql.setImageData(login, license, internet, cpu, ram, imagename,desc,
-				imagePath, filesize,mode,pk_os);
-		
+		// String pk_institution = sql.setInstitution(university);
+		// String pk_person = sql.setPerson(login, lastname, firstname, Mail,
+		// new Date(), pk_institution);
+
+		// OS impl Select and write
+		// ACHTUNG: Anzahl der Leerzeichen muss eingehalten werden: 'Windows 7
+		// 32 bit"
+		String pk_os = sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)), os
+				.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" "))
+				.replace(" ", ""));
+
+		// sql.setImageData(pk_person, license, internet, cpu, ram,
+		// imagename,desc, imagePath, filesize,mode,pk_os);
+
+		sql.setImageData(login, license, internet, cpu, ram, imagename, desc,
+				imagePath, filesize, mode, pk_os);
+
 		log.info(new Date() + " - written VLdata");
 		// TODO Auto-generated method stub
 		return true;
 	}
 
 	@Override
-	public List<Image> getImageListPermissionWrite(String userID) throws TException {
+	public List<Image> getImageListPermissionWrite(String userID)
+			throws TException {
 		return sql.getImageListPermissionWrite(userID);
 	}
-	
+
 	@Override
-	public List<Image> getImageListPermissionRead(String userID) throws TException {
+	public List<Image> getImageListPermissionRead(String userID)
+			throws TException {
 		return sql.getImageListPermissionWrite(userID);
 	}
-	
-	
+
 	@Override
-	public List<Image> getImageListPermissionLink(String userID) throws TException {
+	public List<Image> getImageListPermissionLink(String userID)
+			throws TException {
 		return sql.getImageListPermissionWrite(userID);
 	}
 
@@ -228,8 +229,9 @@ public class ServerHandler implements Server.Iface {
 			throws TException {
 		return sql.getPersonData(Vorname, Nachname);
 	}
-	
-	public void setPerson(String login, String lastname,String firstname, String mail, String Institution){
+
+	public void setPerson(String login, String lastname, String firstname,
+			String mail, String Institution) {
 		sql.setPerson(login, lastname, firstname, mail, new Date(), Institution);
 	}
 
@@ -252,6 +254,8 @@ public class ServerHandler implements Server.Iface {
 		imageversion = Integer.parseInt(map.get("version"));
 		sql.setLectureData(pk_person, pk_image, imageversion, name, desc,
 				shortdesc, startDate, endDate, isActive);
+		
+		
 		XMLCreator xml = new XMLCreator(sql.getConnection(), name);
 		try {
 			xml.create(name);
@@ -266,12 +270,13 @@ public class ServerHandler implements Server.Iface {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
+		
 		return false;
 	}
 
 	@Override
 	public boolean startFileCopy(String filename) throws TException {
-		//copy file from folder temp to folder prod
+		// copy file from folder temp to folder prod
 		String file = Configuration.config.getAbsolute_path() + "temp/"
 				+ filename;
 		File tmpFile = new File(file);
@@ -305,80 +310,74 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public boolean updateImageData(String name, String newName,String desc,
+	public boolean updateImageData(String name, String newName, String desc,
 			String image_path, boolean license, boolean internet, long ram,
 			long cpu, String id, String version, boolean isTemplate,
 			long filesize, long shareMode, String os) throws TException {
-		String mode=null;
-		
-		if(shareMode==0)
-		{
-			mode="only_local";
-		}
-		else{
-			mode="to_be_published";
+		String mode = null;
+
+		if (shareMode == 0) {
+			mode = "only_local";
+		} else {
+			mode = "to_be_published";
 		}
-		String pk_os=sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),os.substring(nthIndexOf(os," ", 2), os.lastIndexOf(" ")).replace(" ", ""));
-		sql.UpdateImageData(name, newName,desc ,image_path, license, internet, cpu,
-				ram, id, version, isTemplate, filesize,mode,pk_os);
+		String pk_os = sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)), os
+				.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" "))
+				.replace(" ", ""));
+		sql.UpdateImageData(name, newName, desc, image_path, license, internet,
+				cpu, ram, id, version, isTemplate, filesize, mode, pk_os);
 		return false;
 	}
 
-	
-
-
 	@Override
 	public List<Lecture> getLectureList() throws TException {
 
-
-					log.info(new Date().toString() + " - returning LectureList: "
+		log.info(new Date().toString() + " - returning LectureList: "
 				+ sql.getLectureList().size() + " items.");
 		return sql.getLectureList();
-		
 
 	}
-	
+
 	@Override
-	public List<Lecture> getLectureListPermissionRead(String userID){
-		log.info(new Date().toString() + " - returning LectureListRead: "+sql.getLectureListPermissionRead(userID).size()+" items");
+	public List<Lecture> getLectureListPermissionRead(String userID) {
+		log.info(new Date().toString() + " - returning LectureListRead: "
+				+ sql.getLectureListPermissionRead(userID).size()
+				+ " items for user " + userID);
 		return sql.getLectureListPermissionRead(userID);
-	}//end getLectureListPermissionRead
-	
+	}// end getLectureListPermissionRead
+
 	@Override
-	public List<Lecture> getLectureListPermissionWrite(String userID){
-		log.info(new Date().toString() + " - returning LectureListWrite: "+sql.getLectureListPermissionWrite(userID).size()+" items");
+	public List<Lecture> getLectureListPermissionWrite(String userID) {
+		log.info(new Date().toString() + " - returning LectureListWrite: "
+				+ sql.getLectureListPermissionWrite(userID).size()
+				+ " items for user " + userID);
 		return sql.getLectureListPermissionWrite(userID);
-	}//end getLectureListPermissionRead
-	
+	}// end getLectureListPermissionRead
+
 	@Override
-	public List<Lecture> getLectureListPermissionAdmin(String userID){
-		log.info(new Date().toString() + " - returning LectureListAdmin: "+sql.getLectureListPermissionAdmin(userID).size()+" items");
+	public List<Lecture> getLectureListPermissionAdmin(String userID) {
+		log.info(new Date().toString() + " - returning LectureListAdmin: "
+				+ sql.getLectureListPermissionAdmin(userID).size()
+				+ " items for user " + userID);
 		return sql.getLectureListPermissionAdmin(userID);
-	}//end getLectureListPermissionRead
-	
-	
-	
-	
-	
-	
+	}// end getLectureListPermissionRead
 
 	@Override
 	public boolean updateLecturedata(String name, String newName,
 			String shortdesc, String desc, String startDate, String endDate,
-			boolean isActive, String imageid,String imageversion,String user ,String firstname,
-			String lastname, String university, String Mail, String Tel,
-			String Fak, String id) throws TException {
+			boolean isActive, String imageid, String imageversion, String user,
+			String firstname, String lastname, String university, String Mail,
+			String Tel, String Fak, String id) throws TException {
 		Map<String, String> map = new HashMap<String, String>();
 		map = sql.getDeleteXMLData(id);
 		sql.updateLectureData(imageid, imageversion, lastname, newName, desc,
 				shortdesc, startDate, endDate, isActive, id);
 
-		String path = Configuration.config.getAbsolute_path()
-				+ "prod/"
-				+ map.get("date")
-						.substring(0, map.get("date").length() - 2) + "_"
-				+ university + "_" + user + "_" + map.get("name") + ".xml";
-		File tmpFile=new File(path);
+		String path = Configuration.config.getAbsolute_path() + "prod/"
+				+ map.get("date").substring(0, map.get("date").length() - 2)
+				+ "_" + university + "_" + user + "_" + map.get("name")
+				+ ".xml";
+		File tmpFile = new File(path);
 		try {
 			FileUtils.forceDelete(tmpFile);
 		} catch (IOException e1) {
@@ -453,13 +452,13 @@ public class ServerHandler implements Server.Iface {
 		return sql.deleteLecture(id);
 
 	}
-	
+
 	@Override
 	public List<String> getAllUniversities() throws TException {
 		return sql.getAllUniversities();
 
 	}
-	
+
 	@Override
 	public Map<String, String> getLectureData(String lectureid)
 			throws TException {
@@ -467,28 +466,24 @@ public class ServerHandler implements Server.Iface {
 				+ sql.getLectureData(lectureid).size() + "items.");
 		return sql.getLectureData(lectureid);
 	}
-	
-	
-	
-	
-	  public static int nthIndexOf(final String string, final String token,
-			     final int index)
-			  {
-			     int j = 0;
 
-			     for (int i = 0; i < index; i++)
-			     {
-			        j = string.indexOf(token, j + 1);
-			        if (j == -1) break;
-			     }
+	public static int nthIndexOf(final String string, final String token,
+			final int index) {
+		int j = 0;
 
-			     return j;
-			  }
+		for (int i = 0; i < index; i++) {
+			j = string.indexOf(token, j + 1);
+			if (j == -1)
+				break;
+		}
+
+		return j;
+	}
 
 	@Override
 	public boolean checkUser(String username) throws TException {
 		return sql.checkUser(username);
-		
+
 	}
 
 	@Override
@@ -501,8 +496,9 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public boolean writeImageRights(String imagename, String username, String lastName, String firstName, String mail, String university, String role)
-			throws TException {
+	public boolean writeImageRights(String imagename, String username,
+			String lastName, String firstName, String mail, String university,
+			String role) throws TException {
 		String pk_image = null;
 		Map<String, String> map = new HashMap<String, String>();
 		int imageversion = 0;
@@ -512,38 +508,40 @@ public class ServerHandler implements Server.Iface {
 		map = sql.getImageIDandVersion(imagename);
 		pk_image = map.get("GUID");
 		imageversion = Integer.parseInt(map.get("version"));
-		
-		if(role.equals("Dozent")) {
-			int read=1;
-			int write=1;
-			//int changePermission=0;
-			int admin=1;
-			int linkallowed=1;
-			int roleID=sql.getRoleID(role);
-			
-			sql.setImageRights(pk_person, pk_image, roleID, read, write, admin, linkallowed);
-			
-		}else if(role.equals("Admin")){
-			int read=1;
-			int write=1;
-			//int changePermission=1;
-			int admin=1;
-			int linkallowed=1;
-			int roleID=sql.getRoleID(role);
-			
-			sql.setImageRights(pk_person, pk_image, roleID, read, write, admin, linkallowed);
-		}
-		else{
-			int read=1;
-			int write=0;
-			//int changePermission=0;
-			int admin=0;
-			int linkallowed=0;
-			int roleID=sql.getRoleID(role);
-			
-			sql.setImageRights(pk_person, pk_image, roleID, read, write, admin, linkallowed);
+
+		if (role.equals("Dozent")) {
+			int read = 1;
+			int write = 1;
+			// int changePermission=0;
+			int admin = 1;
+			int linkallowed = 1;
+			int roleID = sql.getRoleID(role);
+
+			sql.setImageRights(pk_person, pk_image, roleID, read, write, admin,
+					linkallowed);
+
+		} else if (role.equals("Admin")) {
+			int read = 1;
+			int write = 1;
+			// int changePermission=1;
+			int admin = 1;
+			int linkallowed = 1;
+			int roleID = sql.getRoleID(role);
+
+			sql.setImageRights(pk_person, pk_image, roleID, read, write, admin,
+					linkallowed);
+		} else {
+			int read = 1;
+			int write = 0;
+			// int changePermission=0;
+			int admin = 0;
+			int linkallowed = 0;
+			int roleID = sql.getRoleID(role);
+
+			sql.setImageRights(pk_person, pk_image, roleID, read, write, admin,
+					linkallowed);
 		}
-		
+
 		log.info(new Date() + " - written image rights");
 		return true;
 	}
@@ -553,72 +551,104 @@ public class ServerHandler implements Server.Iface {
 			String lastName, String firstName, String mail, String university,
 			String role) throws TException {
 		String pk_lecture = null;
-		
+
 		String pk_institution = sql.setInstitution(university);
 		String pk_person = sql.setPerson(username, lastName, firstName, mail,
 				new Date(), pk_institution);
-		pk_lecture=sql.getLectureID(lecturename);
-		
-		if(role.equals("Dozent")) {
-			int read=1;
-			int write=1;
-			int changePermission=0;
-			int admin=0;
-			int roleID=sql.getRoleID(role);
-			
-			sql.setLectureRights(pk_person, pk_lecture, roleID, read, write, changePermission, admin);
-			
-		}else if(role.equals("Admin")){
-			int read=1;
-			int write=1;
-			int changePermission=1;
-			int admin=1;
-			int roleID=sql.getRoleID(role);
-			
-			sql.setLectureRights(pk_person, pk_lecture, roleID, read, write, changePermission, admin);
-		}
-		else{
-			int read=0;
-			int write=0;
-			int changePermission=0;
-			int admin=0;
-			int roleID=sql.getRoleID(role);
-			
-			sql.setLectureRights(pk_person, pk_lecture, roleID, read, write, changePermission, admin);
+		pk_lecture = sql.getLectureID(lecturename);
+
+		if (role.equals("Dozent")) {
+			int read = 1;
+			int write = 1;
+			// int changePermission=0;
+			int admin = 1;
+			int roleID = sql.getRoleID(role);
+
+			sql.setLectureRights(pk_person, pk_lecture, roleID, read, write,
+					admin);
+
+		} else if (role.equals("Admin")) {
+			int read = 1;
+			int write = 1;
+			// int changePermission=1;
+			int admin = 1;
+			int roleID = sql.getRoleID(role);
+
+			sql.setLectureRights(pk_person, pk_lecture, roleID, read, write,
+					admin);
+		} else {
+			int read = 0;
+			int write = 0;
+			// int changePermission=0;
+			int admin = 0;
+			int roleID = sql.getRoleID(role);
+
+			sql.setLectureRights(pk_person, pk_lecture, roleID, read, write,
+					admin);
 		}
-		
+
 		return true;
 	}
 
 	@Override
-	public List<Person> getAllOtherSatelliteUsers(String userID) throws TException {
+	public List<Person> getAllOtherSatelliteUsers(List<String> userID)
+			throws TException {
 		return sql.getAllOtherSatelliteUsers(userID);
-		//return null;
+		// return null;
 	}
 
-
-	public boolean writeAdditionalImageRights(String imageName, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin){
+	public boolean writeAdditionalImageRights(String imageName, String userID,
+			boolean isRead, boolean isWrite, boolean isLinkAllowed,
+			boolean isAdmin) {
 		boolean success = false;
 		Map<String, String> map = new HashMap<String, String>();
 		map = sql.getImageIDandVersion(imageName);
 		String imageID = map.get("GUID");
-		
-		sql.writeAdditionalImageRights(imageID, userID, isRead, isWrite, isLinkAllowed, isAdmin);
-		log.info(new Date() + " - written additional image rights for "+userID);
+
+		sql.writeAdditionalImageRights(imageID, userID, isRead, isWrite,
+				isLinkAllowed, isAdmin);
+		log.info(new Date() + " - written additional image rights for "
+				+ userID);
 		return success;
 	}
 
+	public boolean writeAdditionalLectureRights(String lectureName,
+			String userID, boolean isRead, boolean isWrite, boolean isAdmin) {
+
+		Map<String, String> map = new HashMap<String, String>();
+		String lectureID = sql.getLectureID(lectureName);
+
+		sql.writeAdditionalLectureRights(lectureID, userID, isRead, isWrite,
+				isAdmin);
+		log.info(new Date() + " - written additional lecture rights for "
+				+ userID);
+
+		return true;
+	}
+
 	@Override
-	public List<Person> getPermissionForUserAndImage(String userID, String imageID) throws TException {
+	public List<Person> getPermissionForUserAndImage(String userID,
+			String imageID) throws TException {
 		return sql.getPermissionForUserAndImage(userID, imageID);
 	}
 
+	public List<Person> getPermissionForUserAndLecture(String userID,
+			String lectureID) {
+		return sql.getPermissionForUserAndLecture(userID, lectureID);
+	}
+
 	@Override
-	public void deleteAllAdditionalImagePermissions(String imageID,String userID) throws TException {
-		
-		sql.deleteAllAdditionalImagePermissions(imageID,userID);
+	public void deleteAllAdditionalImagePermissions(String imageID,
+			String userID) throws TException {
+		sql.deleteAllAdditionalImagePermissions(imageID, userID);
 		return;
-		
 	}
-	
+
+	@Override
+	public void deleteAllAdditionalLecturePermissions(String lectureID,
+			String userID) throws TException {
+		sql.deleteAllAdditionalLecturePermissions(lectureID, userID);
+		return;
+	}
+
 }// end class