Index: openacs-4/packages/acs-admin/www/apm/build-repository.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/build-repository.tcl,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-admin/www/apm/build-repository.tcl	15 Jan 2007 07:53:00 -0000	1.17
+++ openacs-4/packages/acs-admin/www/apm/build-repository.tcl	27 Jun 2015 16:41:07 -0000	1.18
@@ -162,7 +162,7 @@
             set package_key [lindex [file split $spec_file] end-1]
             set version_id [apm_version_id_from_package_key $package_key]
 
-            if { [lsearch -exact $exclude_package_list $package_key] != -1 } {
+            if {$package_key in $exclude_package_list} {
                 ns_write "Package $package_key is on list of packages to exclude - skipping"
                 continue
             }
@@ -177,7 +177,7 @@
             with_catch errmsg {
                 array set version [apm_read_package_info_file $spec_file]
                 
-                if { [lsearch -exact $packages $version(package.key)] != -1 } {
+                if {$version(package.key) in $packages} {
                     ns_write "<li>Skipping package $package_key, because we already have another version of it"
                 } else {
                     lappend packages $version(package.key)
@@ -224,7 +224,7 @@
 
                         # The path to the 'packages' directory in the checkout
                         set packages_root_path [eval file join [lrange [file split $spec_file] 0 end-2]]
-                        set tmp_filename [ns_tmpnam]
+                        set tmp_filename [ad_tmpnam]
                         lappend cmd  --files-from $tmp_filename -C $packages_root_path
 
                         set fp [open $tmp_filename w]
Index: openacs-4/packages/acs-admin/www/apm/package-instances.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-instances.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/package-instances.tcl	27 Oct 2014 16:38:52 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/package-instances.tcl	27 Jun 2015 16:41:07 -0000	1.3
@@ -4,7 +4,7 @@
     @creation-date 3 Sept 2014
     @cvs-id $Id$
 } {
-    {package_key:notnull}
+    {package_key:token,notnull}
 }
 
 set version_id [apm_highest_version $package_key]
@@ -16,7 +16,7 @@
                  [list "/acs-admin/apm/" "Package Manager"] \
                  [list "/acs-admin/apm/version-view?version_id=$version_id" "Package $pretty_name"] \
                  $title]
-set return_url [ad_conn url]?[export_vars { package_key }]
+set return_url [export_vars -base [ad_conn url] { package_key }]
 
 append body <h3>$title</h3><ul>
 
@@ -28,17 +28,20 @@
     if {[llength $urls] > 0} {
         foreach url $urls {
             set node_id [dict get [site_node::get -url $url] node_id]
+            set delete_href [export_vars -base /admin/applications/application-delete { node_id return_url }]
+            set smap_href [export_vars -base /admin/site-map { {root_id $node_id} return_url }]
             append body [subst {
                 <li>$package_id $instance_name <a href="$url">$url</a> (node_id $node_id): 
-                \[<a href="/admin/applications/application-delete?[export_vars { node_id return_url }]">delete</a>,
-                <a href="/admin/site-map?[export_vars { {root_id $node_id} return_url }]">Site Map</a>\]
+                \[<a href="[ns_quotehtml $delete_href]">delete</a>,
+                <a href="[ns_quotehtml $smap_href]">Site Map</a>\]
                 </li>
             }]
         }
     } else {
+        set delete_href [export_vars -base /admin/applications/application-delete { package_id return_url }]
         append body [subst {
             <li>$package_id $instance_name (unmounted): 
-            \[<a href="/admin/applications/application-delete?[export_vars { package_id return_url }]">delete</a>\]
+            \[<a href="[ns_quotehtml $delete_href]">delete</a>\]
             </li>
         }]
     }
Index: openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl	27 Oct 2014 16:38:52 -0000	1.10
+++ openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl	27 Jun 2015 16:41:07 -0000	1.11
@@ -12,7 +12,7 @@
 
 db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
 
-set return_url "version-callbacks?[export_vars { version_id }]"
+set return_url [export_vars -base version-callbacks { version_id }]
 
 # Set default values for type and proc name
 if { $type eq "" } {
Index: openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl	27 Oct 2014 16:38:53 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl	27 Jun 2015 16:41:07 -0000	1.5
@@ -11,7 +11,7 @@
 
 db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
 
-set return_url "version-callbacks?[export_vars { version_id }]"
+set return_url [export_vars -base version-callbacks { version_id }]
 
 # Set default values for type and proc name
 set proc_value [apm_get_callback_proc -type $type -version_id $version_id]
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	19 Jun 2015 09:09:51 -0000	1.13
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	27 Jun 2015 16:41:07 -0000	1.14
@@ -50,4 +50,4 @@
     }
 }
 
-ad_returnredirect "version-dependencies?[export_vars {version_id}]"
+ad_returnredirect [export_vars -base version-dependencies {version_id}]
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	19 Jun 2015 09:09:51 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	27 Jun 2015 16:41:08 -0000	1.8
@@ -32,5 +32,5 @@
 	<blockquote><pre>[ad_quotehtml $errmsg]</pre></blockquote>"
 }
 
