Index: openacs-4/packages/assessment/lib/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v
diff -u -r1.18.2.8 -r1.18.2.9
--- openacs-4/packages/assessment/lib/assessment.tcl	24 Jul 2007 14:47:34 -0000	1.18.2.8
+++ openacs-4/packages/assessment/lib/assessment.tcl	24 Jul 2007 17:11:13 -0000	1.18.2.9
@@ -520,7 +520,7 @@
 \# NOTE the code just incrementes section order so when the section order
 \# is greate than the number of items in the list of sections
 \# we know we are done and should finish the assessment
-	if {!\[empty_string_p \$new_section_order\] && \$new_section_order <= [llength \$section_list]} {
+	if {!\[empty_string_p \$new_section_order\] && \$new_section_order <= \[llength \$section_list\]} {
 	    # go to next section
             if { \$section_to != \"\"} {
                 set section_order \$section_to
@@ -529,7 +529,7 @@
             }
 	    set item_order \$new_item_order
 \#	ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}\]
-	ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple nxt_url total_pages current_page}\]
+	ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple next_url total_pages current_page}\]
 	    ad_script_abort
 	} else {
 	    # calculate session points at end of session
Index: openacs-4/packages/assessment/lib/session-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.tcl,v
diff -u -r1.16.2.2 -r1.16.2.3
--- openacs-4/packages/assessment/lib/session-items.tcl	18 Feb 2007 22:33:56 -0000	1.16.2.2
+++ openacs-4/packages/assessment/lib/session-items.tcl	24 Jul 2007 17:11:13 -0000	1.16.2.3
@@ -19,7 +19,7 @@
 
 set section_list [as::assessment::sections -assessment_id $assessment_id -session_id $session_id -sort_order_type $assessment_data(section_navigation) -random_p $assessment_data(random_p)]
 
-if {[lsearch $section_list $section_id] eq [expr {[llength $section_list]-1}]} {
+if {(![info exists next_url] || $next_url eq "") && [lsearch $section_list $section_id] eq [expr {[llength $section_list]-1}]} {
     set next_url [export_vars -base session {session_id next_url}]
 }
 
@@ -33,14 +33,15 @@
 ad_form -name session_results_$section_id -mode display -form {
     {section_id:text(hidden) {value $section_id}}
 }
-
+ad_form -name Xsession_results_$section_id -mode display -form {
+    {section_id:text(hidden) {value $section_id}}
+}
 set feedback_count 0
 db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title next_pr_type num content has_feedback_p correct_p view} items session_items {} {
     set default_value [as::item_data::get -subject_id $subject_id -as_item_id $as_item_id -session_id $session_id]
     array set item [as::item::item_data -as_item_id $as_item_id]
 
-    set presentation_type [as::item_form::add_item_to_form -name session_results_$section_id -section_id $section_id -item_id $as_item_id -session_id $session_id -default_value $default_value -show_feedback $show_feedback]
-    
+    set presentation_type [as::item_form::add_item_to_form -name session_results_$section_id -section_id $section_id -item_id $as_item_id -session_id $session_id -default_value $default_value -show_feedback $show_feedback -random_p $assessment_data(random_p)]
 
     if {$presentation_type == "fitb"} {
         regsub -all -line -nocase -- {<textbox as_item_choice_id=} $title "<input name=response_to_item.${as_item_id}_" html
@@ -99,7 +100,7 @@
 
 		if { $presentation_type == "rb" } {
 		    set user_answers [lindex $user_answers 0]
-		 
+
 		    if { [lsearch $correct_answers $user_answers] == -1 } {
 			set correct_p 0
 			if {$show_feedback != "correct"} {
@@ -192,5 +193,5 @@
 	set this(next_pr_type) ""
     }
 }
-
 set showpoints [parameter::get -parameter "ShowPoints" -default 1 ]
+