Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -r049f9b1332a5f65c5de9d5b4f891b93fe429ae63 -r3c6f4109c87f92faf4a381d242cf3d95cd171dd6
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 049f9b1332a5f65c5de9d5b4f891b93fe429ae63)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 3c6f4109c87f92faf4a381d242cf3d95cd171dd6)
@@ -91,10 +91,12 @@
 	/** See deleteOldPreviewLessons */
 	public static final String NUM_DELETED = "numDeleted";
 
-	private Integer getUserId() {
-		HttpSession ss = SessionManager.getSession();
+	private Integer getUserId(HttpServletRequest request) {
+		return new Integer(WebUtil.readIntParam(request,"userID"));
+/*		HttpSession ss = SessionManager.getSession();
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 		return user != null ? user.getUserID() : null;
+	*/
 	}
 	
     /**
@@ -176,7 +178,7 @@
     		String desc = WebUtil.readStrParam(request,"lessonDescription");
     		if ( desc == null ) desc = "description";
     		long ldId = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID);
-    		Lesson newLesson = monitoringService.initializeLesson(title,desc,ldId,getUserId());
+    		Lesson newLesson = monitoringService.initializeLesson(title,desc,ldId,getUserId(request));
     		
     		flashMessage = new FlashMessage("initializeLesson",newLesson.getLessonId());
 		} catch (Exception e) {
@@ -222,7 +224,7 @@
     	
     	try {
             long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-    		monitoringService.startLesson(lessonId, getUserId());
+    		monitoringService.startLesson(lessonId, getUserId(request));
     		flashMessage = new FlashMessage("startLesson",Boolean.TRUE);
 		} catch (Exception e) {
 			flashMessage = handleException(e, "startLesson", monitoringService);
@@ -264,7 +266,7 @@
         	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
         	String dateStr = WebUtil.readStrParam(request, MonitoringConstants.PARAM_LESSON_START_DATE);
     		Date startDate = DateFormat.getInstance().parse(dateStr);
-    		monitoringService.startLessonOnSchedule(lessonId,startDate,getUserId());
+    		monitoringService.startLessonOnSchedule(lessonId,startDate,getUserId(request));
     		flashMessage = new FlashMessage("startOnScheduleLesson",Boolean.TRUE);
     	}catch (Exception e) {
 			flashMessage = handleException(e, "startOnScheduleLesson", monitoringService);
@@ -308,7 +310,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());
+    		monitoringService.finishLessonOnSchedule(lessonId,finishDate,getUserId(request));
     		flashMessage = new FlashMessage("finishOnScheduleLesson",Boolean.TRUE);
     	}catch (Exception e) {
 			flashMessage = handleException(e, "finishOnScheduleLesson", monitoringService);
@@ -349,7 +351,7 @@
     	
     	try {
         	long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    		monitoringService.archiveLesson(lessonId, getUserId());
+    		monitoringService.archiveLesson(lessonId, getUserId(request));
     		flashMessage = new FlashMessage("archiveLesson",Boolean.TRUE);
 		} catch (Exception e) {
 			flashMessage = handleException(e, "archiveLesson", monitoringService);
@@ -388,7 +390,7 @@
     	
     	try {
         	long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    		monitoringService.suspendLesson(lessonId, getUserId());
+    		monitoringService.suspendLesson(lessonId, getUserId(request));
     		flashMessage = new FlashMessage("suspendLesson",Boolean.TRUE);
     	} catch (Exception e) {
 			flashMessage = handleException(e, "suspendLesson", monitoringService);
@@ -424,7 +426,7 @@
     	
     	try {
         	long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    		monitoringService.unsuspendLesson(lessonId, getUserId());
+    		monitoringService.unsuspendLesson(lessonId, getUserId(request));
     		flashMessage = new FlashMessage("unsuspendLesson",Boolean.TRUE);
     	} catch (Exception e) {
 			flashMessage = handleException(e, "unsuspendLesson", monitoringService);
@@ -463,7 +465,7 @@
     	
     	try {
         	long lessonId = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID);
-    		monitoringService.removeLesson(lessonId, getUserId());
+    		monitoringService.removeLesson(lessonId, getUserId(request));
     		flashMessage = new FlashMessage("removeLesson",Boolean.TRUE);
 		} catch (Exception e) {
 			flashMessage = handleException(e, "removeLesson", monitoringService);
@@ -527,7 +529,7 @@
                                      HttpServletRequest request,
                                      HttpServletResponse response)throws IOException{
     	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
-    	String wddxPacket = monitoringService.getAllLessonsWDDX(getUserId());
+    	String wddxPacket = monitoringService.getAllLessonsWDDX(getUserId(request));
         PrintWriter writer = response.getWriter();
         writer.println(wddxPacket);
         return null;
@@ -677,7 +679,7 @@
 	        	long lessonID = previewLesson.getLessonId().longValue();
 				
 	        	monitoringService.createPreviewClassForLesson(userID, lessonID);
-		        monitoringService.startLesson(lessonID, getUserId());
+		        monitoringService.startLesson(lessonID, getUserId(request));
 		
 				flashMessage = new FlashMessage("startPreviewSession",new Long(lessonID));