Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -r1.48 -r1.49
--- openacs-4/packages/acs-admin/acs-admin.info	12 Jun 2015 21:14:16 -0000	1.48
+++ openacs-4/packages/acs-admin/acs-admin.info	19 Jun 2015 09:09:51 -0000	1.49
@@ -6,17 +6,19 @@
     <pretty-plural>Site-Wide Administration Services</pretty-plural>
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
+    <implements-subsite-p>f</implements-subsite-p>
+    <inherit-templates-p>t</inherit-templates-p>
     
     <version name="5.9.0d2" url="http://openacs.org/repository/download/apm/acs-admin-5.9.0d2.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>An interface for Site-wide administration of an OpenACS Installation.</summary>
         <release-date>2013-09-08</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
-        <license url="http://www.gnu.org/copyleft/gpl.html">GPL</license>
-        <maturity>3</maturity>
         <description format="text/html">Provides a UI for administering site-wide services
           (including package installation, cache, authentication, and user accounts) for an OpenACS system.
         </description>
+        <license>GPL</license>
+        <maturity>3</maturity>
 
         <provides url="acs-admin" version="5.9.0d2"/>
         <requires url="acs-kernel" version="5.9.0d1"/>
@@ -27,9 +29,6 @@
         <parameters>
         <!-- No version parameters -->
         </parameters>
+
     </version>
 </package>
-
-
-
-
Index: openacs-4/packages/acs-admin/www/apm/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/acs-admin/www/apm/index.tcl	13 Jun 2015 23:55:32 -0000	1.27
+++ openacs-4/packages/acs-admin/www/apm/index.tcl	19 Jun 2015 09:09:51 -0000	1.28
@@ -120,8 +120,8 @@
 }
 
 # The reload links make the page slow, so make them optional
-set page_url [export_vars -base [ad_conn url] -url {orderby owned_by supertype}]
-set href [export_vars -base [ad_conn url] -url {orderby owned_by supertype reload_links_p}]
+set page_url [export_vars -base [ad_conn url] {orderby owned_by supertype}]
+set href     [export_vars -base [ad_conn url] {orderby owned_by supertype reload_links_p}]
 if { $reload_links_p } {
     set reload_filter "<a href=\"[ns_quotehtml $href]\">Do not check for changed files</a>"
 } else {
Index: openacs-4/packages/acs-admin/www/apm/version-callbacks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callbacks.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/apm/version-callbacks.adp	27 Oct 2014 16:38:53 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/version-callbacks.adp	19 Jun 2015 09:09:51 -0000	1.8
@@ -3,7 +3,7 @@
 <property name="context">@context;noquote@</property>
 
 
-<p><listtemplate name="callbacks"></listtemplate></p>
+<p><listtemplate name="callbacks"></listtemplate>
 
 <h3>Help</h3>
 
@@ -24,13 +24,13 @@
   process depending on which version you're upgrading from and to.
 </p>
 
-<table cellspacing="1" cellpadding="4" bgcolor="#999999">
-  <tr bgcolor="white">
+<table cellspacing="1" cellpadding="4" style="background: #999999">
+  <tr style="background: white">
     <th>Callback</th>
     <th>Parameters</th>
   </tr>
 
-  <tr bgcolor="white">
+  <tr style="background: white">
     <td>
       before-install
     </td>
@@ -39,7 +39,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="white">
+  <tr style="background: white">
     <td>
       after-install
     </td>
@@ -48,7 +48,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="white">
+  <tr style="background: white">
     <td>
       before-upgrade
     </td>
@@ -58,7 +58,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="white">
+  <tr style="background: white">
     <td>
       after-upgrade
     </td>
@@ -68,7 +68,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="white">
+  <tr style="background: white">
     <td>
       before-uninstall
     </td>
@@ -77,7 +77,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="white">
+  <tr style="background: white">
     <td>
       after-instantiate
     </td>
@@ -86,7 +86,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="white">
+  <tr style="background: white">
     <td>
       before-uninstantiate
     </td>
@@ -95,7 +95,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="white">
+  <tr style="background: white">
     <td>
       after-mount
     </td>
@@ -105,7 +105,7 @@
     </td>
   </tr>
 
-  <tr bgcolor="white">
+  <tr style="background: white">
     <td>
       before-unmount
     </td>
Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	27 Oct 2014 16:38:53 -0000	1.8
+++ openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	19 Jun 2015 09:09:51 -0000	1.9
@@ -24,14 +24,17 @@
     } else {
         set dependency_type_prep_2 ${dependency_type}ed
     }
-    append body "<h3>Services [string totitle $dependency_type_prep_2]</h3><ul>\n"
 
