Index: tool_adapters/moodle/lams_tool_mdlforum/.classpath
===================================================================
RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlforum/.classpath,v
diff -u -r1.2 -r1.3
--- tool_adapters/moodle/lams_tool_mdlforum/.classpath	27 Oct 2008 01:51:57 -0000	1.2
+++ tool_adapters/moodle/lams_tool_mdlforum/.classpath	3 Dec 2008 01:10:34 -0000	1.3
@@ -10,6 +10,6 @@
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar" sourcepath="/lams_contentrepository"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-learning.jar" sourcepath="/lams_learning"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-monitoring.jar"/>
-	<classpathentry kind="lib" path="/usr/local/jboss-4.0.2/server/default/lib/javax.servlet.jar"/>
+	<classpathentry kind="lib" path="D:/jboss-4.0.2/server/default/lib/javax.servlet.jar"/>
 	<classpathentry kind="output" path="build/classes/java"/>
 </classpath>
Index: tool_adapters/moodle/lams_tool_mdlforum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdfrum/model/MdlForumSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlforum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdfrum/model/MdlForumSession.hbm.xml,v
diff -u -r1.2 -r1.3
--- tool_adapters/moodle/lams_tool_mdlforum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdfrum/model/MdlForumSession.hbm.xml	16 Nov 2008 22:37:14 -0000	1.2
+++ tool_adapters/moodle/lams_tool_mdlforum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mdfrum/model/MdlForumSession.hbm.xml	3 Dec 2008 01:10:28 -0000	1.3
@@ -86,7 +86,7 @@
             insert="true"
         >
             <column
-                name="mdlforum_uid" 
+                name="mdlForum_uid" 
             />
         </many-to-one>
 
@@ -99,7 +99,7 @@
         >
 
             <key
-                column="mdlforum_session_uid"
+                column="mdlForum_session_uid"
             >
             </key>
 
Index: tool_adapters/moodle/lams_tool_mdlforum/db/sql/create_lams_tool_mdlForum.sql
===================================================================
RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlforum/db/sql/create_lams_tool_mdlForum.sql,v
diff -u -r1.2 -r1.3
--- tool_adapters/moodle/lams_tool_mdlforum/db/sql/create_lams_tool_mdlForum.sql	16 Nov 2008 22:36:34 -0000	1.2
+++ tool_adapters/moodle/lams_tool_mdlforum/db/sql/create_lams_tool_mdlForum.sql	3 Dec 2008 01:10:28 -0000	1.3
@@ -9,8 +9,8 @@
 create table tl_mdfrum10_mdlforum (uid bigint not null auto_increment, create_date datetime, update_date datetime, define_later bit, content_in_use bit, run_offline bit, tool_content_id bigint, ext_tool_content_id bigint, ext_user_name varchar(255), ext_course_id varchar(255), ext_section varchar(255), primary key (uid))TYPE=InnoDB;
 create table tl_mdfrum10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, ext_session_id bigint, session_name varchar(250), mdlforum_uid bigint, primary key (uid))TYPE=InnoDB;
 create table tl_mdfrum10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, mdlforum_session_uid bigint, entry_uid bigint, primary key (uid))TYPE=InnoDB;
