Index: openacs-4/packages/acs-tcl/lib/page-error.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/page-error.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-tcl/lib/page-error.tcl	22 May 2015 08:54:42 -0000	1.9
+++ openacs-4/packages/acs-tcl/lib/page-error.tcl	27 Jun 2015 17:32:40 -0000	1.10
@@ -35,13 +35,13 @@
  --------------------------------------------------------<br>
                    [_ acs-tcl.Error_Report]<br>
  --------------------------------------------------------<br>
-<strong>[_ acs-tcl.Previus]</strong> [ad_quotehtml $return_url]<br>
-<strong>[_ acs-tcl.Page]</strong> [ad_quotehtml $error_url]<br>
-<strong>[_ acs-tcl.File]</strong> [ad_quotehtml $error_file]<br>
-<strong>[_ acs-tcl.User_Name]</strong> [ad_quotehtml $user_name]<br>
-<strong>[_ acs-tcl.lt_User_Id_of_the_user_t]</strong> [ad_quotehtml $user_id]<br>
+<strong>[_ acs-tcl.Previus]</strong> [ns_quotehtml $return_url]<br>
+<strong>[_ acs-tcl.Page]</strong> [ns_quotehtml $error_url]<br>
+<strong>[_ acs-tcl.File]</strong> [ns_quotehtml $error_file]<br>
+<strong>[_ acs-tcl.User_Name]</strong> [ns_quotehtml $user_name]<br>
+<strong>[_ acs-tcl.lt_User_Id_of_the_user_t]</strong> [ns_quotehtml $user_id]<br>
 <strong>IP:</strong> [ad_quotehtml [ns_conn peeraddr]]<br>
-<strong>[_ acs-tcl.Browser_of_the_user]</strong> [ad_quotehtml [ns_set get [ns_conn headers] User-Agent]]<br>
+<strong>[_ acs-tcl.Browser_of_the_user]</strong> [ns_quotehtml [ns_set get [ns_conn headers] User-Agent]]<br>
 <br>
 -----------------------------<br>
 [_ acs-tcl.Error_details]<br>
@@ -319,7 +319,11 @@
         }
     }
     # Display value for patches
-    set bug(patches_display) "[bug_tracker::get_patch_links -bug_id $bug(bug_id) -show_patch_status $show_patch_status] &nbsp; \[ <a href=\"patch-add?[export_vars { { bug_number $bug(bug_number) } { component_id $bug(component_id) } }]\">[_ bug-tracker.Upload_Patch]</a> \]"
+    set href [export_vars -base patch-add { { bug_number $bug(bug_number) } { component_id $bug(component_id) } }]
+    set bug(patches_display) [subst {
+	[bug_tracker::get_patch_links -bug_id $bug(bug_id) -show_patch_status $show_patch_status]
+	&nbsp; \[ <a href="[ns_quotehtml $href]">[_ bug-tracker.Upload_Patch]</a> \]
+    }]
     
     # Hide elements that should be hidden depending on the bug status
     foreach element $bug(hide_fields) {
Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.63 -r1.64
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	27 Oct 2014 16:40:06 -0000	1.63
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	27 Jun 2015 17:32:40 -0000	1.64
@@ -139,7 +139,7 @@
 } {
     @return the url for the community member page of a particular user
 } {
-    return "[acs_community_member_page]?[export_vars user_id]"
+    return [export_vars -base [acs_community_member_page] user_id]
 }
 
 ad_proc -public acs_community_member_link {
@@ -153,8 +153,8 @@
         acs_user::get -user_id $user_id -array user
         set label "$user(first_names) $user(last_name)"
     }
-
-    return "<a href=\"[acs_community_member_url -user_id $user_id]\">$label</a>"
+    set href [acs_community_member_url -user_id $user_id]
+    return [subst {<a href="[ns_quotehtml $href]">$label</a>}]
 }
 
 ad_proc -deprecated ad_present_user {
@@ -196,8 +196,8 @@
             where person_id = :user_id
         } -default $user_id]
     }
-
-    return "<a href=\"[acs_community_member_admin_url -user_id $user_id]\">$label</a>"
+    set href [acs_community_member_admin_url -user_id $user_id]
+    return [subst {<a href="[ns_quotehtml $href]">$label</a>}]
 }
 
 ad_proc -deprecated ad_admin_present_user {
@@ -766,7 +766,7 @@
 
     <pre>
     set return_url [ad_return_url]
-    set edit_link "edit?[export_vars item_id return_url]"
+    set edit_link [export_vars -base edit item_id return_url]
     </pre>
 
     Example setting a variable with extra_vars:
Index: openacs-4/packages/acs-tcl/tcl/object-type-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/object-type-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/tcl/object-type-procs.tcl	27 Oct 2014 16:40:07 -0000	1.10
+++ openacs-4/packages/acs-tcl/tcl/object-type-procs.tcl	27 Jun 2015 17:32:40 -0000	1.11
@@ -48,9 +48,9 @@
 	    append result $join_string
 	}
 	incr i
-	append result [subst {\n    $indent<a href="./one?[export_vars -url {object_type}]">[lang::util::localize $pretty_name]</a>}]
+	set href [export_vars -base ./one {object_type}]
+	append result [subst {\n    $indent<a href="[ns_quotehtml $href]">[lang::util::localize $pretty_name]</a>}]
 	append result $additional_html
-
     }
 
     return $result
@@ -159,4 +159,4 @@
 
 } {
     return [db_string get_table_name ""]
-}
\ No newline at end of file
+}
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.76 -r1.77
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	27 Apr 2015 15:28:18 -0000	1.76
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	27 Jun 2015 17:32:40 -0000	1.77
@@ -912,6 +912,9 @@
         if { $token_id eq "" } {
             ns_log Debug "__ad_verify_signature: Neither secret, nor token_id supplied"
             return 0
+        } elseif {![string is integer -strict $token_id]} {
+            ns_log Warning "__ad_verify_signature: token_id <$token_id> is not an integer"
+            return 0
         }
         set secret_token [sec_get_token $token_id]
 
Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	24 Jun 2015 09:22:02 -0000	1.33
+++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl	27 Jun 2015 17:32:40 -0000	1.34
@@ -1595,7 +1595,7 @@
     @creation-date 25 July 2000
 } {
     if { [string first < $value] >= 0 } {
-	ad_complain "[_ acs-tcl.lt_Value_for_name_contai]"
+	ad_complain [_ acs-tcl.lt_Value_for_name_contai]
 	return 0
     }
     return 1
@@ -2076,7 +2076,7 @@
     set complaint_template [parameter::get_from_package_key \
 				-package_key "acs-tcl" \
 				-parameter "ReturnComplaint" \
-				-default "/packages/acs-admin/www/apm/apm.adpacs-tcl/lib/ad-return-complaint"]
+				-default "/packages/acs-tcl/lib/ad-return-complaint"]
     set exception_count 1
     set exception_text $error
     ns_return 200 text/html [ad_parse_template \
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.139 -r1.140
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	22 Jun 2015 21:03:13 -0000	1.139
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	27 Jun 2015 17:32:40 -0000	1.140
@@ -566,7 +566,7 @@
 
     <p>
 
-    Example usage: <code>[export_vars -url -sign -override {{foo "new value"}} -exclude { bar } { foo bar baz }]</code>
+    Example usage: <code>[export_vars -sign -override {{foo "new value"}} -exclude { bar } { foo bar baz }]</code>
 
     <p>