+    append body [subst {
+	<h3>Services [string totitle $dependency_type_prep_2]</h3>
+	<ul>
+    }]
     db_foreach apm_all_dependencies {} {
 	append body "<li>[string totitle $dependency_type_prep] service $service_uri, version $service_version "
 	
         if { $dependency_type ne "provide" } {
-	    set qvars [export_vars -url {package_key dependency_id version_id dependency_type}]
-            append body "(<a href=\"version-dependency-remove?$qvars\">remove</a>)\n"
+	    set href [export_vars -base version-dependency-remove {package_key dependency_id version_id dependency_type}]
+            append body [subst {(<a href="[ns_quotehtml $href]">remove</a>)}]
         }
 	
 	# If this package provides a service, show a list of all packages that require it,
@@ -53,9 +56,10 @@
                 requires { set dep_d required }
                 extends { set dep_d extended }
                 embeds { set dep_d embeds }
-            } 
+            }
+	    set href [export_vars -base version-view {{version_id $dep_version_id}}]
 	    append body [subst {
-		<li>[string totitle $dep_d] by <a href="version-view?version_id=$dep_version_id">$dep_pretty_name, 
+		<li>[string totitle $dep_d] by <a href="[ns_quotehtml $href]">$dep_pretty_name, 
 		version $dep_version_name</a>
 	    }]
 	}
@@ -67,14 +71,12 @@
     }
     if { $installed_p == "t" && $dependency_type ne "provide"} {
 	append body [subst {
-	    <li><a href="version-dependency-add?[export_vars -url {version_id dependency_type}]">Add a 
-	    service $dependency_type_prep_2 by this package</a>
+	    <li><a href="[ns_quotehtml [export_vars -base version-dependency-add {version_id dependency_type}]]">Add
+	    a service $dependency_type_prep_2 by this package</a>
 	}]
     }
     append body "</ul>\n"
 }
 
-append body "</ul>\n"
-
 ad_return_template apm
 
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 -r1.12 -r1.13
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	27 Oct 2014 16:38:53 -0000	1.12
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.tcl	19 Jun 2015 09:09:51 -0000	1.13
@@ -50,4 +50,4 @@
     }
 }
 
-ad_returnredirect "version-dependencies?[export_vars -url {version_id}]"
+ad_returnredirect "version-dependencies?[export_vars {version_id}]"
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	27 Oct 2014 16:38:53 -0000	1.5
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	19 Jun 2015 09:09:51 -0000	1.6
@@ -23,7 +23,7 @@
     <form action='version-dependency-add-2' method='post'>
     [export_vars -form {version_id dependency_type dependency_id {our_package_key $package_key}}]
 
-    $pretty_name ${dependency_type}s the following service:
+    <p>$pretty_name ${dependency_type}s the following service:
     <p>
     <select name="service" size="20">
 }]
@@ -38,6 +38,7 @@
     </select>
     <br>
     <input type="submit" value="Add Dependency">
+    </form>
 }]
 
 ad_return_template apm
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 -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	27 Oct 2014 16:38:53 -0000	1.6
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	19 Jun 2015 09:09:51 -0000	1.7
@@ -32,5 +32,5 @@
 	<blockquote><pre>[ad_quotehtml $errmsg]</pre></blockquote>"
 }
 
-ad_returnredirect "version-dependencies?[export_vars -url {version_id}]"
+ad_returnredirect "version-dependencies?[export_vars {version_id}]"
 
Index: openacs-4/packages/acs-admin/www/apm/version-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-admin/www/apm/version-edit.tcl	27 Oct 2014 16:38:53 -0000	1.11
+++ openacs-4/packages/acs-admin/www/apm/version-edit.tcl	19 Jun 2015 09:09:51 -0000	1.12
@@ -65,42 +65,42 @@
 <table>
 
 <tr>
-  <th align="right" nowrap>Package Key:</th>
+  <th style="text-align:right; white-space: nowrap">Package Key:</th>
   <td><tt>$package_key</tt></td>
 </tr>
 <tr>
-  <th align="right" nowrap>Package URL:</th>
+  <th style="text-align:right; white-space: nowrap">Package URL:</th>
   <td>$package_uri</td>
 </tr>
 
 <tr>
-  <th align="right" nowrap>Package Name:</th>
+  <th style="text-align:right; white-space: nowrap">Package Name:</th>
   <td>$pretty_name</td>
 </tr>
 
 <tr>
-  <th align="right" nowrap>OpenACS Core:</th>
+  <th style="text-align:right; white-space: nowrap">OpenACS Core:</th>
   <td>[ad_decode $initial_install_p t Yes No]</td>
 </tr>
 
 <tr>
-  <th align="right" nowrap>Singleton:</th>
+  <th style="text-align:right; white-space: nowrap">Singleton:</th>
   <td>[ad_decode $singleton_p t Yes No]</td>
 </tr>
 
 <tr>
-  <th align="right" nowrap>Implements Subsite:</th>
+  <th style="text-align:right; white-space: nowrap">Implements Subsite:</th>
   <td>[ad_decode $implements_subsite_p t Yes No]</td>
 </tr>
 
 <tr>
-  <th align="right" nowrap>Inherit Templates:</th>
+  <th style="text-align:right; white-space: nowrap">Inherit Templates:</th>
   <td>[ad_decode $inherit_templates_p t Yes No]</td>
 </tr>
 
 <tr>
-  <th align="right" nowrap>Auto-mount:</th>
-  <td><input name=auto_mount size=30 value="$auto_mount"></td>
+  <th style="text-align:right; white-space: nowrap">Auto-mount:</th>
+  <td><input name="auto_mount" size="30" value="$auto_mount"></td>
 </tr>
 
 <tr>
@@ -111,24 +111,24 @@
 </tr>
 
 <tr>
