- Fixed export_vars brace vs. brackets

tcl/survsimp-procs.tcl

@@ -351,7 +351,7 @@ order by sort_key"
 	append return_string [util_show_plain_text "$clob_answer $number_answer $varchar_answer $date_answer"]
 	
 	if {![empty_string_p $attachment_file_name]} {
-		append return_string "Uploaded file: <a href=/survsimp/view-attachment?[export_url_vars response_id question_id]>\"$attachment_file_name\"</a>"
+	    append return_string "Uploaded file: <a href=/survsimp/view-attachment?[export_vars -url {response_id question_id}]>\"$attachment_file_name\"</a>"
 	}
 	
 	if {$choice_id != 0 && ![empty_string_p $choice_id] && $question_id != $question_id_previous} {
@@ -409,7 +409,7 @@ from survsimp_surveys s, $users_table u
 where s.creation_user = u.user_id
 and creation_date> :since_when
 order by creation_date desc" {
-	append new_survey_items "<li><a href=\"/survsimp/admin/one?[export_url_vars survey_id]\">$name</a> ($description) created by <a href=\"/shared/community-member?[export_url_vars user_id]\">$creator_name</a> on $creation_date\n" 
+    append new_survey_items "<li><a href=\"/survsimp/admin/one?[export_vars -url {survey_id}]\">$name</a> ($description) created by <a href=\"/shared/community-member?[export_vars -url {user_id}]\">$creator_name</a> on $creation_date\n" 
 	}
 	
 	if { ![empty_string_p $new_survey_items] } {

www/admin/description-edit-2.tcl

@@ -35,7 +35,7 @@ if {$exception_count > 0} {
 }
 
 if {$checked_p == "f"} {
-    set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Confirm Description"]
+    set context [list [list "one?[export_vars -url {survey_id}]" "Administer Survey"] "Confirm Description"]
 
     switch $desc_html {
 	"t" {
@@ -61,7 +61,7 @@ if {$checked_p == "f"} {
           where survey_id = :survey_id"
 
     db_release_unused_handles
-    ad_returnredirect "one?[export_url_vars survey_id]"
+    ad_returnredirect "one?[export_vars -url {survey_id}]"
     ad_script_abort
 }
 

www/admin/description-edit.tcl

@@ -23,4 +23,4 @@ where survey_id = :survey_id"
 set html_p_set [ns_set create]
 ns_set put $html_p_set desc_html $desc_html
 
-set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Description"]
+set context [list [list "one?[export_vars -url {survey_id}]" "Administer Survey"] "Edit Description"]

www/admin/edit-logic.tcl

@@ -43,7 +43,7 @@ db_release_unused_handles
 
 doc_return 200 text/html "[ad_header "Edit Survey Logic"]
 <h2>$survey_name</h2>
-[ad_context_bar [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Logic"]
+[ad_context_bar [list "./" "Simple Survey Admin"] [list "one?[export_vars -url {survey_id}]" "Administer Survey"] "Edit Logic"]
 <hr>
 
 <form method=post action=\"edit-logic-2\">

www/admin/modify-responses.tcl

@@ -65,7 +65,7 @@ db_release_unused_handles
 doc_return 200 text/html "[ad_header "Modify Responses"]
 <h2>$survey_name</h2>
 
-[ad_context_bar [list "one?[export_url_vars survey_id]" "Administer Survey"] "Modify Question Responses"]
+[ad_context_bar [list "one?[export_vars -url {survey_id}]" "Administer Survey"] "Modify Question Responses"]
 
 <hr>
 

www/admin/name-edit-2.tcl

@@ -26,6 +26,6 @@ db_dml survsimp_update_name "update survsimp_surveys
 set name= :name, short_name= :name
 where survey_id = :survey_id"
 
-ad_returnredirect "one?[export_url_vars survey_id]"
+ad_returnredirect "one?[export_vars -url {survey_id}]"
 
 

www/admin/name-edit.tcl

@@ -23,7 +23,7 @@ where survey_id = :survey_id"
 set html_p_set [ns_set create]
 ns_set put $html_p_set desc_html $desc_html
 
-set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Name"]
+set context [list [list "one?[export_vars -url {survey_id}]" "Administer Survey"] "Edit Name"]
 
 
 ad_return_template

www/admin/one-respondent.tcl

@@ -47,7 +47,7 @@ set whole_page "[ad_header "Response from $first_names $last_name"]
 
 <hr>
 
-Here is what <a href=\"/shared/community-member?[export_url_vars user_id]\">$first_names $last_name</a> had to say in response to $survey_name:
+Here is what <a href=\"/shared/community-member?[export_vars -url {user_id}]\">$first_names $last_name</a> had to say in response to $survey_name:
 
 <p>
 

www/admin/one.tcl

@@ -45,9 +45,9 @@ where
 if {$survey_response_limit == "One"} {
     set response_limit_toggle "allow Multiple"
     if {$survey_editable_single == "Editable"} {
-        set response_editable_link "| Editable: <a href=\"response-editable-toggle?[export_url_vars survey_id]\">make non-editable</a>"
+        set response_editable_link "| Editable: <a href=\"response-editable-toggle?[export_vars -url { survey_id}]\">make non-editable</a>"
     } else {
-	set response_editable_link "| Non-editable: <a href=\"response-editable-toggle?[export_url_vars survey_id]\">make editable</a>"
+	set response_editable_link "| Non-editable: <a href=\"response-editable-toggle?[export_vars -url { survey_id}]\">make editable</a>"
     }
 } else {
     set response_limit_toggle "limit to One"
@@ -55,8 +55,8 @@ if {$survey_response_limit == "One"} {
 }
 
 # allow site-wide admins to enable/disable surveys directly from here
-set target "one?[export_url_vars survey_id]"
-set toggle_enabled_link "\[ <a href=\"survey-toggle?[export_url_vars survey_id enabled_p target]\">"
+set target "one?[export_vars -url {survey_id}]"
+set toggle_enabled_link "\[ <a href=\"survey-toggle?[export_vars -url {survey_id enabled_p target}]\">"
 if {$enabled_p == "t"} {
     append toggle_enabled_link "Disable"
 } else {
@@ -96,7 +96,7 @@ proc survey_specific_question_option_html { type survey_id question_id } {
 	    set return_html ""
 	}
 	"scored" {
-	    set return_html "<a href=\"modify-responses?[export_url_vars survey_id question_id]\">modify responses</a>"
+	    set return_html "<a href=\"modify-responses?[export_vars -url {survey_id question_id}]\">modify responses</a>"
 	}
 	default {
 	    set return_html ""
@@ -112,21 +112,21 @@ where survey_id = :survey_id
 order by sort_key" {
 
 
-    set question_options [list "<a href=\"question-modify-text?[export_url_vars question_id survey_id]\">modify text</a>" "<a href=\"question-delete?question_id=$question_id\">delete</a>" "<a href=\"question-add?[export_url_vars survey_id]&after=$sort_key\">add new question</a>"]
+    set question_options [list "<a href=\"question-modify-text?[export_vars -url {question_id survey_id}]\">modify text</a>" "<a href=\"question-delete?question_id=$question_id\">delete</a>" "<a href=\"question-add?[export_vars -url {survey_id}]&after=$sort_key\">add new question</a>"]
 
     if { $count > 0 } {
-	lappend question_options "<a href=\"question-swap?[export_url_vars survey_id sort_key]\">swap with prev</a>"
+	lappend question_options "<a href=\"question-swap?[export_vars -url {survey_id sort_key}]\">swap with prev</a>"
     }
 
     if {$active_p == "t"} {
-	lappend question_options "Active: <a href=\"question-active-toggle?[export_url_vars survey_id question_id active_p]\">inactivate</a>"
+	lappend question_options "Active: <a href=\"question-active-toggle?[export_vars -url { survey_id question_id active_p}]\">inactivate</a>"
 	if {$required_p == "t"} {
-	    lappend question_options "Response Required: <a href=\"question-required-toggle?[export_url_vars survey_id question_id required_p]\">don't require</a>"
+	    lappend question_options "Response Required: <a href=\"question-required-toggle?[export_vars -url { survey_id question_id required_p}]\">don't require</a>"
 	} else {
-	    lappend question_options "Response Not Required: <a href=\"question-required-toggle?[export_url_vars survey_id question_id required_p]\">require</a>"
+	    lappend question_options "Response Not Required: <a href=\"question-required-toggle?[export_vars -url { survey_id question_id required_p}]\">require</a>"
 	}
     } else {
-	lappend question_options "Inactive: <a href=\"question-active-toggle?[export_url_vars survey_id question_id active_p]\">activate</a>"
+	lappend question_options "Inactive: <a href=\"question-active-toggle?[export_vars -url { survey_id question_id active_p}]\">activate</a>"
     }
 
     lappend question_options [survey_specific_question_option_html $type $survey_id $question_id]

www/admin/question-active-toggle.tcl

@@ -21,5 +21,5 @@ where survey_id = :survey_id
 and question_id = :question_id"
 
 db_release_unused_handles
-ad_returnredirect "one?[export_url_vars survey_id]"
+ad_returnredirect "one?[export_vars -url { survey_id}]"
 

www/admin/question-add-2.tcl

@@ -179,6 +179,6 @@ Type of Response:
 
 }
 
-set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"]
+set context [list [list "one?[export_vars -url { survey_id}]" "Administer Survey"] "Add A Question"]
 
 ad_return_template

www/admin/question-add.tcl

@@ -67,4 +67,4 @@ Number of possible responses? <input type=text name=\"n_responses\" value=2 size
     return $return_html
 }
 
-set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"]
+set context [list [list "one?[export_vars -url { survey_id}]" "Administer Survey"] "Add A Question"]

www/admin/question-delete.tcl

@@ -56,14 +56,14 @@ if { $n_responses == 0 } {
     doc_return 200 text/html "[ad_header "Confirm Question Deletion"]
 <h2>Really Delete?</h2>
 
-[ad_context_bar [list "one?[export_url_vars survey_id]" "Administer Survey"] "Delete Question"]
+[ad_context_bar [list "one?[export_vars -url { survey_id}]" "Administer Survey"] "Delete Question"]
 
 <hr>
 
 Deleting this question will also delete all $n_responses responses. Really delete?
 <p>
-<a href=\"question-delete-2?[export_url_vars question_id]\">Yes</a> / 
-<a href=\"one?[export_url_vars survey_id]\">No</a>
+<a href=\"question-delete-2?[export_vars -url { question_id}]\">Yes</a> / 
+<a href=\"one?[export_vars -url { survey_id}]\">No</a>
 
 [ad_footer]
 "

www/admin/question-modify-text.tcl

@@ -24,4 +24,4 @@ set question_text [db_string survsimp_question_text_from_id "select question_tex
 from survsimp_questions
 where question_id = :question_id" ]
 
-set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Modify a Question's Text"]
+set context [list [list "one?[export_vars -url { survey_id}]" "Administer Survey"] "Modify a Question's Text"]

www/admin/question-required-toggle.tcl

@@ -26,4 +26,4 @@ where survey_id = :survey_id
 and question_id = :question_id"
 
 db_release_unused_handles
-ad_returnredirect "one?[export_url_vars survey_id]"
+ad_returnredirect "one?[export_vars -url { survey_id}]"

www/admin/question-swap.tcl

@@ -29,7 +29,7 @@ db_transaction {
 	where survey_id = :survey_id and sort_key in (:sort_key, :next_sort_key)
     "
 
-    ad_returnredirect "one?[export_url_vars survey_id]"
+    ad_returnredirect "one?[export_vars -url { survey_id}]"
     
 } on_error {
     

www/admin/response-drill-down.tcl

@@ -72,7 +72,7 @@ where
   and qr.question_id = :question_id
   and qr.choice_id = :choice_id" {
 
-    append results "<li><a href=\"one-respondent?[export_url_vars user_id survey_id]\">$responder_name</a>\n"
+      append results "<li><a href=\"one-respondent?[export_vars -url { user_id survey_id}]\">$responder_name</a>\n"
 }
 
 

www/admin/response-editable-toggle.tcl

@@ -20,4 +20,4 @@ db_dml survsimp_response_editable_toggle "update survsimp_surveys set single_edi
 where survey_id = :survey_id"
 
 db_release_unused_handles
-ad_returnredirect "one?[export_url_vars survey_id]"
+ad_returnredirect "one?[export_vars -url { survey_id}]"

www/admin/response-limit-toggle.tcl

@@ -20,4 +20,4 @@ set single_response_p = util.logical_negation(single_response_p)
 where survey_id = :survey_id"
 
 db_release_unused_handles
-ad_returnredirect "one?[export_url_vars survey_id]"
+ad_returnredirect "one?[export_vars -url { survey_id}]"

www/admin/responses.tcl

@@ -134,7 +134,7 @@ where qr.choice_id = qc.choice_id
   and qr.question_id = :question_id
 group by label, sort_order, qc.choice_id
 order by sort_order" {
-             append results "$label: <a href=\"response-drill-down?[export_url_vars question_id choice_id]\">$n_responses</a><br>\n"
+    append results "$label: <a href=\"response-drill-down?[export_vars -url { question_id choice_id}]\">$n_responses</a><br>\n"
              }
 	 }
     }

www/admin/survey-category-add.tcl

@@ -39,5 +39,5 @@ db_transaction {
 }
 
 db_release_unused_handles
-ad_returnredirect "one?[export_url_vars survey_id]"
+ad_returnredirect "one?[export_vars -url { survey_id}]"
 

www/admin/survey-display-type-edit.tcl

@@ -19,4 +19,4 @@ where survey_id = :survey_id"
 }
 
 db_release_unused_handles
-ad_returnredirect "one?[export_url_vars survey_id]"
+ad_returnredirect "one?[export_vars -url { survey_id}]"

www/one-respondent.tcl

@@ -42,7 +42,7 @@ db_1row survey_info { select name, description
 
 set survey_name $survey(name)
 set description $survey(description)
-set context [list [list "index" "Surveys"] [list "one?[export_url_vars survey_id]" "One survey"] "Responses"]
+set context [list [list "index" "Surveys"] [list "one?[export_vars -url { survey_id}]" "One survey"] "Responses"]
 
 if { ![empty_string_p $group_id] } {
     set limit_to_sql "group_id = :group_id"