-ad_returnredirect "version-dependencies?[export_vars {version_id}]"
+ad_returnredirect [export_vars -base version-dependencies {version_id}]
 
Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/apm/version-reload.tcl	27 Oct 2014 16:38:54 -0000	1.10
+++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl	27 Jun 2015 16:41:08 -0000	1.11
@@ -50,9 +50,9 @@
 
             # Remove the two first elements of the path, namely packages/package-key/
             set local_path [file join {*}[lrange [file split $file] 2 end]]
-
+            set href [export_vars -base file-watch { version_id { paths $local_path } }]
             append body [subst {
-                (<a href="file-watch?[export_vars { version_id { paths $local_path } }]">watch this file</a>)
+                (<a href="[ns_quotehtml $href]">watch this file</a>)
             }]
             lappend files_to_watch $local_path
         }
@@ -84,13 +84,13 @@
 
 
 if { [info exists files_to_watch_p] } {
+    set href [export_vars -base file-watch { version_id { paths:multiple $files_to_watch } }]
     append body [subst {
         If you know you're going to be modifying one of the above files frequently,
         select the "watch this file" link next to a filename to cause the interpreters to
         reload the file immediately whenever it is changed.<p>
         <ul class="action-links">
-        <li><a href="file-watch?[export_vars { version_id { paths:multiple $files_to_watch } }]">Watch 
-        all above files</a></li>
+        <li><a href="[ns_quotehtml $href]">Watch all above files</a></li>
     }]
 } else {
     append body "<ul class=\"action-links\">"
Index: openacs-4/packages/acs-admin/www/auth/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/index.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/auth/index.tcl	10 Jun 2015 12:02:48 -0000	1.10
+++ openacs-4/packages/acs-admin/www/auth/index.tcl	27 Jun 2015 16:41:08 -0000	1.11
@@ -123,10 +123,10 @@
     order  by sort_order
 } {
     set toggle_enabled_p [ad_decode $enabled_p "t" "f" "t"]
-    set enabled_p_url "authority-set-enabled-p?[export_vars { authority_id {enabled_p $toggle_enabled_p} }]"
+    set enabled_p_url [export_vars -base authority-set-enabled-p { authority_id {enabled_p $toggle_enabled_p} }]
     set delete_url [export_vars -base authority-delete { authority_id }]
-    set sort_order_url_up "authority-set-sort-order?[export_vars { authority_id {direction up} }]"
-    set sort_order_url_down "authority-set-sort-order?[export_vars { authority_id {direction down} }]"
+    set sort_order_url_up [export_vars -base authority-set-sort-order { authority_id {direction up} }]
+    set sort_order_url_down [export_vars -base authority-set-sort-order { authority_id {direction down} }]
 
     if {$authority_id eq $register_authority_id} {
         # The authority is selected as register authority
Index: openacs-4/packages/acs-admin/www/test/signed-cookies-test-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/test/signed-cookies-test-2.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/test/signed-cookies-test-2.tcl	10 Jan 2007 21:22:00 -0000	1.2
+++ openacs-4/packages/acs-admin/www/test/signed-cookies-test-2.tcl	27 Jun 2015 16:41:08 -0000	1.3
@@ -15,16 +15,16 @@
 set cookie_data [split $cookie_value {,}]
 set cookie_data_length [llength $cookie_data]
 
-set hash [lindex $cookie_data [expr {$cookie_data_length - 1}]]
-set max_age [lindex $cookie_data [expr {$cookie_data_length - 2}]]
-set token_id [lindex $cookie_data [expr {$cookie_data_length - 3}]]
+set hash [lindex $cookie_data $cookie_data_length-1]
+set max_age [lindex $cookie_data $cookie_data_length-2]
+set token_id [lindex $cookie_data $cookie_data_length-3]
 
 if { $cookie_data_length == 4 } {
     # no commas in data
     set data [lindex $cookie_data 0]
 } else {
     # join the data using commas
-    set data [join [lrange $cookie_data 0 [expr {$cookie_data_length - 4}]] {,}]
+    set data [join [lrange $cookie_data 0 $cookie_data_length-4] {,}]
 }
 
 set secret_token hello
Index: openacs-4/packages/acs-admin/www/users/session-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/session-history.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/session-history.tcl	10 Jan 2007 21:22:00 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/session-history.tcl	27 Jun 2015 16:41:08 -0000	1.4
@@ -37,12 +37,12 @@
 	}
 	set last_year $pretty_year
     }
-    append whole_page "<tr>
-<td><a href=\"sessions-one-month?[export_url_vars pretty_month pretty_year]\">$pretty_month $pretty_year</a>
-<td align=right>[util_commify_number $total_sessions]</td>
-<td align=right>[util_commify_number $total_repeats]</td>
-</tr>
-"
+    set href [export_vars -base sessions-one-month {pretty_month pretty_year}]
+    append whole_page [subst {<tr>
+<td><a href="[ns_quotehtml $href]">$pretty_month $pretty_year</a>
+<td align="right">[util_commify_number $total_sessions]</td>
+<td align="right">[util_commify_number $total_repeats]</td>
+</tr>\n}]
 }
 
 append whole_page "