Index: openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp	10 Jan 2002 21:19:32 -0000	1.1
@@ -0,0 +1,10 @@
+<master src="master">
+<property name="title">dotLRN Admin</property>
+<property name="context_bar">@context_bar@</property>
+
+The results of your search are:
+<ul>
+<multiple name="users">
+  <li><a href="add-instructor-3?user_id=@users.user_id@&community_id=@community_id@&referer=@referer@">@users.last_name@, @users.first_names@ (@users.email@)</li>
+</multiple>
+</ul>
Index: openacs-4/packages/dotlrn/www/admin/add-instructor-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-2.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/add-instructor-2.tcl	10 Jan 2002 21:19:32 -0000	1.1
@@ -0,0 +1,19 @@
+# dotlrn/www/admin/add-instructor-2.tcl
+
+ad_page_contract {
+    @author yon (yon@milliped.com)
+    @creation-date Jan 10, 2002
+    @version $Id: add-instructor-2.tcl,v 1.1 2002/01/10 21:19:32 yon Exp $
+} -query {
+    community_id:integer,notnull
+    {search_text ""}
+    {referer ""}
+} -properties {
+    users:multirow
+}
+
+set context_bar {Add an Instructor}
+
+db_multirow users select_users {}
+
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql	10 Jan 2002 21:19:32 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <fullquery name="select_users">
+    <querytext>
+      select user_id,
+             first_names,
+             last_name,
+             email
+      from registered_users
+      where lower(last_name) like lower('%' || :search_text || '%')
+      or lower(email) like lower('%' || :search_text || '%')
+    </querytext>
+  </fullquery>
+</queryset>
Index: openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/add-instructor-3.tcl	10 Jan 2002 21:19:32 -0000	1.1
@@ -0,0 +1,25 @@
+# dotlrn/www/admin/add-instructor-3.tcl
+
+ad_page_contract {
+    @author yon (yon@milliped.com)
+    @creation-date Jan 10, 2002
+    @version $Id: add-instructor-3.tcl,v 1.1 2002/01/10 21:19:32 yon Exp $
+} -query {
+    user_id:integer,notnull
+    community_id:integer,notnull
+    {referer ""}
+} -properties {
+}
+
+set is_dotlrn_user [db_string is_dotlrn_user {}]
+
+# if the user isn't already a dotLRN user make him so
+if {!${is_dotlrn_user}} {
+    dotlrn::user_add -rel_type dotlrn_full_user_rel -user_id $user_id -type_id 2
+    acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn_community::get_package_id $community_id] -value "t"
+}
+
+# Add the relation
+dotlrn_community::add_user -rel_type "dotlrn_instructor_rel" $community_id $user_id
+
+ad_returnredirect $referer
Index: openacs-4/packages/dotlrn/www/admin/add-instructor-3.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-3.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/add-instructor-3.xql	10 Jan 2002 21:19:32 -0000	1.1
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <fullquery name="is_dotlrn_user">
+    <querytext>
+      select count(*)
+      from dual
+      where exists (select 1
+                    from dotlrn_users
+                    where user_id = :user_id)
+    </querytext>
+  </fullquery>
+</queryset>
Index: openacs-4/packages/dotlrn/www/admin/add-instructor.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/add-instructor.adp	10 Jan 2002 21:19:32 -0000	1.1
@@ -0,0 +1,11 @@
+<master src="./master">
+<property name="title">dotLRN Admin</property>
+<property name="context_bar">@context_bar@</property>
+
+<h3>Add an Instructor</h3>
+
+<form method="get" action="add-instructor-2">
+  <if @referer@ not nil><input type="hidden" name="referer" value="@referer@"></input>
+  <input type="hidden" name="community_id" value="@community_id@"></input>
+  Add an Instructor: <input type="text" name="search_text"><input type="submit" value="search"></input>
+</form>
Index: openacs-4/packages/dotlrn/www/admin/add-instructor.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/add-instructor.tcl	10 Jan 2002 21:19:32 -0000	1.1
@@ -0,0 +1,15 @@
+# dotlrn/www/admin/add-instructor.tcl
+
+ad_page_contract {
+    @author yon (yon@milliped.com)
+    @creation-date Jan 10, 2002
+    @version $Id: add-instructor.tcl,v 1.1 2002/01/10 21:19:32 yon Exp $
+} -query {
+    community_id:integer,notnull
+    {referer "./"}
+} -properties {
+}
+
+set context_bar {Add an Instructor}
+
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	10 Jan 2002 19:30:18 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	10 Jan 2002 21:19:32 -0000	1.9
@@ -29,8 +29,11 @@
 element create add_class_instance referer \
     -label "Referer" -value $referer -datatype text -widget hidden
 
