Index: openacs-4/packages/dotlrn-admin/tcl/dotlrn-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/tcl/dotlrn-admin-procs.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/tcl/dotlrn-admin-procs.tcl	20 Aug 2004 14:44:21 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/tcl/dotlrn-admin-procs.tcl	20 Aug 2004 21:38:12 -0000	1.1.2.1
@@ -2,4 +2,7 @@
     ad_proc -public mount_point {} {} {
 	return dotlrn-admin
     }
+    ad_proc -public get_admin_url {} {} {
+	return [dotlrn::get_url]/[mount_point]/admin
+    }
 }
\ No newline at end of file
Index: openacs-4/packages/dotlrn-admin/www/admin/department.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/department.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/department.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/department.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -31,7 +31,7 @@
 }
 
 if {[empty_string_p $department_key]} {
-    ad_returnredirect "[dotlrn::get_admin_url]/classes"
+    ad_returnredirect "[dotlrn_admin::get_admin_url]/classes"
     ad_script_abort
 }
 
Index: openacs-4/packages/dotlrn-admin/www/admin/edit-preapproved-emails.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/edit-preapproved-emails.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/edit-preapproved-emails.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/edit-preapproved-emails.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -17,7 +17,7 @@
     @creation-date 2002-03-05
     @version $Id$
 } -query {
-    {referer [dotlrn::get_admin_url]}
+    {referer [dotlrn_admin::get_admin_url]}
 } -properties {
     context_bar:onevalue
 }
Index: openacs-4/packages/dotlrn-admin/www/admin/user-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user-edit.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/user-edit.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/user-edit.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -22,7 +22,7 @@
     @creation-date 2001-12-10
     @version $Id$
 } -query {
-    {return_url "[dotlrn::get_admin_url]/users"}
+    {return_url "[dotlrn_admin::get_admin_url]/users"}
     user_id
 }
 
Index: openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -22,7 +22,7 @@
     @version $Id$
 } -query {
     user_id
-    {referer "[dotlrn::get_admin_url]/users"}
+    {referer "[dotlrn_admin::get_admin_url]/users"}
 }
 
 set context_bar [list [list users [_ dotlrn.Users]] [_ dotlrn.New]]
Index: openacs-4/packages/dotlrn-admin/www/admin/user-nuke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user-nuke.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/user-nuke.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/user-nuke.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -7,7 +7,7 @@
     @version $Id$
 } {
     user_id:integer,notnull
-    {referer "[dotlrn::get_admin_url]/users"}
+    {referer "[dotlrn_admin::get_admin_url]/users"}
 }
 
 db_1row select_user_info {
Index: openacs-4/packages/dotlrn-admin/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/user.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/user.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -92,7 +92,7 @@
 
 set context_bar [list [list users [_ dotlrn.Users]] "$first_names $last_name"]
 
-set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
+set dual_approve_return_url [ns_urlencode [dotlrn_admin::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
 
 set approve_user_url "/acs-admin/users/member-state-change?user_id=$user_id&member_state=approved&return_url=$dual_approve_return_url"
 
@@ -103,6 +103,6 @@
 set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name]
 set subcommunities_pretty_name [parameter::get -localize -parameter subcommunities_pretty_name]
 
-set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
+set dual_approve_return_url [ns_urlencode [dotlrn_admin::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk-large.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk-large.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk-large.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk-large.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -30,7 +30,7 @@
 }
 
 if {![exists_and_not_null referer]} {
-    set referer "[dotlrn::get_admin_url]/users"
+    set referer "[dotlrn_admin::get_admin_url]/users"
 }
 
 set user_id [ad_conn user_id]
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk-medium.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk-medium.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk-medium.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk-medium.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -35,7 +35,7 @@
 }
 
 if {![exists_and_not_null referer]} {
-    set referer "[dotlrn::get_admin_url]/users"
+    set referer "[dotlrn_admin::get_admin_url]/users"
 }
 
 set dimension_list {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z}
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk-small.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk-small.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk-small.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk-small.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -33,7 +33,7 @@
 }
 
 if {![exists_and_not_null referer]} {
-    set referer "[dotlrn::get_admin_url]/users"
+    set referer "[dotlrn_admin::get_admin_url]/users"
 }
 
 # Currently, just present a list of dotLRN users
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -77,7 +77,7 @@
 
     <if @oacs_site_wide_admin_p@ true>
     <% # We had to escape to Tcl to get the desired behavior. AG %>
-    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | </if>
+    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn_admin::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | </if>
     <a href="user-nuke?user_id=@users.user_id@&referer=@referer@">#acs-kernel.common_delete#</small>
     </td>
 </if>
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk.tcl	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -28,7 +28,7 @@
 set user_id [ad_conn user_id]
 
 if {![exists_and_not_null referer]} {
-    set referer "[dotlrn::get_admin_url]/users"
+    set referer "[dotlrn_admin::get_admin_url]/users"
 }
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users.adp,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/dotlrn-admin/www/admin/users.adp	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users.adp	20 Aug 2004 21:38:13 -0000	1.1.2.1
@@ -22,7 +22,7 @@
 <property name="title">#dotlrn.Users#</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<% set referer "[dotlrn::get_admin_url]/users" %>
+<% set referer "[dotlrn_admin::get_admin_url]/users" %>
 
 [<small>
   <a href="../../user-add?add_membership_p=f&dotlrn_interactive_p=1&referer=@referer@"><small>#dotlrn.Create_A_New_User#</small></a>