Index: lams_bb_integration/web/modules/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/create.jsp,v
diff -u -r1.17 -r1.18
--- lams_bb_integration/web/modules/create.jsp	6 Aug 2014 19:36:21 -0000	1.17
+++ lams_bb_integration/web/modules/create.jsp	5 Dec 2014 22:33:50 -0000	1.18
@@ -27,6 +27,7 @@
 
 <bbNG:cssFile href="../includes/css/treeview.css" />
 <bbNG:cssFile href="../includes/css/folders.css" />
+
 <%
     // Authorise current user for Course Control Panel (automatic redirect)
     try{
@@ -35,17 +36,11 @@
     } catch(PlugInException e) {
         throw new RuntimeException(e);
     }
-
-    // Get the Login Request URL for authoring LAMS Lessons
-    String authorUrl = LamsSecurityUtil.generateRequestURL(ctx, "author", null);
     
-    // Get the list of Learning Designs
-    //String learningDesigns = LamsSecurityUtil.getLearningDesigns(ctx, 2);
     String lamsServerUrl = LamsSecurityUtil.getServerAddress();
     
 	// get all user accessible folders and LD descriptions as JSON
 	String learningDesigns = LamsSecurityUtil.getLearningDesigns(ctx, ctx.getCourse().getCourseId(), null);
-
 %>
 
 <bbNG:jsBlock>
