--- loncom/interface/loncreateuser.pm	2010/01/03 03:14:45	1.295.2.16
+++ loncom/interface/loncreateuser.pm	2010/01/19 22:41:02	1.295.2.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.295.2.16 2010/01/03 03:14:45 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.295.2.24 2010/01/19 22:41:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,13 +51,14 @@ In LON-CAPA, roles are actually collecti
 Assistant", "Course Coordinator", and other such roles are really just
 collection of privileges that are useful in many circumstances.
 
-Creating custom roles can be done by the Domain Coordinator through
-the Create User functionality. That screen will show all privileges
-that can be assigned to users. For a complete list of privileges,
-please see C</home/httpd/lonTabs/rolesplain.tab>.
+Custom roles can be defined by a Domain Coordinator, Course Coordinator
+or Community Coordinator via the Manage User functionality.
+The custom role editor screen will show all privileges which can be
+assigned to users. For a complete list of privileges, please see 
+C</home/httpd/lonTabs/rolesplain.tab>.
 
-Custom role definitions are stored in the C<roles.db> file of the role
-author.
+Custom role definitions are stored in the C<roles.db> file of the creator
+of the role.
 
 =cut
 
@@ -466,7 +467,7 @@ sub courserequest_display {
 # =================================================================== Phase one
 
 sub print_username_entry_form {
-    my ($r,$context,$response,$srch,$forcenewuser) = @_;
+    my ($r,$context,$response,$srch,$forcenewuser,$crstype) = @_;
     my $defdom=$env{'request.role.domain'};
     my $formtoset = 'crtuser';
     if (exists($env{'form.startrolename'})) {
@@ -485,10 +486,15 @@ sub print_username_entry_form {
         '// ]]>'."\n".
         '</script>'."\n";
 
+    my %existingroles=&Apache::lonuserutils::my_custom_roles($crstype);
+    if (($env{'form.action'} eq 'custom') && (keys(%existingroles) > 0)
+        && (&Apache::lonnet::allowed('mcr','/'))) {
+        $jscript .= &customrole_javascript();
+    }
     my %loaditems = (
                 'onload' => "javascript:setFormElements(document.$formtoset)",
                     );
-    my %breadcrumb_text = &singleuser_breadcrumb();
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
     my $start_page =
 	&Apache::loncommon::start_page('User Management',
 				       $jscript,{'add_entries' => \%loaditems,});
@@ -510,48 +516,113 @@ sub print_username_entry_form {
     }
     my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',
                                                      $helpitem);
-    my %existingroles=&Apache::lonuserutils::my_custom_roles();
-    my $choice=&Apache::loncommon::select_form('make new role','rolename',
-		('make new role' => 'Generate new role ...',%existingroles));
     my %lt=&Apache::lonlocal::texthash(
                     'srst' => 'Search for a user and enroll as a student',
+                    'srme' => 'Search for a user and enroll as a member',
+
                     'srad' => 'Search for a user and modify/add user information or roles',
 		    'usr'  => "Username",
                     'dom'  => "Domain",
-                    'ecrp' => "Edit Custom Role Privileges",
-                    'nr'   => "Name of Role",
+                    'ecrp' => "Define or Edit Custom Role",
+                    'nr'   => "role name",
                     'cre'  => "Next",
 				       );
     $r->print($start_page."\n".$crumbs);
     if ($env{'form.action'} eq 'custom') {
         if (&Apache::lonnet::allowed('mcr','/')) {
-            $r->print(<<ENDCUSTOM);
-<form action="/adm/createuser" method="post" name="docustom">
-<input type="hidden" name="action" value="$env{'form.action'}" />
-<input type="hidden" name="phase" value="selected_custom_edit" />
-<h3>$lt{'ecrp'}</h3>
-$choice $lt{'nr'}: <input type="text" size="15" name="newrolename" /><br />
-<input name="customeditor" type="submit" value="$lt{'cre'}" />
-</form>
-ENDCUSTOM
+            my $newroletext = &mt('Define new custom role:');
+            $r->print('<form action="/adm/createuser" method="post" name="docustom">'.
+                      '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
+                      '<input type="hidden" name="phase" value="selected_custom_edit" />'.
+                      '<h3>'.$lt{'ecrp'}.'</h3>'.
+                      &Apache::loncommon::start_data_table().
+                      &Apache::loncommon::start_data_table_row().
+                      '<td>');
+            if (keys(%existingroles) > 0) {
+                $r->print('<br /><label><input type="radio" name="customroleaction" value="new" checked="checked" onclick="setCustomFields();" /><b>'.$newroletext.'</b></label>');
+            } else {
+                $r->print('<br /><input type="hidden" name="customroleaction" value="new" /><b>'.$newroletext.'</b>');
+            }
+            $r->print('</td><td align="center">'.$lt{'nr'}.'<br /><input type="text" size="15" name="newrolename" onfocus="setCustomAction('."'new'".');" /></td>'.
+                      &Apache::loncommon::end_data_table_row());
+            if (keys(%existingroles) > 0) {
+                $r->print(&Apache::loncommon::start_data_table_row().'<td><br />'.
+                          '<label><input type="radio" name="customroleaction" value="edit" onclick="setCustomFields();"/><b>'.
+                          &mt('View/Modify existing role:').'</b></label></td>'.
+                          '<td align="center"><br />'.
+                          '<select name="rolename" onchange="setCustomAction('."'edit'".');">'.
+                          '<option value="" selected="selected">'.
+                          &mt('Select'));
+                foreach my $role (sort(keys(%existingroles))) {
+                    $r->print('<option value="'.$role.'">'.$role.'</option>');
+                }
+                $r->print('</select>'.
+                          '</td>'.
+                          &Apache::loncommon::end_data_table_row());
+            }
+            $r->print(&Apache::loncommon::end_data_table().'<p>'.
+                      '<input name="customeditor" type="submit" value="'.
+                      $lt{'cre'}.'" /></p>'.
+                      '</form>');
         }
     } else {
         my $actiontext = $lt{'srad'};
         if ($env{'form.action'} eq 'singlestudent') {
-            $actiontext = $lt{'srst'};
+            if ($crstype eq 'Community') {
+                $actiontext = $lt{'srme'};
+            } else {
+                $actiontext = $lt{'srst'};
+            }
         }
-        $r->print("
-<h3>$actiontext</h3>");
+        $r->print("<h3>$actiontext</h3>");
         if ($env{'form.origform'} ne 'crtusername') {
             $r->print("\n".$response);
         }
-        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response));
+        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype));
     }
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub customrole_javascript {
+    my $js = <<"END";
+<script type="text/javascript">
+// <![CDATA[
+
+function setCustomFields() {
+    if (document.docustom.customroleaction.length > 0) {
+        for (var i=0; i<document.docustom.customroleaction.length; i++) {
+            if (document.docustom.customroleaction[i].checked) {
+                if (document.docustom.customroleaction[i].value == 'new') {
+                    document.docustom.rolename.selectedIndex = 0;
+                } else {
+                    document.docustom.newrolename.value = '';
+                }
+            }
+        }
+    }
+    return;
+}
+
+function setCustomAction(caller) {
+    if (document.docustom.customroleaction.length > 0) {
+        for (var i=0; i<document.docustom.customroleaction.length; i++) {
+            if (document.docustom.customroleaction[i].value == caller) {
+                document.docustom.customroleaction[i].checked = true;
+            }
+        }
+    }
+    setCustomFields();
+    return;
+}
+
+// ]]>
+</script>
+END
+    return $js;
+}
+
 sub entry_form {
-    my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_;
+    my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_;
     my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
     my ($usertype,$inexact);
     if (ref($srch) eq 'HASH') {
@@ -591,6 +662,7 @@ ENDBLOCK
         my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
         my %lt=&Apache::lonlocal::texthash(
                   'enro' => 'Enroll one student',
+                  'enrm' => 'Enroll one member',
                   'admo' => 'Add/modify a single user',
                   'crea' => 'create new user if required',
                   'uskn' => "username is known",
@@ -603,7 +675,11 @@ ENDBLOCK
         my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain');
         my ($title,$buttontext,$showresponse);
         if ($env{'form.action'} eq 'singlestudent') {   
-            $title = $lt{'enro'};
+            if ($crstype eq 'Community') {
+                $title = $lt{'enrm'};
+            } else {
+                $title = $lt{'enro'};
+            }
             $buttontext = $lt{'enrl'};
         } else {
             $title = $lt{'admo'};
@@ -674,7 +750,7 @@ END
 
 # =================================================================== Phase two
 sub print_user_selection_page {
-    my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements) = @_;
+    my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements,$crstype) = @_;
     my @fields = ('username','domain','lastname','firstname','permanentemail');
     my $sortby = $env{'form.sortby'};
 
@@ -702,8 +778,10 @@ ENDSCRIPT
     my %lt=&Apache::lonlocal::texthash(
                                        'usrch'          => "User Search to add/modify roles",
                                        'stusrch'        => "User Search to enroll student",
+                                       'memsrch'        => "User Search to enroll member",
                                        'usel'           => "Select a user to add/modify roles",
-                                       'stusel'         => "Select a user to enroll as a student", 
+                                       'stusel'         => "Select a user to enroll as a student",
+                                       'memsel'         => "Select a user to enroll as a member",
                                        'username'       => "username",
                                        'domain'         => "domain",
                                        'lastname'       => "last name",
@@ -715,7 +793,7 @@ ENDSCRIPT
     } else {
         $r->print(&Apache::loncommon::start_page('User Management',$jscript));
 
-        my %breadcrumb_text = &singleuser_breadcrumb();
+        my %breadcrumb_text = &singleuser_breadcrumb($crstype);
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"javascript:backPage(document.usersrchform,'','')",
               text=>$breadcrumb_text{'search'},
@@ -727,14 +805,26 @@ ENDSCRIPT
             $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
                                                           'Course_Change_Privileges'));
             $r->print("<b>$lt{'usrch'}</b><br />");
-            $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
+            $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
             $r->print('<h3>'.$lt{'usel'}.'</h3>');
         } elsif ($env{'form.action'} eq 'singlestudent') {
             $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
                                                           'Course_Add_Student'));