-  <th align="right" nowrap>Version:</th>
+  <th style="text-align:right; white-space: nowrap">Version:</th>
   <td><input name="version_name" size="10" value="$version_name" $version_name_on_change>
 </td>
 </tr>
 
 <tr>
-  <th align="right" nowrap>Version URL:</th>
+  <th style="text-align:right; white-space: nowrap">Version URL:</th>
   <td><input name="version_uri" size="80" value="$version_uri"></td>
 </tr>
 
 <tr valign="top">
-  <th align="right"><br>Summary:</th>
-  <td><textarea name="summary" cols="60" rows="2" required="required" wrap="soft">[ns_quotehtml $summary]</textarea></td>
+  <th style="text-align:right"><br>Summary:</th>
+  <td><textarea name="summary" cols="60" rows="2">[ns_quotehtml $summary]</textarea></td>
 </tr>
 
-<tr valign=top>
-  <th align="right"><br>Description:</th>
-  <td><textarea name="description" cols="60" rows="5" wrap="soft">[ns_quotehtml $description]</textarea><br>
+<tr valign="top">
+  <th style="text-align:right"><br>Description:</th>
+  <td><textarea name="description" cols="60" rows="5">[ns_quotehtml $description]</textarea><br>
 This description is <select name="description_format">
 <option value="text/html" [ad_decode $description_format "text/plain" "" "selected"]>HTML-formatted.
 <option value="text/plain" [ad_decode $description_format "text/plain" "selected" ""]>plain text.
@@ -158,7 +158,7 @@
     }
     append body [subst {
 <tr>
-  <th align=right nowrap>[dict get $attribute pretty_name]:</th>
+  <th style="text-align:right; white-space: nowrap">[dict get $attribute pretty_name]:</th>
   <td><input name="$attribute_name" size="[dict get $attribute size]" value="$attribute_value"></td>
 </tr>
     }]