@@ -225,8 +220,7 @@
         
             // Open the LAMS Seuence Author Window
             function openAuthor() {
-                var authorUrl = '<%=authorUrl%>';
-                authorUrl += "&isPostMessageToParent=true";
+                var authorUrl = 'openAuthor.jsp?course_id=<%=request.getParameter("course_id")%>&content_id=<%=request.getParameter("content_id")%>';
                 
                 if(authorWin && authorWin.open && !authorWin.closed){
                     try {
Index: lams_bb_integration/web/modules/learnermonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/learnermonitor.jsp,v
diff -u -r1.16 -r1.17
--- lams_bb_integration/web/modules/learnermonitor.jsp	6 Aug 2014 19:36:21 -0000	1.16
+++ lams_bb_integration/web/modules/learnermonitor.jsp	5 Dec 2014 22:33:50 -0000	1.17
@@ -42,12 +42,6 @@
     } catch(PlugInException e) {
         throw new RuntimeException(e);
     }
-    
-    // Get the LAMS access URLs
-    String lsid = request.getParameter("lsid");
-    String learnerUrl = LamsSecurityUtil.generateRequestURL(ctx, "learnerStrictAuth", lsid);
-    String monitorUrl = LamsSecurityUtil.generateRequestURL(ctx, "monitor", lsid);
-    String liveEditUrl = LamsSecurityUtil.generateRequestURL(ctx, "author", null);
 	
     // Get Course ID and Session User ID
     BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
@@ -183,9 +177,6 @@
         <!--
             var learnerWin = null;
             var monitorWin = null;
-            var liveEditUrl= null;
-            var learnerUrl = null;
-            var monitorUrl = null;
                 
             // Go back one page if the user clicks the Cancel Button
             function back() {
@@ -194,7 +185,7 @@
                 
             // Open the Lesson as a Learner
             function openLearner() {
-                learnerUrl = '<%=learnerUrl%>'; 
+            	var learnerUrl = 'openLearner.jsp?course_id=<%=request.getParameter("course_id")%>&content_id=<%=request.getParameter("content_id")%>&lsid=<%=request.getParameter("lsid")%>';
                 if(learnerWin && learnerWin.open && !learnerWin.closed){
                     try {
                         learnerWin.focus();
@@ -215,7 +206,7 @@
             
             // Open the Lesson Monitor                
             function openMonitor() {
-                monitorUrl = '<%=monitorUrl%>'; 
+            	var monitorUrl = 'openMonitor.jsp?course_id=<%=request.getParameter("course_id")%>&content_id=<%=request.getParameter("content_id")%>&lsid=<%=request.getParameter("lsid")%>';
                 if(monitorWin && monitorWin.open && !monitorWin.closed){
                     try {
                         monitorWin.focus();
Index: lams_bb_integration/web/modules/openAuthor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/Attic/openAuthor.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_bb_integration/web/modules/openAuthor.jsp	5 Dec 2014 22:33:50 -0000	1.1
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<%@ page import="blackboard.platform.plugin.PlugInUtil"%>
+<%@ page import="blackboard.platform.plugin.PlugInException"%>
+<%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsSecurityUtil"%>
+<%@ page errorPage="/error.jsp"%>
+<%@ taglib uri="/bbNG" prefix="bbNG"%>
+<bbNG:genericPage title="Open Author" ctxId="ctx">
+
+<%
+	// Authorise current user for Course Control Panel (automatic redirect)
+	try{
+	    if (!PlugInUtil.authorizeForCourseControlPanel(request, response))
+	        return;
+	} catch(PlugInException e) {
+	    throw new RuntimeException(e);
+	}
+
+	// Get the Login Request URL for authoring LAMS Lessons
+	String authorUrl = LamsSecurityUtil.generateRequestURL(ctx, "author", null);
+	authorUrl = authorUrl + "&isPostMessageToParent=true";
+		
+    response.sendRedirect(authorUrl);
+%>
+
+</bbNG:genericPage>
Index: lams_bb_integration/web/modules/openLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/Attic/openLearner.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_bb_integration/web/modules/openLearner.jsp	5 Dec 2014 22:33:50 -0000	1.1
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<%@ page import="java.util.*"%>
+<%@ page import="java.util.Date"%>
+<%@ page import="java.text.SimpleDateFormat"%>
+<%@ page import="blackboard.data.*"%>
+<%@ page import="blackboard.persist.*"%>
+<%@ page import="blackboard.data.course.*"%>
+<%@ page import="blackboard.data.user.*"%>
+<%@ page import="blackboard.persist.course.*"%>
+<%@ page import="blackboard.data.content.*"%>
+<%@ page import="blackboard.persist.content.*"%>
+<%@ page import="blackboard.persist.navigation.CourseTocDbLoader"%>
+<%@ page import="blackboard.persist.gradebook.*"%>
+<%@ page import="blackboard.data.gradebook.*"%>
+<%@ page import="blackboard.db.*"%>
+<%@ page import="blackboard.base.*"%>
+<%@ page import="blackboard.platform.*"%>
+<%@ page import="blackboard.platform.plugin.*"%>
+<%@ page import="blackboard.portal.servlet.*"%>
+<%@ page import="blackboard.portal.data.*"%>
+<%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsSecurityUtil"%>
+<%@ page errorPage="/error.jsp"%>
+<%@ taglib uri="/bbNG" prefix="bbNG"%>
+<bbNG:genericPage title="Open Author" ctxId="ctx">
+
+<%
+	// Authorise current user for Course Access (automatic redirect)
+	try{
+	    if (!PlugInUtil.authorizeForCourse(request, response))
+	        return;
+	} catch(PlugInException e) {
+	    throw new RuntimeException(e);
+	}
+
+	// Get Course ID and Session User ID
+	BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
+	String course_idstr = request.getParameter("course_id");    
+	Id course_id = bbPm.generateId(Course.DATA_TYPE, course_idstr);
+	User sessionUser = ctx.getUser();
+	Id sessionUserId = sessionUser.getId();
+	// Get the membership data to determine the User's Role
+	CourseMembership courseMembership = null;
+	CourseMembership.Role courseRole = null;
+	CourseMembershipDbLoader sessionCourseMembershipLoader = (CourseMembershipDbLoader) bbPm.getLoader(CourseMembershipDbLoader.TYPE);
+	try {  
+	    courseMembership = sessionCourseMembershipLoader.loadByCourseAndUserId(course_id, sessionUserId);
+	    courseRole = courseMembership.getRole();
+	} catch (KeyNotFoundException e) {
+	    // There is no membership record.
+	    e.printStackTrace();
+	} catch (PersistenceException pe) {
+	    // There is no membership record.
+	    pe.printStackTrace();
+	}
+	
+	// if the user is not an Instructor, Teaching Assistant or Student - Access Denied 
+	if (!(courseRole.equals(CourseMembership.Role.INSTRUCTOR) || courseRole.equals(CourseMembership.Role.TEACHING_ASSISTANT) 
+		|| courseRole.equals(CourseMembership.Role.STUDENT))) {
+	    response.sendRedirect("notAllowed.jsp");
+	}
+
+	// Get the Login Request URL for authoring LAMS Lessons
+	String lsid = request.getParameter("lsid");
+	String learnerUrl = LamsSecurityUtil.generateRequestURL(ctx, "learnerStrictAuth", lsid);
+		
+    response.sendRedirect(learnerUrl);
+%>
+
+</bbNG:genericPage>
Index: lams_bb_integration/web/modules/openMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/Attic/openMonitor.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_bb_integration/web/modules/openMonitor.jsp	5 Dec 2014 22:33:50 -0000	1.1
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<%@ page import="java.util.*"%>
+<%@ page import="java.util.Date"%>
+<%@ page import="java.text.SimpleDateFormat"%>
+<%@ page import="blackboard.data.*"%>
+<%@ page import="blackboard.persist.*"%>
+<%@ page import="blackboard.data.course.*"%>
+<%@ page import="blackboard.data.user.*"%>
+<%@ page import="blackboard.persist.course.*"%>
+<%@ page import="blackboard.data.content.*"%>
+<%@ page import="blackboard.persist.content.*"%>
+<%@ page import="blackboard.persist.navigation.CourseTocDbLoader"%>
+<%@ page import="blackboard.persist.gradebook.*"%>
+<%@ page import="blackboard.data.gradebook.*"%>
+<%@ page import="blackboard.db.*"%>
+<%@ page import="blackboard.base.*"%>
+<%@ page import="blackboard.platform.*"%>
+<%@ page import="blackboard.platform.plugin.*"%>
+<%@ page import="blackboard.portal.servlet.*"%>
+<%@ page import="blackboard.portal.data.*"%>
+<%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsSecurityUtil"%>
+<%@ page errorPage="/error.jsp"%>
+<%@ taglib uri="/bbNG" prefix="bbNG"%>
+<bbNG:genericPage title="Open Author" ctxId="ctx">
+
+<%
+	// Authorise current user for Course Control Panel (automatic redirect)
+	try{
+	    if (!PlugInUtil.authorizeForCourseControlPanel(request, response))
+	        return;
+	} catch(PlugInException e) {
+	    throw new RuntimeException(e);
+	}
+
+	// Get Course ID and Session User ID
+	BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
+	String course_idstr = request.getParameter("course_id");    
+	Id course_id = bbPm.generateId(Course.DATA_TYPE, course_idstr);
+	User sessionUser = ctx.getUser();
+	Id sessionUserId = sessionUser.getId();
+	// Get the membership data to determine the User's Role
+	CourseMembership courseMembership = null;
+	CourseMembership.Role courseRole = null;
+	CourseMembershipDbLoader sessionCourseMembershipLoader = (CourseMembershipDbLoader) bbPm.getLoader(CourseMembershipDbLoader.TYPE);
+	try {  
+	    courseMembership = sessionCourseMembershipLoader.loadByCourseAndUserId(course_id, sessionUserId);
+	    courseRole = courseMembership.getRole();
+	} catch (KeyNotFoundException e) {
+	    // There is no membership record.
+	    e.printStackTrace();
+	} catch (PersistenceException pe) {
+	    // There is no membership record.
+	    pe.printStackTrace();
+	}
+	
+	// if the user is not an Instructor or Teaching Assistant - Access Denied 
+	if (!(courseRole.equals(CourseMembership.Role.INSTRUCTOR) || courseRole.equals(CourseMembership.Role.TEACHING_ASSISTANT))) {
+	    response.sendRedirect("notAllowed.jsp");
+	}
+
+	// Get the Login Request URL for monitoring LAMS Lessons
+	String lsid = request.getParameter("lsid");
+	String monitorUrl = LamsSecurityUtil.generateRequestURL(ctx, "monitor", lsid);
+		
+    response.sendRedirect(monitorUrl);
+%>
+
+</bbNG:genericPage>