Index: openacs-4/packages/survey/www/admin/responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/survey/www/admin/responses.tcl	27 Oct 2014 16:41:58 -0000	1.7
+++ openacs-4/packages/survey/www/admin/responses.tcl	27 Jun 2015 20:46:16 -0000	1.8
@@ -44,7 +44,8 @@
 	"date" -
 	"text" -
 	"shorttext" {
-	    append results "<div><a href=\"view-text-responses?question_id=$question_id\">[_ survey.View_responses]</a></div>\n"
+	    set href [export_vars -base view-text-responses {question_id}]
+	    append results [subst {<div><a href="[ns_quotehtml $href]">[_ survey.View_responses]</a></div>\n}]
 	}
 	
 	"boolean" {
@@ -59,18 +60,19 @@
                append results "$number_answer: $n_responses<br>\n"
             }
             db_1row survey_number_average "" 
-         append results "<p>[_ survey.Mean] $mean<br>[_ survey.Standard_Dev]: $standard_deviation<br>\
-\n"
+	    append results "<p>[_ survey.Mean] $mean<br>[_ survey.Standard_Dev]: $standard_deviation<br>\n"
 	    
         }
 	"choice" {
 	    db_foreach survey_section_question_choices "" {
-             append results "$label: <a href=\"response-drill-down?[export_vars -url {question_id choice_id}]\">$n_responses</a><br>\n"
-             }
+		set href [export_vars -base response-drill-down {question_id choice_id}]
+		append results [subst {$label: <a href="[ns_quotehtml $href]">$n_responses</a><br>\n}]
+	    }
 	 }
 	"blob" {
 	    db_foreach survey_attachment_summary {} {
-	        append results "<a href=\"../view-attachment?response_id=$response_id&question_id=$question_id\">$title</a><br>"
+		set href [export_vars -base ../view-attachment {response_id question_id}]
+	        append results [subst {<a href="[ns_quotehtml $href]">$title</a><br>}]
 	    }
 	}
     }
@@ -84,9 +86,9 @@
 if { $n_responses == 1 } {
     set response_sentence "[_ survey.lt_There_has_been_1_resp]"
 } else {
- 	set response_sentence "[_ survey.lt_There_have_been_n]"
+    set response_sentence "[_ survey.lt_There_have_been_n]"
 }
 
-set context [list [list "one?[export_vars -url {survey_id}]" $survey_info(name)] "[_ survey.Responses]"]
+set context [list [list [export_vars -base one {survey_id}] $survey_info(name)] "[_ survey.Responses]"]
 
 ad_return_template