@@ -189,41 +189,44 @@
 
     append body [subst {
 <tr>
-  <th align=right nowrap>$prompt:</th>
-  <td><input name=owner_name size=30 value="$owner_name"></td>
+  <th style="text-align:right; white-space: nowrap">$prompt:</th>
+  <td><input name="owner_name" size="30" value="$owner_name"></td>
 </tr>
 <tr>
-  <th align=right nowrap>$prompt URL:</th>
-  <td><input name=owner_uri size=30 value="$owner_uri" onChange="checkMailto(this)"></td>
+  <th style="text-align:right; white-space: nowrap">$prompt URL:</th>
+  <td><input name="owner_uri" size="30" value="$owner_uri" onChange="checkMailto(this)"></td>
 </tr>
     }]
 }
 
 append body [subst {
 <tr>
-  <th align=right nowrap>Vendor:</th>
-  <td><input name=vendor size=30 value="$vendor"></td>
+  <th style="text-align:right; white-space: nowrap">Vendor:</th>
+  <td><input name="vendor" size="30" value="$vendor"></td>
 </tr>
 <tr>
-  <th align=right nowrap>Vendor URL:</th>
-  <td><input name=vendor_uri size=60 value="$vendor_uri"></td>
+  <th style="text-align:right; white-space: nowrap">Vendor URL:</th>
+  <td><input name="vendor_uri" size="60" value="$vendor_uri"></td>
 </tr>
 }]
 
 append body [subst {
 <tr>
   <td></td>
   <td>
-    <table><tr valign=baseline><td><input type=checkbox name=upgrade_p value=1 checked></td><td>
-Upgrade the local package $pretty_name to this version and supersede older versions.
-  </td></tr></table>
+    <table>
+    <tr valign="baseline">
+    <td><input type="checkbox" name="upgrade_p" value="1" checked></td>
+    <td>Upgrade the local package $pretty_name to this version and supersede older versions.</td>
+    </tr>
+    </table>
   </td>
 </tr>
 
 <tr>
-  <td colspan=2 align=center><br>
-<input type=submit value="Save Information">
-</td>
+  <td colspan="2" align="center"><br>
+  <input type="submit" value="Save Information">
+  </td>
 </tr>
 
 </table>
Index: openacs-4/packages/acs-admin/www/apm/version-files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-files.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-admin/www/apm/version-files.tcl	27 Oct 2014 16:38:53 -0000	1.17
+++ openacs-4/packages/acs-admin/www/apm/version-files.tcl	19 Jun 2015 09:09:51 -0000	1.18
@@ -22,9 +22,9 @@
     <blockquote>
     <table cellspacing="0" cellpadding="0">
     <tr>
-    <th align="left">Path</th><th width="40"></th>
-    <th align="left">File type</th><th width="40"></th>
-    <th align="left">Database support</th><th width="40"></th>
+    <th align="left">Path</th><th style="width:40px"></th>
+    <th align="left">File type</th><th style="width:40px"></th>
+    <th align="left">Database support</th><th style="width:40px"></th>
     </tr>
 }
 
@@ -75,9 +75,9 @@
 	} else {
 	    append body [subst {
 		</td>
-		<td width="40">&nbsp;</td><td>$file_pretty_name</td>
-		<td width="40">&nbsp</td><td>$db_pretty_name</td>
-		<td width="40">&nbsp;</td>
+		<td>&nbsp;</td><td>$file_pretty_name</td>
+		<td>&nbsp</td><td>$db_pretty_name</td>
+		<td>&nbsp;</td>
 	    }]
 
 	    if { $installed_p == "t" } {
@@ -90,8 +90,9 @@
 			if {![parameter::get -package_id [ad_acs_kernel_id] \
 				  -parameter PerformanceModeP -default 1]} {
 			    # Provide a link to watch the procs file.
+			    set href [export_vars -base file-watch {version_id {paths $path} return_url}]
 			    append body [subst {
-				<td>&nbsp;<a href="file-watch?[export_vars -url {version_id {paths $path} return_url}]">watch</a>
+				<td>&nbsp;<a href="[ns_quotehtml $href]">watch</a>
 				&nbsp;</td>
 			    }]
 			} else {
@@ -120,13 +121,14 @@
 
 if { $installed_p == "t" } {
     append body [subst {<ul>
-	<li><a href="package-watch?[export_vars -url {package_key return_url}]">watch all files</a></li>
-	<li><a href="package-watch-cancel?[export_vars -url {package_key return_url}]">cancel all watches</a></li>
+	<li><a href="[ns_quotehtml [export_vars -base package-watch {package_key return_url}]]">watch all files</a></li>
+	<li><a href="[ns_quotehtml [export_vars -base package-watch-cancel {package_key return_url}]]">cancel all watches</a></li>
     }]
 
     if {$tagged_p == "t"} {
 	append body [subst {
-	    <li><a href="archive/[file tail $version_uri]?version_id=$version_id">Download a tarball from the package archive</a>
+	    <li><a href="[ns_quotehtml [export_vars -base archive/[file tail $version_uri] {version_id}]">Download
+	    a tarball from the package archive</a>
 	}]
     }
 
@@ -135,7 +137,8 @@
 } elseif { [info exists tagged_p] } {
     if { $tagged_p == "t" } {
 	append body [subst {<ul>
-	    <li><a href="archive/[file tail $version_uri]?version_id=$version_id">Download a tarball from the package archive</a>
+	    <li><a href="[ns_quotehtml [export_vars -base archive/[file tail $version_uri] {version_id}]]">Download
+	    a tarball from the package archive</a>
         </ul>
 	}]
     }
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	13 Jun 2015 23:55:32 -0000	1.18
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	19 Jun 2015 09:09:51 -0000	1.19
@@ -19,9 +19,9 @@
     # to processing the next one
     set remaining_files [lrange $files 1 end]
     if { [llength $remaining_files] > 0 } {
-        ad_returnredirect "version-i18n-process?[export_vars -url {version_id {files:multiple $remaining_files} file_action:multiple}]"    
+        ad_returnredirect [export_vars -base version-i18n-process {version_id {files:multiple $remaining_files} file_action:multiple}]
     } else {
-        ad_returnredirect "version-i18n?[export_vars -url {version_id}]"
+        ad_returnredirect [export_vars -base version-i18n {version_id}]
     }
     ad_script_abort
 }
@@ -115,7 +115,7 @@
 
 # The proceed link will be to the next adp file if there is one and back to the I18N page
 # if we're done
-set proceed_url_export_vars [export_vars -url {version_id files:multiple file_action:multiple}]
+set proceed_url_export_vars [export_vars {version_id files:multiple file_action:multiple}]
 if { [llength $files] > 0 } {
     # There are no more files to process so present a link back to the i18n page for this version
     set proceed_url "version-i18n-process?${proceed_url_export_vars}"
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl	27 Oct 2014 16:38:54 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl	19 Jun 2015 09:09:51 -0000	1.5
@@ -22,7 +22,7 @@
 
 # If no texts should be replaced we need not give the user a choice of keys to use and
 # can go straight to the processing
-set redirect_url "version-i18n-process-2?[export_vars -url {version_id files:multiple file_action:multiple}]"
+set redirect_url [export_vars -base version-i18n-process-2 {version_id files:multiple file_action:multiple}]
 if { ! $replace_text_p } {
 
     ad_returnredirect $redirect_url
Index: openacs-4/packages/acs-admin/www/apm/version-i18n.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/apm/version-i18n.tcl	13 Jun 2015 23:55:32 -0000	1.13
+++ openacs-4/packages/acs-admin/www/apm/version-i18n.tcl	19 Jun 2015 09:09:51 -0000	1.14
@@ -118,32 +118,57 @@
 }
 
 if { $pre_select_files_p } {
-    set pre_select_filter "<a href=\"version-i18n?[export_vars -url -override {{pre_select_files_p 0}} {version_id file_type show_status_p only_text_p}]\">Unselect all checkboxes</a>"
+    set href [export_vars -base version-i18n -override {{pre_select_files_p 0}} {version_id file_type show_status_p only_text_p}]
+    set pre_select_filter [subst {<a href="[ns_quotehtml $href]">Unselect all checkboxes</a>}]
 } else {
-    set pre_select_filter "<a href=\"version-i18n?[export_vars -url -override {{pre_select_files_p 1}} {version_id file_type show_status_p only_text_p}]\">Select all checkboxes</a>"
+    set href [export_vars -base version-i18n -override {{pre_select_files_p 1}} {version_id file_type show_status_p only_text_p}]
+    set pre_select_filter [subst {<a href="[ns_quotehtml $href]">Select all checkboxes</a>}]
 }
 
 if { $show_status_p } {
-    set status_filter "<a href=\"version-i18n?[export_vars -url -override {{show_status_p 0}} {version_id file_type pre_select_files_p only_text_p}]\">Hide I18N status of files</a>"
+    set href [export_vars -base version-i18n -override {{show_status_p 0}} {version_id file_type pre_select_files_p only_text_p}]
+    set status_filter [subst {<a href="[ns_quotehtml $href]">Hide I18N status of files</a>}]
 } else {
-    set status_filter "<a href=\"version-i18n?[export_vars -url -override {{show_status_p 1}} {version_id file_type pre_select_files_p only_text_p}]\">Show I18N status of files</a>"
+    set href [export_vars -base version-i18n -override {{show_status_p 1}} {version_id file_type pre_select_files_p only_text_p}]
+    set status_filter [subst {<a href="[ns_quotehtml $href]">Show I18N status of files</a>}]
 }
 
 switch -- $file_type {
     adp {
         if { $only_text_p } {
-            set text_only_filter "<a href=\"version-i18n?[export_vars -url -override {{only_text_p 0}} {pre_select_files_p version_id file_type show_status_p}]\">all adp files</a> | only adp files with translatable text"
+	    set href [export_vars -base version-i18n-override {{only_text_p 0}} {pre_select_files_p version_id file_type show_status_p}]
+            set text_only_filter [subst {<a href="[ns_quotehtml $href]">all adp files</a> | only adp files with translatable text}]
         } else {
-            set text_only_filter "<b>all adp files</b> | <a href=\"version-i18n?[export_vars -url -override {{only_text_p 1}} {pre_select_files_p version_id file_type show_status_p}]\">only apd files with translatable text</a>"
-        }    
+	    set href [export_vars -base version-i18n -override {{only_text_p 1}} {pre_select_files_p version_id file_type show_status_p}]
+            set text_only_filter [subst {<b>all adp files</b> | <a href="[ns_quotehtml $href]">only apd files with translatable text</a>}]
+        }
 
-        set file_type_filter "<b>Show adp files</b>: $text_only_filter | <a href=\"version-i18n?[export_vars -url -override {{file_type tcl}} {version_id pre_select_files_p show_status_p only_text_p}]\">Show tcl files</a> | <a href=\"version-i18n?[export_vars -url -override {{file_type sql}} {version_id pre_select_files_p show_status_p only_text_p}]\">Show sql files</a>"
+	set href1 [export_vars -base version-i18n -override {{file_type tcl}} {version_id pre_select_files_p show_status_p only_text_p}]
+	set href2 [export_vars -base version-i18n -override {{file_type sql}} {version_id pre_select_files_p show_status_p only_text_p}]
+        set file_type_filter [subst {
+	    <b>Show adp files</b>: $text_only_filter |
+	    <a href="[ns_quotehtml $href1]">Show tcl files</a> |
+	    <a href="[ns_quotehtml $href2]">Show sql files</a>
+	}]
     }
     tcl {
-        set file_type_filter "<a href=\"version-i18n?[export_vars -url -override {{file_type adp}} {version_id pre_select_files_p show_status_p only_text_p}]\">Show adp files</a> | <b>Show tcl files</b> | <a href=\"version-i18n?[export_vars -url -override {{file_type sql}} {version_id pre_select_files_p show_status_p only_text_p}]\">Show sql files</a>"
+	set href1 [export_vars -base version-i18n -override {{file_type adp}} {version_id pre_select_files_p show_status_p only_text_p}]
+	set href2 [export_vars -base version-i18n -override {{file_type sql}} {version_id pre_select_files_p show_status_p only_text_p}]
+        set file_type_filter [subst {
+	    <a href="[ns_quotehtml $href1]">Show adp files</a> |
+	    <b>Show tcl files</b> |
+	    <a href="[ns_quotehtml $href2]">Show sql files</a>
+	}]
     }
     sql {
-        set file_type_filter "<a href=\"version-i18n?[export_vars -url -override {{file_type adp}} {version_id pre_select_files_p show_status_p only_text_p}]\">Show adp files</a> | <a href=\"version-i18n?[export_vars -url -override {{file_type tcl}} {version_id pre_select_files_p show_status_p only_text_p}]\">Show tcl files</a> | <b>Show sql files</b>"
+	set href1 [export_vars -base version-i18n -override {{file_type adp}} {version_id pre_select_files_p show_status_p only_text_p}]
+	set href2 [export_vars -base version-i18n -override {{file_type tcl}} {version_id pre_select_files_p show_status_p only_text_p}]
+	
+        set file_type_filter [subst {
+	    <a href="[ns_quotehtml $href1]">Show adp files</a> |
+	    <a href="[ns_quotehtml $href2]">Show tcl files</a> |
+	    <b>Show sql files</b>
+	}]
     }
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	27 Oct 2014 16:38:54 -0000	1.9
+++ openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	19 Jun 2015 09:09:51 -0000	1.10
@@ -68,9 +68,10 @@
 append sql_clauses " [template::list::orderby_clause -orderby -name parameters_list]"
 
 db_multirow -extend {actions} parameters parameter_table {} {
-    set actions "\[<font size=-1>
-        <a href=parameter-delete?[export_vars -url {parameter_id version_id section_name}]>delete</a> | 
-        <a href=parameter-edit?[export_vars -url {version_id parameter_id}]>edit</a></font>\]"
+    set actions [subst {\[<font size="-1">
+        <a href="[ns_quotehtml [export_vars -base parameter-delete {parameter_id version_id section_name}]]">delete</a> | 
+        <a href="[ns_quotehtml [export_vars -base parameter-edit {version_id parameter_id}]]">edit</a></font>\]
+    }]
 }
 
 
Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-admin/www/apm/version-view.tcl	27 Oct 2014 16:38:54 -0000	1.21
+++ openacs-4/packages/acs-admin/www/apm/version-view.tcl	19 Jun 2015 09:09:51 -0000	1.22
@@ -77,18 +77,21 @@
 
 if { ![info exists installed_version_id] } {
     if { !$downloaded_p } {
+        set href [export_vars -base version-generate-info {version_id {write_p 1}}]
         set status [subst {
             No version of this package is installed: there is no <tt>.info</tt> file in the
             <tt>packages/$package_key</tt> directory. If you're building the package now, you probably
-            want to <a href="version-generate-info?version_id=$version_id&write_p=1">generate one</a>.
+            want to <a href="[ns_quotehtml $href]">generate one</a>.
         }]
     } else {
+        set href [export_vars -base version-install {version_id}]
         set status [subst {
             No version of this package is installed. You may 
-            <a href="version-install?version_id=$version_id">install this package now</a>.
+            <a href="[ns_quotehtml $href]">install this package now</a>.
         }]
     }
     lappend prompts $status
+    
 } elseif { $installed_version_id == $version_id } {
     set status "This version of the package is installed"
     if { $enabled_p == "t" } {
@@ -104,8 +107,9 @@
         version $installed_version_name, is installed and [ad_decode $installed_enabled_p "t" "enabled" "disabled"].
     }]
     if { $version_name_greater < 0 } {
+        set href [export_vars -base version-upgrade {version_id}]
         append body [subst {
-            You may <a href="version-upgrade?version_id=$version_id">upgrade to this version now</a>.
+            You may <a href="[ns_quotehtml $href]">upgrade to this version now</a>.
         }]
     }
 }
@@ -133,7 +137,7 @@
     if { $owner_uri eq "" } {
         lappend owners $owner_name
     } else {
-        lappend owners "$owner_name (<a href=\"$owner_uri\">$owner_uri</a>)"
+        lappend owners [subst {$owner_name (<a href="[ns_quotehtml $owner_uri]">$owner_uri</a>)}]
     }
 }
 
@@ -200,7 +204,7 @@
     }]
 }
 
