Index: openacs-4/packages/dotlrn/www/admin/user-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/user-edit.tcl	23 Jan 2002 00:15:44 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/user-edit.tcl	1 Feb 2002 21:46:22 -0000	1.6
@@ -24,20 +24,24 @@
 element create edit_user read_private_data_p \
         -label "Can Access Private Information?" -datatype text -widget select -options {{yes t} {no f}}
 
+element create edit_user referer \
+        -label "Referer" -datatype text -widget hidden -value $referer
+
 # Create a form of hidden vars
 form create verif_edit_user
 
 element create verif_edit_user user_id -label "User ID" -datatype integer -widget hidden
 element create verif_edit_user type_id -label "Type ID" -datatype integer -widget hidden
 element create verif_edit_user rel_type -label "Relationship Type" -datatype text -widget hidden
 element create verif_edit_user read_private_data_p -label "Can Read Private Data?" -datatype text -widget hidden
+element create verif_edit_user referer -label "Referer" -datatype text -widget hidden -value $referer
 
 set context_bar {{users Users} {Edit}}
 set dotlrn_package_id [dotlrn::get_package_id]
 
 # We verified everything, now we make the change
 if {[form is_valid verif_edit_user]} {
-    template::form get_values verif_edit_user user_id type_id rel_type read_private_data_p
+    template::form get_values verif_edit_user user_id type_id rel_type read_private_data_p referer
 
     set rel_id [db_string select_rel_id {
         select rel_id
@@ -62,7 +66,7 @@
 
 
 if {[form is_valid edit_user]} {
-    template::form get_values edit_user user_id type_id rel_type read_private_data_p
+    template::form get_values edit_user user_id type_id rel_type read_private_data_p referer
 
     # Do something
     set new_rel_type $rel_type
Index: openacs-4/packages/dotlrn/www/admin/user-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/user-new-2.tcl	23 Jan 2002 00:15:44 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.tcl	1 Feb 2002 21:46:22 -0000	1.12
@@ -5,6 +5,7 @@
     @creation-date 2001-11-04
 } -query {
     user_id
+    {referer "users"}
 }
 
 form create add_user
@@ -21,8 +22,11 @@
 element create add_user read_private_data_p \
         -label "Can Access Private Information?" -datatype text -widget select -options {{yes t} {no f}}
 
+element create add_user referer \
+        -label "Referer" -datatype text -widget hidden -value $referer
+
 if {[form is_valid add_user]} {
-    template::form get_values add_user user_id type_id rel_type read_private_data_p
+    template::form get_values add_user user_id type_id rel_type read_private_data_p referer
 
     db_transaction {
         # add the user
@@ -32,7 +36,7 @@
     }
 
     # redirect
-    ad_returnredirect "users"
+    ad_returnredirect $referer
     ad_script_abort
 }
 
Index: openacs-4/packages/dotlrn/www/admin/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/user-new.tcl	23 Jan 2002 00:15:44 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/user-new.tcl	1 Feb 2002 21:46:22 -0000	1.6
@@ -4,6 +4,7 @@
     @author Ben Adida (ben@openforce.net)
     @creation-date 2001-11-04
 } -query {
+    {referer "users"}
     search_text
 }
 
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp	1 Feb 2002 21:37:15 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-large.adp	1 Feb 2002 21:46:22 -0000	1.4
@@ -1,3 +1,3 @@
 <formtemplate id="user_search"></formtemplate>
 
-<include src="users-chunk" type=@type@ &users="users">
+<include src="users-chunk" type=@type@ &users="users" referer=@referer@>
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp	1 Feb 2002 21:37:15 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium.adp	1 Feb 2002 21:46:22 -0000	1.4
@@ -1,3 +1,3 @@
 <p>@control_bar@</p>
 
-<include src="users-chunk" type=@type@ &users="users">
+<include src="users-chunk" type=@type@ &users="users" referer=@referer@>
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp	1 Feb 2002 21:37:15 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small.adp	1 Feb 2002 21:46:22 -0000	1.4
@@ -1 +1 @@
-<include src="users-chunk" type=@type@ &users="users">
+<include src="users-chunk" type=@type@ &users="users" referer=@referer@>
Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/users-chunk.adp	1 Feb 2002 21:37:15 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp	1 Feb 2002 21:46:22 -0000	1.4
@@ -21,21 +21,21 @@
         <tr bgcolor="@bgcolor@">
           <td>
             <if @type@ eq "pending">
-              <a href="user-new-2?user_id=@users.user_id@">@users.last_name@, @users.first_names@</a> (<a href="mailto:@users.email@">@users.email@</a>)
+              <a href="user-new-2?user_id=@users.user_id@&referer=@referer@">@users.last_name@, @users.first_names@</a> (<a href="mailto:@users.email@">@users.email@</a>)
             </if>
             <else>
-              <a href="user-edit?user_id=@users.user_id@">@users.last_name@, @users.first_names@</a> (<a href="mailto:@users.email@">@users.email@</a>)
+              <a href="user-edit?user_id=@users.user_id@&referer=@referer@">@users.last_name@, @users.first_names@</a> (<a href="mailto:@users.email@">@users.email@</a>)
             </else>
           </td>
           <td align="center"><if @users.limited_access_p@ eq t>limited</if><else>full</else></td>
           <td align="center"><if @users.read_private_data_p@ eq t>yes</if><else>no</else></td>
           <td align="center">
             <if @user_id@ ne @users.user_id@>
               <if @users.site_wide_admin_p@ eq t>
-                <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=revoke&referer=users">yes</a>
+                <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=revoke&referer=@referer@">yes</a>
               </if>
               <else>
-                <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=grant&referer=users">no</a>
+                <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=grant&referer=@referer@">no</a>
               </else>
             </if>
             <else>yes</else>
Index: openacs-4/packages/dotlrn/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/users.adp	30 Jan 2002 23:32:41 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/users.adp	1 Feb 2002 21:46:22 -0000	1.14
@@ -15,13 +15,13 @@
 <p>@control_bar@</p>
 
 <if @n_users@ gt 2500>
-  <include src="users-chunk-large" type=@type@>
+  <include src="users-chunk-large" type=@type@ referer="users?type=@type@">
 </if>
 <else>
   <if @n_users@ gt 100>
-    <include src="users-chunk-medium" type=@type@>
+    <include src="users-chunk-medium" type=@type@ referer="users?type=@type@">
   </if>
   <else>
-    <include src="users-chunk-small" type=@type@>
+    <include src="users-chunk-small" type=@type@ referer="users?type=@type@">
   </else>
 </else>