Index: openacs-4/packages/dotlrn/www/members-chunk-table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/members-chunk-table.adp	18 May 2002 22:42:11 -0000	1.3
+++ openacs-4/packages/dotlrn/www/members-chunk-table.adp	24 May 2002 17:44:00 -0000	1.4
@@ -22,7 +22,9 @@
 
 @table@
 
-<if @admin_p@ eq 1>
+<ul>
+
+<if @admin_p@ eq 1 and @subcomm_p@ eq 0>
   <br>
   <li>
     <form method="get" action="member-add">
@@ -31,7 +33,6 @@
     </form>
   </li>
 </if>
-
 <if @site_wide_admin_p@ eq 1>
   <br>
   <li>
Index: openacs-4/packages/dotlrn/www/members-chunk-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/members-chunk-table.tcl	21 May 2002 07:46:03 -0000	1.8
+++ openacs-4/packages/dotlrn/www/members-chunk-table.tcl	24 May 2002 17:44:00 -0000	1.9
@@ -19,7 +19,7 @@
 ad_page_contract {
     @author arjun (arjun@openforce.net)
     @author yon (yon@openforce.net)
-    @creation-date Jan 08, 2002
+    @creation-date 2002-01-08
     @version $Id$
 }  -query {
     {parent_user_role:multiple,array,optional}
@@ -34,9 +34,9 @@
 set community_id [dotlrn_community::get_community_id]
 set referer [ns_conn url]
 
-set site_wide_admin_p [ad_permission_p \
-    -user_id $my_user_id \
-    [acs_magic_object "security_context_root"] "admin"
+set site_wide_admin_p [permission::permission_p \
+    -object_id [acs_magic_object security_context_root] \
+    -privilege admin \
 ]
 
 if {!$site_wide_admin_p} {
@@ -48,7 +48,7 @@
 }
 
 if {![exists_and_not_null referer]} {
-    if {[string equal $admin_p "t"] == 1} {
+    if {[string equal $admin_p t] == 1} {
         set referer "one-community-admin"
     } else {
         set referer "one-community"
@@ -59,71 +59,73 @@
 set community_members [dotlrn_community::list_users $community_id]
 
 set table_def [list]
-lappend table_def [list \
-    first_names \
-    "First Names" \
-    {upper(first_names) $order} \
+
+lappend table_def {
+    first_names
+    "First Names"
+    {upper(first_names) $order}
     {<td>[acs_community_member_link -user_id $user_id -label $first_names</td>]}
-]
-lappend table_def [list \
-    last_name \
-    "Last Name" \
-    {upper(last_name) $order} \
+}
+
+lappend table_def {
+    last_name
+    "Last Name"
+    {upper(last_name) $order}
     {<td>[acs_community_member_link -user_id $user_id -label $last_name</td>]}
-]
+}
 
 if {$read_private_data_p || [string equal $my_user_id $user_id]} {
-    lappend table_def [list \
-        email \
-        "Email" \
-        {upper(email) $order, upper(role)} \
+    lappend table_def {
+        email
+        Email
+        {upper(email) $order, upper(role)}
         {<td><a href="mailto:$email">$email</a></td>}
-    ]
+    }
 } else {
-    lappend table_def [list \
-        email \
-        "Email" \
-        {upper(email) $order, upper(role)} \
+    lappend table_def {
+        email
+        Email
+        {upper(email) $order, upper(role)}
         {<td>&nbsp;</td>}
-    ]
+    }
 }
 
-lappend table_def [list \
-    role \
-    "Role" \
-    {decode(role, 'instructor', 1, 'admin', 2, 'teaching_assistant', 3, 'course_assistant', 4, 'course_admin', 5, 'student', 6, 'member', 7) asc, last_name $order} \
-    "<td><nobr>\[dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type \$rel_type\]</nobr></td>"
-]
+lappend table_def {
+    role
+    Role
+    {decode(role,'instructor',1,'admin',2,'teaching_assistant',3,'course_assistant',4,'course_admin',5,'student',6,'member',7) asc, last_name $order} \
+    {<td><nobr>[dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]</nobr></td>}
+}
 
 if {$site_wide_admin_p} {
-    lappend table_def [list \
-        manage \
-        "Actions" \
-        {} \
-        {<td>\[<small> <a href="deregister?user_id=$user_id&referer=$referer">Drop&nbsp;Membership</a>&nbsp;| <a href=[dotlrn::get_url]/admin/user?user_id=$user_id>Manage</a> </small>\]</td>} \
-    ]
+    lappend table_def {
+        manage
+        Actions
+        {}
+        {<td>\[<small> <a href="deregister?user_id=$user_id&referer=$referer">Drop&nbsp;Membership</a> | <a href="[dotlrn::get_url]/admin/user?user_id=$user_id">Manage</a> </small>\]</td>}
+    }
 } elseif {$admin_p} {
-    lappend table_def [list \
-        manage \
-        "Actions" \
-        {} \
-        {<td>\[<small> <a href="deregister?user_id=$user_id&referer=$referer">Drop&nbsp;Membership</a> <small>\]} \
-    ]
+    lappend table_def {
+        manage
+        Actions
+        {}
+        {<td>\[<small> <a href="deregister?user_id=$user_id&referer=$referer">Drop&nbsp;Membership</a> <small>\]}
+    }
 } else {
-    lappend table_def [list \
-        manage \
-        "Actions" \
-        {} \
+    lappend table_def {
+        manage
+        Actions
+        {}
         {
             [eval {
-                if {$my_user_id == $user_id} {
+                if {$my_user_id == \$user_id} {
                     return "<td>\[<small> <a href=\"deregister?user_id=$user_id&referer=$referer\">Drop&nbsp;Membership</a> </small>\]</td>"
                 } else {
                     return "<td>&nbsp;</td>"
                 }
             }]
         }
-    ]
+    }
 }
 
 set sql "
@@ -143,7 +145,7 @@
 
 set table [ad_table \
     -Tmissing_text {<blockquote><i>No members</i></blockquote>} \
-    -Textra_vars {referer my_user_id} \
+    -Textra_vars {referer my_user_id community_id rel_type} \
     -Torderby $orderby \
     select_current_members \
     $sql \
Index: openacs-4/packages/dotlrn/www/members-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk.adp,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/dotlrn/www/members-chunk.adp	18 May 2002 22:42:11 -0000	1.14
+++ openacs-4/packages/dotlrn/www/members-chunk.adp	24 May 2002 17:44:00 -0000	1.15
@@ -41,7 +41,7 @@
 
 </multiple>
 
-<if @admin_p@ eq 1>
+<if @admin_p@ eq 1 and @subcomm_p@ eq 0>
   <br>
   <li>
     <form method="get" action="member-add">
Index: openacs-4/packages/dotlrn/www/subcommunity-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-new.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/subcommunity-new.tcl	24 May 2002 01:58:45 -0000	1.16
+++ openacs-4/packages/dotlrn/www/subcommunity-new.tcl	24 May 2002 17:44:00 -0000	1.17
@@ -34,13 +34,13 @@
 form create add_subcomm
 
 element create add_subcomm pretty_name \
-    -label "Name" \
+    -label Name \
     -datatype text \
     -widget text \
     -html {size 40}
 
 element create add_subcomm description \
-    -label "Description <br> (Text or HTML)" \
+    -label Description \
     -datatype text \
     -widget text \
     -html {size 40} \
@@ -50,76 +50,67 @@
     -label "Join Policy" \
     -datatype text \
     -widget select \
-    -options {{Closed closed} {"Needs Approval" "needs approval"} {Open open}}
+    -options {{Closed closed} {{Needs Approval} {needs approval}} {Open open}}
 
 element create add_subcomm referer \
-    -label "Referer" \
+    -label Referer \
     -datatype text \
     -widget hidden \
     -value $referer
 
 if {[form is_valid add_subcomm]} {
     form get_values add_subcomm \
-            pretty_name description join_policy referer 
+        pretty_name description join_policy referer
 
     # we set some extra vars based on the community_type of the parent
-    set parent_type  \
-            [dotlrn_community::get_community_type_from_community_id \
-            $parent_community_id]
+    set parent_type [dotlrn_community::get_community_type_from_community_id $parent_community_id]
 
     set extra_vars [ns_set create]
     ns_set put $extra_vars join_policy $join_policy
-    
+
     if {![string equal $parent_type [dotlrn_club::community_type]] &&
-        ![string equal $parent_type "dotlrn_community"]} {
+        ![string equal $parent_type dotlrn_community]} {
             # we want to make a subgroup of a class instance
             # get the term_id, since the subgroup should not
             # outlive the class
             set term_id [dotlrn_class::get_term_id -class_instance_id $parent_community_id]
-        
             ns_set put $extra_vars term_id $term_id
-        } 
+    }
 
     db_transaction {
         set subcomm_id [dotlrn_community::new \
-                            -parent_community_id $parent_community_id \
-                            -description $description \
-                            -community_type "dotlrn_community" \
-                            -pretty_name $pretty_name \
-                            -extra_vars $extra_vars]
+            -parent_community_id $parent_community_id \
+            -description $description \
+            -community_type dotlrn_community \
+            -pretty_name $pretty_name \
+            -extra_vars $extra_vars \
+        ]
 
         # let admins of the parent comm, be admins of the subcomm
         set parent_admin_segment_id [dotlrn_community::get_rel_segment_id \
-                -community_id $parent_community_id \
-                -rel_type "dotlrn_admin_rel"]
+            -community_id $parent_community_id \
+            -rel_type dotlrn_admin_rel \
+        ]
 
         permission::grant \
             -party_id $parent_admin_segment_id \
             -object_id $subcomm_id \
             -privilege admin
 
-        # add self as admin
-        dotlrn_community::add_user \
-                -rel_type "dotlrn_admin_rel" \
-                $subcomm_id \
-                $user_id
-
         # for a subcomm of a "class instance" set the start and end dates
         if {![string equal $parent_type [dotlrn_club::community_type]] &&
-                 ![string equal $parent_type "dotlrn_community"]} {
+            ![string equal $parent_type "dotlrn_community"]} {
 
-                     dotlrn_community::set_active_dates \
-                             -community_id $subcomm_id \
-                             -start_date \
-                             [dotlrn_term::get_start_date -term_id $term_id] \
-                             -end_date \
-                             [dotlrn_term::get_end_date -term_id $term_id]
+            dotlrn_community::set_active_dates \
+                -community_id $subcomm_id \
+                -start_date [dotlrn_term::get_start_date -term_id $term_id] \
+                -end_date [dotlrn_term::get_end_date -term_id $term_id]
+
         }
     }
 
     # redirect to the member page of the new sub comm (for adding)
     ad_returnredirect "[dotlrn_community::get_community_key -community_id $subcomm_id]/members?referer=$referer"
-
     ad_script_abort
 }