-set vendorHTML [ad_decode $vendor_uri "" $vendor "<a href=\"$vendor_uri\">$vendor</a>"]
+set vendorHTML [ad_decode $vendor_uri "" $vendor [subst {<a href="[ns_quotehtml $vendor_uri]">$vendor</a>}]]
 append body [subst {
     <tr valign="baseline"><th align="left">Vendor:</th><td>$vendorHTML</td></tr>
     <tr valign="baseline"><th align="left">Package URL:</th><td><a href="$package_uri">$package_uri</a></td></tr>
@@ -209,23 +213,25 @@
 }]
 
 if { $tarball_length ne "" && $tarball_length > 0 } {
+    set href [export_vars -base packages/[file tail $version_uri] {version_id}]
     append body [subst {
-        <a href="packages/[file tail $version_uri]?version_id=$version_id">[format "%.1f" [expr { $tarball_length / 1024.0 }]]KB</a> 
+        <a href="[ns_quotehtml $href]">[format "%.1f" [expr { $tarball_length / 1024.0 }]]KB</a> 
     }]
     if { $distribution_uri eq "" } {
         append body "(generated on this system"
         if { $distribution_date ne "" } {
             append body " on $distribution_date"
         }
         append body ")"
-        set params [export_vars { {m create-new} {p.description $summary} {title "[file tail $version_uri]"}}]
+        set href [export_vars -base "http://openacs.org/xowf/package-submissions/PackageSubmit.wf" \
+                      {{m create-new} {p.description $summary} {title "[file tail $version_uri]"}}]
         append body [subst {
             <p>
             In order to contribute this package back to the OpenACS community, 
             <ol>
             <li>download the .apm-file to your file system and</li>
             <li>submit the .apm-file 
-            <a href="http://openacs.org/xowf/package-submissions/PackageSubmit.wf?$params" target="_blank">to 
+            <a href="[ns_quotehtml $href]" target="_blank">to 
             the package repository of OpenACS</a>.</li>
             </ol>
         }]
@@ -239,8 +245,9 @@
 } else {
     append body "None available"
     if { $installed_p == "t" } {
+        set href [export_vars -base version-generate-tarball {version_id}]
         append body [subst {
-            (<a href="version-generate-tarball?version_id=$version_id">generate one now</a> from the filesystem)
+            (<a href="[ns_quotehtml $href]">generate one now</a> from the filesystem)
         }]
     }
 }
@@ -250,15 +257,15 @@
 if {$nr_instances > 0} {
     set instances [subst {
         Installed instances of this package:
-        <a href="package-instances?[export_vars { package_key }]">$nr_instances</a>
+        <a href="[ns_quotehtml [export_vars -base package-instances { package_key }]]">$nr_instances</a>
     }]
 } else {
     set instances "No installed instance of this package\n"
 }
 if {$nr_instances == 0 || ($nr_instances > 0 && !$singleton_p)} {
-    set query [export_vars { package_key {return_url [ad_return_url]}}]
+    set href [export_vars -base package-instance-create { package_key {return_url [ad_return_url]}}]
     set instance_create [subst {
-        <li><a href="package-instance-create?$query">Create 
+        <li><a href="[ns_quotehtml $href]">Create 
         (unmounted) instance of this package</a></li>
     }]
 } else {
@@ -271,26 +278,30 @@
     </blockquote>
 
     <ul>
-    <li><a href="version-edit?[export_vars { version_id }]">Edit above information</a> (Also use this to create a new version)
+    <li><a href="[ns_quotehtml [export_vars -base version-edit {version_id}]]">Edit
+    above information</a> (Also use this to create a new version)</li>
     </ul>
     <h4>Manage</h4>
     <ul>
-    <li><a href="version-files?[export_vars { version_id }]">Files</a></li>
-    <li><a href="version-dependencies?[export_vars { version_id }]">Dependencies and Provides</a></li>
-    <li><a href="version-parameters?[export_vars { version_id }]">Parameters</a></li>
-    <li><a href="version-callbacks?[export_vars { version_id }]">Tcl Callbacks (install, instantiate, mount)</a></li>
-    <li><a href="version-i18n-index?[export_vars { version_id }]">Internationalization</a></li>
+    <li><a href="[ns_quotehtml [export_vars -base version-files        {version_id}]]">Files</a></li>
+    <li><a href="[ns_quotehtml [export_vars -base version-dependencies {version_id}]]">Dependencies and Provides</a></li>
+    <li><a href="[ns_quotehtml [export_vars -base version-parameters   {version_id}]]">Parameters</a></li>
+    <li><a href="[ns_quotehtml [export_vars -base version-callbacks    {version_id}]]">Tcl Callbacks (install, instantiate, mount)</a></li>
+    <li><a href="[ns_quotehtml [export_vars -base version-i18n-index   {version_id}]]">Internationalization</a></li>
     <li>$instances</li>
     $instance_create
     </ul>
     <h4>Reload</h4>
     <ul>
-    <li><a href="[export_vars -base version-reload { version_id {return_url [ad_return_url]}}]">Reload this package</a></li>
-    <li><a href="[export_vars -base package-watch { package_key {return_url [ad_return_url]}}]">Watch all files in package</a></li>
+    <li><a href="[ns_quotehtml [export_vars -base version-reload {version_id  {return_url [ad_return_url]}}]]">Reload
+    this package</a></li>
+    <li><a href="[ns_quotehtml [export_vars -base package-watch  {package_key {return_url [ad_return_url]}}]]">Watch
+    all files in package</a></li>
     </ul>
     <h4>XML .info package specification file</h4>
     <ul>
-    <li><a href="version-generate-info?[export_vars { version_id }]">Display an XML package specification file for this version</a></li>
+    <li><a href="[ns_quotehtml [export_vars -base version-generate-info {version_id}]]">Display an
+    XML package specification file for this version</a></li>
 }]
 
 if { ![info exists installed_version_id] || $installed_version_id == $version_id && 
@@ -299,7 +310,7 @@
     # generated locally, allow the user to write a specification file for this version
     # of the package.
     append body [subst {
-        <li><a href="version-generate-info?[export_vars { version_id }]&write_p=1">Write 
+        <li><a href="[ns_quotehtml [export_vars -base version-generate-info {version_id {write_p 1}}]]">Write 
         an XML package specification to the <tt>packages/$package_key/$package_key.info</tt> file</a></li>
     }]
 }
