Index: dotlrn_packages/lams2int/www/admin/add.adp
===================================================================
RCS file: /usr/local/cvsroot/dotlrn_packages/lams2int/www/admin/add.adp,v
diff -u -r1.4 -r1.5
--- dotlrn_packages/lams2int/www/admin/add.adp	6 Aug 2008 08:00:34 -0000	1.4
+++ dotlrn_packages/lams2int/www/admin/add.adp	1 Sep 2008 04:55:50 -0000	1.5
@@ -155,7 +155,7 @@
 
 <tr>
         <td align="center">
-                <input type="button" id="create" name="create" value="Open LAMS Author" onClick="window.open('@lams_server_url@/LoginRequest?uid=@username@&method=author&ts=@datetime@&sid=@server_id@&hash=@hashValue@&courseid=@course_id@&country=AU&lang=EN&requestSrc=@requestSrc@&notifyCloseURL=@notifyCloseURL@&customCSV=@username@,@course_id@,@course_url@&extlmsid=dotLRN','LAMS_Author','height=600,width=800,resizable');">
+                <input type="button" id="create" name="create" value="Open LAMS Author" onClick="window.open('@lams_server_url@/LoginRequest?uid=@username@&method=author&ts=@datetime@&sid=@server_id@&hash=@hashValue@&courseid=@course_id@&@coursename=@course_name@&country=AU&lang=EN&requestSrc=@requestSrc@&notifyCloseURL=@notifyCloseURL@&customCSV=@username@,@course_id@,@course_url@&extlmsid=dotLRN','LAMS_Author','height=600,width=800,resizable');">
                 <input type="button" id="preview" name="preview" value="Preview" onClick="previewSequence();">
                 <input type="button" id="refresh" name="refresh" value="Refresh" onclick="javascript:refreshSequences();"/>
                 <input type="submit" id="cancel" name=cancel value="Cancel" />
Index: dotlrn_packages/lams2int/www/admin/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/dotlrn_packages/lams2int/www/admin/add.tcl,v
diff -u -r1.4 -r1.5
--- dotlrn_packages/lams2int/www/admin/add.tcl	13 Aug 2008 00:32:29 -0000	1.4
+++ dotlrn_packages/lams2int/www/admin/add.tcl	1 Sep 2008 04:55:50 -0000	1.5
@@ -6,7 +6,7 @@
     
     @author Ernie Ghiglione (ErnieG@melcoe.mq.edu.au)
     @creation-date 2007-04-16
-    @cvs-id add.tcl,v 1.1 2007/09/12 06:37:02 ernieg Exp
+    @cvs-id $Id$
 } {
     
 } -properties {
@@ -27,23 +27,23 @@
 # get course data
 set course_id [dotlrn_community::get_community_id]
 set course_url "[ad_url][dotlrn_community::get_community_url $course_id]"
+set course_name "[ad_urlencode [dotlrn_community::get_community_name $course_id]]"
 
 #set datetime 1
 
 set hashValue [lams2int::ws::generate_hash -datetime $datetime -username $username -method "author"]
 
-
 # get variables to pass to LAMS
 
-set requestSrc [lams2int::get_request_source]
+set requestSrc "[ad_urlencode [lams2int::get_request_source]]"
 set notifyCloseURL "[ad_url][util_get_current_url]"
 
 
 # get seq list
 
 set hashSeq [lams2int::ws::generate_hash -datetime $datetime -username $username]
 
-set get_sequences_url "$lams_server_url/services/xml/LearningDesignRepository?serverId=$server_id&datetime=[ad_urlencode $datetime]&hashValue=$hashSeq&username=$username&courseId=$course_id&mode=2&country=AU&lang=en"
+set get_sequences_url "$lams_server_url/services/xml/LearningDesignRepository?serverId=$server_id&datetime=[ad_urlencode $datetime]&hashValue=$hashSeq&username=$username&courseId=$course_id&mode=2&country=AU&lang=en&coursename=$course_name"
 
 ns_log Notice "URL requested $get_sequences_url"
 
@@ -52,6 +52,12 @@
     ad_script_abort
 }
 
+# if the response status isn't 200, then we throw a complaint
+if {![string equal [lindex $return_string 3] "200"] } {
+    ad_return_complaint 0 "<b>It seems that your LAMS2 - .LRN Configuration isn't working. Please check the integration configuration and try again. HTTP Response is: [lindex $return_string 3]</b>"
+    ad_script_abort
+}
+
 set xml [lindex $return_string 1]
 
 set sequence_list [lams2int::process_sequence_xml -xml $xml]
Index: dotlrn_packages/lams2int/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/dotlrn_packages/lams2int/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- dotlrn_packages/lams2int/www/admin/index.adp	6 Aug 2008 08:00:34 -0000	1.2
+++ dotlrn_packages/lams2int/www/admin/index.adp	1 Sep 2008 04:55:50 -0000	1.3
@@ -6,7 +6,7 @@
 <a title="Add a LAMS lesson to this course" href="add" class="button"> Add a LAMS Lesson </a>
 &nbsp;&nbsp;
 
-<a title="Open LAMS Authoring to create or edit lessons" href="javascript:;" onClick="window.open('@lams_server_url@/LoginRequest?uid=@username@&method=author&ts=@datetime@&sid=@server_id@&hash=@hashauthor@&courseid=@course_id@&country=AU&lang=EN&requestSrc=@requestSrc@&notifyCloseURL=@notifyCloseURL@&customCSV=@username@,@course_id@,@course_url@&extlmsid=dotLRN','LAMS_Author','height=600,width=800,resizable');" class="button"> LAMS Author </a>
+<a title="Open LAMS Authoring to create or edit lessons" href="javascript:;" onClick="window.open('@lams_server_url@/LoginRequest?uid=@username@&method=author&ts=@datetime@&sid=@server_id@&hash=@hashauthor@&courseid=@course_id@&country=AU&lang=EN&requestSrc=@requestSrc@&notifyCloseURL=@notifyCloseURL@&coursename=@course_name@&customCSV=@username@,@course_id@,@course_url@','LAMS_Author','height=600,width=800,resizable');" class="button"> LAMS Author </a>
 &nbsp;&nbsp;
 
 </p>
Index: dotlrn_packages/lams2int/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/dotlrn_packages/lams2int/www/admin/index.tcl,v
diff -u -r1.2 -r1.3
--- dotlrn_packages/lams2int/www/admin/index.tcl	6 Aug 2008 08:00:34 -0000	1.2
+++ dotlrn_packages/lams2int/www/admin/index.tcl	1 Sep 2008 04:55:50 -0000	1.3
@@ -6,7 +6,7 @@
     
     @author Ernie Ghiglione (ErnieG@melcoe.mq.edu.au)
     @creation-date 2007-04-17
-    @cvs-id index.tcl,v 1.1 2007/09/12 06:37:02 ernieg Exp
+    @cvs-id $Id$
 } {
     
 } -properties {
@@ -25,12 +25,12 @@
 set datetime [lams2int::get_datetime]
 set server_id [lams2int::get_server_id]
 set course_id [dotlrn_community::get_community_id]
-set requestSrc [lams2int::get_request_source]
+set requestSrc "[ad_urlencode [lams2int::get_request_source]]"
 set notifyCloseURL "[ad_url][util_get_current_url]"
 
 set course_url "[ad_url][dotlrn_community::get_community_url $course_id]"
+set course_name "[ad_urlencode [dotlrn_community::get_community_name $course_id]]"
 
-
 set hashauthor [lams2int::ws::generate_hash -datetime $datetime -username $username -method "author"]