Index: openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl	27 Oct 2014 16:41:24 -0000	1.7
+++ openacs-4/packages/evaluation/lib/student-grades-report-chunk.tcl	28 Jun 2015 12:28:50 -0000	1.8
@@ -9,7 +9,7 @@
 set base_url [ad_conn package_url]
 
 set mode display
-set return_url "[ad_conn url]?[export_vars { grade_id }]"
+set return_url [export_vars -base [ad_conn url] { grade_id }]
 
 db_1row grade_info { *SQL* }
 
Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl	27 Oct 2014 16:41:25 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.tcl	28 Jun 2015 12:28:50 -0000	1.10
@@ -10,7 +10,7 @@
 
 } {
     task_id:naturalnum,notnull
-    {orderby:optional ""}
+    {orderby:token,optional ""}
 }
 
 db_1row get_task_info { *SQL* }
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl	27 Oct 2014 16:41:25 -0000	1.18
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students-2.tcl	28 Jun 2015 12:28:50 -0000	1.19
@@ -280,5 +280,5 @@
     }
 }
 
-ad_returnredirect "student-list?[export_vars { task_id } ]"
+ad_returnredirect [export_vars -base student-list { task_id } ]
 
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl	27 Oct 2014 16:41:25 -0000	1.10
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete-2.tcl	28 Jun 2015 12:28:50 -0000	1.11
@@ -24,4 +24,4 @@
 db_release_unused_handles
 
 # redirect to the index page by default
-ad_returnredirect "student-list?[export_vars -url { task_id }]"
+ad_returnredirect [export_vars -base student-list { task_id }]
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	27 Oct 2014 16:41:25 -0000	1.14
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.tcl	28 Jun 2015 12:28:50 -0000	1.15
@@ -8,7 +8,7 @@
     @cvs-id $Id$
 } {
     task_id:naturalnum,notnull
-    {return_url "student-list?[export_vars -url { task_id }]"}
+    {return_url [export_vars -base student-list { task_id }]}
     grade_id:naturalnum,optional
 } 
 
Index: openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl	27 Oct 2014 16:41:25 -0000	1.11
+++ openacs-4/packages/evaluation/www/admin/evaluations/one-evaluation-edit.tcl	28 Jun 2015 12:28:50 -0000	1.12
@@ -12,7 +12,7 @@
     {evaluation_mode "edit"}
 } 
 
-set return_url "student-list?[export_vars -url { task_id }]"
+set return_url [export_vars -base student-list { task_id }]
 
 set page_title "[_ evaluation.ViewEdit_Evaluation_]"
 
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	14 Jun 2015 00:33:46 -0000	1.27
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	28 Jun 2015 12:28:50 -0000	1.28
@@ -15,7 +15,7 @@
     {show_portrait_p:boolean ""}
     {orderby_wa:optional}
     {orderby_na:optional}
-    {orderby:optional}
+    {orderby:token,optional}
     {grade_id:naturalnum ""}
     {class "list"}
     {bulk_actions ""}
@@ -41,29 +41,31 @@
 db_1row get_task_info { *SQL* }
 
 
-set return_url "[ad_conn url]?[export_vars -url { task_item_id }]"
+set return_url [export_vars -base [ad_conn url] -url { task_item_id }]
 
 set community_id [dotlrn_community::get_community_id]
 set max_grade $perfect_score
-set page_title "[_ evaluation.lt_Students_List_for_tas]"
-set context [list "[_ evaluation.lt_Students_List_for_tas]"]
+set page_title [_ evaluation.lt_Students_List_for_tas]
+set context [list [_ evaluation.lt_Students_List_for_tas]]
 
 if {$show_portrait_p == "t"} {
-    set this_url "student-list?[export_vars -entire_form -url { { show_portrait_p f } }]"
+    set this_url [export_vars -base student-list -entire_form -url { { show_portrait_p f } }]
 } else {
-    set this_url "student-list?[export_vars -entire_form -url { { show_portrait_p t } }]"
+    set this_url [export_vars -base student-list -entire_form -url { { show_portrait_p t } }]
 }
 
 set due_date_pretty  [lc_time_fmt $due_date_ansi "%q %r"]
 
 if { $number_of_members > 1 } {
-    set groups_admin "<a href=\"[export_vars -base ../groups/one-task { task_id }]\">[_ evaluation.lt_Groups_administration]</a>"
+    set href [export_vars -base ../groups/one-task { task_id }]
+    set groups_admin [subst {<a href="[ns_quotehtml $href]">[_ evaluation.lt_Groups_administration]</a>}]
 } else {
     set groups_admin ""
 }
-set task_admin_url "[export_vars -base ../tasks/task-add-edit { task_id grade_id return_url }]"
+set task_admin_url [export_vars -base ../tasks/task-add-edit { task_id grade_id return_url }]
 