-            $r->print($jscript."<b>$lt{'stusrch'}</b><br />");
-            $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
-            $r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
+            $r->print($jscript."<b>");
+            if ($crstype eq 'Community') {
+                $r->print($lt{'memsrch'});
+            } else {
+                $r->print($lt{'stusrch'});
+            }
+            $r->print("</b><br />");
+            $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
+            $r->print('</form><h3>');
+            if ($crstype eq 'Community') {
+                $r->print($lt{'memsel'});
+            } else {
+                $r->print($lt{'stusel'});
+            }
+            $r->print('</h3>');
         }
     }
     $r->print('<form name="usersrchform" method="post">'.
@@ -809,11 +899,11 @@ sub print_user_query_page {
 }
 
 sub print_user_modification_page {
-    my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission) = @_;
+    my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission,$crstype) = @_;
     if (($ccuname eq '') || ($ccdomain eq '')) {
         my $usermsg = &mt('No username and/or domain provided.');
         $env{'form.phase'} = '';
-	&print_username_entry_form($r,$context,$usermsg);
+	&print_username_entry_form($r,$context,$usermsg,'','',$crstype);
         return;
     }
     my ($form,$formname);
@@ -854,7 +944,7 @@ sub print_user_modification_page {
                             ,'<a href="'.$helplink.'">','</a>')
                         .'</p><br />';
             $env{'form.phase'} = '';
