Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Wed Jun 3 10:59:16 2015 @@ -46,7 +46,6 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.calendar.AppointmentCategory; import org.apache.openmeetings.db.entity.calendar.AppointmentReminderType; import org.apache.openmeetings.db.entity.calendar.MeetingMember; -import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.db.util.TimezoneUtil; @@ -114,9 +113,9 @@ public class CalendarWebService { public List<AppointmentDTO> getAppointmentByRange(String SID, Calendar starttime, Calendar endtime) { log.debug("getAppointmentByRange : startdate - " + starttime.getTime() + ", enddate - " + endtime.getTime()); try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - return getAppointments(appointmentDao.getAppointmentsByRange(users_id, starttime.getTime(), endtime.getTime())); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + return getAppointments(appointmentDao.getAppointmentsByRange(userId, starttime.getTime(), endtime.getTime())); } } catch (Exception err) { log.error("[getAppointmentByRange]", err); @@ -141,8 +140,8 @@ public class CalendarWebService { public List<AppointmentDTO> getAppointmentByRangeForUserId(String SID, long userId, Calendar starttime, Calendar endtime) { log.debug("getAppointmentByRangeForUserId : startdate - " + starttime.getTime() + ", enddate - " + endtime.getTime()); try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long authUserId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) { return getAppointments(appointmentDao.getAppointmentsByRange(userId, starttime.getTime(), endtime.getTime())); } } catch (Exception err) { @@ -160,9 +159,9 @@ public class CalendarWebService { */ public AppointmentDTO getNextAppointment(String SID) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - return new AppointmentDTO(appointmentDao.getNextAppointment(users_id, new Date())); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + return new AppointmentDTO(appointmentDao.getNextAppointment(userId, new Date())); } } catch (Exception err) { log.error("[getNextAppointmentById]", err); @@ -181,8 +180,8 @@ public class CalendarWebService { */ public AppointmentDTO getNextAppointmentForUserId(String SID, long userId) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long authUserId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) { return new AppointmentDTO(appointmentDao.getNextAppointment(userId, new Date())); } } catch (Exception err) { @@ -204,9 +203,9 @@ public class CalendarWebService { */ public List<AppointmentDTO> searchAppointmentByTitle(String SID, String appointmentName) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - return getAppointments(appointmentDao.searchAppointmentsByTitle(users_id, appointmentName)); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + return getAppointments(appointmentDao.searchAppointmentsByTitle(userId, appointmentName)); } } catch (Exception err) { log.error("[searchAppointmentByName]", err); @@ -276,14 +275,14 @@ public class CalendarWebService { log.debug("saveAppointMent SID:" + SID); try { - Long users_id = sessiondataDao.checkSession(SID); - log.debug("saveAppointMent users_id:" + users_id); + Long userId = sessiondataDao.checkSession(SID); + log.debug("saveAppointMent userId:" + userId); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { Appointment a = appointmentLogic.getAppointment(appointmentName, appointmentLocation, appointmentDescription, appointmentstart, appointmentend, isDaily, isWeekly, isMonthly, isYearly, categoryId, remind, - mmClient, roomType, languageId, isPasswordProtected, password, roomId, users_id); - return appointmentDao.update(a, users_id).getId(); + mmClient, roomType, languageId, isPasswordProtected, password, roomId, userId); + return appointmentDao.update(a, userId).getId(); } else { log.error("saveAppointment : wrong user level"); } @@ -312,18 +311,18 @@ public class CalendarWebService { */ public Long updateAppointmentTimeOnly(String SID, Long appointmentId, Date appointmentstart, Date appointmentend, Long languageId) { try { - Long users_id = sessiondataDao.checkSession(SID); - Set<Right> rights = userDao.getRights(users_id); + Long userId = sessiondataDao.checkSession(SID); + Set<Right> rights = userDao.getRights(userId); if (AuthLevelUtil.hasUserLevel(rights)) { Appointment a = appointmentDao.get(appointmentId); - if (!AuthLevelUtil.hasAdminLevel(rights) && !a.getOwner().getId().equals(users_id)) { + if (!AuthLevelUtil.hasAdminLevel(rights) && !a.getOwner().getId().equals(userId)) { throw new ServiceException("The Appointment cannot be updated by the given user"); } if (!a.getStart().equals(appointmentstart) || !a.getEnd().equals(appointmentend)) { a.setStart(appointmentstart); a.setEnd(appointmentend); //FIXME this might change the owner!!!!! - return appointmentDao.update(a, users_id).getId(); + return appointmentDao.update(a, userId).getId(); } } } catch (Exception err) { @@ -394,15 +393,15 @@ public class CalendarWebService { Boolean isPasswordProtected, String password) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); - Set<Right> rights = userDao.getRights(users_id); + Long userId = sessiondataDao.checkSession(SID); + Set<Right> rights = userDao.getRights(userId); if (AuthLevelUtil.hasWebServiceLevel(rights) || AuthLevelUtil.hasAdminLevel(rights)) { // fine } else if (AuthLevelUtil.hasUserLevel(rights)) { // check if the appointment belongs to the current user Appointment a = appointmentDao.get(appointmentId); - if (!a.getOwner().getId().equals(users_id)) { + if (!a.getOwner().getId().equals(userId)) { throw new ServiceException("The Appointment cannot be updated by the given user"); } } else { @@ -424,16 +423,16 @@ public class CalendarWebService { a.getRoom().setComment(appointmentDescription); a.getRoom().setName(appointmentName); a.getRoom().setRoomtype(roomTypeDao.get(roomType)); - a.setOwner(userDao.get(users_id)); + a.setOwner(userDao.get(userId)); a.setPasswordProtected(isPasswordProtected); a.setPassword(password); a.setMeetingMembers(new ArrayList<MeetingMember>()); for (String singleClient : mmClient) { - MeetingMember mm = appointmentLogic.getMeetingMember(users_id, languageId, singleClient); + MeetingMember mm = appointmentLogic.getMeetingMember(userId, languageId, singleClient); mm.setAppointment(a); a.getMeetingMembers().add(mm); } - return appointmentDao.update(a, users_id).getId(); + return appointmentDao.update(a, userId).getId(); } catch (Exception err) { log.error("[updateAppointment]", err); throw new ServiceException(err.getMessage()); @@ -453,28 +452,28 @@ public class CalendarWebService { * an authenticated SID * @param appointmentId * the id to delete - * @param language_id + * @param languageId * the language id in which the notifications for the deleted * appointment are send * @return - id of appointment deleted */ - public Long deleteAppointment(String SID, Long appointmentId, Long language_id) throws ServiceException { + public Long deleteAppointment(String SID, Long appointmentId, Long languageId) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); - Set<Right> rights = userDao.getRights(users_id); + Long userId = sessiondataDao.checkSession(SID); + Set<Right> rights = userDao.getRights(userId); Appointment a = appointmentDao.get(appointmentId); if (AuthLevelUtil.hasWebServiceLevel(rights) || AuthLevelUtil.hasAdminLevel(rights)) { // fine } else if (AuthLevelUtil.hasUserLevel(rights)) { // check if the appointment belongs to the current user - if (!a.getOwner().getId().equals(users_id)) { + if (!a.getOwner().getId().equals(userId)) { throw new ServiceException("The Appointment cannot be updated by the given user"); } } else { throw new ServiceException("Not allowed to preform that action, Authenticate the SID first"); } - appointmentDao.delete(a, users_id); //FIXME check this !!!! + appointmentDao.delete(a, userId); //FIXME check this !!!! return a.getId(); } catch (Exception err) { log.error("[deleteAppointment]", err); @@ -487,14 +486,14 @@ public class CalendarWebService { * Load a calendar event by its room id * * @param SID - * @param room_id + * @param roomId * @return - calendar event by its room id */ - public AppointmentDTO getAppointmentByRoomId(String SID, Long room_id) { + public AppointmentDTO getAppointmentByRoomId(String SID, Long roomId) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - Appointment appStored = appointmentDao.getAppointmentByOwnerRoom(users_id, room_id); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + Appointment appStored = appointmentDao.getAppointmentByOwnerRoom(userId, roomId); if (appStored != null) { return new AppointmentDTO(appStored); } @@ -515,9 +514,9 @@ public class CalendarWebService { log.debug("AppointmenetCategoryService.getAppointmentCategoryList SID : " + SID); try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { List<AppointmentCategory> res = appointmentCategoryDao.getAppointmentCategoryList(); if (res == null || res.size() < 1) { @@ -557,12 +556,9 @@ public class CalendarWebService { log.debug("getAppointmentReminderTypList"); try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - - User user = userDao.get(users_id); - long language_id = (user == null) ? 1 : user.getLanguageId(); - return getReminders(appointmentReminderTypDao.getList(language_id)); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + return getReminders(appointmentReminderTypDao.get()); } else log.debug("getAppointmentReminderTypList :error - wrong authlevel!"); } catch (Exception err) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java Wed Jun 3 10:59:16 2015 @@ -85,10 +85,10 @@ public class FileWebService { * Import file from external source * * to upload a file to a room-drive you specify: externalUserId, user if of openmeetings user for which we upload - * the file room_id = openmeetings room id isOwner = 0 parentFolderId = 0 + * the file roomId = openmeetings room id isOwner = 0 parentFolderId = 0 * * to upload a file to a private-drive you specify: externalUserId, user if of openmeetings user for which we upload - * the file room_id = openmeetings room id isOwner = 1 parentFolderId = -2 + * the file roomId = openmeetings room id isOwner = 1 parentFolderId = -2 * * @param SID * The logged in session id with minimum webservice level @@ -99,7 +99,7 @@ public class FileWebService { * the external file-type to identify the file later * @param externalType * the name of the external system - * @param room_id + * @param roomId * the room Id, if the file goes to the private folder of an user, you can set a random number here * @param isOwner * specify a 1/true AND parentFolderId==-2 to make the file goto the private section @@ -114,13 +114,13 @@ public class FileWebService { * @throws ServiceException */ public FileImportError[] importFile(String SID, String externalUserId, Long externalFileId, String externalType, - Long room_id, boolean isOwner, String path, Long parentFolderId, String fileSystemName) + Long roomId, boolean isOwner, String path, Long parentFolderId, String fileSystemName) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { URL url = new URL(path); URLConnection uc = url.openConnection(); @@ -131,7 +131,7 @@ public class FileWebService { LinkedHashMap<String, Object> hs = new LinkedHashMap<String, Object>(); hs.put("user", externalUser); - ConverterProcessResultList returnError = fileProcessor.processFile(externalUser.getId(), room_id, + ConverterProcessResultList returnError = fileProcessor.processFile(externalUser.getId(), roomId, isOwner, inputstream, parentFolderId, fileSystemName, externalFileId, externalType); // Flash cannot read the response of an upload @@ -157,10 +157,10 @@ public class FileWebService { * Import file from external source * * to upload a file to a room-drive you specify: internalUserId, user if of openmeetings user for which we upload - * the file room_id = openmeetings room id isOwner = 0 parentFolderId = 0 + * the file roomId = openmeetings room id isOwner = 0 parentFolderId = 0 * * to upload a file to a private-drive you specify: internalUserId, user if of openmeetings user for which we upload - * the file room_id = openmeetings room id isOwner = 1 parentFolderId = -2 + * the file roomId = openmeetings room id isOwner = 1 parentFolderId = -2 * * @param SID * The SID of the User. This SID must be marked as logged in @@ -171,7 +171,7 @@ public class FileWebService { * the external file-type to identify the file later * @param externalType * the name of the external system - * @param room_id + * @param roomId * the room Id, if the file goes to the private folder of an user, you can set a random number here * @param isOwner * specify a 1/true AND parentFolderId==-2 to make the file goto the private section @@ -186,13 +186,13 @@ public class FileWebService { * @throws ServiceException */ public FileImportError[] importFileByInternalUserId(String SID, Long internalUserId, Long externalFileId, - String externalType, Long room_id, boolean isOwner, String path, Long parentFolderId, String fileSystemName) + String externalType, Long roomId, boolean isOwner, String path, Long parentFolderId, String fileSystemName) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { URL url = new URL(path); URLConnection uc = url.openConnection(); @@ -203,7 +203,7 @@ public class FileWebService { LinkedHashMap<String, Object> hs = new LinkedHashMap<String, Object>(); hs.put("user", internalUser); - ConverterProcessResultList returnError = fileProcessor.processFile(internalUser.getId(), room_id, + ConverterProcessResultList returnError = fileProcessor.processFile(internalUser.getId(), roomId, isOwner, inputstream, parentFolderId, fileSystemName, externalFileId, externalType); // Flash cannot read the response of an upload @@ -236,7 +236,7 @@ public class FileWebService { * @param parentId * @param folderName * the name of the folder - * @param room_id + * @param roomId * the room Id, if the file goes to the private folder of an user, you can set a random number here * @param isOwner * specify a 1/true AND parentFolderId==-2 to make the file goto the private section @@ -249,12 +249,12 @@ public class FileWebService { * @throws ServiceException */ public Long addFolderByExternalUserIdAndType(String SID, String externalUserId, Long parentId, String folderName, - Long room_id, Boolean isOwner, Long externalFilesid, String externalType) throws ServiceException { + Long roomId, Boolean isOwner, Long externalFilesid, String externalType) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long authUserId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) { User userExternal = userDao.getExternalUser(externalUserId, externalType); @@ -263,12 +263,12 @@ public class FileWebService { log.debug("addFolder " + parentId); if (parentId == -2 && isOwner) { - // users_id (OwnerID) => only set if its directly root in + // userId (OwnerID) => only set if its directly root in // Owner Directory, // other Folders and Files maybe are also in a Home // directory // but just because their parent is - return fileExplorerItemDao.add(folderName, "", 0L, userId, room_id, userId, true, // isFolder + return fileExplorerItemDao.add(folderName, "", 0L, userId, roomId, userId, true, // isFolder false, // isImage false, // isPresentation "", // WML Path @@ -276,7 +276,7 @@ public class FileWebService { false, // isXmlFile externalFilesid, externalType); } else { - return fileExplorerItemDao.add(folderName, "", parentId, null, room_id, userId, true, // isFolder + return fileExplorerItemDao.add(folderName, "", parentId, null, roomId, userId, true, // isFolder false, // isImage false, // isPresentation "", // WML Path @@ -304,7 +304,7 @@ public class FileWebService { * specify a parentFolderId==-2 AND isOwner == 1/true AND to make the file goto the private section * @param folderName * the name of the folder - * @param room_id + * @param roomId * the room Id, if the file goes to the private folder of an user, you can set a random number here * @param isOwner * specify a 1/true AND parentFolderId==-2 to make the file goto the private section @@ -316,13 +316,13 @@ public class FileWebService { * @return - id of the folder * @throws ServiceException */ - public Long addFolderByUserId(String SID, Long userId, Long parentId, String folderName, Long room_id, + public Long addFolderByUserId(String SID, Long userId, Long parentId, String folderName, Long roomId, Boolean isOwner, Long externalFilesid, String externalType) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long authUserId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) { log.debug("addFolder " + parentId); @@ -332,7 +332,7 @@ public class FileWebService { // other Folders and Files maybe are also in a Home // directory // but just because their parent is - return fileExplorerItemDao.add(folderName, "", 0L, userId, room_id, userId, true, // isFolder + return fileExplorerItemDao.add(folderName, "", 0L, userId, roomId, userId, true, // isFolder false, // isImage false, // isPresentation "", // WML Path @@ -340,7 +340,7 @@ public class FileWebService { false, // isXmlFile externalFilesid, externalType); } else { - return fileExplorerItemDao.add(folderName, "", parentId, null, room_id, userId, true, // isFolder + return fileExplorerItemDao.add(folderName, "", parentId, null, roomId, userId, true, // isFolder false, // isImage false, // isPresentation "", // WML Path @@ -366,16 +366,16 @@ public class FileWebService { * parent folder id * @param fileName * the file name - * @param room_id + * @param roomId * the room id * @param isOwner * @return - id of the folder */ - public Long addFolderSelf(String SID, Long parentId, String fileName, Long room_id, Boolean isOwner) + public Long addFolderSelf(String SID, Long parentId, String fileName, Long roomId, Boolean isOwner) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { log.debug("addFolder " + parentId); @@ -385,7 +385,7 @@ public class FileWebService { // other Folders and Files maybe are also in a Home // directory // but just because their parent is - return fileExplorerItemDao.add(fileName, "", parentId, users_id, room_id, users_id, true, // isFolder + return fileExplorerItemDao.add(fileName, "", parentId, userId, roomId, userId, true, // isFolder false, // isImage false, // isPresentation "", // WML Path @@ -393,7 +393,7 @@ public class FileWebService { false // isXmlFile , 0L, ""); } else { - return fileExplorerItemDao.add(fileName, "", parentId, null, room_id, users_id, true, // isFolder + return fileExplorerItemDao.add(fileName, "", parentId, null, roomId, userId, true, // isFolder false, // isImage false, // isPresentation "", // WML Paht @@ -425,9 +425,9 @@ public class FileWebService { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { fileExplorerItemDao.deleteFileExplorerItemByExternalIdAndType(externalFilesid, externalType); @@ -453,9 +453,9 @@ public class FileWebService { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { fileExplorerItemDao.delete(fileId); @@ -481,9 +481,9 @@ public class FileWebService { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { // TODO: Check if user has access or not to the file @@ -528,9 +528,9 @@ public class FileWebService { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { File working_dir = new File(OmFileHelper.getUploadProfilesDir(), parentFolder); log.debug("############# working_dir : " + working_dir); @@ -561,27 +561,27 @@ public class FileWebService { * * @param SID * The SID of the User. This SID must be marked as logged in - * @param room_id + * @param roomId * Room id - * @param owner_id + * @param ownerId * Owner id * @return - File Explorer Object by a given Room and owner id * @throws ServiceException */ - public FileExplorerObject getFileExplorerByRoom(String SID, Long room_id, Long owner_id) throws ServiceException { + public FileExplorerObject getFileExplorerByRoom(String SID, Long roomId, Long ownerId) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { - log.debug("room_id " + room_id); + log.debug("roomId " + roomId); FileExplorerObject fileExplorerObject = new FileExplorerObject(); // Home File List - FileExplorerItem[] fList = fileExplorerItemDao.getByOwner(owner_id) + FileExplorerItem[] fList = fileExplorerItemDao.getByOwner(ownerId) .toArray(new FileExplorerItem[0]); long homeFileSize = 0; @@ -595,7 +595,7 @@ public class FileWebService { fileExplorerObject.setUserHomeSize(homeFileSize); // Public File List - FileExplorerItem[] rList = fileExplorerItemDao.getByRoom(room_id).toArray(new FileExplorerItem[0]); + FileExplorerItem[] rList = fileExplorerItemDao.getByRoom(roomId).toArray(new FileExplorerItem[0]); long roomFileSize = 0; @@ -626,25 +626,25 @@ public class FileWebService { * * @param SID * The SID of the User. This SID must be marked as logged in - * @param room_id + * @param roomId * Room Id * @return - File Explorer Object by a given Room * @throws ServiceException */ - public FileExplorerObject getFileExplorerByRoomSelf(String SID, Long room_id) throws ServiceException { + public FileExplorerObject getFileExplorerByRoomSelf(String SID, Long roomId) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { - log.debug("room_id " + room_id); + log.debug("roomId " + roomId); FileExplorerObject fileExplorerObject = new FileExplorerObject(); // Home File List - FileExplorerItem[] fList = fileExplorerItemDao.getByOwner(users_id) + FileExplorerItem[] fList = fileExplorerItemDao.getByOwner(userId) .toArray(new FileExplorerItem[0]); long homeFileSize = 0; @@ -658,7 +658,7 @@ public class FileWebService { fileExplorerObject.setUserHomeSize(homeFileSize); // Public File List - FileExplorerItem[] rList = fileExplorerItemDao.getByRoom(room_id).toArray(new FileExplorerItem[0]); + FileExplorerItem[] rList = fileExplorerItemDao.getByRoom(roomId).toArray(new FileExplorerItem[0]); long roomFileSize = 0; @@ -691,31 +691,31 @@ public class FileWebService { * The SID of the User. This SID must be marked as logged in * @param parentId * the parent folder id - * @param room_id + * @param roomId * the room id * @param isOwner * true if its a private drive - * @param owner_id + * @param ownerId * the owner id * @return - FileExplorerItem list by parent folder * @throws ServiceException */ - public FileExplorerItem[] getFileExplorerByParent(String SID, Long parentId, Long room_id, Boolean isOwner, - Long owner_id) throws ServiceException { + public FileExplorerItem[] getFileExplorerByParent(String SID, Long parentId, Long roomId, Boolean isOwner, + Long ownerId) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { log.debug("parentFileExplorerItemId " + parentId); if (parentId == 0) { if (isOwner) { - return fileExplorerItemDao.getByOwner(owner_id).toArray(new FileExplorerItem[0]); + return fileExplorerItemDao.getByOwner(ownerId).toArray(new FileExplorerItem[0]); } else { - return fileExplorerItemDao.getByRoom(room_id).toArray(new FileExplorerItem[0]); + return fileExplorerItemDao.getByRoom(roomId).toArray(new FileExplorerItem[0]); } } else { return fileExplorerItemDao.getByParent(parentId).toArray(new FileExplorerItem[0]); @@ -736,29 +736,29 @@ public class FileWebService { * SID The SID of the User. This SID must be marked as logged in * @param parentId * the parent folder id - * @param room_id + * @param roomId * the room id * @param isOwner * true to request private drive * @return - list of file explorer items * @throws ServiceException */ - public FileExplorerItem[] getFileExplorerByParentSelf(String SID, Long parentId, Long room_id, Boolean isOwner) + public FileExplorerItem[] getFileExplorerByParentSelf(String SID, Long parentId, Long roomId, Boolean isOwner) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { log.debug("parentFileExplorerItemId " + parentId); if (parentId == 0) { if (isOwner) { - return fileExplorerItemDao.getByOwner(users_id).toArray(new FileExplorerItem[0]); + return fileExplorerItemDao.getByOwner(userId).toArray(new FileExplorerItem[0]); } else { - return fileExplorerItemDao.getByRoom(room_id).toArray(new FileExplorerItem[0]); + return fileExplorerItemDao.getByRoom(roomId).toArray(new FileExplorerItem[0]); } } else { return fileExplorerItemDao.getByParent(parentId).toArray(new FileExplorerItem[0]); @@ -786,9 +786,9 @@ public class FileWebService { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { log.debug("deleteFileOrFolder " + fileId); @@ -818,9 +818,9 @@ public class FileWebService { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { // TODO: check if this user is allowed to change this file /* @@ -850,39 +850,39 @@ public class FileWebService { * current file or folder id to be moved * @param newParentId * new parent folder id - * @param room_id + * @param roomId * room id * @param isOwner * if true owner id will be set * @param moveToHome * if true move to private drive - * @param owner_id + * @param ownerId * owner id * @return - null * @throws ServiceException */ - public Long moveFile(String SID, Long fileId, Long newParentId, Long room_id, Boolean isOwner, Boolean moveToHome, - Long owner_id) throws ServiceException { + public Long moveFile(String SID, Long fileId, Long newParentId, Long roomId, Boolean isOwner, Boolean moveToHome, + Long ownerId) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { log.debug("deleteFileOrFolder " + fileId); - fileExplorerItemDao.moveFile(fileId, newParentId, room_id, isOwner, owner_id); + fileExplorerItemDao.moveFile(fileId, newParentId, roomId, isOwner, ownerId); FileExplorerItem fileExplorerItem = fileExplorerItemDao.get(fileId); if (moveToHome) { // set this file and all subfiles and folders the ownerId - fileUtils.setFileToOwnerOrRoomByParent(fileExplorerItem, owner_id, null); + fileUtils.setFileToOwnerOrRoomByParent(fileExplorerItem, ownerId, null); } else { - // set this file and all subfiles and folders the room_id - fileUtils.setFileToOwnerOrRoomByParent(fileExplorerItem, null, room_id); + // set this file and all subfiles and folders the roomId + fileUtils.setFileToOwnerOrRoomByParent(fileExplorerItem, null, roomId); } @@ -902,7 +902,7 @@ public class FileWebService { * current file or folder id to be moved * @param newParentId * new parent folder id - * @param room_id + * @param roomId * room id * @param isOwner * if true owner id will be set @@ -911,30 +911,30 @@ public class FileWebService { * @return - null * @throws ServiceException */ - public Long moveFileSelf(String SID, Long fileId, Long newParentId, Long room_id, Boolean isOwner, + public Long moveFileSelf(String SID, Long fileId, Long newParentId, Long roomId, Boolean isOwner, Boolean moveToHome) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { // A test is required that checks if the user is allowed to move the file log.debug("moveFileSelf " + fileId); - fileExplorerItemDao.moveFile(fileId, newParentId, room_id, isOwner, users_id); + fileExplorerItemDao.moveFile(fileId, newParentId, roomId, isOwner, userId); FileExplorerItem fileExplorerItem = fileExplorerItemDao.get(fileId); if (moveToHome) { // set this file and all subfiles and folders the ownerId - fileUtils.setFileToOwnerOrRoomByParent(fileExplorerItem, users_id, null); + fileUtils.setFileToOwnerOrRoomByParent(fileExplorerItem, userId, null); } else { - // set this file and all subfiles and folders the room_id - fileUtils.setFileToOwnerOrRoomByParent(fileExplorerItem, null, room_id); + // set this file and all subfiles and folders the roomId + fileUtils.setFileToOwnerOrRoomByParent(fileExplorerItem, null, roomId); } Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java Wed Jun 3 10:59:16 2015 @@ -99,8 +99,8 @@ public class JabberWebService { rl.addAll(pbl); } - Long users_id = sessiondataDao.checkSession(SID); - User u = userDao.get(users_id); + Long userId = sessiondataDao.checkSession(SID); + User u = userDao.get(userId); for (OrganisationUser ou : u.getOrganisationUsers()) { List<RoomOrganisation> rol = conferenceService.getRoomsByOrganisationWithoutType(SID , ou.getOrganisation().getId().longValue()); @@ -127,9 +127,9 @@ public class JabberWebService { * @return number of users as int */ public int getUserCount(String SID, Long roomId) { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { return conferenceService.getRoomClientsListByRoomId(roomId).size(); } return -1; @@ -141,15 +141,15 @@ public class JabberWebService { * * @param SID The SID from UserService.getSession * @param username The name of invited user, will be displayed in the rooms user list - * @param room_id id of the room to get users + * @param roomId id of the room to get users * @return hash to enter the room */ - public String getInvitationHash(String SID, String username, Long room_id) { - Long users_id = sessiondataDao.checkSession(SID); + public String getInvitationHash(String SID, String username, Long roomId) { + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { - User invitee = userDao.getContact(username, username, username, users_id); - Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(room_id), false, "", Valid.OneTime, userDao.get(users_id), 1L, new Date(), new Date(), null); + if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) { + User invitee = userDao.getContact(username, username, username, userId); + Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(roomId), false, "", Valid.OneTime, userDao.get(userId), 1L, new Date(), new Date(), null); return invitation == null ? null : invitation.getHash(); } else { Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Wed Jun 3 10:59:16 2015 @@ -136,9 +136,9 @@ public class RoomWebService { */ public List<RoomDTO> getRoomsPublic(String SID, Long roomtypesId) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return RoomDTO.list(roomDao.getPublicRooms(roomtypesId)); } return null; @@ -163,9 +163,9 @@ public class RoomWebService { throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return flvRecordingDao.delete(flvRecordingId); } @@ -190,9 +190,9 @@ public class RoomWebService { public List<RecordingDTO> getFlvRecordingByExternalUserId(String SID, String externalUserId, String externalUserType) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalUserId(externalUserId, externalUserType)); } @@ -220,9 +220,9 @@ public class RoomWebService { throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalRoomTypeAndCreator(externalRoomType, insertedBy)); } @@ -247,9 +247,9 @@ public class RoomWebService { String SID, String externalRoomType) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType)); } @@ -273,9 +273,9 @@ public class RoomWebService { */ public List<RecordingDTO> getRecordingsByExternalType(String SID, String externalType) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return RecordingDTO.list(flvRecordingDao.getRecordingsByExternalType(externalType)); } @@ -300,9 +300,9 @@ public class RoomWebService { String externalRoomType) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return RecordingDTO.list(flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType)); } @@ -327,9 +327,9 @@ public class RoomWebService { throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return RecordingDTO.list(flvRecordingDao.getFlvRecordingByRoomId(roomId)); } @@ -367,9 +367,9 @@ public class RoomWebService { public List<RoomCountBean> getRoomCounters(String SID, Integer[] roomId) throws ServiceException { List<RoomCountBean> roomBeans = new ArrayList<RoomCountBean>(); try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { List<Integer> roomIds = new ArrayList<Integer>(); if (roomId != null) { @@ -407,11 +407,11 @@ public class RoomWebService { * returns a conference room object * * @param SID - The SID of the User. This SID must be marked as Loggedin - * @param rooms_id - the room id + * @param roomId - the room id * @return - room with the id given */ - public Room getRoomById(String SID, long rooms_id) { - return conferenceService.getRoomById(SID, rooms_id); + public Room getRoomById(String SID, long roomId) { + return conferenceService.getRoomById(SID, roomId); } /** @@ -419,24 +419,24 @@ public class RoomWebService { * * @param SID * The SID of the User. This SID must be marked as Loggedin - * @param rooms_id + * @param roomId * @return - object of type RoomReturn * @throws ServiceException */ - public RoomReturn getRoomWithClientObjectsById(String SID, long rooms_id) throws ServiceException { + public RoomReturn getRoomWithClientObjectsById(String SID, long roomId) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { - Room room = roomDao.get(rooms_id); + Room room = roomDao.get(roomId); RoomReturn roomReturn = new RoomReturn(); - roomReturn.setCreated(room.getStarttime()); + roomReturn.setCreated(room.getInserted()); roomReturn.setCreator(null); roomReturn.setName(room.getName()); - roomReturn.setRoom_id(room.getId()); + roomReturn.setRoomId(room.getId()); List<Client> map = sessionManager .getClientListByRoom(room.getId()); @@ -472,7 +472,7 @@ public class RoomWebService { /** * Returns a List of Objects of Rooms You can use "name" as value for - * orderby or rooms_id + * orderby or roomId * * @param SID - The SID of the User. This SID must be marked as Loggedin * @param start - The id you want to start @@ -541,8 +541,8 @@ public class RoomWebService { Boolean ispublic, Boolean appointment, Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return roomManager.addRoom(name, roomtypesId, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, true, @@ -612,8 +612,8 @@ public class RoomWebService { Integer demoTime, Boolean isModeratedRoom, Boolean allowUserQuestions) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return roomManager.addRoom(name, roomtypesId, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, @@ -686,8 +686,8 @@ public class RoomWebService { Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom, Boolean allowUserQuestions, Boolean isAudioOnly) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return roomManager.addRoom(name, roomtypesId, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, @@ -780,8 +780,8 @@ public class RoomWebService { Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return roomManager.addRoom(name, roomtypesId, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, @@ -854,8 +854,8 @@ public class RoomWebService { Integer demoTime, Boolean isModeratedRoom, Long externalRoomId, String externalRoomType) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { Room room = conferenceService.getRoomByExternalId(SID, externalRoomId, externalRoomType, roomtypesId); Long roomId = null; @@ -884,7 +884,7 @@ public class RoomWebService { * * @param SID * The SID of the User. This SID must be marked as Loggedin - * @param room_id + * @param roomId * the room id to update * @param name * new name of the room @@ -912,14 +912,14 @@ public class RoomWebService { * * @return - id of the room updated or error code */ - public Long updateRoomWithModeration(String SID, Long room_id, String name, + public Long updateRoomWithModeration(String SID, Long roomId, String name, Long roomtypesId, String comment, Long numberOfPartizipants, Boolean ispublic, Boolean appointment, Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - return roomManager.updateRoomInternal(room_id, roomtypesId, + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + return roomManager.updateRoomInternal(roomId, roomtypesId, name, ispublic, comment, numberOfPartizipants, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, true, false, true, false, "", "", null, null, @@ -949,7 +949,7 @@ public class RoomWebService { * * @param SID * The SID of the User. This SID must be marked as Loggedin - * @param room_id + * @param roomId * the room id to update * @param name * new name of the room @@ -980,15 +980,15 @@ public class RoomWebService { * * @return - id of the room updated or error code */ - public Long updateRoomWithModerationAndQuestions(String SID, Long room_id, + public Long updateRoomWithModerationAndQuestions(String SID, Long roomId, String name, Long roomtypesId, String comment, Long numberOfPartizipants, Boolean ispublic, Boolean appointment, Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom, Boolean allowUserQuestions) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - return roomManager.updateRoomInternal(room_id, roomtypesId, + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + return roomManager.updateRoomInternal(roomId, roomtypesId, name, ispublic, comment, numberOfPartizipants, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, allowUserQuestions, false, true, false, "", "", @@ -1020,7 +1020,7 @@ public class RoomWebService { * * @param SID * The SID of the User. This SID must be marked as Loggedin - * @param room_id + * @param roomId * the room id to update * @param name * new name of the room @@ -1070,7 +1070,7 @@ public class RoomWebService { * @return - id of the room updated or error code */ public Long updateRoomWithModerationQuestionsAudioTypeAndHideOptions( - String SID, Long room_id, String name, Long roomtypesId, + String SID, Long roomId, String name, Long roomtypesId, String comment, Long numberOfPartizipants, Boolean ispublic, Boolean appointment, Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom, Boolean allowUserQuestions, @@ -1079,9 +1079,9 @@ public class RoomWebService { Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - return roomManager.updateRoomInternal(room_id, roomtypesId, + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + return roomManager.updateRoomInternal(roomId, roomtypesId, name, ispublic, comment, numberOfPartizipants, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, allowUserQuestions, isAudioOnly, true, false, "", "", @@ -1109,12 +1109,12 @@ public class RoomWebService { * * @param SID * The SID of the User. This SID must be marked as Loggedin - * @param rooms_id + * @param roomId * * @return - id of the room deleted */ - public Long deleteRoom(String SID, long rooms_id) { - return conferenceService.deleteRoom(SID, rooms_id); + public Long deleteRoom(String SID, long roomId) { + return conferenceService.deleteRoom(SID, roomId); } /** @@ -1123,16 +1123,16 @@ public class RoomWebService { * @param SID * The SID of the User. This SID must be marked as Loggedin * _Admin - * @param room_id + * @param roomId * the room id * * @return - true if user was kicked, false otherwise */ - public Boolean kickUser(String SID_Admin, Long room_id) { + public Boolean kickUser(String SID_Admin, Long roomId) { try { Boolean salida = false; - salida = userManager.kickUserByStreamId(SID_Admin, room_id); + salida = userManager.kickUserByStreamId(SID_Admin, roomId); if (salida == null) salida = false; @@ -1185,8 +1185,8 @@ public class RoomWebService { Boolean ispublic, Boolean appointment, Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom, String externalRoomType) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return roomManager.addExternalRoom(name, roomtypesId, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1245,8 +1245,8 @@ public class RoomWebService { String externalRoomType, Boolean allowUserQuestions, Boolean isAudioOnly) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return roomManager.addExternalRoom(name, roomtypesId, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1310,8 +1310,8 @@ public class RoomWebService { Boolean allowUserQuestions, Boolean isAudioOnly, Boolean waitForRecording, boolean allowRecording) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return roomManager.addExternalRoom(name, roomtypesId, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1382,8 +1382,8 @@ public class RoomWebService { Boolean isAudioOnly, Boolean waitForRecording, boolean allowRecording, Boolean hideTopBar) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return roomManager.addExternalRoom(name, roomtypesId, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1409,7 +1409,7 @@ public class RoomWebService { * valid Session Token * @param username * the username of the User that he will get - * @param room_id + * @param roomId * the conference room id of the invitation * @param isPasswordProtected * if the invitation is password protected @@ -1434,11 +1434,11 @@ public class RoomWebService { * :$PORT/openmeetings/?invitationHash="+invitationsHash; * @throws ServiceException */ - public String getInvitationHash(String SID, String username, Long room_id, + public String getInvitationHash(String SID, String username, Long roomId, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, String validFromTime, String validToDate, String validToTime) throws ServiceException { - return getInvitationHashFullName(SID, username, username, username, room_id, isPasswordProtected, invitationpass, valid, + return getInvitationHashFullName(SID, username, username, username, roomId, isPasswordProtected, invitationpass, valid, validFromDate, validFromTime, validToDate, validToTime); } /** @@ -1457,7 +1457,7 @@ public class RoomWebService { * the first name of the User that he will get * @param lastname * the last name of the User that he will get - * @param room_id + * @param roomId * the conference room id of the invitation * @param isPasswordProtected * if the invitation is password protected @@ -1482,12 +1482,12 @@ public class RoomWebService { * :$PORT/openmeetings/?invitationHash="+invitationsHash; * @throws ServiceException */ - public String getInvitationHashFullName(String SID, String username, String firstname, String lastname, Long room_id, + public String getInvitationHashFullName(String SID, String username, String firstname, String lastname, Long roomId, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, String validFromTime, String validToDate, String validToTime) throws ServiceException { return sendInvitationHash(SID, username, firstname, lastname, null, null, - room_id, isPasswordProtected, invitationpass, valid, validFromDate, + roomId, isPasswordProtected, invitationpass, valid, validFromDate, validFromTime, validToDate, validToTime, 1L, false); } @@ -1510,7 +1510,7 @@ public class RoomWebService { * @param subject * the subject of the Email send with the invitation if sendMail * is true - * @param room_id + * @param roomId * the conference room id of the invitation * @param isPasswordProtected * if the invitation is password protected @@ -1530,7 +1530,7 @@ public class RoomWebService { * 2 * @param validToTime * time in Format of hh:mm only of interest if valid is type 2 - * @param language_id + * @param languageId * the language id of the EMail that is send with the invitation * if sendMail is true * @param sendMail @@ -1542,20 +1542,20 @@ public class RoomWebService { * @throws ServiceException */ public String sendInvitationHash(String SID, String username, String message, String email, String subject, - Long room_id, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, - String validFromTime, String validToDate, String validToTime, Long language_id, Boolean sendMail) throws ServiceException { + Long roomId, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, + String validFromTime, String validToDate, String validToTime, Long languageId, Boolean sendMail) throws ServiceException { return sendInvitationHash(SID, email, username, username, message, subject, - room_id, isPasswordProtected, invitationpass, valid, validFromDate, - validFromTime, validToDate, validToTime, language_id, sendMail); + roomId, isPasswordProtected, invitationpass, valid, validFromDate, + validFromTime, validToDate, validToTime, languageId, sendMail); } private String sendInvitationHash(String SID, String email, String firstname, String lastname, String message, String subject, - Long room_id, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, - String validFromTime, String validToDate, String validToTime, Long language_id, Boolean sendMail) throws ServiceException { + Long roomId, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, + String validFromTime, String validToDate, String validToTime, Long languageId, Boolean sendMail) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { Date dFrom = new Date(); Date dTo = new Date(); @@ -1594,10 +1594,10 @@ public class RoomWebService { log.info("validToDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(dTo)); } - User invitee = userDao.getContact(email, firstname, lastname, users_id); - Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(room_id), + User invitee = userDao.getContact(email, firstname, lastname, userId); + Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(roomId), isPasswordProtected, invitationpass, Valid.fromInt(valid) - , userDao.get(users_id), language_id, + , userDao.get(userId), languageId, dFrom, dTo, null); if (invitation != null) { @@ -1638,7 +1638,7 @@ public class RoomWebService { * @param subject * the subject of the Email send with the invitation if sendMail * is true - * @param room_id + * @param roomId * the conference room id of the invitation * @param conferencedomain * the domain of the room (keep empty) @@ -1654,7 +1654,7 @@ public class RoomWebService { * Date as Date Object only of interest if valid is type 2 * @param toDate * Date as Date Object only of interest if valid is type 2 - * @param language_id + * @param languageId * the language id of the EMail that is send with the invitation * if sendMail is true * @param sendMail @@ -1667,13 +1667,13 @@ public class RoomWebService { */ public String sendInvitationHashWithDateObject(String SID, String username, String message, String email, String subject, - Long room_id, String conferencedomain, Boolean isPasswordProtected, + Long roomId, String conferencedomain, Boolean isPasswordProtected, String invitationpass, Integer valid, Date fromDate, Date toDate, - Long language_id, Boolean sendMail) throws ServiceException { + Long languageId, Boolean sendMail) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { Calendar calFrom = Calendar.getInstance(); calFrom.setTime(fromDate); @@ -1689,10 +1689,10 @@ public class RoomWebService { log.info("validToDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(dTo)); - User invitee = userDao.getContact(email, users_id); - Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(room_id), + User invitee = userDao.getContact(email, userId); + Invitation invitation = invitationManager.getInvitation(invitee, roomDao.get(roomId), isPasswordProtected, invitationpass, Valid.fromInt(valid) - , userDao.get(users_id), language_id, dFrom, dTo, null); + , userDao.get(userId), languageId, dFrom, dTo, null); if (invitation != null) { if (sendMail) { @@ -1739,11 +1739,11 @@ public class RoomWebService { for (Room room : rooms) { RoomReturn roomReturn = new RoomReturn(); - roomReturn.setRoom_id(room.getId()); + roomReturn.setRoomId(room.getId()); roomReturn.setName(room.getName()); roomReturn.setCreator("SOAP"); - roomReturn.setCreated(room.getStarttime()); + roomReturn.setCreated(room.getInserted()); RoomUser[] rUser = new RoomUser[room.getCurrentusers().size()]; @@ -1801,11 +1801,11 @@ public class RoomWebService { for (Room room : rooms) { RoomReturn roomReturn = new RoomReturn(); - roomReturn.setRoom_id(room.getId()); + roomReturn.setRoomId(room.getId()); roomReturn.setName(room.getName()); roomReturn.setCreator("SOAP"); - roomReturn.setCreated(room.getStarttime()); + roomReturn.setCreated(room.getInserted()); RoomUser[] rUser = new RoomUser[room.getCurrentusers().size()]; @@ -1892,9 +1892,9 @@ public class RoomWebService { Boolean isPasswordProtected, String password, Long reminderTypeId, String redirectURL) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { int validFromHour = Integer.valueOf(validFromTime.substring(0, 2)).intValue(); int validFromMinute = Integer.valueOf(validFromTime.substring(3, 5)).intValue(); @@ -1928,7 +1928,7 @@ public class RoomWebService { log.info("validFromDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(dFrom)); log.info("validToDate: " + CalendarPatterns.getDateWithTimeByMiliSeconds(dTo)); - Long rooms_id = roomManager.addExternalRoom(name, + Long roomId = roomManager.addExternalRoom(name, roomtypesId, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, null, externalRoomType, false, // allowUserQuestions @@ -1937,26 +1937,26 @@ public class RoomWebService { false, // isClosed redirectURL, false, true, false); - if (rooms_id <= 0) { - return rooms_id; + if (roomId <= 0) { + return roomId; } Appointment a = new Appointment(); a.setTitle("appointmentName"); - a.setOwner(userDao.get(users_id)); + a.setOwner(userDao.get(userId)); a.setLocation("appointmentLocation"); a.setDescription("appointmentDescription"); a.setStart(dFrom); a.setEnd(dTo); a.setCategory(appointmentCategoryDao.get(1L)); a.setRemind(appointmentReminderTypDao.get(reminderTypeId)); - a.setRoom(roomDao.get(rooms_id)); + a.setRoom(roomDao.get(roomId)); a.setPasswordProtected(isPasswordProtected); a.setPassword(password); a.setLanguageId(1L); //TODO check - appointmentDao.update(a, users_id); //FIXME verify !!! + appointmentDao.update(a, userId); //FIXME verify !!! - return rooms_id; + return roomId; } else { return -2L; @@ -1976,7 +1976,7 @@ public class RoomWebService { * * @param SID * The SID of the User. This SID must be marked as Loggedin - * @param room_id + * @param roomId * The Room Id the meeting member is going to be added * @param firstname * The first name of the meeting member @@ -1984,16 +1984,16 @@ public class RoomWebService { * The last name of the meeting member * @param email * The email of the Meeting member - * @param language_id + * @param languageId * The ID of the language, for the email that is send to the * meeting member * * @return - id of the member in case of success, error code otherwise * @throws ServiceException */ - public Long addMeetingMemberRemindToRoom(String SID, Long room_id, - String firstname, String lastname, String email, Long language_id) throws ServiceException { - return addExternalMeetingMemberRemindToRoom(SID, room_id, firstname, lastname, email, language_id, null, null); + public Long addMeetingMemberRemindToRoom(String SID, Long roomId, + String firstname, String lastname, String email, Long languageId) throws ServiceException { + return addExternalMeetingMemberRemindToRoom(SID, roomId, firstname, lastname, email, languageId, null, null); } /** @@ -2002,7 +2002,7 @@ public class RoomWebService { * * @param SID * The SID of the User. This SID must be marked as Loggedin - * @param room_id + * @param roomId * The Room Id the meeting member is going to be added * @param firstname * The first name of the meeting member @@ -2010,7 +2010,7 @@ public class RoomWebService { * The last name of the meeting member * @param email * The email of the Meeting member - * @param language_id + * @param languageId * The ID of the language, for the email that is send to the * meeting member * @param jNameTimeZone @@ -2021,28 +2021,28 @@ public class RoomWebService { * @return - id of the member in case of success, error code otherwise * @throws ServiceException */ - public Long addExternalMeetingMemberRemindToRoom(String SID, Long room_id, - String firstname, String lastname, String email, Long language_id, String jNameTimeZone, String invitorName) + public Long addExternalMeetingMemberRemindToRoom(String SID, Long roomId, + String firstname, String lastname, String email, Long languageId, String jNameTimeZone, String invitorName) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - Appointment a = appointmentDao.getAppointmentByRoom(room_id); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + Appointment a = appointmentDao.getAppointmentByRoom(roomId); if (email == null || a == null) { return -1L; } for (MeetingMember mm : a.getMeetingMembers()) { - if (email.equals(mm.getUser().getAdresses().getEmail())) { + if (email.equals(mm.getUser().getAddress().getEmail())) { return mm.getId(); } } MeetingMember mm = new MeetingMember(); mm.setAppointment(a); - mm.setUser(userDao.getContact(email, firstname, lastname, language_id, jNameTimeZone, users_id)); + mm.setUser(userDao.getContact(email, firstname, lastname, languageId, jNameTimeZone, userId)); a.getMeetingMembers().add(mm); - appointmentDao.update(a, users_id); + appointmentDao.update(a, userId); return mm.getId(); //FIXME check to return ID } else { @@ -2064,7 +2064,7 @@ public class RoomWebService { * * @param SID * The SID of the User. This SID must be marked as Loggedin - * @param room_id + * @param roomId * the room id * @param status * false = close, true = open @@ -2072,23 +2072,23 @@ public class RoomWebService { * @return - 1 in case of success, -2 otherwise * @throws ServiceException */ - public int closeRoom(String SID, Long room_id, Boolean status) + public int closeRoom(String SID, Long roomId, Boolean status) throws ServiceException { try { - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - log.debug("closeRoom 1 " + room_id); + log.debug("closeRoom 1 " + roomId); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { log.debug("closeRoom 2 " + status); - roomManager.closeRoom(room_id, status); + roomManager.closeRoom(roomId, status); if (status) { Map<String, String> message = new HashMap<String, String>(); message.put("message", "roomClosed"); - scopeApplicationAdapter.sendMessageByRoomAndDomain(room_id, + scopeApplicationAdapter.sendMessageByRoomAndDomain(roomId, message); } return 1; @@ -2108,21 +2108,21 @@ public class RoomWebService { * Method to update arbitrary room parameter. * * @param SID The SID of the User. This SID must be marked as logged in - * @param room_id the room id + * @param roomId the room id * @param paramName the name of parameter to be updated, please NOTE rooms_id is not updatable as well as fields of type {@link Date} and {@link List} * @param paramValue the value to be set, please use "type id" to set room type * @return 1 in case of success, -2 if permissions are insufficient * @throws AxisFault if any error occurred */ - public int modifyRoomParameter(String SID, Long room_id, String paramName, String paramValue) throws ServiceException { + public int modifyRoomParameter(String SID, Long roomId, String paramName, String paramValue) throws ServiceException { try { if ("rooms_id".equals(paramName)) { throw new ServiceException("Non modifiable parameter"); } - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - log.debug(String.format("modifyRoomParameter[%s]: %s = %s", room_id, paramName, paramValue)); - Room r = roomDao.get(room_id); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + log.debug(String.format("modifyRoomParameter[%s]: %s = %s", roomId, paramName, paramValue)); + Room r = roomDao.get(roomId); BeanWrapper rw = new BeanWrapperImpl(r); Class<?> valueClass = rw.getPropertyType(paramName); Object val = null; @@ -2141,7 +2141,7 @@ public class RoomWebService { val = Integer.parseInt(paramValue); } rw.setPropertyValue(paramName, val); - roomDao.update(r, users_id); + roomDao.update(r, userId); } else { return -2; } @@ -2157,17 +2157,17 @@ public class RoomWebService { * Adds a room to an organization * * @param SID - The SID of the User. This SID must be marked as Loggedin - * @param rooms_id - Id of room to be added - * @param organisation_id - Id of organisation that the room is being paired with + * @param roomId - Id of room to be added + * @param organisationId - Id of organisation that the room is being paired with * * @return Id of the relation created, null or -1 in case of the error */ - public Long addRoomToOrg(String SID, Long rooms_id, Long organisation_id) { + public Long addRoomToOrg(String SID, Long roomId, Long organisationId) { try { - Long users_id = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - if (null == roomManager.getRoomsOrganisationByOrganisationIdAndRoomId(organisation_id, rooms_id)) { - return roomManager.addRoomToOrganisation(rooms_id, organisation_id); + Long userId = sessiondataDao.checkSession(SID); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { + if (null == roomManager.getRoomsOrganisationByOrganisationIdAndRoomId(organisationId, roomId)) { + return roomManager.addRoomToOrganisation(roomId, organisationId); } } } catch (Exception err) { Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1683280&r1=1683279&r2=1683280&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java Wed Jun 3 10:59:16 2015 @@ -71,9 +71,9 @@ public class ServerWebService { */ public Server[] getServers(String SID, int start, int max) throws ServiceException { log.debug("getServers enter"); - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return serversDao.get(start, max).toArray(new Server[0]); } else { log.warn("Insuffisient permissions"); @@ -91,9 +91,9 @@ public class ServerWebService { */ public int getServerCount(String SID) throws ServiceException { log.debug("getServerCount enter"); - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { return (int) serversDao.count(); } else { log.warn("Insuffisient permissions"); @@ -132,9 +132,9 @@ public class ServerWebService { int port, String user, String pass, String webapp, String protocol, Boolean active, String comment) throws ServiceException { log.debug("saveServerCount enter"); - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { Server s = serversDao.get(id); if (s == null) { s = new Server(); @@ -148,7 +148,7 @@ public class ServerWebService { s.setProtocol(protocol); s.setActive(active); s.setComment(comment); - return serversDao.update(s, users_id).getId(); + return serversDao.update(s, userId).getId(); } else { log.warn("Insuffisient permissions"); return -1; @@ -166,12 +166,12 @@ public class ServerWebService { */ public boolean deleteServer(String SID, long id) throws ServiceException { log.debug("saveServerCount enter"); - Long users_id = sessiondataDao.checkSession(SID); + Long userId = sessiondataDao.checkSession(SID); - if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) { Server s = serversDao.get(id); if (s != null) { - serversDao.delete(s, users_id); + serversDao.delete(s, userId); return true; } } else {