@@ -309,7 +320,7 @@
         # The distribution tarball was either (a) never generated, or (b) generated on this
         # system. Allow the user to make a tarball based on files in the filesystem.
         append body [subst {
-            <li><a href="version-generate-tarball?[export_vars { version_id }]">Generate 
+            <li><a href="[ns_quotehtml [export_vars -base version-generate-tarball {version_id}]]">Generate 
             a distribution file for this package from the filesystem</a></li>
         }]
     }
@@ -318,20 +329,20 @@
 
     if { [info exists can_disable_p] } {
         append body [subst {
-            <li><a href="version-disable?[export_vars { version_id }]">Disable 
+            <li><a href="[ns_quotehtml [export_vars -base version-disable {version_id}]]">Disable 
             this version of the package</a></li>
         }]
     }
     if { [info exists can_enable_p] } {
         append body [subst {
-            <li><a href="version-enable?[export_vars { version_id }]">Enable 
+            <li><a href="[ns_quotehtml [export_vars -base version-enable {version_id}]]">Enable 
             this version of the package</a></li>
         }]
     }
     
     if { $installed_p == "t" } {    
         append body [subst {
-            <li><a href="package-delete?[export_vars { version_id }]">Uninstall 
+            <li><a href="[ns_quotehtml [export_vars -base package-delete {version_id}]]">Uninstall 
             this package from your system</a> (be very careful!)</li>
         }]
     }