-alter table tl_mdfrum10_session add index FKE2A598184D07F6E8 (mdlforum_uid), add constraint FKE2A598184D07F6E8 foreign key (mdlforum_uid) references tl_mdfrum10_mdlforum (uid);
-alter table tl_mdfrum10_user add index FK108B9589C7050F3F (mdlforum_session_uid), add constraint FK108B9589C7050F3F foreign key (mdlforum_session_uid) references tl_mdfrum10_session (uid);
+alter table tl_mdfrum10_session add index FKfrum10_session (mdlForum_uid), add constraint FKfrum10_session foreign key (mdlForum_uid) references tl_mdmdfrum10_user (uid);
+alter table tl_mdfrum10_user add index FKmdfrum10_user (mdlforum_session_uid), add constraint FK108B9589C7050F3F foreign key (mdlforum_session_uid) references tl_mdfrum10_session (uid);
 
 INSERT INTO tl_mdfrum10_configuration (
 	config_key, 
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AuthoringAction.java,v
diff -u -r1.3 -r1.4
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AuthoringAction.java	14 Nov 2008 04:11:32 -0000	1.3
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/AuthoringAction.java	3 Dec 2008 01:08:19 -0000	1.4
@@ -64,7 +64,9 @@
 
     public IMdlForumService mdlForumService;
 
-    public static final String RELATIVE_MOODLE_AUTHOR_URL = "course/modedit-lams.php?";
+    //public static final String RELATIVE_MOODLE_AUTHOR_URL = "/course/modedit-lams.php?";
+    public static final String RELATIVE_MOODLE_AUTHOR_URL = "course/lamsframes.php?";
+    public static final String MOODLE_EDIT_URL = "course/modedit-lams.php";
 
     // Authoring SessionMap key names
     private static final String KEY_TOOL_CONTENT_ID = "toolContentID";
@@ -149,7 +151,12 @@
 	    responseUrl += RELATIVE_MOODLE_AUTHOR_URL;
 	    String returnUpdateUrl = URLEncoder.encode(TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&"
 		    + AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8");
+  
 	    responseUrl += "&lamsUpdateURL=" + returnUpdateUrl;
+	    
+	    String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_EDIT_URL, "UTF8");
+	    
+	    responseUrl += "&dest=" + encodedMoodleRelativePath ;
 
 	    if (mdlForum.getExtSection() != null) {
 		responseUrl += "&section=" + mdlForum.getExtSection();
@@ -158,9 +165,9 @@
 	    }
 
 	    if (mdlForum.getExtToolContentId() != null) {
-		responseUrl += "&update=" + mdlForum.getExtToolContentId().toString();
+		responseUrl += "&id=" + mdlForum.getExtToolContentId().toString();
 	    } else {
-		responseUrl += "&add=forum";
+		responseUrl += "&add=Forum";
 	    }
 
 	    if (mdlForum.getExtCourseId() != null) {
@@ -169,11 +176,11 @@
 		responseUrl += "&course=" + courseFromCSV;
 	    }
 
-	    log.debug("Sending to moodle forum edit page: " + responseUrl);
+	    log.debug("Sending to moodle Forum edit page: " + responseUrl);
 
 	    response.sendRedirect(responseUrl);
 	} catch (Exception e) {
-	    log.error("Could not redirect to mdl forum authoring", e);
+	    log.error("Could not redirect to mdl Forum authoring", e);
 	}
 	return null;
     }
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java,v
diff -u -r1.3 -r1.4
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java	14 Nov 2008 04:11:32 -0000	1.3
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java	3 Dec 2008 01:08:19 -0000	1.4
@@ -34,6 +34,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.mdfrum.dto.MdlForumDTO;
 import org.lamsfoundation.lams.tool.mdfrum.model.MdlForum;
@@ -73,7 +74,11 @@
     private static final String TOOL_APP_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/"
 	    + MdlForumConstants.TOOL_SIGNATURE + "/";
 
-    public static final String RELATIVE_LEARNER_URL = "mod/forum/view.php?";
+    //public static final String RELATIVE_LEARNER_URL = "mod/Forum/view.php?";
+    
+    public static final String RELATIVE_LEARNER_URL = "course/lamsframes.php?";
+    public static final String MOODLE_VIEW_URL = "mod/Forum/view.php";
+    public static final String RELATIVE_TEACHER_URL = "mod/Forum/view.php?"; 
 
     private IMdlForumService mdlForumService;
 
@@ -88,6 +93,7 @@
 	}
 
 	// Retrieve the session and content.