+element create add_class_instance add_instructor \
+    -label "Add Instructor" -datatype text -widget radio -options {{Yes 1} {No 0}} -value 1
+
 if {[form is_valid add_class_instance]} {
-    template::form get_values add_class_instance class_key term name description join_policy referer
+    template::form get_values add_class_instance class_key term name description join_policy referer add_instructor
 
     set class_instance_id [dotlrn_class::new_instance \
         -class_type $class_key \
@@ -44,6 +47,11 @@
         set referer "one-class?class_key=$class_key"
     }
 
+    if {${add_instructor}} {
+        ad_returnredirect "add-instructor?community_id=$class_instance_id&referer=$referer"
+        ad_script_abort
+    }
+
     ad_returnredirect $referer
     ad_script_abort
 }
Index: openacs-4/packages/dotlrn/www/admin/user-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/admin/user-new-2.adp	11 Dec 2001 16:14:13 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.adp	10 Jan 2002 21:19:32 -0000	1.7
@@ -6,6 +6,3 @@
 <p>
 
 <formtemplate id=add_user></formtemplate>
-
-
-
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.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/user-new-2.tcl	17 Dec 2001 23:02:56 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.tcl	10 Jan 2002 21:19:32 -0000	1.8
@@ -1,4 +1,3 @@
-
 ad_page_contract {
     Choose a role
     
@@ -41,4 +40,3 @@
 
 set context_bar {{users Users} New}
 ad_return_template
-
Index: openacs-4/packages/dotlrn/www/admin/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/user-new.adp	11 Dec 2001 16:14:13 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/user-new.adp	10 Jan 2002 21:19:32 -0000	1.4
@@ -5,9 +5,6 @@
 The results of your search are:
 <ul>
 <multiple name="users">
-<li> <a href=user-new-2?user_id=@users.user_id@>@users.last_name@, @users.first_names@ (@users.email@)
+  <li><a href=user-new-2?user_id=@users.user_id@>@users.last_name@, @users.first_names@ (@users.email@)</li>
 </multiple>
 </ul>
-
-
-
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.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/user-new.tcl	29 Nov 2001 06:05:37 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/user-new.tcl	10 Jan 2002 21:19:32 -0000	1.3
@@ -1,4 +1,3 @@
-
 ad_page_contract {
     Search for a new user for dotLRN
     
@@ -12,4 +11,5 @@
 db_multirow users select_users {}
 
 set context_bar {{users Users} {New}}
+
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/user-new.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/user-new.xql	7 Nov 2001 15:52:19 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/user-new.xql	10 Jan 2002 21:19:32 -0000	1.2
@@ -1,11 +1,17 @@
 <?xml version="1.0"?>
 
 <queryset>
-
-<fullquery name="select_users">
-<querytext>
-select user_id, first_names, last_name, email from registered_users where lower(last_name) like lower('%' || :search_text || '%') or lower(email) like lower('%' || :search_text || '%') and user_id not in (select user_id from dotlrn_users)
-</querytext>
-</fullquery>
-
+  <fullquery name="select_users">
+    <querytext>
+      select user_id,
+             first_names,
+             last_name,
+             email
+      from registered_users
+      where lower(last_name) like lower('%' || :search_text || '%')
+      or lower(email) like lower('%' || :search_text || '%')
+      and user_id not in (select user_id
+                          from dotlrn_users)
+    </querytext>
+  </fullquery>
 </queryset>
Index: openacs-4/packages/dotlrn/www/admin/users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/users.tcl	10 Dec 2001 23:58:31 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/users.tcl	10 Jan 2002 21:19:32 -0000	1.4
@@ -1,5 +1,3 @@
-
-
 ad_page_contract {
     Displays main dotLRN admin page
     
@@ -14,4 +12,5 @@
 db_multirow users select_dotlrn_users {}
 
 set context_bar {Users}
+
 ad_return_template