-set task_admin "<a href=\"[export_vars -base ../tasks/task-add-edit { task_id grade_id return_url }]\">[_ evaluation.lt_task_name_administrat]</a>"
+set href [export_vars -base ../tasks/task-add-edit { task_id grade_id return_url }]
+set task_admin [subst {<a href="[ns_quotehtml $href]">[_ evaluation.lt_task_name_administrat]</a>}]
 
 set done_students [list]
 set evaluation_mode "display"
@@ -188,11 +190,11 @@
 	    if { $answer_data eq "" } {
 		set action "[_ evaluation.No_response_]"
 	    } elseif {$answer_title eq "link"} {
-		set action_url "[export_vars -base "$answer_data" { }]"
+		set action_url [export_vars -base $answer_data { }]
 		set action "[_ evaluation.View_answer_]"
 	    } else {
 		# we assume it's a file
-		set action_url "[export_vars -base "../../view/$answer_title" { revision_id }]"
+		set action_url [export_vars -base "../../view/$answer_title" { revision_id }]
 		set action "<a href=\"$action_url\">[_ evaluation.View_answer_]</a>"
 	    }
 
@@ -261,7 +263,7 @@
 	] 
 lappend elements show_answer \
     [list label "[_ evaluation.see_grades]" \
-	 display_template { <pre>[_ evaluation.Yes_]<input checked type=radio name="show_student_wa.@not_evaluated_wa.party_id@" value=t> [_ evaluation.No_]<input type=radio name="show_student_wa.@not_evaluated_wa.party_id@" value=f></pre> } \
+	 display_template { <pre>[_ evaluation.Yes_]<input checked type=radio name="show_student_wa.@not_evaluated_wa.party_id@" value=t> [_ evaluation.No_]<input type="radio" name="show_student_wa.@not_evaluated_wa.party_id@" value=f></pre> } \
 	] 
 
 template::list::create \
@@ -290,9 +292,10 @@
 	ns_set put $tag_attributes alt "[_ evaluation.lt_No_portrait_for_party]"
 	ns_set put $tag_attributes width 98
 	ns_set put $tag_attributes height 104
-	set portrait "<a href=\"../grades/student-grades-report?[export_vars -url { { student_id $party_id } }]\">[evaluation::get_user_portrait -user_id $party_id -tag_attributes $tag_attributes]</a>"
+	set href [export_vars -base ../grades/student-grades-report { { student_id $party_id } }]
+	set portrait [subst {<a href="[ns_quotehtml $href]">[evaluation::get_user_portrait -user_id $party_id -tag_attributes $tag_attributes]</a>]
     } else {
-	set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups"
+	set party_url [export_vars -base ../groups/one-task -anchor groups { task_id return_url }]
     }
 
     lappend done_students $party_id
@@ -406,9 +409,12 @@
 	ns_set put $tag_attributes alt "[_ evaluation.lt_No_portrait_for_party]"
 	ns_set put $tag_attributes width 98
 	ns_set put $tag_attributes height 104
-	set portrait "<a href=\"../grades/student-grades-report?[export_vars -url { { student_id $party_id } }]\">[evaluation::get_user_portrait -user_id $party_id -tag_attributes $tag_attributes]</a>"
+	set href [export_vars -base ../grades/student-grades-report { { student_id $party_id } }]
+	set portrait [subst {<a href="[ns_quotehtml $href]">[evaluation::get_user_portrait \
+								 -user_id $party_id \
+								 -tag_attributes $tag_attributes]</a>}]
     } else {
-	set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups"
+	set party_url [export_vars -href ../groups/one-task -anchor groups { task_id return_url }]
     }
 }
 
@@ -506,9 +512,12 @@
 	ns_set put $tag_attributes alt "[_ evaluation.lt_No_portrait_for_party]"
 	ns_set put $tag_attributes width 98
 	ns_set put $tag_attributes height 104
-	set portrait "<a href=\"../grades/student-grades-report?[export_vars -url { { student_id $party_id } }]\">[evaluation::get_user_portrait -user_id $party_id -tag_attributes $tag_attributes]</a>"
+	set href [export_vars -base ../grades/student-grades-report { { student_id $party_id } }]
+	set portrait [subst {<a href="[ns_quotehtml $href]">[evaluation::get_user_portrait \
+								 -user_id $party_id \
+								 -tag_attributes $tag_attributes]</a>}]
     } else {
-	set party_url "../groups/one-task?[export_vars -url { task_id return_url }]#groups"
+	set party_url [export_vars -base ../groups/one-task -anchor groups { task_id return_url }]
     }
 }
 
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	27 Oct 2014 16:41:26 -0000	1.15
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	28 Jun 2015 12:28:50 -0000	1.16
@@ -82,7 +82,7 @@
     set orderby " order by task_name asc"
 }
 