Index: openacs-4/packages/acs-admin/www/users/bouncing-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/bouncing-users.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/users/bouncing-users.tcl	9 Apr 2007 07:10:57 -0000	1.1
+++ openacs-4/packages/acs-admin/www/users/bouncing-users.tcl	19 Jun 2015 09:09:51 -0000	1.2
@@ -47,7 +47,7 @@
 
 db_multirow -extend {unbounce_link} bouncing_users select_bouncing_users {} {
     set return_url [ad_return_url]
-    set unbounce_link [export_vars -base "/register/restore-bounce" -url {user_id return_url}]
+    set unbounce_link [export_vars -base /register/restore-bounce {user_id return_url}]
 }
 
-set context [list [list "." "Users"] "[_ acs_mail_lite.Bouncing_users]"]
+set context [list [list "." "Users"] "[_ acs-mail-lite.Bouncing_users]"]
Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-admin/www/users/complex-search.tcl	15 Jun 2015 11:10:10 -0000	1.14
+++ openacs-4/packages/acs-admin/www/users/complex-search.tcl	19 Jun 2015 09:09:51 -0000	1.15
@@ -229,14 +229,14 @@
     set user_search:[set rowcount](first_names) $first_names
     set user_search:[set rowcount](last_name) $last_name
     set user_search:[set rowcount](email) $email