-            &print_username_entry_form($r,$context,$response);
+            &print_username_entry_form($r,$context,$response,undef,undef,$crstype);
             return;
         }
         $newuser = 1;
@@ -878,7 +968,7 @@ sub print_user_modification_page {
                             'username');
                     }
                     $env{'form.phase'} = '';
-                    &print_username_entry_form($r,$context,$userchkmsg);
+                    &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype);
                     return;
                 }
             }
@@ -905,7 +995,7 @@ sub print_user_modification_page {
     }
     my $start_page = 
 	&Apache::loncommon::start_page('User Management',$js,$args);
-    my %breadcrumb_text = &singleuser_breadcrumb();
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
     &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage($form)",
        text=>$breadcrumb_text{'search'},
@@ -954,6 +1044,7 @@ ENDFORMINFO
         my %lt=&Apache::lonlocal::texthash(
                 'cnu'            => 'Create New User',
                 'ast'            => 'as a student',
+                'ame'            => 'as a member',
                 'ind'            => 'in domain',
                 'lg'             => 'Login Data',
                 'hs'             => "Home Server",
@@ -972,7 +1063,11 @@ $loginscript
 <h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
 ENDTITLE
         if ($env{'form.action'} eq 'singlestudent') {
-            $r->print(' ('.$lt{'ast'}.')');
+            if ($crstype eq 'Community') {
+                $r->print(' ('.$lt{'ame'}.')');
+            } else {
+                $r->print(' ('.$lt{'ast'}.')');
+            }
         }
         $r->print('</h2>'."\n".'<div class="LC_left_float">');
         my $personal_table = 
@@ -991,7 +1086,7 @@ $lt{'hs'}: $home_server_pick
             $r->print($home_server_pick);
         }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
-            $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.
+            $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table().
                       &build_tools_display($ccuname,$ccdomain,
                                            'requestcourses').
@@ -1065,6 +1160,7 @@ ENDAUTH
 	my %lt=&Apache::lonlocal::texthash(
                     'cup'  => "Modify existing user: ",
                     'ens'  => "Enroll one student: ",
+                    'enm'  => "Enroll one member: ",
                     'id'   => "in domain",
 				       );
 	$r->print(<<ENDCHANGEUSER);
@@ -1074,7 +1170,11 @@ $forminfo
 <h2>
 ENDCHANGEUSER
         if ($env{'form.action'} eq 'singlestudent') {
-            $r->print($lt{'ens'});
+            if ($crstype eq 'Community') {
+                $r->print($lt{'enm'});
+            } else {
+                $r->print($lt{'ens'});
+            }
         } else {
             $r->print($lt{'cup'});
         }
@@ -1088,7 +1188,7 @@ ENDCHANGEUSER
             $r->print(&Apache::lonuserutils::forceid_change($context));
         }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