-set return_url "../grades/distribution-edit?[export_vars { grade_id } ]"
+set return_url [export_vars -base ../grades/distribution-edit { grade_id } ]
 
 db_multirow -extend { radio_yes_checked radio_no_checked delete_template } grades get_grade_tasks { *SQL* } {
     
Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl	27 Oct 2014 16:41:26 -0000	1.16
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl	28 Jun 2015 12:28:50 -0000	1.17
@@ -10,7 +10,7 @@
 
 
 } {
-    {orderby ""}
+    {orderby:token ""}
 } -validate {
     grades_for_package {
 	if {[db_string package_grades { *SQL* }] eq "0"} {
Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl	27 Oct 2014 16:41:26 -0000	1.12
+++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.tcl	28 Jun 2015 12:28:50 -0000	1.13
@@ -9,7 +9,7 @@
 	@cvs-id $Id$
 
 } {
-	{orderby ""}
+	{orderby:token ""}
 	grade_id:naturalnum,notnull
 } -validate {
 	tasks_for_grade {
Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl	27 Oct 2014 16:41:26 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report.tcl	28 Jun 2015 12:28:51 -0000	1.10
@@ -10,7 +10,7 @@
     
 } {
     student_id:naturalnum,notnull
-    {orderby:optional ""}
+    {orderby:token,optional ""}
 }
 
 db_1row student_info { *SQL* } 
Index: openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl	27 Oct 2014 16:41:27 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/groups/group-delete-2.tcl	28 Jun 2015 12:28:51 -0000	1.10
@@ -29,4 +29,4 @@
 
 db_release_unused_handles
 
-ad_returnredirect "one-task?[export_vars -url { task_id }]"
+ad_returnredirect [export_vars -base one-task { task_id }]
Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl	27 Oct 2014 16:41:27 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/groups/group-member-add-2.tcl	28 Jun 2015 12:28:51 -0000	1.7
@@ -18,4 +18,4 @@
 
 db_exec_plsql associate_student { *SQL* }		
 
-ad_returnredirect "one-task?[export_vars -url { task_id }]"
+ad_returnredirect [export_vars -base one-task { task_id }]
Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl	27 Oct 2014 16:41:27 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/groups/group-member-add.tcl	28 Jun 2015 12:28:51 -0000	1.9
@@ -9,7 +9,7 @@
 } {
 	student_id:naturalnum,notnull
 	task_id:naturalnum,notnull
-	{orderby:optional}
+	{orderby:token,optional}
 } -validate {
 	target_exists {
 		if { [string equal "select count(group_id) from evaluation_task_groups where task_id = :task_id" 0] } {
Index: openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl	27 Oct 2014 16:41:27 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/groups/group-new-2.tcl	28 Jun 2015 12:28:51 -0000	1.9
@@ -34,6 +34,6 @@
 	}
 }
 
-ad_returnredirect "one-task?[export_vars -url { task_id }]"
+ad_returnredirect [export_vars -base one-task { task_id }]
 
 
Index: openacs-4/packages/evaluation/www/admin/groups/group-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/groups/group-new.tcl	27 Oct 2014 16:41:27 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/groups/group-new.tcl	28 Jun 2015 12:28:51 -0000	1.9
@@ -9,7 +9,7 @@
 } {
 	student_ids:array,integer,notnull
 	task_id:naturalnum,notnull
-	{return_url "one-task?[export_vars -url { task_id }]"}
+	{return_url [export_vars -base one-task { task_id }]}
 } -validate {
 	students_to_work_with {
 		if { [array size student_ids] == 0  } {
Index: openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl	27 Oct 2014 16:41:27 -0000	1.7
+++ openacs-4/packages/evaluation/www/admin/groups/group-remove-member.tcl	28 Jun 2015 12:28:51 -0000	1.8
@@ -16,7 +16,7 @@
 
 if {[db_string get_members { *SQL* }] eq "0"} {
     db_exec_plsql delete_group { *SQL* }
-    ad_returnredirect "one-task?[export_vars -url { task_id }]"
+    ad_returnredirect [export_vars -base one-task { task_id }]
 }
 
-ad_returnredirect "one-group?[export_vars -url { evaluation_group_id task_id }]"
+ad_returnredirect [export_vars -base one-group { evaluation_group_id task_id }]
Index: openacs-4/packages/evaluation/www/admin/groups/group-rename.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-rename.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/groups/group-rename.tcl	27 Oct 2014 16:41:27 -0000	1.7
+++ openacs-4/packages/evaluation/www/admin/groups/group-rename.tcl	28 Jun 2015 12:28:51 -0000	1.8
@@ -14,5 +14,5 @@
 
 db_dml rename_group { *SQL* }		
 
-ad_returnredirect "one-group?[export_vars -url { task_id evaluation_group_id }]"
+ad_returnredirect [export_vars -base one-group { task_id evaluation_group_id }]
 
Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl	27 Oct 2014 16:41:27 -0000	1.8
+++ openacs-4/packages/evaluation/www/admin/groups/group-reuse-2.tcl	28 Jun 2015 12:28:51 -0000	1.9
@@ -46,6 +46,6 @@
 } 
 
 
-ad_returnredirect "one-task.tcl?[export_vars task_id]" 
+ad_returnredirect [export_vars -base one-task.tcl task_id] 
 
 
Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl	27 Oct 2014 16:41:27 -0000	1.10
+++ openacs-4/packages/evaluation/www/admin/groups/group-reuse.tcl	28 Jun 2015 12:28:51 -0000	1.11
@@ -8,7 +8,7 @@
 	@cvs-id $Id$
 } {
 	task_id:naturalnum,notnull
-	{orderby:optional}
+	{orderby:token,optional}
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/evaluation/www/admin/groups/one-group.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-group.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/evaluation/www/admin/groups/one-group.tcl	27 Oct 2014 16:41:27 -0000	1.10
+++ openacs-4/packages/evaluation/www/admin/groups/one-group.tcl	28 Jun 2015 12:28:51 -0000	1.11
@@ -9,7 +9,7 @@
 } {
 	task_id:naturalnum,notnull
 	evaluation_group_id:naturalnum,notnull
-	{orderby:optional}
+	{orderby:token,optional}
 }
 
 set number_of_members [db_string get_no_of_members { *SQL* }]
@@ -22,7 +22,7 @@
 	append page_title ": $group_name"
 }
 
-set return_url "[ad_conn url]?[export_vars -url { evaluation_group_id task_id }]"
+set return_url [export_vars -base [ad_conn url] -url { evaluation_group_id task_id }]
 
 set actions [list "[_ evaluation.Delete_Group_]" [export_vars -base "group-delete" { evaluation_group_id task_id return_url }]  {}]
 
Index: openacs-4/packages/evaluation/www/admin/groups/one-task.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/evaluation/www/admin/groups/one-task.tcl	27 Oct 2014 16:41:27 -0000	1.12
+++ openacs-4/packages/evaluation/www/admin/groups/one-task.tcl	28 Jun 2015 12:28:51 -0000	1.13
@@ -8,7 +8,7 @@
 	@cvs-id $Id$
 } {
 	task_id:naturalnum,notnull
-	{orderby:optional}
+	{orderby:token,optional}
 	{orderby_groups:optional}
 	{return_url ""}
 } -validate {
Index: openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl	29 Sep 2013 13:54:10 -0000	1.5
+++ openacs-4/packages/fs-portlet/www/fs-admin-portlet.tcl	28 Jun 2015 12:34:22 -0000	1.6
@@ -39,5 +39,5 @@
 ad_return_template
 
 set package_id [site_node_apm_integration::get_child_package_id -package_key "file-storage"]
-set fs_url "/shared/parameters?[export_vars -url {package_id return_url}]"
+set fs_url [export_vars -base /shared/parameters {package_id return_url}]
 set show_fs_url_p [parameter::get_from_package_key -parameter ShowParametersLinkP -package_key [fs_portlet::my_package_key] -default 1]
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	27 Oct 2014 16:41:42 -0000	1.9
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	28 Jun 2015 12:34:22 -0000	1.10
@@ -61,7 +61,7 @@
 set n_past_days ""
 set url [site_node_object_map::get_url -object_id $folder_id]
 set recurse_p 1
-set contents_url "${url}folder-contents?[export_vars {folder_id recurse_p}]&"
+set contents_url [export_vars -base ${url}folder-contents {folder_id recurse_p}]&
 
 # Enable Notifications
 
Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	27 Oct 2014 16:41:42 -0000	1.25
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	28 Jun 2015 12:34:22 -0000	1.26
@@ -46,7 +46,7 @@
 set user_root_folder [dotlrn_fs::get_user_root_folder -user_id $user_id]
 set user_root_folder_present_p 0
 
-if {$user_root_folder ne "" && [lsearch -exact $list_of_folder_ids $user_root_folder] != -1} {
+if {$user_root_folder ne "" && $user_root_folder in $list_of_folder_ids} {
     set folder_id $user_root_folder
     set user_root_folder_present_p 1
     set use_ajaxfs_p 0
@@ -67,7 +67,7 @@
 
 if {$contents_url eq ""} {
     set recurse_p 1
-    set contents_url "${url}folder-contents?[export_vars {folder_id recurse_p}]&"
+    set contents_url [export_vars -base ${url}folder-contents {folder_id recurse_p}]&
 } else {
     set contents_url "${contents_url}?"
 }