-    set user_search:[set rowcount](export_vars) [export_vars -url {user_id_from_search first_names_from_search last_name_from_search email_from_search}]
+    set user_search:[set rowcount](export_vars) [export_vars {user_id_from_search first_names_from_search last_name_from_search email_from_search}]
     set user_search:[set rowcount](member_state) $member_state
     
     if { $member_state ne "approved" } {
 	set user_search:[set rowcount](user_finite_state_links) \
 	    [join [ad_registration_finite_state_machine_admin_links \
 		       $member_state $email_verified_p $user_id_from_search \
-		       [export_vars -base -url {
+		       [export_vars -base complex-search {
 			   email last_name keyword target passthrough limit_to_users_in_group_id only_authorized_p
 		       }]] " | "]
     } else {
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	13 Jun 2015 23:55:33 -0000	1.16
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	19 Jun 2015 09:09:51 -0000	1.17
@@ -91,13 +91,13 @@
 set message $email_message
 
 if {$return_url eq ""} {
-    set return_url "/acs-admin/users/one?[export_vars -url {user_id}]"
+    set return_url [export_vars -base /acs-admin/users/one {user_id}]
 } else {
     ad_returnredirect $return_url
     ad_script_abort
 }
 
 set context [list [list "./" "Users"] "$action"]
-set export_vars [export_vars -url {email email_from subject message return_url}]
+set export_vars [export_vars {email email_from subject message return_url}]
 
 ad_return_template
Index: openacs-4/packages/acs-admin/www/users/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/users/search.tcl	13 Jun 2015 23:55:33 -0000	1.8
+++ openacs-4/packages/acs-admin/www/users/search.tcl	19 Jun 2015 09:09:51 -0000	1.9
@@ -148,11 +148,11 @@
     set user_search:[set rowcount](first_names) $first_names
     set user_search:[set rowcount](last_name) $last_name
     set user_search:[set rowcount](email) $email
-    set user_search:[set rowcount](export_vars) [export_vars -url {user_id_from_search first_names_from_search last_name_from_search email_from_search}]
+    set user_search:[set rowcount](export_vars) [export_vars {user_id_from_search first_names_from_search last_name_from_search email_from_search}]
     set user_search:[set rowcount](member_state) $member_state
     
     if { $member_state ne "approved" } {
-	set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "search?[export_vars -url {email last_name keyword target passthrough limit_to_users_in_group_id only_authorized_p}]"] " | "]
+	set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search [export_vars -base search {email last_name keyword target passthrough limit_to_users_in_group_id only_authorized_p}]] " | "]
     } else {
 	set user_search:[set rowcount](user_finite_state_links) ""
     }
Index: openacs-4/packages/acs-admin/www/users/user-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/users/user-add-3.tcl	27 Oct 2014 16:38:58 -0000	1.7
+++ openacs-4/packages/acs-admin/www/users/user-add-3.tcl	19 Jun 2015 09:09:51 -0000	1.8
@@ -19,15 +19,19 @@
 set admin_user_id [ad_conn user_id]
 
 set context [list [list "./" "Users"] "New user notified"]
-set export_vars [export_vars -url {user_id}]
+set export_vars [export_vars {user_id}]
 
 set admin_email [db_string get_admin_email {}]
 set subject "You have been added as a user to [ad_system_name] at [ad_url]"
 
 if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $admin_email -subject $subject -body $message} errmsg]} {
-    ad_return_error "Mail Failed" "<p>The system was unable to send email.  Please notify the user personally.  This problem is probably caused by a misconfiguration of your email system.  Here is the error:</p>
+    ad_return_error "Mail Failed" [subst {
+	<p>The system was unable to send email.  Please notify the user personally.
+	This problem is probably caused by a misconfiguration of your email system.
+	Here is the error message:</p>
 <div><code>
-[ad_quotehtml $errmsg]
-</code></div>"
+[ns_quotehtml $errmsg]
+</code></div>
+}]
     return
 }