+	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, false);
 	MdlForumSession mdlForumSession = mdlForumService.getSessionBySessionId(toolSessionID);
 	if (mdlForumSession == null) {
 	    throw new MdlForumException("Cannot retreive session with toolSessionID: " + toolSessionID);
@@ -118,19 +124,34 @@
 	    try {
 		String responseUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL)
 			.getConfigValue();
-		responseUrl += RELATIVE_LEARNER_URL;
+		
+			if(mode.equals(ToolAccessMode.TEACHER))
+			{
+				responseUrl += RELATIVE_TEACHER_URL;
+			}
+			else if (mode.equals(ToolAccessMode.LEARNER))
+			{
+				responseUrl += RELATIVE_LEARNER_URL;
+			}
 
 		String returnUrl = TOOL_APP_URL + "learning.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "="
 			+ toolSessionID.toString() + "&dispatch=finishActivity";
+		
+		
+		
+		String encodedMoodleRelativePath = URLEncoder.encode(MOODLE_VIEW_URL, "UTF8");
 
 		returnUrl = URLEncoder.encode(returnUrl, "UTF8");
+		
 
-		responseUrl += "&id=" + mdlForumSession.getExtSessionId() + "&returnUrl=" + returnUrl;
+		responseUrl += "&id=" + mdlForumSession.getExtSessionId() + "&returnUrl=" + returnUrl
+			+ "&dest=" + encodedMoodleRelativePath + "&is_learner=1";
+		
 
-		log.debug("Redirecting for mdl forum learner: " + responseUrl);
+		log.debug("Redirecting for mdl Forum learner: " + responseUrl);
 		response.sendRedirect(responseUrl);
 	    } catch (Exception e) {
-		log.error("Could not redirect to mdl forum authoring", e);
+		log.error("Could not redirect to mdl Forum authoring", e);
 	    }
 	} else {
 	    throw new MdlForumException("External content id null for learner");
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java,v
diff -u -r1.3 -r1.4
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java	14 Nov 2008 04:11:32 -0000	1.3
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java	3 Dec 2008 01:08:19 -0000	1.4
@@ -64,7 +64,7 @@
     private static final String TOOL_APP_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/"
 	    + MdlForumConstants.TOOL_SIGNATURE + "/";
 
-    public static final String RELATIVE_MONITOR_URL = "mod/forum/view.php?";
+    public static final String RELATIVE_MONITOR_URL = "mod/Forum/view.php?";
 
     public IMdlForumService mdlForumService;
 
Index: tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/struts/struts-config.xml,v
diff -u -r1.1 -r1.2
--- tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/struts/struts-config.xml	26 Aug 2008 04:42:09 -0000	1.1
+++ tool_adapters/moodle/lams_tool_mdlforum/web/WEB-INF/struts/struts-config.xml	3 Dec 2008 01:10:28 -0000	1.2
@@ -14,21 +14,21 @@
   <form-beans>
 
     <form-bean
-      name="authoringForm"
-      type="org.lamsfoundation.lams.tool.mdfrum.web.forms.AuthoringForm"
+      name="mdfrum10AdminForm"
+      type="org.lamsfoundation.lams.tool.mdfrum.web.forms.AdminForm"
     />
     <form-bean
       name="monitoringForm"
       type="org.lamsfoundation.lams.tool.mdfrum.web.forms.MonitoringForm"
     />
     <form-bean
-      name="mdfrum10AdminForm"
-      type="org.lamsfoundation.lams.tool.mdfrum.web.forms.AdminForm"
-    />
-    <form-bean
       name="learningForm"
       type="org.lamsfoundation.lams.tool.mdfrum.web.forms.LearningForm"
     />
+    <form-bean
+      name="authoringForm"
+      type="org.lamsfoundation.lams.tool.mdfrum.web.forms.AuthoringForm"
+    />
 
   </form-beans>
 
@@ -46,21 +46,6 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/mdfrum10admin"
-      type="org.lamsfoundation.lams.tool.mdfrum.web.actions.AdminAction"
-      name="mdfrum10AdminForm"
-      scope="request"
-      parameter="dispatch"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="config"
-        path="/pages/admin/config.jsp"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/learning"
       type="org.lamsfoundation.lams.tool.mdfrum.web.actions.LearningAction"
       name="learningForm"
@@ -93,6 +78,21 @@
     >
     </action>
     <action
+      path="/monitoring"
+      type="org.lamsfoundation.lams.tool.mdfrum.web.actions.MonitoringAction"
+      name="monitoringForm"
+      scope="request"
+      parameter="dispatch"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="tiles:/monitoring/main"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/authoring"
       type="org.lamsfoundation.lams.tool.mdfrum.web.actions.AuthoringAction"
       name="authoringForm"
@@ -113,17 +113,17 @@
       />
     </action>
     <action
-      path="/monitoring"
-      type="org.lamsfoundation.lams.tool.mdfrum.web.actions.MonitoringAction"
-      name="monitoringForm"
+      path="/mdfrum10admin"
+      type="org.lamsfoundation.lams.tool.mdfrum.web.actions.AdminAction"
+      name="mdfrum10AdminForm"
       scope="request"
       parameter="dispatch"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path="tiles:/monitoring/main"
+        name="config"
+        path="/pages/admin/config.jsp"
         redirect="false"
       />
     </action>