Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.29 -r1.30
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	16 Oct 2008 06:08:51 -0000	1.29
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	25 Nov 2008 00:59:52 -0000	1.30
@@ -163,6 +163,7 @@
 				req.setAttribute(AttributeNames.PARAM_PRESENCE_ENABLED, lesson.getLearnerPresenceAvailable());
 				req.setAttribute(AttributeNames.PARAM_PRESENCE_IM_ENABLED, lesson.getLearnerImAvailable());
 				req.setAttribute(AttributeNames.PARAM_TITLE, lesson.getLessonName());
+				req.setAttribute(AttributeNames.PARAM_CREATE_DATE_TIME, lesson.getCreateDateTime());
 				String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
 				req.setAttribute("serverUrl", serverUrl);
 				String presenceUrl = Configuration.get(ConfigurationKeys.XMPP_DOMAIN);
Index: lams_central/web/learner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/learner.jsp,v
diff -u -r1.16 -r1.17
--- lams_central/web/learner.jsp	16 Oct 2008 06:08:50 -0000	1.16
+++ lams_central/web/learner.jsp	25 Nov 2008 00:59:52 -0000	1.17
@@ -16,7 +16,7 @@
 		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${presenceImAvailable}"/>&presenceUrl=<c:out value="${presenceUrl}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if>">
 	</c:when>
 	<c:otherwise>
-		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainnoflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${presenceImAvailable}"/>&presenceUrl=<c:out value="${presenceUrl}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if>">
+		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainnoflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&presenceEnabledPatch=<c:out value="${presenceEnabledPatch}"/>&presenceImEnabled=<c:out value="${presenceImAvailable}"/>&presenceUrl=<c:out value="${presenceUrl}"/>&createDateTime=<c:out value="${createDateTime}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if>">
 	</c:otherwise>
 </c:choose>
 
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java,v
diff -u -r1.23 -r1.24
--- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	16 Oct 2008 06:08:46 -0000	1.23
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	25 Nov 2008 00:59:52 -0000	1.24
@@ -70,6 +70,7 @@
     public static final String PARAM_CURRENT_TAB = "currentTab";
     public static final String PARAM_CUSTOM_CSV = "customCSV";
     public static final String PARAM_EXT_LMS_ID = "extlmsid";
+    public static final String PARAM_CREATE_DATE_TIME = "createDateTime"; 
     
     public static final String PARAM_LIB = "library";
     
Index: lams_learning/web/mainnoflash.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/mainnoflash.jsp,v
diff -u -r1.8 -r1.9
--- lams_learning/web/mainnoflash.jsp	24 Nov 2008 00:14:36 -0000	1.8
+++ lams_learning/web/mainnoflash.jsp	25 Nov 2008 00:59:52 -0000	1.9
@@ -50,14 +50,16 @@
         <script type="text/javascript">
      		var HTTPBASE = "<lams:LAMSURL/>JHB";
      		var presenceLabel = "<fmt:message key='label.presence'/>";
+     		var roomName = "${param.lessonID}" + "${param.createDateTime}";
+     		roomName = correctPresenceRoomName(roomName);
      		
 	    	window.onload=function(){
 				// if presence is enabled, attempt to login once the window is loaded
 				attemptLogin();
 			}
 			
 			function attemptLogin(){
-				doLogin("${param.presenceUrl}", "<lams:user property="userID"/>", "<lams:user property="userID"/>", "<lams:user property="userID"/>", "${param.lessonID}", "<lams:user property="firstName"/>" + " " + "<lams:user property="lastName"/>", false, false);
+				doLogin("${param.presenceUrl}", "<lams:user property="userID"/>", "<lams:user property="userID"/>", "<lams:user property="userID"/>", roomName, "<lams:user property="firstName"/>" + " " + "<lams:user property="lastName"/>", false, false);
 			}
 			
 			function attemptRegistration(){
Index: lams_learning/web/includes/presence.js
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/includes/Attic/presence.js,v
diff -u -r1.4 -r1.5
--- lams_learning/web/includes/presence.js	24 Nov 2008 00:14:56 -0000	1.4
+++ lams_learning/web/includes/presence.js	25 Nov 2008 00:59:52 -0000	1.5
@@ -76,6 +76,13 @@
 	return o;
 }
 
+function correctPresenceRoomName(s){
+	s = s.replace(/ /g, "_");
+	s = s.replace(/:/g, "_");
+	
+	return s;
+}
+
 function createElem(name, attrs, style, text) {
 	var e = document.createElement(name);
 	if (attrs) {