Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java,v diff -u -r1.33 -r1.34 --- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java 17 Sep 2006 06:12:05 -0000 1.33 +++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java 10 Oct 2006 05:17:36 -0000 1.34 @@ -31,6 +31,8 @@ import java.util.Set; import java.util.Vector; +import javax.servlet.http.HttpSession; + import org.apache.log4j.Logger; import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; @@ -66,9 +68,12 @@ import org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; import org.lamsfoundation.lams.util.wddx.WDDXTAGS; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; /** * @author Manpreet Minhas @@ -301,18 +306,15 @@ if (keyExists(table, WDDXTAGS.SAVE_MODE)) mode = WDDXProcessor.convertToInteger(table, WDDXTAGS.SAVE_MODE); - if (keyExists(table, WDDXTAGS.USER_ID)) - { - Integer userId = WDDXProcessor.convertToInteger(table,WDDXTAGS.USER_ID); - if( userId != null ) { - User user = (User)baseDAO.find(User.class,userId); - if(user!=null) { - learningDesign.setUser(user); - } else { - throw new ObjectExtractorException("userID missing"); - } + Integer userId = getUserId(); + + if( userId != null ) { + User user = (User)baseDAO.find(User.class,userId); + if(user!=null) { + learningDesign.setUser(user); + } else { + throw new ObjectExtractorException("userID missing"); } - //else dont do anything. } if (keyExists(table, WDDXTAGS.LICENCE_ID)) @@ -1001,5 +1003,17 @@ public Integer getMode() { return mode; } + + /** + * Helper method to retrieve the user data. Gets the id from the user details + * in the shared session + * @return the user id + */ + public static Integer getUserId() + { + HttpSession ss = SessionManager.getSession(); + UserDTO learner = (UserDTO) ss.getAttribute(AttributeNames.USER); + return learner != null ? learner.getUserID() : null; + } } \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java,v diff -u -r1.6 -r1.7 --- lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java 4 Oct 2006 07:56:50 -0000 1.6 +++ lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java 10 Oct 2006 05:17:36 -0000 1.7 @@ -27,15 +27,19 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.util.wddx.FlashMessage; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; import org.lamsfoundation.lams.util.wddx.WDDXTAGS; import org.lamsfoundation.lams.web.servlet.AbstractStoreWDDXPacketServlet; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -59,7 +63,19 @@ WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); return (ICoreNotebookService) webContext.getBean("coreNotebookService"); } - + + /** + * Helper method to retrieve the user data. Gets the id from the user details + * in the shared session + * @return the user id + */ + public static Integer getUserId() + { + HttpSession ss = SessionManager.getSession(); + UserDTO learner = (UserDTO) ss.getAttribute(AttributeNames.USER); + return learner != null ? learner.getUserID() : null; + } + protected String process(String entryDetails, HttpServletRequest request) throws Exception { @@ -81,8 +97,10 @@ if (keyExists(table, WDDXTAGS.EXTERNAL_SIG)) { notebookEntry.setExternalSignature(WDDXProcessor.convertToString(table, WDDXTAGS.EXTERNAL_SIG)); } - if (keyExists(table, WDDXTAGS.USER_ID)) { - User user = (User) notebookService.getUserManagementService().findById(User.class,WDDXProcessor.convertToInteger(table, WDDXTAGS.USER_ID)); + Integer userID = getUserId(); + if (userID != null) { + + User user = (User) notebookService.getUserManagementService().findById(User.class,userID); notebookEntry.setUser(user); } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/CreateLessonServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/Attic/CreateLessonServlet.java,v diff -u -r1.4 -r1.5 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/CreateLessonServlet.java 17 Sep 2006 06:19:29 -0000 1.4 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/CreateLessonServlet.java 10 Oct 2006 05:17:36 -0000 1.5 @@ -61,7 +61,7 @@ //get User infomation from shared session. HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Integer userID = new Integer(WebUtil.readIntParam(request,AttributeNames.PARAM_USER_ID)); + Integer userID = (user != null) ? user.getUserID() : null; if(userID == null){ log.error("Can not find valid login user information"); FlashMessage flashMessage = new FlashMessage("createLesson", Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.47 -r1.48 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 19 Sep 2006 04:57:24 -0000 1.47 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 10 Oct 2006 05:17:36 -0000 1.48 @@ -31,6 +31,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; import org.apache.struts.action.ActionForm; @@ -48,6 +49,8 @@ import org.lamsfoundation.lams.util.wddx.FlashMessage; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.util.AttributeNames; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -88,12 +91,10 @@ private static IAuditService auditService; - private Integer getUserId(HttpServletRequest request) { - return new Integer(WebUtil.readIntParam(request,"userID")); -/* HttpSession ss = SessionManager.getSession(); + private Integer getUserId() { + HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); return user != null ? user.getUserID() : null; - */ } private FlashMessage handleException(Exception e, String methodKey, IMonitoringService monitoringService) { @@ -172,7 +173,7 @@ if ( desc == null ) desc = "description"; Integer organisationId = WebUtil.readIntParam(request,"organisationID",true); long ldId = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID); - Lesson newLesson = monitoringService.initializeLesson(title,desc,ldId,organisationId,getUserId(request)); + Lesson newLesson = monitoringService.initializeLesson(title,desc,ldId,organisationId,getUserId()); flashMessage = new FlashMessage("initializeLesson",newLesson.getLessonId()); } catch (Exception e) { @@ -218,7 +219,7 @@ try { long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); - monitoringService.startLesson(lessonId, getUserId(request)); + monitoringService.startLesson(lessonId, getUserId()); flashMessage = new FlashMessage("startLesson",Boolean.TRUE); } catch (Exception e) { flashMessage = handleException(e, "startLesson", monitoringService); @@ -262,7 +263,7 @@ String dateStr = WebUtil.readStrParam(request, MonitoringConstants.PARAM_LESSON_START_DATE); Date startDate = DateUtil.convertFromLAMSFlashFormat(dateStr); - monitoringService.startLessonOnSchedule(lessonId,startDate,getUserId(request)); + monitoringService.startLessonOnSchedule(lessonId,startDate,getUserId()); flashMessage = new FlashMessage("startOnScheduleLesson",Boolean.TRUE); }catch (Exception e) { flashMessage = handleException(e, "startOnScheduleLesson", monitoringService); @@ -306,7 +307,7 @@ long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); String dateStr = WebUtil.readStrParam(request, MonitoringConstants.PARAM_LESSON_FINISH_DATE); Date finishDate = DateFormat.getInstance().parse(dateStr); - monitoringService.finishLessonOnSchedule(lessonId,finishDate,getUserId(request)); + monitoringService.finishLessonOnSchedule(lessonId,finishDate,getUserId()); flashMessage = new FlashMessage("finishOnScheduleLesson",Boolean.TRUE); }catch (Exception e) { flashMessage = handleException(e, "finishOnScheduleLesson", monitoringService); @@ -347,7 +348,7 @@ try { long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID); - monitoringService.archiveLesson(lessonId, getUserId(request)); + monitoringService.archiveLesson(lessonId, getUserId()); flashMessage = new FlashMessage("archiveLesson",Boolean.TRUE); } catch (Exception e) { flashMessage = handleException(e, "archiveLesson", monitoringService); @@ -388,7 +389,7 @@ try { long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID); - monitoringService.unarchiveLesson(lessonId, getUserId(request)); + monitoringService.unarchiveLesson(lessonId, getUserId()); flashMessage = new FlashMessage("unarchiveLesson",Boolean.TRUE); } catch (Exception e) { flashMessage = handleException(e, "unarchiveLesson", monitoringService); @@ -426,7 +427,7 @@ try { long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID); - monitoringService.suspendLesson(lessonId, getUserId(request)); + monitoringService.suspendLesson(lessonId, getUserId()); flashMessage = new FlashMessage("suspendLesson",Boolean.TRUE); } catch (Exception e) { flashMessage = handleException(e, "suspendLesson", monitoringService); @@ -462,7 +463,7 @@ try { long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID); - monitoringService.unsuspendLesson(lessonId, getUserId(request)); + monitoringService.unsuspendLesson(lessonId, getUserId()); flashMessage = new FlashMessage("unsuspendLesson",Boolean.TRUE); } catch (Exception e) { flashMessage = handleException(e, "unsuspendLesson", monitoringService); @@ -501,7 +502,7 @@ try { long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID); - monitoringService.removeLesson(lessonId, getUserId(request)); + monitoringService.removeLesson(lessonId, getUserId()); flashMessage = new FlashMessage("removeLesson",Boolean.TRUE); } catch (Exception e) { flashMessage = handleException(e, "removeLesson", monitoringService); @@ -573,7 +574,7 @@ IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); try{ Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - wddxPacket = monitoringService.getLessonDetails(lessonID, getUserId(request)); + wddxPacket = monitoringService.getLessonDetails(lessonID, getUserId()); }catch (Exception e) { wddxPacket = handleException(e, "getLessonDetails", monitoringService).serializeMessage(); } @@ -806,7 +807,7 @@ long lessonID = previewLesson.getLessonId().longValue(); monitoringService.createPreviewClassForLesson(userID, lessonID); - monitoringService.startLesson(lessonID, getUserId(request)); + monitoringService.startLesson(lessonID, getUserId()); flashMessage = new FlashMessage("startPreviewSession",new Long(lessonID));