-            $r->print('<h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.
+            $r->print('<h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table());
             if ($env{'request.role.domain'} eq $ccdomain) {
                 $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
@@ -1172,7 +1272,13 @@ ENDNOTOOLSPRIV
     } ## End of new user/old user logic
 
     if ($env{'form.action'} eq 'singlestudent') {
-        $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onclick="setSections(this.form)" />'."\n");
+        my $btntxt;
+        if ($crstype eq 'Community') {
+            $btntxt = &mt('Enroll Member');
+        } else {
+            $btntxt = &mt('Enroll Student');
+        }
+        $r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n");
     } else {
         $r->print('<h3>'.&mt('Add Roles').'</h3>');
         my $addrolesdisplay = 0;
@@ -1211,9 +1317,14 @@ ENDNOTOOLSPRIV
 }
 
 sub singleuser_breadcrumb {
+    my ($crstype) = @_;
     my %breadcrumb_text;
     if ($env{'form.action'} eq 'singlestudent') {
-        $breadcrumb_text{'search'} = 'Enroll a student';
+        if ($crstype eq 'Community') {
+            $breadcrumb_text{'search'} = 'Enroll a member';
+        } else {
+            $breadcrumb_text{'search'} = 'Enroll a student';
+        }
         $breadcrumb_text{'userpicked'} = 'Select a user',
         $breadcrumb_text{'modify'} = 'Set section/dates',
     } else {
@@ -1441,7 +1552,7 @@ sub display_existing_roles {
         } # end of foreach        (table building loop)
         my $rolesdisplay = 0;
         my %output = ();
-        foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
+        foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
             $output{$type} = '';
             foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
                 if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
@@ -1461,7 +1572,8 @@ sub display_existing_roles {
         if ($rolesdisplay == 1) {
             my $contextrole='';
             if ($env{'request.course.id'}) {
-                $contextrole = 'Existing Roles in this Course';
+                my $crstype = &Apache::loncommon::course_type();
+                $contextrole = "Existing Roles in this $crstype";
             } elsif ($env{'request.role'} =~ /^au\./) {
                 $contextrole = 'Existing Co-Author Roles in your Construction Space';
             } else {
@@ -1476,7 +1588,7 @@ sub display_existing_roles {
 '</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
 '</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
 &Apache::loncommon::end_data_table_header_row());
-           foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
+           foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
                 if ($output{$type}) {
                     $r->print($output{$type}."\n");
                 }
@@ -1971,7 +2083,7 @@ sub get_inststatuses {
 
 # ================================================================= Phase Three
 sub update_user_data {
-    my ($r,$context) = @_; 
+    my ($r,$context,$crstype) = @_; 
     my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
                                           $env{'form.ccdomain'});
     # Error messages
@@ -1995,7 +2107,7 @@ sub update_user_data {
                   $jsback."\n".
                   '// ]]>'."\n".
                   '</script>'."\n";
-    my %breadcrumb_text = &singleuser_breadcrumb();
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
     my $args;
     if ($env{'form.popup'}) {
         $args->{'no_nav_bar'} = 1;
@@ -2227,9 +2339,10 @@ sub update_user_data {
 	}
     }
     ##
-    my (@userroles,%userupdate,$cnum,$cdom,$namechanged);
+    my (@userroles,%userupdate,$cnum,$cdom,$crstype,$namechanged);
     if ($context eq 'course') {
         ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+        $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
     }
     if (! $env{'form.makeuser'} ) {
         # Check for need to change
@@ -2313,7 +2426,7 @@ sub update_user_data {
             if ($role eq 'cr') {
                 push(@longroles,'Custom');
             } else {
-                push(@longroles,&Apache::lonnet::plaintext($role)); 
+                push(@longroles,&Apache::lonnet::plaintext($role,$crstype)); 
             }
         }
         my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
@@ -2778,9 +2891,14 @@ END
                   .'</span>');
     }
     if ($env{'form.action'} eq 'singlestudent') {
-        &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context);
-        $r->print('<p><a href="javascript:backPage(document.userupdate)">'.
-                  &mt('Enroll Another Student').'</a></p>');
+        &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype);
+        $r->print('<p><a href="javascript:backPage(document.userupdate)">');
+        if ($crstype eq 'Community') {
+            $r->print(&mt('Enroll Another Member'));
+        } else {
+            $r->print(&mt('Enroll Another Student'));
+        }
+        $r->print('</a></p>');
     } else {
         my @rolechanges = &update_roles($r,$context);
         if ($namechanged) {
@@ -3249,8 +3367,14 @@ sub update_roles {
 }
 
 sub enroll_single_student {
-    my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_;
-    $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
+    my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype) = @_;
+    $r->print('<h3>');
+    if ($crstype eq 'Community') {
+        $r->print(&mt('Enrolling Member'));
+    } else {
+        $r->print(&mt('Enrolling Student'));
+    }
+    $r->print('</h3>');
 
     # Remove non alphanumeric values from section
     $env{'form.sections'}=~s/\W//g;
@@ -3283,7 +3407,13 @@ sub enroll_single_student {
         }
         $r->print('.<br />'.$showstart.'; '.$showend);
         if ($startdate <= $now && !$newuser) {
-            $r->print("<p> ".&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')."</p>");
+            $r->print('<p> ');
+            if ($crstype eq 'Community') {
+                $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));
+            } else {
+                $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.'));
+            }
+            $r->print('</p>');
         }
     } else {
         $r->print(&mt('unable to enroll').": ".$enroll_result);
@@ -3408,18 +3538,27 @@ sub build_roles {
 
 sub custom_role_editor {
     my ($r) = @_;
-    my $rolename=$env{'form.rolename'};
-
-    if ($rolename eq 'make new role') {
-	$rolename=$env{'form.newrolename'};
+    my $action = $env{'form.customroleaction'};
+    my $rolename;
+    if ($action eq 'new') {
+        $rolename=$env{'form.newrolename'};
+    } else {
+        $rolename=$env{'form.rolename'};
     }
 
     $rolename=~s/[^A-Za-z0-9]//gs;
-
     if (!$rolename || $env{'form.phase'} eq 'pickrole') {
 	&print_username_entry_form($r);
         return;
     }
+    my ($crstype,$context);
+    if ($env{'request.course.id'}) {
+        $crstype = &Apache::loncommon::course_type();
+        $context = 'course';
+    } else {
+        $context = 'domain';
+        $crstype = $env{'form.templatecrstype'};
+    }
 # ------------------------------------------------------- What can be assigned?
     my %full=();
     my %courselevel=();
@@ -3437,6 +3576,9 @@ sub custom_role_editor {
 	$body_top .= &mt('Existing Role').' "';
 # ------------------------------------------------- Get current role privileges
 	($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
+        if ($crstype eq 'Community') {
+            $syspriv =~ s/bre\&S//;
+        }
     } else {
 	$body_top .= &mt('New Role').' "';
 	$roledef='';
@@ -3478,16 +3620,54 @@ sub custom_role_editor {
     my $head_script = "\n";
     $head_script .= '<script type="text/javascript">'."\n".
                     '// <![CDATA['."\n";
-    my @template_roles = ("cc","in","ta","ep","st");
+    my @template_roles = ("in","ta","ep");
+    if ($context eq 'domain') {
+        push(@template_roles,"ad");
+    }
+    push(@template_roles,"st");
+    if ($crstype eq 'Community') {
+        unshift(@template_roles,'co');
+    } else {
+        unshift(@template_roles,'cc');
+    }
     foreach my $role (@template_roles) {
-        $head_script .= &make_script_template($role);
-        $button_code .= &make_button_code($role).' ';
+        $head_script .= &make_script_template($role,$crstype);
+        $button_code .= &make_button_code($role,$crstype).' ';
+    }
+    my $context_code;
+    if ($context eq 'domain') {
+        my $checkedCommunity = '';
+        my $checkedCourse = ' checked="checked"';
+        if ($env{'form.templatecrstype'} eq 'Community') {
+            $checkedCommunity = $checkedCourse;
+            $checkedCourse = '';
+        }
+        $context_code = '<label>'.
+                        '<input type="radio" name="templatecrstype" value="Course"'.$checkedCourse.' onclick="this.form.submit();">'.
+                        &mt('Course').
+                        '</label>'.('&nbsp;' x2).
+                        '<label>'.
+                        '<input type="radio" name="templatecrstype" value="Community"'.$checkedCommunity.' onclick="this.form.submit();">'.
+                        &mt('Community').
+                        '</label>'.
+                        '</fieldset>'.
+                        '<input type="hidden" name="customroleaction" value="'.
+                        $action.'" />';
+        if ($env{'form.customroleaction'} eq 'new') {
+            $context_code .= '<input type="hidden" name="newrolename" value="'.
+                             $rolename.'" />';
+        } else {
+            $context_code .= '<input type="hidden" name="rolename" value="'.
+                             $rolename.'" />';
+        }
+        $context_code .= '<input type="hidden" name="action" value="custom" />'.
+                         '<input type="hidden" name="phase" value="selected_custom_edit" />';
     }
     $head_script .= "\n".$jsback."\n".
                     '// ]]>'."\n".
                     '</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
-   &Apache::lonhtmlcommon::add_breadcrumb
+    &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.form1,'pickrole','')",
        text=>"Pick custom role",
        faq=>282,bug=>'Instructor Interface',},
@@ -3504,13 +3684,21 @@ sub custom_role_editor {
                     'dml'  => "Domain Level",
                     'ssl'  => "System Level");
 
-    $r->print('<div>'
+    $r->print('<div class="LC_left_float">'
              .'<form action=""><fieldset>'
              .'<legend>'.&mt('Select a Template').'</legend>'
              .$button_code
-             .'</fieldset></form>'
-             .'</div>'
-    );
+             .'</fieldset></form></div>');
+    if ($context_code) {
+        $r->print('<div class="LC_left_float">'
+                 .'<form action="/adm/createuser" method="post"><fieldset>'
+                 .'<legend>'.&mt('Context').'</legend>'
+                 .$context_code
+                 .'</form>'
+                 .'</div>'
+        );
+    }
+    $r->print('<br clear="all" />');
 
     $r->print(<<ENDCCF);
 <form name="form1" method="post">
@@ -3523,7 +3711,7 @@ ENDCCF
 '</th><th>'.$lt{'ssl'}.'</th>'.
               &Apache::loncommon::end_data_table_header_row());
     foreach my $priv (sort keys %full) {
-        my $privtext = &Apache::lonnet::plaintext($priv);
+        my $privtext = &Apache::lonnet::plaintext($priv,$crstype);
         $r->print(&Apache::loncommon::start_data_table_row().
 	          '<td>'.$privtext.'</td><td>'.
     ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'.
@@ -3531,11 +3719,15 @@ ENDCCF
     '</td><td>'.
     ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'.
     ($domainlevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;').
-    '</td><td>'.
-    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'.
-    ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;').
-    '</td>'.
-             &Apache::loncommon::end_data_table_row());
+    '</td><td>');
+        if ($priv eq 'bre' && $crstype eq 'Community') {
+            $r->print('&nbsp;');
+        } else {
+            $r->print($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'.
+                      ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;');
+        }
+        $r->print('</td>'.
+                  &Apache::loncommon::end_data_table_row());
     }
     $r->print(&Apache::loncommon::end_data_table().
    '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
@@ -3547,7 +3739,7 @@ ENDCCF
 }
 # --------------------------------------------------------
 sub make_script_template {
-    my ($role) = @_;
+    my ($role,$crstype) = @_;
     my %full_c=();
     my %full_d=();
     my %full_s=();
@@ -3561,6 +3753,7 @@ sub make_script_template {
         $full_d{$priv}=1;
     }
     foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+        next if (($crstype eq 'Community') && ($item eq 'bre&S'));
         my ($priv,$restrict)=split(/\&/,$item);
         $full_s{$priv}=1;
     }
@@ -3613,8 +3806,8 @@ sub make_script_template {
 }
 # ----------------------------------------------------------
 sub make_button_code {
-    my ($role) = @_;
-    my $label = &Apache::lonnet::plaintext($role);
+    my ($role,$crstype) = @_;
+    my $label = &Apache::lonnet::plaintext($role,$crstype);
     my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
     return ($button_code);
 }
@@ -3714,9 +3907,10 @@ sub handler {
        $r->send_http_header;
        return OK;
     }
-    my $context;
+    my ($context,$crstype);
     if ($env{'request.course.id'}) {
         $context = 'course';
+        $crstype = &Apache::loncommon::course_type();
     } elsif ($env{'request.role'} =~ /^au\./) {
         $context = 'author';
     } else {
@@ -3735,7 +3929,7 @@ sub handler {
     #SD Following files not added to help, because the corresponding .tex-files seem to
     #be missing: Course_Approve_Selfenroll,Course_User_Logs,
     my ($permission,$allowed) = 
-        &Apache::lonuserutils::get_permission($context);
+        &Apache::lonuserutils::get_permission($context,$crstype);
     if (!$allowed) {
         $env{'user.error.msg'}=
             "/adm/createuser:cst:0:0:Cannot create/modify user data ".
@@ -3750,7 +3944,7 @@ sub handler {
     if (! exists($env{'form.action'})) {
         $r->print(&header());
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
-        $r->print(&print_main_menu($permission,$context));
+        $r->print(&print_main_menu($permission,$context,$crstype));
         $r->print(&Apache::loncommon::end_page());
     } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
         $r->print(&header());
@@ -3766,7 +3960,7 @@ sub handler {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         } elsif ($env{'form.state'} eq 'got_file') {
             &Apache::lonuserutils::print_upload_manager_form($r,$context,
-                                                             $permission);
+                                                             $permission,$crstype);
         } elsif ($env{'form.state'} eq 'enrolling') {
             if ($env{'form.datatoken'}) {
                 &Apache::lonuserutils::upfile_drop_add($r,$context,$permission);
@@ -3791,13 +3985,13 @@ sub handler {
                 if ($env{'form.srchterm'} !~ /^$match_username$/) {
                     my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
                     $env{'form.phase'} = '';
-                    &print_username_entry_form($r,$context,$response,$srch);
+                    &print_username_entry_form($r,$context,$response,$srch,undef,$crstype);
                 } else {
                     my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
                     my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
                     &print_user_modification_page($r,$ccuname,$ccdomain,
                                                   $srch,$response,$context,
-                                                  $permission);
+                                                  $permission,$crstype);
                 }
             } elsif ($env{'form.phase'} eq 'get_user_info') {
                 my ($currstate,$response,$forcenewuser,$results) = 
@@ -3807,7 +4001,7 @@ sub handler {
                 }
                 if ($currstate eq 'select') {
                     &print_user_selection_page($r,$response,$srch,$results,
-                                               \@search,$context);
+                                               \@search,$context,undef,$crstype);
                 } elsif ($currstate eq 'modify') {
                     my ($ccuname,$ccdomain);
                     if (($srch->{'srchby'} eq 'uname') && 
@@ -3825,24 +4019,24 @@ sub handler {
                     }
                     &print_user_modification_page($r,$ccuname,$ccdomain,
                                                   $srch,$response,$context,
-                                                  $permission);
+                                                  $permission,$crstype);
                 } elsif ($currstate eq 'query') {
                     &print_user_query_page($r,'createuser');
                 } else {
                     $env{'form.phase'} = '';
                     &print_username_entry_form($r,$context,$response,$srch,
-                                               $forcenewuser);
+                                               $forcenewuser,$crstype);
                 }
             } elsif ($env{'form.phase'} eq 'userpicked') {
                 my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
                 my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
                 &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
-                                              $context,$permission);
+                                              $context,$permission,$crstype);
             }
         } elsif ($env{'form.phase'} eq 'update_user_data') {
-            &update_user_data($r,$context);
+            &update_user_data($r,$context,$crstype);
         } else {
-            &print_username_entry_form($r,$context,undef,$srch);
+            &print_username_entry_form($r,$context,undef,$srch,undef,$crstype);
         }
     } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
         if ($env{'form.phase'} eq 'set_custom_roles') {
@@ -3877,10 +4071,22 @@ sub handler {
                   text=>"List Users"});
             my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
             my $formname = 'studentform';
-            if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
-                ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = 
-                    &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
-                                                            $formname);
+            if (($context eq 'domain') && (($env{'form.roletype'} eq 'course') ||
+                ($env{'form.roletype'} eq 'community'))) {
+                if ($env{'form.roletype'} eq 'course') {
+                    ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) =
+                        &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
+                                                                $formname);
+                } elsif ($env{'form.roletype'} eq 'community') {
+                    $cb_jscript =
+                        &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'});
+                    my %elements = (
+                                      coursepick => 'radio',
+                                      coursetotal => 'text',
+                                      courselist => 'text',
+                                   );
+                    $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements);
+                }
                 $jscript .= &verify_user_display();
                 my $js = &add_script($jscript).$cb_jscript;
                 my $loadcode = 
@@ -3901,19 +4107,25 @@ sub handler {
         }
     } elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {
         $r->print(&header());
+        my $brtext;
+        if ($crstype eq 'Community') {
+            $brtext = 'Drop Members';
+        } else {
+            $brtext = 'Drop Students';
+        }
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/createuser?action=drop',
-              text=>"Drop Students"});
+              text=>$brtext});
         if (!exists($env{'form.state'})) {
             $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
                                                           'Course_Drop_Student'));
 
-            &Apache::lonuserutils::print_drop_menu($r,$context,$permission);
+            &Apache::lonuserutils::print_drop_menu($r,$context,$permission,$crstype);
         } elsif ($env{'form.state'} eq 'done') {
             &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/createuser?action=drop',
               text=>"Result"});
