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

1 files changed, 28 insertions, 9 deletions

diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index da00dfe4..a66083c5 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -24,6 +24,7 @@ import server.generated.User;
 import server.generated.Image;
 import server.generated.Lecture;
 import server.generated.Server;
+import server.generated.Person;
 
 import com.mysql.jdbc.StringUtils;
 
@@ -190,7 +191,7 @@ public class ServerHandler implements Server.Iface {
 		
 		sql.setImageData(pk_person, license, internet, cpu, ram, imagename,desc,
 				imagePath, filesize,mode,pk_os);
-
+		
 		log.info(new Date() + " - written VLdata");
 		// TODO Auto-generated method stub
 		return true;
@@ -474,34 +475,35 @@ public class ServerHandler implements Server.Iface {
 		if(role.equals("Dozent")) {
 			int read=1;
 			int write=1;
-			int changePermission=0;
-			int admin=0;
+			//int changePermission=0;
+			int admin=1;
 			int linkallowed=1;
 			int roleID=sql.getRoleID(role);
 			
-			sql.setImageRights(pk_person, pk_image, roleID, read, write, changePermission, admin, linkallowed);
+			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 changePermission=1;
 			int admin=1;
 			int linkallowed=1;
 			int roleID=sql.getRoleID(role);
 			
-			sql.setImageRights(pk_person, pk_image, roleID, read, write, changePermission, admin, linkallowed);
+			sql.setImageRights(pk_person, pk_image, roleID, read, write, admin, linkallowed);
 		}
 		else{
 			int read=1;
 			int write=0;
-			int changePermission=0;
+			//int changePermission=0;
 			int admin=0;
 			int linkallowed=0;
 			int roleID=sql.getRoleID(role);
 			
-			sql.setImageRights(pk_person, pk_image, roleID, read, write, changePermission, admin, linkallowed);
+			sql.setImageRights(pk_person, pk_image, roleID, read, write, admin, linkallowed);
 		}
 		
+		log.info(new Date() + " - written image rights");
 		return true;
 	}
 
@@ -547,5 +549,22 @@ public class ServerHandler implements Server.Iface {
 		return true;
 	}
 
+	@Override
+	public List<Person> getAllOtherSatelliteUsers(String userID) throws TException {
+		return sql.getAllOtherSatelliteUsers(userID);
+		//return null;
+	}
 
-}
+
+	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);
+		return success;
+	}
+	
+}// end class