Index: openacs-4/packages/acs-subsite/www/permissions/grant-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/Attic/grant-2.tcl,v
diff -u -N -r1.2 -r1.2.4.1
--- openacs-4/packages/acs-subsite/www/permissions/grant-2.tcl	22 Apr 2001 16:13:15 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/permissions/grant-2.tcl	1 May 2003 19:18:29 -0000	1.2.4.1
@@ -9,6 +9,7 @@
   object_id:integer,notnull
   party_id:integer,notnull
   privilege
+  {application_url ""}
 }
 
 ad_require_permission $object_id admin
@@ -19,4 +20,4 @@
   end;
 }
 
-ad_returnredirect "one?[export_url_vars object_id]"
+ad_returnredirect "one?[export_vars {object_id application_url}]"
Index: openacs-4/packages/acs-subsite/www/permissions/grant.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.tcl,v
diff -u -N -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-subsite/www/permissions/grant.tcl	16 Mar 2003 14:45:49 -0000	1.2.2.2
+++ openacs-4/packages/acs-subsite/www/permissions/grant.tcl	1 May 2003 19:18:29 -0000	1.2.2.3
@@ -7,6 +7,7 @@
   @cvs-id $Id$
 } {
   object_id:integer,notnull
+  {application_url ""}
 }
 
 ad_require_permission $object_id admin
@@ -21,7 +22,7 @@
 <hr>
 
 <form method=get action=grant-2>
-[export_form_vars object_id]
+[export_vars -form {application_url object_id}]
 
 Grant: 
 
Index: openacs-4/packages/acs-subsite/www/permissions/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.adp,v
diff -u -N -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/acs-subsite/www/permissions/one.adp	1 May 2003 11:15:43 -0000	1.1.2.4
+++ openacs-4/packages/acs-subsite/www/permissions/one.adp	1 May 2003 19:18:29 -0000	1.1.2.5
@@ -16,7 +16,7 @@
     <h3>Direct Permissions</h3>
     <if @acl:rowcount@ gt 0>
       <form method="get" action="revoke">
-        <input type=hidden name="object_id" value="@object_id@">
+        @export_form_vars@
           <blockquote style="margin-left: 16px;">
             <multiple name="acl">
               <input type="checkbox" name="revoke_list" value="@acl.grantee_id@ @acl.privilege@" 
@@ -42,20 +42,24 @@
             <li><a href="one?object_id=@children.c_object_id@">@children.c_name@</a> @children.c_type@</li>
           </multiple>
         </ul>
+
+        [<a href="@hide_children_url@">Hide</a>]
       </if>
       <else>
         <p><em>No children</em></p>
       </else>
     </if>
+
     <if @children_p@ eq "f">
-      <if @num_children@ gt 0> @num_children@ Children Hidden [<a href="one?object_id=@object_id@&amp;children_p=t">Show</a>]</if>
+      <if @num_children@ gt 0> @num_children@ Children Hidden [<a href="@show_children_url@">Show</a>]</if>
       <else>
         <em>No children</em>
       </else>
     </if>
-    <if @return_url@ not nil>
+
+    <if @application_url@ not nil>
       <p>
-        [<a href="@return_url@">return to application</a>]
+        [<a href="@application_url@">return to application</a>]
       </p>
     </if>
     <else>
Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v
diff -u -N -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-subsite/www/permissions/one.tcl	1 May 2003 11:15:43 -0000	1.2.2.2
+++ openacs-4/packages/acs-subsite/www/permissions/one.tcl	1 May 2003 19:18:29 -0000	1.2.2.3
@@ -1,4 +1,4 @@
-# packages/acs-core-ui/www/acs_object/permissions/index.tcl
+# packages-core-ui/www/acs_object/permissions/index.tcl
 ad_page_contract {
     Display permissions and children for the given object_id
 
@@ -10,7 +10,7 @@
 } {
     object_id:integer,notnull
     {children_p "f"}
-    {return_url ""}
+    {application_url ""}
 }
 
 set user_id [ad_maybe_redirect_for_registration]
@@ -30,19 +30,23 @@
 
 set controls [list]
 
-lappend controls "<a href=grant?[export_url_vars object_id]>Grant Permission</a>"
+lappend controls "<a href=grant?[export_vars {application_url object_id}]>Grant Permission</a>"
 
 db_1row context { *SQL* }
 
 if { $security_inherit_p == "t" && ![empty_string_p $context_id] } {
-    lappend controls "<a href=toggle-inherit?[export_url_vars object_id]>Don't Inherit Permissions from $context_name</a>"
+    lappend controls "<a href=toggle-inherit?[export_vars {application_url object_id}]>Don't Inherit Permissions from $context_name</a>"
 } else {
-    lappend controls "<a href=toggle-inherit?[export_url_vars object_id]>Inherit Permissions from $context_name</a>"
+    lappend controls "<a href=toggle-inherit?[export_vars {application_url object_id}]>Inherit Permissions from $context_name</a>"
 }
 
 set controls "\[ [join $controls " | "] \]"
 
+set export_form_vars [export_vars -form {object_id application_url}]
 
+set show_children_url "one?[export_vars {object_id application_url {children_p t}}]"
+set hide_children_url "one?[export_vars {object_id application_url {children_p f}}]"
+
 if [string equal $children_p "t"] {
     db_multirow children children { *SQL* } {
         set c_name [ad_quotehtml $c_name]
Index: openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl,v
diff -u -N -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl	2 Oct 2002 11:31:22 -0000	1.2.4.1
+++ openacs-4/packages/acs-subsite/www/permissions/revoke-2.tcl	1 May 2003 19:18:29 -0000	1.2.4.2
@@ -9,6 +9,7 @@
   object_id:integer,notnull
   revoke_list:multiple
   { operation "" }
+  {application_url ""}
 }
 
 permission::require_permission -object_id $object_id -privilege admin
@@ -23,4 +24,4 @@
     }
 }
 
-ad_returnredirect "one?[export_url_vars object_id]"
+ad_returnredirect "one?[export_vars {object_id application_url}]"
Index: openacs-4/packages/acs-subsite/www/permissions/revoke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/revoke.tcl,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/www/permissions/revoke.tcl	18 Sep 2002 12:16:44 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/permissions/revoke.tcl	1 May 2003 19:18:29 -0000	1.3.2.1
@@ -8,6 +8,7 @@
 } {
   object_id:integer,notnull
   {revoke_list:multiple,optional {}}
+  {application_url ""}
 }
 
 ad_require_permission $object_id admin
@@ -38,7 +39,7 @@
 doc_body_append "</ul>
 
 <form method=get action=revoke-2>
-[export_form_vars object_id]
+[export_vars -form {object_id application_url}]
 
 "
 
Index: openacs-4/packages/acs-subsite/www/permissions/toggle-inherit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/toggle-inherit.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-subsite/www/permissions/toggle-inherit.tcl	13 Mar 2002 22:54:34 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/permissions/toggle-inherit.tcl	1 May 2003 19:18:29 -0000	1.2.2.1
@@ -9,10 +9,11 @@
   @cvs-id $Id$
 } {
   object_id:integer,notnull
+  {application_url ""}
 }
 
 ad_require_permission $object_id admin
 
 permission::toggle_inherit -object_id $object_id
 
-ad_returnredirect one?[export_url_vars object_id]
+ad_returnredirect one?[export_vars {application_url object_id}]