-            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext,
                                                           'Course_Drop_Student'));
             &Apache::lonuserutils::update_user_list($r,$context,undef,
                                                     $env{'form.action'});
@@ -3923,7 +4135,7 @@ sub handler {
         if ($permission->{'cusr'}) {
             $r->print(&header(undef,undef,{'no_nav_bar' => 1}).
                       &Apache::lonuserutils::date_section_selector($context,
-                                                                   $permission).
+                                                                   $permission,$crstype).
                       &Apache::loncommon::end_page());
         } else {
             $r->print(&header().
@@ -3989,7 +4201,7 @@ sub handler {
     } else {
         $r->print(&header());
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
-        $r->print(&print_main_menu($permission,$context));
+        $r->print(&print_main_menu($permission,$context,$crstype));
         $r->print(&Apache::loncommon::end_page());
     }
     return OK;
@@ -4033,7 +4245,14 @@ END
 ###############################################################
 #  Menu Phase One
 sub print_main_menu {
-    my ($permission,$context) = @_;
+    my ($permission,$context,$crstype) = @_;
+    my $linkcontext = $context;
+    my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));
+    if (($context eq 'course') && ($crstype eq 'Community')) {
+        $linkcontext = lc($crstype);
+        $stuterm = 'Members';
+    }
+
     my %links = (
                        domain => {
                                    upload => 'Upload a File of Users',
@@ -4050,8 +4269,12 @@ sub print_main_menu {
                                    singleuser => 'Add/Modify a Single Course User',
                                    listusers => 'Display Class Lists and Manage Multiple Users',
                                  },
+                       community => {
+                                   upload     => 'Upload a File of Community Users',
+                                   singleuser => 'Add/Modify a Community User',
+                                   listusers  => 'Manage Community Users',
+                                 },
                 );
-
     my @menu =
         (
           { text => $links{$context}{'upload'},
@@ -4093,18 +4316,21 @@ sub print_main_menu {
                 permission => $permission->{'cusr'},
               });
         if (!exists($permission->{'cusr_section'})) {
-            push(@courselinks,
-               { text => 'Automated Enrollment Manager',
-                 help => 'Course_Automated_Enrollment',
-                 permission => (&Apache::lonnet::auto_run($cnum,$cdom)
-                                && $permission->{'cusr'}),
-                 url  => '/adm/populate',
-                 },
-               { text => 'Configure User Self-enrollment',
-                 help => 'Course_Self_Enrollment',
-                 action => 'selfenroll',
-                 permission => $permission->{'cusr'},
-               });
+            if ($crstype ne 'Community') {
+                push(@courselinks,
+                   { text => 'Automated Enrollment Manager',
+                     help => 'Course_Automated_Enrollment',
+                     permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                   && $permission->{'cusr'}),
+                     url  => '/adm/populate',
+                   });
+             }
+             push(@courselinks,
+                 { text  => 'Configure User Self-enrollment',
+                   help  => 'Course_Self_Enrollment',
+                   action => 'selfenroll',
+                   permission => $permission->{'cusr'},
+                 });
         }
         if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
             push(@courselinks,
@@ -4165,6 +4391,7 @@ sub restore_prev_selections {
 
 sub print_selfenroll_menu {
     my ($r,$context,$permission) = @_;
+    my $crstype = &Apache::loncommon::course_type();
     my $formname = 'enrollstudent';
     my $nolink = 1;
     my ($row,$lt) = &get_selfenroll_titles();
@@ -4528,8 +4755,12 @@ ENDSCRIPT
                            &mt('No').'</label>';
                 my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);
                 my (@ccs,%notified);
-                if ($advhash{'cc'}) {
-                    @ccs = split(/,/,$advhash{'cc'});
+                my $ccrole = 'cc';
+                if ($crstype eq 'Community') {
+                    $ccrole = 'co';
+                }
+                if ($advhash{$ccrole}) {
+                    @ccs = split(/,/,$advhash{$ccrole});
                 }
                 if ($currnotified) {
                     foreach my $current (split(/,/,$currnotified)) {
@@ -4616,9 +4847,9 @@ sub visible_in_cat {
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
     my ($cathash,%settable,@vismsgs,$cansetvis);
     my %visactions = &Apache::lonlocal::texthash(
-                   vis => 'Your course currently appears in the Course Catalog for this domain.',
+                   vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.',
                    gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
-                   miss => 'Your course does not currently appear in the Course Catalog for this domain.',
+                   miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.',
                    yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
                    coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
                    make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
@@ -4834,6 +5065,7 @@ sub print_userchangelogs_display {
     my $formname = 'roleslog';
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = &Apache::loncommon::course_type();
     my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
     if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
 
@@ -4872,7 +5104,7 @@ sub print_userchangelogs_display {
     }
     my (%whodunit,%changed,$version);
     ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
-    $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version));
+    $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype));
     my $showntablehdr = 0;
     my $tablehdr = &Apache::loncommon::start_data_table().
                    &Apache::loncommon::start_data_table_header_row().
@@ -4948,11 +5180,11 @@ sub print_userchangelogs_display {
         if ($roleslog{$id}{'logentry'}{'selfenroll'}) {
             $chgcontext = 'selfenroll';
         }
-        my %lt = &rolechg_contexts();
+        my %lt = &rolechg_contexts($crstype);
         if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
             $chgcontext = $lt{$chgcontext};
         }
-        $r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td><td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td><td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td><td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td><td>'.$sec.'</td><td>'.$chgcontext.'</td><td>'.$rolestart.'</td><td>'.$roleend.'</td>'.&Apache::loncommon::end_data_table_row()."\n");
+        $r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td><td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td><td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td><td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).'</td><td>'.$sec.'</td><td>'.$chgcontext.'</td><td>'.$rolestart.'</td><td>'.$roleend.'</td>'.&Apache::loncommon::end_data_table_row()."\n");
     }
     if ($showntablehdr) {
         $r->print(&Apache::loncommon::end_data_table().'<br />');
@@ -4993,8 +5225,9 @@ ENDSCRIPT
 }
 
 sub role_display_filter {
-    my ($formname,$cdom,$cnum,$curr,$version) = @_;
+    my ($formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
     my $context = 'course';
+    my $lctype = lc($crstype);
     my $nolink = 1;
     my $output = '<table><tr><td valign="top">'.
                  '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
@@ -5009,7 +5242,7 @@ sub role_display_filter {
         &Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date',
                                             $curr->{'rolelog_end_date'},undef,
                                             undef,undef,undef,undef,undef,undef,$nolink);
-    my %lt = &rolechg_contexts();
+    my %lt = &rolechg_contexts($crstype);
     $output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br /><table><tr><td>'.&mt('After:').
                '</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'.
                $endform.'</td></tr></table></td><td>&nbsp;&nbsp;</td>'.
@@ -5019,13 +5252,13 @@ sub role_display_filter {
         $output .= ' selected="selected"';
     }
     $output .=  '>'.&mt('Any').'</option>'."\n";
-    my @roles = &Apache::lonuserutils::course_roles($context,undef,1);
+    my @roles = &Apache::lonuserutils::course_roles($context,undef,1,$lctype);
     foreach my $role (@roles) {
         my $plrole;
         if ($role eq 'cr') {
             $plrole = &mt('Custom Role');
         } else {
-            $plrole=&Apache::lonnet::plaintext($role);
+            $plrole=&Apache::lonnet::plaintext($role,$crstype);
         }
         my $selstr = '';
         if ($role eq $curr->{'role'}) {
@@ -5035,7 +5268,7 @@ sub role_display_filter {
     }
     $output .= '</select></td><td>&nbsp;&nbsp;</td><td valign="top"><b>'.
                &mt('Context:').'</b><br /><select name="chgcontext">';
-    foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
+    foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll','requestcourses') {
         my $selstr = '';
         if ($curr->{'chgcontext'} eq $chgtype) {
             $selstr = ' selected="selected"';
@@ -5065,6 +5298,7 @@ sub role_display_filter {
 }
 
 sub rolechg_contexts {
+    my ($crstype) = @_;
     my %lt = &Apache::lonlocal::texthash (
                                              any          => 'Any',
                                              auto         => 'Automated enrollment',
@@ -5075,6 +5309,11 @@ sub rolechg_contexts {
                                              selfenroll   => 'Self-enrolled',
                                              requestcourses => 'Course Request',
                                          );
+    if ($crstype eq 'Community') {
+        $lt{'createcourse'} = &mt('Community Creation');
+        $lt{'course'} = &mt('User Management in community');
+        $lt{'requestcourses'} = &mt('Community Request');
+    }
     return %lt;
 }
 
@@ -5590,7 +5829,7 @@ sub course_level_table {
 	$thiscourse=~s:_:/:g;
 	my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
 	my $area=$coursedata{'description'};
-        my $type=$coursedata{'type'};
+        my $crstype=$coursedata{'type'};
 	if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
 	my ($domain,$cnum)=split(/\//,$thiscourse);
         my %sections_count;
@@ -5600,9 +5839,9 @@ sub course_level_table {
 		    &Apache::loncommon::get_sections($domain,$cnum);
             }
         }
-        my @roles = &Apache::lonuserutils::roles_by_context('course');
+        my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype);
 	foreach my $role (@roles) {
-            my $plrole=&Apache::lonnet::plaintext($role);
+            my $plrole=&Apache::lonnet::plaintext($role,$crstype);
 	    if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
                 $table .= &course_level_row($protectedcourse,$role,$area,$domain,
                                             $plrole,\%sections_count,\%lt);    
@@ -5615,7 +5854,8 @@ sub course_level_table {
             }
         }
         if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
-            foreach my $cust (sort keys %customroles) {
+            foreach my $cust (sort(keys(%customroles))) {
+                next if ($crstype eq 'Community' && $customroles{$cust} =~ /bre\&S/);
                 my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust;
                 $table .= &course_level_row($protectedcourse,$role,$area,$domain,
                                             $cust,\%sections_count,\%lt);
@@ -5646,7 +5886,7 @@ sub course_level_row {
               $protectedcourse.'_'.$role.'" /></td>'."\n".
               ' <td>'.$plrole.'</td>'."\n".
               ' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
-    if ($role eq 'cc') {
+    if (($role eq 'cc') || ($role eq 'co')) {
         $row .= '<td>&nbsp;</td>';
     } elsif ($env{'request.course.sec'} ne '') {
         $row .= ' <td><input type="hidden" value="'.
@@ -5695,7 +5935,7 @@ sub course_level_dc {
                       '<input type="hidden" name="dccourse" value="" />';
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
             ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
-    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
+    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser');
     my %lt=&Apache::lonlocal::texthash(
                     'rol'  => "Role",
                     'grs'  => "Section",
@@ -5706,14 +5946,14 @@ sub course_level_dc {
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
                   );
-    my $header = '<h4>'.&mt('Course Level').'</h4>'.
+    my $header = '<h4>'.&mt('Course/Community Level').'</h4>'.
                  &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row().
                  '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
                  &Apache::loncommon::end_data_table_header_row();
     my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
-                     '<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
-                     '<td><select name="role">'."\n";
+                     '<td><br /><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" /></td>'."\n".
+                     '<td valign><br /><select name="role">'."\n";
     foreach my $role (@roles) {
         my $plrole=&Apache::lonnet::plaintext($role);
         $otheritems .= '  <option value="'.$role.'">'.$plrole;
@@ -5733,13 +5973,14 @@ sub course_level_dc {
                      '<td valign="top">&nbsp;<b>'.$lt{'new'}.'</b><br />'.
                      '<input type="text" name="newsec" value="" />'.
                      '<input type="hidden" name="section" value="" />'.
-                     '<input type="hidden" name="groups" value="" /></td>'.
+                     '<input type="hidden" name="groups" value="" />'.
+                     '<input type="hidden" name="crstype" value="" /></td>'.
                      '</tr></table></td>';
     $otheritems .= <<ENDTIMEENTRY;
-<td><input type="hidden" name="start" value='' />
+<td><br /><input type="hidden" name="start" value='' />
 <a href=
 "javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type="hidden" name="end" value='' />
+<td><br /><input type="hidden" name="end" value='' />
 <a href=
 "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY
@@ -5803,7 +6044,8 @@ sub update_selfenroll_config {
                             $newnum ++;
                         }
                     }
-                    for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) {                        if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) {
+                    for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) {
+                        if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) {
                             my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$j);
                             if (@types > 0) {
                                 @types = sort(@types);