--- loncom/interface/lonuserutils.pm	2008/12/12 16:53:37	1.73.2.1
+++ loncom/interface/lonuserutils.pm	2010/11/14 22:41:53	1.97.2.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.73.2.1 2008/12/12 16:53:37 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.97.2.23 2010/11/14 22:41:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,8 @@ sub modifystudent {
     # this one.  If $csec is defined, drop them from all other sections of
     # this course and add them to section $csec
     my ($cnum,$cdom) = &get_course_identity($courseid);
-    my %roles = &Apache::lonnet::dump('roles',$udom,$unam);
+    my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
+    my %roles = &Apache::lonnet::dump('roles',$udom,$unam,'.',undef,$extra);
     my ($tmp) = keys(%roles);
     # Bail out if we were unable to get the students roles
     return "$1" if ($tmp =~ /^(con_lost|error|no_such_host)/i);
@@ -86,12 +87,12 @@ sub modifystudent {
 sub modifyuserrole {
     my ($context,$setting,$changeauth,$cid,$udom,$uname,$uid,$umode,$upass,
         $first,$middle,$last,$gene,$sec,$forceid,$desiredhome,$email,$role,
-        $end,$start,$checkid) = @_;
+        $end,$start,$checkid,$inststatus) = @_;
     my ($scope,$userresult,$authresult,$roleresult,$idresult);
     if ($setting eq 'course' || $context eq 'course') {
         $scope = '/'.$cid;
         $scope =~ s/\_/\//g;
-        if ($role ne 'cc' && $sec ne '') {
+        if (($role ne 'cc') && ($role ne 'co') && ($sec ne '')) {
             $scope .='/'.$sec;
         }
     } elsif ($context eq 'domain') {
@@ -124,7 +125,7 @@ sub modifyuserrole {
     $userresult =
         &Apache::lonnet::modifyuser($udom,$uname,$uid,$umode,$upass,$first,
                                     $middle,$last,$gene,$forceid,$desiredhome,
-                                    $email,$role,$start,$end);
+                                    $email,$inststatus);
     if ($userresult eq 'ok') {
         if ($role ne '') {
             $role =~ s/_/\//g;
@@ -235,7 +236,7 @@ sub domain_roles_select {
     # domain context   
     #
     # Role types
-    my @roletypes = ('domain','author','course');
+    my @roletypes = ('domain','author','course','community');
     my %lt = &role_type_names();
     #
     # build up the menu information to be passed to
@@ -247,6 +248,10 @@ sub domain_roles_select {
     foreach my $roletype (@roletypes) {
         # set up the text for this domain
         $select_menus{$roletype}->{'text'}= $lt{$roletype};
+        my $crstype;
+        if ($roletype eq 'community') {
+            $crstype = 'Community';
+        }
         # we want a choice of 'default' as the default in the second menu
         if ($env{'form.roletype'} ne '') {
             $select_menus{$roletype}->{'default'} = $env{'form.showrole'};
@@ -261,7 +266,7 @@ sub domain_roles_select {
             @roles = &construction_space_roles();
         } else {
             my $custom = 1;
-            @roles = &course_roles('domain',undef,$custom);
+            @roles = &course_roles('domain',undef,$custom,$roletype);
         }
         my $order = ['Any',@roles];
         $select_menus{$roletype}->{'order'} = $order; 
@@ -271,14 +276,15 @@ sub domain_roles_select {
                               &mt('Custom role');
             } else {
                 $select_menus{$roletype}->{'select2'}->{$role} = 
-                              &Apache::lonnet::plaintext($role);
+                              &Apache::lonnet::plaintext($role,$crstype);
             }
         }
         $select_menus{$roletype}->{'select2'}->{'Any'} = &mt('Any');
     }
     my $result = &Apache::loncommon::linked_select_forms
         ('studentform',(' 'x3).&mt('Role: '),$env{'form.roletype'},
-         'roletype','showrole',\%select_menus,['domain','author','course']);
+         'roletype','showrole',\%select_menus,
+         ['domain','author','course','community']);
     return $result;
 }
 
@@ -290,7 +296,8 @@ sub hidden_input {
 }
 
 sub print_upload_manager_header {
-    my ($r,$datatoken,$distotal,$krbdefdom,$context,$permission)=@_;
+    my ($r,$datatoken,$distotal,$krbdefdom,$context,$permission,$crstype,
+        $can_assign)=@_;
     my $javascript;
     #
     if (! exists($env{'form.upfile_associate'})) {
@@ -304,9 +311,9 @@ sub print_upload_manager_header {
         }
     }
     if ($env{'form.upfile_associate'} eq 'reverse') {
-        $javascript=&upload_manager_javascript_reverse_associate();
+        $javascript=&upload_manager_javascript_reverse_associate($can_assign);
     } else {
-        $javascript=&upload_manager_javascript_forward_associate();
+        $javascript=&upload_manager_javascript_forward_associate($can_assign);
     }
     #
     # Deal with restored settings
@@ -327,10 +334,12 @@ sub print_upload_manager_header {
     my $javascript_validations =
         &javascript_validations('upload',$krbdefdom,$password_choice,undef,
                                 $env{'request.role.domain'},$context,
-                                $groupslist);
-    my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
-    $r->print(&mt('Total number of records found in file: [_1]','<b>'.$distotal.'</b>').
-              "<br />\n");
+                                $groupslist,$crstype);
+    my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
+    $r->print('<p>'
+             .&mt('Total number of records found in file: [_1]'
+                 ,'<b>'.$distotal.'</b>')
+             ."</p>\n");
     $r->print('<div class="LC_left_float"><h3>'.
               &mt('Identify fields in uploaded list')."</h3>\n");
     $r->print(&mt('Enter as many fields as you can.<br /> The system will inform you and bring you back to this page, <br /> if the data selected are insufficient to add users.')."<br />\n");
@@ -341,21 +350,24 @@ sub print_upload_manager_header {
               &hidden_input('fileupload',$env{'form.fileupload'}).
               &hidden_input('upfiletype',$env{'form.upfiletype'}).
               &hidden_input('upfile_associate',$env{'form.upfile_associate'}));
-    $r->print('<br /><label><input type="checkbox" name="noFirstLine"'.$checked.'/>'.
+    $r->print('<br /><label><input type="checkbox" name="noFirstLine"'.$checked.' />'.
               &mt('Ignore First Line').'</label><br />');
     $r->print('<br /><input type="button" value="'.&mt('Reverse Association').'" '.
               'name="Reverse Association" '.
-              'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
+              'onclick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
     $r->print("<br /><br />\n".
               '<script type="text/javascript" language="Javascript">'."\n".
-              $javascript."\n".$javascript_validations.'</script>');
+              '// <![CDATA['."\n".
+              $javascript."\n".$javascript_validations."\n".
+              '// ]]>'."\n".
+              '</script>');
 }
 
 ###############################################################
 ###############################################################
 sub javascript_validations {
     my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain,
-        $context,$groupslist)=@_;
+        $context,$groupslist,$crstype)=@_;
     my %param = (
                   kerb_def_dom => $krbdefdom,
                   curr_authtype => $curr_authtype,
@@ -376,10 +388,10 @@ sub javascript_validations {
         if (($context eq 'course') || ($context eq 'domain')) {
             if ($context eq 'course') {
                 if ($env{'request.course.sec'} eq '') {
-                    $setsection_call = 'setSections(document.'.$param{'formname'}.');';
+                    $setsection_call = 'setSections(document.'.$param{'formname'}.",'$crstype'".');';
                     $setsections_js =
                         &setsections_javascript($param{'formname'},$groupslist,
-                                                $mode);
+                                                $mode,'',$crstype);
                 } else {
                     $setsection_call = "'ok'";
                 }
@@ -401,17 +413,20 @@ sub javascript_validations {
          krb      => 'You need to specify the Kerberos domain.',
          ipass    => 'You need to specify the initial password.',
          name     => 'The optional name field was not specified.',
-         snum     => 'The optional ID number field was not specified.',
+         snum     => 'The optional student/employee ID field was not specified.',
          section  => 'The optional section field was not specified.',
-         email    => 'The optional email address field was not specified.',
+         email    => 'The optional e-mail address field was not specified.',
          role     => 'The optional role field was not specified.',
          domain   => 'The optional domain field was not specified.',
          continue => 'Continue adding users?',
          );
+    if (($mode eq 'upload') && ($context eq 'domain')) {
+        $alert{'inststatus'} = &mt('The optional affiliation field was not specified'); 
+    }
     my $function_name = <<"END";
 $setsections_js
 
-function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain) {
+function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus) {
 END
     my ($authnum,%can_assign) =  &Apache::loncommon::get_assignable_auth($domain);
     my $auth_checks;
@@ -519,6 +534,7 @@ END
         if (message!='') {
             message+='\\n';
         }
+        message+='$alert{'section'}';
     }
     if (foundemail==0) {
         if (message!='') {
@@ -538,6 +554,20 @@ END
         }
         message+='$alert{'domain'}';
     }
+END
+        if (($mode eq 'upload') && ($context eq 'domain')) {
+            $optional_checks .= (<<END);
+
+    if (foundinststatus==0) {
+        if (message!='') {
+            message+='\\n';
+        }
+        message+='$alert{'inststatus'}';
+    }
+END
+        }
+        $optional_checks .= (<<END);
+
     if (message!='') {
         message+= '\\n$alert{'continue'}';
         if (confirm(message)) {
@@ -558,6 +588,46 @@ END
 ###############################################################
 ###############################################################
 sub upload_manager_javascript_forward_associate {
+    my ($can_assign) = @_;
+    my ($auth_update,$numbuttons,$argreset);
+    if (ref($can_assign) eq 'HASH') {
+        if ($can_assign->{'krb4'} || $can_assign->{'krb5'}) {
+            $argreset .= "      vf.krbarg.value='';\n";
+            $numbuttons ++ ;
+        }
+        if ($can_assign->{'int'}) {
+            $argreset .= "      vf.intarg.value='';\n";
+            $numbuttons ++;
+        }
+        if ($can_assign->{'loc'}) {
+            $argreset .= "      vf.locarg.value='';\n";
+            $numbuttons ++;
+        }
+        if (!$can_assign->{'int'}) {
+            my $warning = &mt('You may not specify an initial password for each user, as this is only available when new users use LON-CAPA internal authentication.\n').
+                          &mt('Your current role does not have rights to create users with that authentication type.');
+            $auth_update = <<"END";
+   // Currently the initial password field is only supported for internal auth
+   // (see bug 6368).
+   if (nw==9) {
+       eval('vf.f'+tf+'.selectedIndex=0;')
+       alert('$warning');
+   }
+END
+        } elsif ($numbuttons > 1) {
+            $auth_update = <<"END";
+   // If we set the password, make the password form below correspond to
+   // the new value.
+   if (nw==9) {
+      changed_radio('int',document.studentform);
+      set_auth_radio_buttons('int',document.studentform);
+$argreset
+   }
+
+END
+        }
+    }
+
     return(<<ENDPICK);
 function verify(vf,sec_caller) {
     var founduname=0;
@@ -568,6 +638,7 @@ function verify(vf,sec_caller) {
     var foundemail=0;
     var foundrole=0;
     var founddomain=0;
+    var foundinststatus=0;
     var tw;
     for (i=0;i<=vf.nfields.value;i++) {
         tw=eval('vf.f'+i+'.selectedIndex');
@@ -579,8 +650,9 @@ function verify(vf,sec_caller) {
         if (tw==10) { foundemail=1; }
         if (tw==11) { foundrole=1; }
         if (tw==12) { founddomain=1; }
+        if (tw==13) { foundinststatus=1; }
     }
-    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain);
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus);
 }
 
 //
@@ -602,6 +674,7 @@ function verify(vf,sec_caller) {
 // 10 = email address
 // 11 = role
 // 12 = domain
+// 13 = inststatus
 
 function flip(vf,tf) {
    var nw=eval('vf.f'+tf+'.selectedIndex');
@@ -631,15 +704,7 @@ function flip(vf,tf) {
          }
       }
    }
-   // If we set the password, make the password form below correspond to
-   // the new value.
-   if (nw==9) {
-       changed_radio('int',document.studentform);
-       set_auth_radio_buttons('int',document.studentform);
-       vf.intarg.value='';
-       vf.krbarg.value='';
-       vf.locarg.value='';
-   }
+   $auth_update
 }
 
 function clearpwd(vf) {
@@ -657,6 +722,45 @@ ENDPICK
 ###############################################################
 ###############################################################
 sub upload_manager_javascript_reverse_associate {
+    my ($can_assign) = @_;
+    my ($auth_update,$numbuttons,$argreset);
+    if (ref($can_assign) eq 'HASH') {
+        if ($can_assign->{'krb4'} || $can_assign->{'krb5'}) {
+            $argreset .= "      vf.krbarg.value='';\n";
+            $numbuttons ++ ;
+        }
+        if ($can_assign->{'int'}) {
+            $argreset .= "      vf.intarg.value='';\n";
+            $numbuttons ++;
+        }
+        if ($can_assign->{'loc'}) {
+            $argreset .= "      vf.locarg.value='';\n";
+            $numbuttons ++;
+        }
+        if (!$can_assign->{'int'}) {
+            my $warning = &mt('You may not specify an initial password, as this is only available when new users use LON-CAPA internal authentication.\n').
+                          &mt('Your current role does not have rights to create users with that authentication type.');
+            $auth_update = <<"END";
+   // Currently the initial password field is only supported for internal auth
+   // (see bug 6368).
+   if (tf==8 && nw!=0) {
+       eval('vf.f'+tf+'.selectedIndex=0;')
+       alert('$warning');
+   }
+END
+        } elsif ($numbuttons > 1) {
+            $auth_update = <<"END";
+   // initial password specified, pick internal authentication
+   if (tf==8 && nw!=0) {
+      changed_radio('int',document.studentform);
+      set_auth_radio_buttons('int',document.studentform);
+$argreset
+   }
+
+END
+        }
+    }
+
     return(<<ENDPICK);
 function verify(vf,sec_caller) {
     var founduname=0;
@@ -664,8 +768,10 @@ function verify(vf,sec_caller) {
     var foundname=0;
     var foundid=0;
     var foundsec=0;
+    var foundemail=0;
     var foundrole=0;
     var founddomain=0;
+    var foundinststatus=0;
     var tw;
     for (i=0;i<=vf.nfields.value;i++) {
         tw=eval('vf.f'+i+'.selectedIndex');
@@ -674,10 +780,12 @@ function verify(vf,sec_caller) {
         if (i==6 && tw!=0) { foundid=1; }
         if (i==7 && tw!=0) { foundsec=1; }
         if (i==8 && tw!=0) { foundpwd=1; }
-        if (i==9 && tw!=0) { foundrole=1; }
-        if (i==10 && tw!=0) { founddomain=1; }
+        if (i==9 && tw!=0) { foundemail=1; }
+        if (i==10 && tw!=0) { foundrole=1; }
+        if (i==11 && tw!=0) { founddomain=1; }
+        if (i==12 && tw!=0) { foundinstatus=1; }
     }
-    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole,founddomain);
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus);
 }
 
 function flip(vf,tf) {
@@ -694,14 +802,7 @@ function flip(vf,tf) {
    if ((tf>=2) && (tf<=5) && (nw!=0)) {
       eval('vf.f1.selectedIndex=0;')
    }
-   // intial password specified, pick internal authentication
-   if (tf==8 && nw!=0) {
-       changed_radio('int',document.studentform);
-       set_auth_radio_buttons('int',document.studentform);
-       vf.krbarg.value='';
-       vf.intarg.value='';
-       vf.locarg.value='';
-   }
+   $auth_update
 }
 
 function clearpwd(vf) {
@@ -716,7 +817,7 @@ ENDPICK
 ###############################################################
 ###############################################################
 sub print_upload_manager_footer {
-    my ($r,$i,$keyfields,$defdom,$today,$halfyear,$context,$permission) = @_;
+    my ($r,$i,$keyfields,$defdom,$today,$halfyear,$context,$permission,$crstype) = @_;
     my $form = 'document.studentform';
     my $formname = 'studentform';
     my ($krbdef,$krbdefdom) =
@@ -734,79 +835,146 @@ sub print_upload_manager_footer {
     my $intform = &Apache::loncommon::authform_internal(%param);
     my $locform = &Apache::loncommon::authform_local(%param);
     my $date_table = &date_setting_table(undef,undef,$context,undef,
-                                         $formname,$permission);
+                                         $formname,$permission,$crstype);
+
     my $Str = "\n".'<div class="LC_left_float">';
     $Str .= &hidden_input('nfields',$i);
     $Str .= &hidden_input('keyfields',$keyfields);
-    $Str .= "<h3>".&mt('Login Type')."</h3>\n";
+
+    $Str .= '<h3>'.&mt('Options').'</h3>'
+           .&Apache::lonhtmlcommon::start_pick_box();
+
+    $Str .= &Apache::lonhtmlcommon::row_title(&mt('Login Type'));
     if ($context eq 'domain') {
-        $Str .= '<p>'.&mt('Change authentication for existing users in domain "[_1]" to these settings?',$defdom).'&nbsp;<span class="LC_nobreak"><label><input type="radio" name="changeauth" value="No" checked="checked" />'.&mt('No').'</label>&nbsp;&nbsp;<label><input type="radio" name="changeauth" value="Yes" />'.&mt('Yes').'</label></span></p>'; 
+        $Str .= '<p>'
+               .&mt('Change authentication for existing users in domain "[_1]" to these settings?'
+                   ,$defdom)
+               .'&nbsp;<span class="LC_nobreak"><label>'
+               .'<input type="radio" name="changeauth" value="No" checked="checked" />'
+               .&mt('No').'</label>'
+               .'&nbsp;&nbsp;<label>'
+               .'<input type="radio" name="changeauth" value="Yes" />'
+               .&mt('Yes').'</label>'
+               .'</span></p>'; 
     } else {
-        $Str .= "<p>\n".
-            &mt('Note: This will not take effect if the user already exists.').
+        $Str .= '<p class="LC_info">'."\n".
+            &mt('This will not take effect if the user already exists.').
             &Apache::loncommon::help_open_topic('Auth_Options').
             "</p>\n";
     }
     $Str .= &set_login($defdom,$krbform,$intform,$locform);
+
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($defdom,'lcserver',
                                                   'default','hide');
     if ($numlib > 1) {
-        $Str .= '<h3>'.&mt('LON-CAPA Home Server for New Users')."</h3>\n".
-                &mt('LON-CAPA domain: [_1] with home server: [_2]',$defdom,
-                $home_server_pick).'<br />';
-    } else {
-        $Str .= $home_server_pick;
-    }
-    $Str .= '<h3>'.&mt('Default domain').'</h3>'."\n".
-            &Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1);
-    $Str .= '<h3>'.&mt('Starting and Ending Dates').
-            "</h3>\n";
-    $Str .= "<p>\n".$date_table."</p>\n";
+        $Str .= &Apache::lonhtmlcommon::row_closure()
+               .&Apache::lonhtmlcommon::row_title(
+                    &mt('LON-CAPA Home Server for New Users'))
+               .&mt('LON-CAPA domain: [_1] with home server:','"'.$defdom.'"')
+               .$home_server_pick
+               .&Apache::lonhtmlcommon::row_closure();
+    } else {
+        $Str .= $home_server_pick.
+                &Apache::lonhtmlcommon::row_closure();
+    }
+
+    $Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain'))
+           .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1)
+           .&Apache::lonhtmlcommon::row_closure();
+
+    $Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates'))
+           ."<p>\n".$date_table."</p>\n"
+           .&Apache::lonhtmlcommon::row_closure();
+
     if ($context eq 'domain') {
-        $Str .= '<h3>'.&mt('Settings for assigning roles:').'</h3>'."\n".
-                &mt('Pick the action to take on roles for these users:').'<br /><span class="LC_nobreak"><label><input type="radio" name="roleaction" value="norole" checked="checked" />&nbsp;'.&mt('No role changes').'</label>&nbsp;&nbsp;&nbsp;<label><input type="radio" name="roleaction" value="domain" />&nbsp;'.&mt('Add a domain role').'</label>&nbsp;&nbsp;&nbsp;<label><input type="radio" name="roleaction" value="course" />&nbsp;'.&mt('Add a course role').'</label></span>';
-    }
-    if ($context eq 'author') {
-        $Str .= '<h3>'.&mt('Default role')."</h3>\n".
-                &mt('Choose the role to assign to users without a value specified in the uploaded file');
+        $Str .= &Apache::lonhtmlcommon::row_title(
+                    &mt('Settings for assigning roles'))
+               .&mt('Pick the action to take on roles for these users:').'<br />'
+               .'<span class="LC_nobreak"><label>'
+               .'<input type="radio" name="roleaction" value="norole" checked="checked" />'
+               .'&nbsp;'.&mt('No role changes').'</label>'
+               .'&nbsp;&nbsp;&nbsp;<label>'
+               .'<input type="radio" name="roleaction" value="domain" />'
+               .'&nbsp;'.&mt('Add a domain role').'</label>'
+               .'&nbsp;&nbsp;&nbsp;<label>'
+               .'<input type="radio" name="roleaction" value="course" />'
+               .'&nbsp;'.&mt('Add a course/community role').'</label>'
+               .'</span>';
+    } elsif ($context eq 'author') {
+        $Str .= &Apache::lonhtmlcommon::row_title(
+                    &mt('Default role'))
+               .&mt('Choose the role to assign to users without a value specified in the uploaded file.')
     } elsif ($context eq 'course') {
-        $Str .= '<h3>'.&mt('Default role and section')."</h3>\n".
-                &mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file');
-    } else {
-        $Str .= '<br /><br /><b>'.&mt('Default role and/or section(s)')."</b><br />\n".
-                &mt('Role and/or section(s) for users without values specified in the uploaded file.');
+        $Str .= &Apache::lonhtmlcommon::row_title(
+                    &mt('Default role and section'))
+               .&mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file.');
+    } else {
+        $Str .= &Apache::lonhtmlcommon::row_title(
+                    &mt('Default role and/or section(s)'))
+               .&mt('Role and/or section(s) for users without values specified in the uploaded file.');
     }
-    $Str .= '<br />';
     if (($context eq 'domain') || ($context eq 'author')) {
+        $Str .= '<br />';
         my ($options,$cb_script,$coursepick) = &default_role_selector($context,1);
         if ($context eq 'domain') {
-            $Str .= '<span class="LC_role_level">'.&mt('Domain Level').'</span><br />'.$options.'<br /><br /><span class="LC_role_level">'.&mt('Course Level').'</span><br />'.$cb_script.$coursepick;
+            $Str .= '<p>'
+                   .'<b>'.&mt('Domain Level').'</b><br />'
+                   .$options
+                   .'</p><p>'
+                   .'<b>'.&mt('Course Level').'</b>'
+                   .'</p>'
+                   .$cb_script.$coursepick
+                   .&Apache::lonhtmlcommon::row_closure();
         } elsif ($context eq 'author') {
-            $Str .= $options;
+            $Str .= $options
+                   .&Apache::lonhtmlcommon::row_closure(1); # last row in pick_box
         }
     } else {
         my ($cnum,$cdom) = &get_course_identity();
         my $rowtitle = &mt('section');
         my $secbox = &section_picker($cdom,$cnum,'Any',$rowtitle,
-                                     $permission,$context,'upload');
-        $Str .= $secbox."<h3>".&mt('Full Update')."</h3>\n".
-                '<p><label><input type="checkbox" name="fullup" value="yes">'.
-                ' '.&mt('Display students with current/future access who are not in the uploaded file.').'</label><br />'.&mt('Students selected from this list can be dropped.').'</p>'."\n";
+                                     $permission,$context,'upload',$crstype);
+        $Str .= $secbox
+               .&Apache::lonhtmlcommon::row_closure();
+        my %lt;
+        if ($crstype eq 'Community') {
+            %lt = &Apache::lonlocal::texthash (
+                    disp => 'Display members with current/future access who are not in the uploaded file',
+                    stus => 'Members selected from this list can be dropped.'
+            );
+        } else {
+            %lt = &Apache::lonlocal::texthash (
+                    disp => 'Display students with current/future access who are not in the uploaded file',
+                    stus => 'Students selected from this list can be dropped.'
+            );
+        }
+        $Str .= &Apache::lonhtmlcommon::row_title(&mt('Full Update'))
+               .'<label><input type="checkbox" name="fullup" value="yes" />'
+               .' '.$lt{'disp'}
+               .'</label><br />'
+               .$lt{'stus'}
+               .&Apache::lonhtmlcommon::row_closure();
     }
     if ($context eq 'course' || $context eq 'domain') {
         $Str .= &forceid_change($context);
     }
+
+    $Str .= &Apache::lonhtmlcommon::end_pick_box();
     $Str .= '</div>';
-    $Str .= '<div class="LC_clear_float_footer">';
+
+    # Footer
+    $Str .= '<div class="LC_clear_float_footer">'
+           .'<hr />';
     if ($context eq 'course') {
-        $Str .= '<div class="LC_info">'
-               .&mt('Note: For large courses, this operation may be time consuming.')
-               .'</div>';
-    }
-    $Str .= '<input type="button"'
-           .'onClick="javascript:verify(this.form,this.form.csec)" '
-           .'value="'.&mt('Update Users').'" />'."\n"
+        $Str .= '<p class="LC_info">'
+               .&mt('Note: This operation may be time consuming when adding several users.')
+               .'</p>';
+    }
+    $Str .= '<p><input type="button"'
+           .' onclick="javascript:verify(this.form,this.form.csec)"'
+           .' value="'.&mt('Update Users').'" />'
+           .'</p>'."\n"
            .'</div>';
     $r->print($Str);
     return;
@@ -815,25 +983,25 @@ sub print_upload_manager_footer {
 sub forceid_change {
     my ($context) = @_;
     my $output = 
-        "<h3>".&mt('Student/Employee ID')."</h3>\n".
-        "<p>\n".'<label><input type="checkbox" name="forceid" value="yes">'.
-        &mt('Disable Student/Employee ID Safeguard and force change of conflicting IDs').
-        '</label><br />'."\n".
-        &mt('(only do if you know what you are doing.)')."\n";
+        &Apache::lonhtmlcommon::row_title(&mt('Student/Employee ID'))
+       .'<label><input type="checkbox" name="forceid" value="yes" />'
+       .&mt('Disable Student/Employee ID Safeguard and force change of conflicting IDs')
+       .'</label><br />'."\n"
+       .&mt('(only do if you know what you are doing.)')."\n";
     if ($context eq 'domain') {
         $output .= '<br /><label><input type="checkbox" name="recurseid"'.
-                   ' value="yes">'. 
-  &mt('Update Student/Employee ID in courses in which user is active/future student,[_1](if forcing change).','<br />').
+                   ' value="yes" />'. 
+  &mt('Update student/employee ID in courses in which user is active/future student,[_1](if forcing change).','<br />').
                    '</label>'."\n";
     }
-    $output .= '</p>';
+    $output .= &Apache::lonhtmlcommon::row_closure(1); # last row in pick_box
     return $output;
 }
 
 ###############################################################
 ###############################################################
 sub print_upload_manager_form {
-    my ($r,$context,$permission) = @_;
+    my ($r,$context,$permission,$crstype) = @_;
     my $firstLine;
     my $datatoken;
     if (!$env{'form.datatoken'}) {
@@ -864,6 +1032,7 @@ sub print_upload_manager_form {
                                'email_choice' => 'scalar',
                                'role_choice' => 'scalar',
                                'domain_choice' => 'scalar',
+                               'inststatus_choice' => 'scalar',
                              };
     my $defdom = $env{'request.role.domain'};
     if ($context eq 'course') {
@@ -878,8 +1047,9 @@ sub print_upload_manager_form {
     my ($krbdef,$krbdefdom) =
         &Apache::loncommon::get_kerberos_defaults($defdom);
     #
+    my ($authnum,%can_assign) =  &Apache::loncommon::get_assignable_auth($defdom);
     &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom,$context,
-                                 $permission);
+                                 $permission,$crstype,\%can_assign);
     my $i;
     my $keyfields;
     if ($total>=0) {
@@ -895,7 +1065,8 @@ sub print_upload_manager_form {
              ['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}],
              ['email',&mt('E-mail Address'),   $env{'form.email_choice'}],
              ['role',&mt('Role'),             $env{'form.role_choice'}],
-             ['domain',&mt('Domain'),         $env{'form.domain_choice'}]);
+             ['domain',&mt('Domain'),         $env{'form.domain_choice'}],
+             ['inststatus',&mt('Affiliation'), $env{'form.inststatus_choice'}]);
         if ($env{'form.upfile_associate'} eq 'reverse') {
             &Apache::loncommon::csv_print_samples($r,\@records);
             $i=&Apache::loncommon::csv_print_select_table($r,\@records,
@@ -914,7 +1085,7 @@ sub print_upload_manager_form {
     }
     $r->print('</div>');
     &print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear,
-                                 $context,$permission);
+                                 $context,$permission,$crstype);
 }
 
 sub setup_date_selectors {
@@ -988,7 +1159,7 @@ sub get_dates_from_form {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime,$mode,$bulkaction,$formname,$permission) = @_;
+    my ($starttime,$endtime,$mode,$bulkaction,$formname,$permission,$crstype) = @_;
     my $nolink;
     if ($bulkaction) {
         $nolink = 1;
@@ -1005,9 +1176,13 @@ sub date_setting_table {
             ($env{'form.action'} eq 'upload')) {
             if ($env{'request.course.sec'} eq '') {
                 $dateDefault = '<span class="LC_nobreak">'.
-                    '<label><input type="checkbox" name="makedatesdefault" value="1" /> '.
-                    &mt('make these dates the default access dates for future student enrollment').
-                    '</label></span>';
+                    '<label><input type="checkbox" name="makedatesdefault" value="1" /> ';
+                if ($crstype eq 'Community') {
+                    $dateDefault .= &mt("make these dates the default access dates for future community enrollment");
+                } else {
+                    $dateDefault .= &mt("make these dates the default access dates for future course enrollment");
+                }
+                $dateDefault .= '</label></span>';
             }
         }
     }
@@ -1036,7 +1211,7 @@ sub date_setting_table {
 }
 
 sub make_dates_default {
-    my ($startdate,$enddate,$context) = @_;
+    my ($startdate,$enddate,$context,$crstype) = @_;
     my $result = '';
     if ($context eq 'course') {
         my ($cnum,$cdom) = &get_course_identity();
@@ -1044,26 +1219,34 @@ sub make_dates_default {
                 {'default_enrollment_start_date'=>$startdate,
                  'default_enrollment_end_date'  =>$enddate},$cdom,$cnum);
         if ($put_result eq 'ok') {
-            $result .= &mt('Set default start and end access dates for course.').
-                       '<br />'."\n";
+            if ($crstype eq 'Community') {
+                $result .= &mt('Set default start and end access dates for community.');
+            } else {
+                $result .= &mt('Set default start and end access dates for course.');
+            }
+            $result .= '<br />'."\n";
             #
             # Refresh the course environment
             &Apache::lonnet::coursedescription($env{'request.course.id'},
                                                {'freshen_cache' => 1});
         } else {
-            $result .= &mt('Unable to set default access dates for course.').":".$put_result.
-                       '<br />';
+            if ($crstype eq 'Community') {
+                $result .= &mt('Unable to set default access dates for community');
+            } else {
+                $result .= &mt('Unable to set default access dates for course');
+            }
+            $result .= ':'.$put_result.'<br />';
         }
     }
     return $result;
 }
 
 sub default_role_selector {
-    my ($context,$checkpriv) = @_;
+    my ($context,$checkpriv,$crstype) = @_;
     my %customroles;
     my ($options,$coursepick,$cb_jscript);
     if ($context ne 'author') {
-        %customroles = &my_custom_roles();
+        %customroles = &my_custom_roles($crstype);
     }
 
     my %lt=&Apache::lonlocal::texthash(
@@ -1075,7 +1258,7 @@ sub default_role_selector {
     $options = '<select name="defaultrole">'."\n".
                ' <option value="">'.&mt('Please select').'</option>'."\n"; 
     if ($context eq 'course') {
-        $options .= &default_course_roles($context,$checkpriv,%customroles);
+        $options .= &default_course_roles($context,$checkpriv,$crstype,%customroles);
     } elsif ($context eq 'author') {
         my @roles = &construction_space_roles($checkpriv);
         foreach my $role (@roles) {
@@ -1089,18 +1272,18 @@ sub default_role_selector {
            $options .= '  <option value="'.$role.'">'.$plrole.'</option>';
         }
         my $courseform = &Apache::loncommon::selectcourse_link
-            ('studentform','dccourse','dcdomain','coursedesc',"$env{'request.role.domain'}",undef,'Course');
+            ('studentform','dccourse','dcdomain','coursedesc',"$env{'request.role.domain'}",undef,'Course/Community');
         $cb_jscript = 
-            &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'},'currsec','studentform');
+            &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'},'currsec','studentform','courserole','Course/Community');
         $coursepick = &Apache::loncommon::start_data_table().
                       &Apache::loncommon::start_data_table_header_row().
                       '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th>'.
                       '<th>'.$lt{'grs'}.'</th>'.
                       &Apache::loncommon::end_data_table_header_row().
                       &Apache::loncommon::start_data_table_row()."\n".
-                      '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'studentform','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
+                      '<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'studentform','dccourse','dcdomain','coursedesc','','','','crstype'".')" /></td>'."\n".
                       '<td><select name="courserole">'."\n".
-                      &default_course_roles($context,$checkpriv,%customroles)."\n".
+                      &default_course_roles($context,$checkpriv,'Course',%customroles)."\n".
                       '</select></td><td>'.
                       '<table class="LC_createuser">'.
                       '<tr class="LC_section_row"><td valign"top">'.
@@ -1116,6 +1299,7 @@ sub default_role_selector {
                       $env{'request.role.domain'}.'" />'.
                       '<input type="hidden" name="dccourse" value="" />'.
                       '<input type="hidden" name="dcdomain" value="" />'.
+                      '<input type="hidden" name="crstype" value="" />'.
                       '</td></tr></table></td>'.
                       &Apache::loncommon::end_data_table_row().
                       &Apache::loncommon::end_data_table()."\n";
@@ -1125,13 +1309,13 @@ sub default_role_selector {
 }
 
 sub default_course_roles {
-    my ($context,$checkpriv,%customroles) = @_;
+    my ($context,$checkpriv,$crstype,%customroles) = @_;
     my $output;
     my $custom = 1;
-    my @roles = &course_roles($context,$checkpriv,$custom);
+    my @roles = &course_roles($context,$checkpriv,$custom,lc($crstype));
     foreach my $role (@roles) {
         if ($role ne 'cr') {
-            my $plrole=&Apache::lonnet::plaintext($role);
+            my $plrole=&Apache::lonnet::plaintext($role,$crstype);
             $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
         }
     }
@@ -1180,8 +1364,14 @@ sub domain_roles {
 }
 
 sub course_roles {
-    my ($context,$checkpriv,$custom) = @_;
-    my @allroles = &roles_by_context('course',$custom);
+    my ($context,$checkpriv,$custom,$roletype) = @_;
+    my $crstype;
+    if ($roletype eq 'community') {
+        $crstype = 'Community' ;
+    } else {
+        $crstype = 'Course';
+    }
+    my @allroles = &roles_by_context('course',$custom,$crstype);
     my @roles;
     if ($context eq 'domain') {
         @roles = @allroles;
@@ -1192,7 +1382,7 @@ sub course_roles {
                     if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) {
                         push(@roles,$role);
                     } else {
-                        if ($role ne 'cc' && $env{'request.course.sec'} ne '') {
+                        if ((($role ne 'cc') && ($role ne 'co')) && ($env{'request.course.sec'} ne '')) {
                             if (&Apache::lonnet::allowed('c'.$role,
                                              $env{'request.course.id'}.'/'.
                                              $env{'request.course.sec'})) {
@@ -1210,19 +1400,19 @@ sub course_roles {
 }
 
 sub curr_role_permissions {
-    my ($context,$setting,$checkpriv) = @_; 
+    my ($context,$setting,$checkpriv,$type) = @_; 
     my $custom = 1;
     my @roles;
     if ($context eq 'author') {
         @roles = &construction_space_roles($checkpriv);
     } elsif ($context eq 'domain') {
         if ($setting eq 'course') {
-            @roles = &course_roles($context,$checkpriv,$custom); 
+            @roles = &course_roles($context,$checkpriv,$custom,$type); 
         } else {
             @roles = &domain_roles($checkpriv);
         }
     } elsif ($context eq 'course') {
-        @roles = &course_roles($context,$checkpriv,$custom);
+        @roles = &course_roles($context,$checkpriv,$custom,$type);
     }
     return @roles;
 }
@@ -1230,10 +1420,14 @@ sub curr_role_permissions {
 # ======================================================= Existing Custom Roles
 
 sub my_custom_roles {
+    my ($crstype) = @_;
     my %returnhash=();
     my %rolehash=&Apache::lonnet::dump('roles');
-    foreach my $key (keys %rolehash) {
+    foreach my $key (keys(%rolehash)) {
         if ($key=~/^rolesdef\_(\w+)$/) {
+            if ($crstype eq 'Community') {
+                next if ($rolehash{$key} =~ /bre\&S/); 
+            }
             $returnhash{$1}=$1;
         }
     }
@@ -1291,9 +1485,9 @@ sub print_userlist {
                                            'html'  => 'HTML');
         my $output_selector = '<select size="1" name="output" >';
         foreach my $outputformat ('html','csv','excel') {
-            my $option = '<option value="'.$outputformat.'" ';
+            my $option = '<option value="'.$outputformat.'"';
             if ($outputformat eq $env{'form.output'}) {
-                $option .= 'selected ';
+                $option .= ' selected="selected"';
             }
             $option .='>'.$lt{$outputformat}.'</option>';
             $output_selector .= "\n".$option;
@@ -1308,7 +1502,7 @@ sub print_userlist {
              .'</span></label>'.('&nbsp;'x3)."\n");
     my $roleselected = '';
     if ($env{'form.showrole'} eq 'Any') {
-       $roleselected = ' selected="selected" '; 
+       $roleselected = ' selected="selected"'; 
     }
     my ($cnum,$cdom);
     $r->print(&role_filter($context));
@@ -1316,26 +1510,56 @@ sub print_userlist {
         ($cnum,$cdom) = &get_course_identity();
         $r->print(&section_group_filter($cnum,$cdom));
     }
-    if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
-        $r->print('&nbsp;'.&list_submit_button(&mt('Update Display')).
-                  "\n</p>\n");
+    if ($env{'form.phase'} eq '') {
+        $r->print('<br /><br />'.&list_submit_button(&mt('Display List of Users')).
+                  "\n</p>\n".
+                  '<input type="hidden" name="phase" value="" /></form>');
+        return;
+    }
+    if (!(($context eq 'domain') && 
+        (($env{'form.roletype'} eq 'course') || ($env{'form.roletype'} eq 'community')))) {
+        $r->print(
+            "\n</p>\n"
+           .'<p>'
+           .&list_submit_button(&mt('Update Display'))
+           ."</p>\n"
+        );
     }
     my ($indexhash,$keylist) = &make_keylist_array();
-    my (%userlist,%userinfo);
-    if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
+    my (%userlist,%userinfo,$clearcoursepick);
+    if (($context eq 'domain') && 
+        ($env{'form.roletype'} eq 'course') ||
+        ($env{'form.roletype'} eq 'community')) {
+        my ($crstype,$numcodes,$title,$warning);
+        if ($env{'form.roletype'} eq 'course') {
+            $crstype = 'Course';
+            $numcodes = $totcodes;
+            $title = &mt('Select Courses');
+            $warning = &mt('Warning: data retrieval for multiple courses can take considerable time, as this operation is not currently optimized.');
+        } elsif ($env{'form.roletype'} eq 'community') {
+            $crstype = 'Community';
+            $numcodes = 0;
+            $title = &mt('Select Communities');
+            $warning = &mt('Warning: data retrieval for multiple communities can take considerable time, as this operation is not currently optimized.');
+        }
         my $courseform =
-            &Apache::lonhtmlcommon::course_selection($formname,$totcodes,
-                                         $codetitles,$idlist,$idlist_titles);
+            &Apache::lonhtmlcommon::course_selection($formname,$numcodes,
+                            $codetitles,$idlist,$idlist_titles,$crstype);
         $r->print('<p>'.&Apache::lonhtmlcommon::start_pick_box()."\n".
                   &Apache::lonhtmlcommon::start_pick_box()."\n".
-                  &Apache::lonhtmlcommon::row_title(&mt('Select Course(s)'),
-                                                    'LC_oddrow_value')."\n".
+                  &Apache::lonhtmlcommon::row_title($title,'LC_oddrow_value')."\n".
                   $courseform."\n".
                   &Apache::lonhtmlcommon::row_closure(1).
                   &Apache::lonhtmlcommon::end_pick_box().'</p>'.
-                  '<p>'.&list_submit_button(&mt('Update Display')).
-                  "\n".'</p><span class="LC_warning">'.&mt('Warning: data retrieval for multiple courses can take considerable time, as this operation is not currently optimized.').'</span>'."\n");
-        if ($env{'form.coursepick'}) {
+                  '<p><input type="hidden" name="origroletype" value="'.$env{'form.roletype'}.'" />'.
+                  &list_submit_button(&mt('Update Display')).
+                  "\n".'</p><span class="LC_warning">'.$warning.'</span>'."\n");
+        $clearcoursepick = 0;
+        if (($env{'form.origroletype'} ne '') &&
+            ($env{'form.origroletype'} ne $env{'form.roletype'})) {
+            $clearcoursepick = 1;
+        }
+        if (($env{'form.coursepick'}) && (!$clearcoursepick)) {
             $r->print('<hr />'.&mt('Searching').' ...<br />&nbsp;<br />');
         }
     } else {
@@ -1408,8 +1632,9 @@ sub print_userlist {
                         }
                     }
                 }
-            } elsif ($env{'form.roletype'} eq 'course') {
-                if ($env{'form.coursepick'}) {
+            } elsif (($env{'form.roletype'} eq 'course') ||
+                     ($env{'form.roletype'} eq 'community')) {
+                if (($env{'form.coursepick'}) && (!$clearcoursepick)) {
                     my %courses = &process_coursepick();
                     my %allusers;
                     my $hidepriv = 1;
@@ -1420,7 +1645,8 @@ sub print_userlist {
                         my (@roles,@sections,%access,%users,%userdata,
                             %statushash);
                         if ($env{'form.showrole'} eq 'Any') {
-                            @roles = &course_roles($context,undef,$custom);
+                            @roles = &course_roles($context,undef,$custom,
+                                                   $env{'form.roletype'});
                         } else {
                             @roles = ($env{'form.showrole'});
                         }
@@ -1466,6 +1692,8 @@ sub print_userlist {
                 $r->print(&mt('There are no authors or co-authors to display.')."\n");
             } elsif ($env{'form.roletype'} eq 'course') {
                 $r->print(&mt('There are no course users to display')."\n"); 
+            } elsif ($env{'form.roletype'} eq 'community') {
+                $r->print(&mt('There are no community users to display')."\n");
             }
         } elsif ($context eq 'course') {
             $r->print(&mt('There are no course users to display.')."\n");
@@ -1496,7 +1724,7 @@ sub role_filter {
     my $output;
     my $roleselected = '';
     if ($env{'form.showrole'} eq 'Any') {
-       $roleselected = ' selected="selected" ';
+       $roleselected = ' selected="selected"';
     }
     my ($role_select);
     if ($context eq 'domain') {
@@ -1508,17 +1736,26 @@ sub role_filter {
         $role_select = '<select name="showrole">'."\n".
                        '<option value="Any" '.$roleselected.'>'.
                        &mt('Any role').'</option>';
-        my @poss_roles = &curr_role_permissions($context);
+        my ($roletype,$crstype);
+        if ($context eq 'course') {
+            $crstype = &Apache::loncommon::course_type();
+            if ($crstype eq 'Community') {
+                $roletype = 'community';
+            } else {
+                $roletype = 'course';
+            } 
+        }
+        my @poss_roles = &curr_role_permissions($context,'','',$roletype);
         foreach my $role (@poss_roles) {
             $roleselected = '';
             if ($role eq $env{'form.showrole'}) {
-                $roleselected = ' selected="selected" ';
+                $roleselected = ' selected="selected"';
             }
             my $plrole;
             if ($role eq 'cr') {
                 $plrole = &mt('Custom role');
             } else {
-                $plrole=&Apache::lonnet::plaintext($role);
+                $plrole=&Apache::lonnet::plaintext($role,$crstype);
             }
             $role_select .= '<option value="'.$role.'"'.$roleselected.'>'.$plrole.'</option>';
         }
@@ -1554,7 +1791,7 @@ sub section_group_filter {
             $env{'form.'.$name{$item}} = 'all';
         }
         if ($item eq 'sec') {
-            if ($env{'form.showrole'} eq 'cc') {
+            if (($env{'form.showrole'} eq 'cc') || ($env{'form.showrole'} eq 'co')) {
                 $env{'form.'.$name{$item}} = 'none';
             }
             my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
@@ -1565,11 +1802,11 @@ sub section_group_filter {
         }
         if (@options > 0) {
             my $currsel;
-            $markup = '<select name="'.$name{$item}.'" />'."\n";
+            $markup = '<select name="'.$name{$item}.'">'."\n";
             foreach my $option ('all','none',@options) { 
                 $currsel = '';
                 if ($env{'form.'.$name{$item}} eq $option) {
-                    $currsel = ' selected="selected" ';
+                    $currsel = ' selected="selected"';
                 }
                 $markup .= ' <option value="'.$option.'"'.$currsel.'>';
                 if (($option eq 'all') || ($option eq 'none')) {
@@ -1580,7 +1817,9 @@ sub section_group_filter {
                 $markup .= '</option>'."\n";
             }
             $markup .= '</select>'."\n";
-            $output .= ('&nbsp;'x3).'<label>'.$title{$item}.': '.$markup.'</label>';
+            $output .= ('&nbsp;'x3).'<span class="LC_nobreak">'
+                      .'<label>'.$title{$item}.': '.$markup.'</label>'
+                      .'</span> ';
         }
     }
     return $output;
@@ -1633,7 +1872,8 @@ sub gather_userinfo {
                                            $indexhash,$uniqid,$userlist);
                     }
                 }
-            } elsif ($env{'form.roletype'} eq 'course') {
+            } elsif (($env{'form.roletype'} eq 'course') || 
+                     ($env{'form.roletype'} eq 'community')) {
                 ($userdata{'username'},$userdata{'domain'},$userdata{'role'}) =
                     split(/:/,$item);
                 if (ref($rolehash->{$item}) eq 'HASH') {
@@ -1683,7 +1923,8 @@ sub gather_userinfo {
 sub build_user_record {
     my ($context,$userdata,$userinfo,$indexhash,$record_key,$userlist) = @_;
     next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1');
-    if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
+    if (!(($context eq 'domain') && (($env{'form.roletype'} eq 'course')
+                             && ($env{'form.roletype'} eq 'community')))) {
         &process_date_info($userdata);
     }
     my $username = $userdata->{'username'};
@@ -1798,13 +2039,17 @@ sub process_coursepick {
     my $coursefilter = $env{'form.coursepick'};
     my $cdom = $env{'request.role.domain'};
     my %courses;
+    my $crssrch = 'Course';
+    if ($env{'form.roletype'} eq 'community') {
+        $crssrch = 'Community';
+    }
     if ($coursefilter eq 'all') {
         %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.',
-                                                 undef,undef,'Course');
+                                                 undef,undef,$crssrch);
     } elsif ($coursefilter eq 'category') {
         my $instcode = &instcode_from_coursefilter();
         %courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.',
-                                                 undef,undef,'Course');
+                                                 undef,undef,$crssrch);
     } elsif ($coursefilter eq 'specific') {
         if ($env{'form.coursetotal'} > 1) {
             my @course_ids = split(/&&/,$env{'form.courselist'});
@@ -1908,15 +2153,15 @@ sub aggregate_user_info {
 sub process_date_info {
     my ($userdata) = @_;
     my $now = time;
-    $userdata->{'status'} = &mt('Active');
+    $userdata->{'status'} = 'Active';
     if ($userdata->{'start'} > 0) {
         if ($now < $userdata->{'start'}) {
-            $userdata->{'status'} = &mt('Future');
+            $userdata->{'status'} = 'Future';
         }
     }
     if ($userdata->{'end'} > 0) {
         if ($now > $userdata->{'end'}) {
-            $userdata->{'status'} = &mt('Expired');
+            $userdata->{'status'} = 'Expired';
         }
     }
     return;
@@ -1948,9 +2193,10 @@ sub show_users_list {
         $sortby = 'username';
     }
     my $setting = $env{'form.roletype'};
-    my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers);
+    my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers,$crstype);
     if ($context eq 'course') {
         $cid = $env{'request.course.id'};
+        $crstype = &Apache::loncommon::course_type();
         ($cnum,$cdom) = &get_course_identity($cid);
         ($classgroups) = &Apache::loncoursedata::get_group_memberships(
                                      $userlist,$keylist,$cdom,$cnum);
@@ -1968,6 +2214,7 @@ sub show_users_list {
             if ($env{'course.'.$cid.'.internal.showphoto'}) {
                 $r->print('
 <script type="text/javascript">
+// <![CDATA[
 function photowindow(photolink) {
     var title = "Photo_Viewer";
     var options = "scrollbars=1,resizable=1,menubar=0";
@@ -1975,6 +2222,7 @@ function photowindow(photolink) {
     stdeditbrowser = open(photolink,title,options,"1");
     stdeditbrowser.focus();
 }
+// ]]>
 </script>
                ');
             }
@@ -1983,6 +2231,12 @@ function photowindow(photolink) {
 <input type="hidden" name="displayclickers" value="$displayclickers" />
 END
         }
+    } elsif ($context eq 'domain') {
+        if ($setting eq 'community') {
+            $crstype = 'Community';
+        } elsif ($setting eq 'course') {
+            $crstype = 'Course';
+        }
     }
     if ($mode ne 'autoenroll' && $mode ne 'pickauthor') {
         my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript();
@@ -1991,6 +2245,7 @@ END
         $r->print(<<END);
 
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
 $check_uncheck_js
 
 $verify_action_js
@@ -2028,7 +2283,19 @@ function username_display_launch(usernam
             document.location.href = '/adm/'+domain+'/'+username+'/aboutme';
         }
     }
+    if (target == 'track') {
+        if (document.$formname.userwin.checked == true) {
+            var url = '/adm/trackstudent?selected_student='+username+':'+domain+'&only_body=1';
+            var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';
+            var trackwin = window.open(url,'',options,1);
+            trackwin.focus();
+            return;
+        } else {
+            document.location.href = '/adm/trackstudent?selected_student='+username+':'+domain;
+        }
+    }
 }
+// ]]>
 </script>
 $date_sec_selector
 <input type="hidden" name="state" value="$env{'form.state'}" />
@@ -2050,7 +2317,7 @@ END
                        'status'     => "status",
                        'role'       => "role",
                        'type'       => "enroll type/action",
-                       'email'      => "email address",
+                       'email'      => "e-mail address",
                        'photo'      => "photo",
                        'extent'     => "extent",
                        'pr'         => "Proceed",
@@ -2058,13 +2325,16 @@ END
                        'ua'         => "uncheck all",
                        'ac'         => "Action to take for selected users",
                        'link'       => "Behavior of clickable username link for each user",
-                       'aboutme'    => "Display a user's personal page",
+                       'aboutme'    => "Display a user's personal information page",
                        'owin'       => "Open in a new window",
                        'modify'     => "Modify a user's information",
+                       'track'      => "View a user's recent activity",
                        'clicker'    => "Clicker-ID",
                       );
     if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
         $lt{'extent'} = &mt('Course(s): description, section(s), status');
+    } elsif ($context eq 'domain' && $env{'form.roletype'} eq 'community') {
+        $lt{'extent'} = &mt('Communities: description, section(s), status');
     } elsif ($context eq 'author') {
         $lt{'extent'} = &mt('Author'); 
     }
@@ -2076,18 +2346,21 @@ END
         if ($context eq 'course') {
             push(@cols,'section');
         }
-        if (!($context eq 'domain' && $env{'form.roletype'} eq 'course')) { 
+        if (!($context eq 'domain' && ($env{'form.roletype'} eq 'course')
+                              && ($env{'form.roletype'} eq 'community'))) {
             push(@cols,('start','end'));
         }
         if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') {
             push(@cols,'role');
         }
         if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' ||
-                                    $env{'form.roletype'} eq 'course')) {
+                                    $env{'form.roletype'} eq 'course' ||
+                                    $env{'form.roletype'} eq 'community')) {
             push (@cols,'extent');
         }
-        if (($statusmode eq 'Any') && 
-            (!($context eq 'domain' && $env{'form.roletype'} eq 'course'))) {
+        if (($statusmode eq 'Any') &&
+            (!($context eq 'domain' && (($env{'form.roletype'} eq 'course')
+             || ($env{'form.roletype'} eq 'community'))))) {
             push(@cols,'status');
         }
         if ($context eq 'course') {
@@ -2100,19 +2373,24 @@ END
     if ($env{'form.showrole'} eq 'cr') {
         $rolefilter = &mt('custom');  
     } elsif ($env{'form.showrole'} ne 'Any') {
-        $rolefilter = &Apache::lonnet::plaintext($env{'form.showrole'});
+        $rolefilter = &Apache::lonnet::plaintext($env{'form.showrole'},$crstype);
     }
     my $results_description;
     if ($mode ne 'autoenroll') {
         $results_description = &results_header_row($rolefilter,$statusmode,
-                                                   $context,$permission,$mode);
+                                                   $context,$permission,$mode,$crstype);
+
         $r->print('<b>'.$results_description.'</b><br /><br />');
     }
     my ($output,$actionselect,%canchange,%canchangesec);
     if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll' || $mode eq 'pickauthor') {
         if ($mode ne 'autoenroll' && $mode ne 'pickauthor') {
             if ($permission->{'cusr'}) {
-                $actionselect = &select_actions($context,$setting,$statusmode,$formname);
+                unless (($context eq 'domain') && 
+                        (($setting eq 'course') || ($setting eq 'community'))) {
+                    $actionselect = 
+                        &select_actions($context,$setting,$statusmode,$formname);
+                }
             }
             $r->print(<<END);
 <input type="hidden" name="srchby"  value="uname" />
@@ -2132,9 +2410,9 @@ END
                 if ($env{'form.showrole'} eq 'Any') {
                     my $custom = 1;
                     if ($context eq 'domain') {
-                        @allroles = &roles_by_context($setting,$custom);
+                        @allroles = &roles_by_context($setting,$custom,$crstype);
                     } else {
-                        @allroles = &roles_by_context($context,$custom);
+                        @allroles = &roles_by_context($context,$custom,$crstype);
                     }
                 } else {
                     @allroles = ($env{'form.showrole'});
@@ -2174,6 +2452,11 @@ END
             if ($permission->{'cusr'}) {
                 unshift (@linkdests,'modify');
             }
+            if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) ||
+                &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.
+                                         $env{'request.course.sec'})) {
+                push(@linkdests,'track');
+            }
             $output .= '<td>';
             my $usernamelink = $env{'form.usernamelink'};
             if ($usernamelink eq '') {
@@ -2182,15 +2465,15 @@ END
             foreach my $item (@linkdests) {
                 my $checkedstr = '';
                 if ($item eq $usernamelink) {
-                    $checkedstr = ' checked="checked" ';
+                    $checkedstr = ' checked="checked"';
                 }
-                $output .= '<span class="LC_nobreak"><label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.'>&nbsp;'.$lt{$item}.'</label></span><br />';
+                $output .= '<span class="LC_nobreak"><label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.' />&nbsp;'.$lt{$item}.'</label></span><br />';
             }
             my $checkwin;
             if ($env{'form.userwin'}) {
-                $checkwin = 'checked = "checked"';
+                $checkwin = ' checked="checked"';
             }
-            $output .= '</td><td valign="top"><span class="LC_nobreak"><input type="checkbox" name="userwin" value="1" '.$checkwin.'/>'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>';
+            $output .= '</td><td valign="top" style="border-left: 1px solid;><span class="LC_nobreak"><input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>';
         }
         $output .= "\n".'<div class="LC_clear_float_footer">&nbsp;</div>'."\n".
                   &Apache::loncommon::start_data_table().
@@ -2200,11 +2483,7 @@ END
  <th><a href=\"javascript:document.$formname.sortby.value='type';document.$formname.submit();\">$lt{'type'}</a></th>
             ";
         } else {
-            if ($mode eq 'pickauthor') {
-                $output .= "\n".'<th>&nbsp;</th>'."\n";
-            } else { 
-                $output .= "\n".'<th>'.&mt('Count').'</th>'."\n";
-            }
+            $output .= "\n".'<th>&nbsp;</th>'."\n";
             if ($actionselect) {
                 $output .= '<th>'.&mt('Select').'</th>'."\n";
             }
@@ -2259,9 +2538,13 @@ END
                        time.'_'.rand(1000000000).'.csv';
         unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
             $r->log_error("Couldn't open $CSVfilename for output $!");
-            $r->print(&mt('Problems occurred in writing the CSV file. '
-                         .'This error has been logged. '
-                         .'Please alert your LON-CAPA administrator.'));
+            $r->print(
+                '<p class="LC_error">'
+               .&mt('Problems occurred in writing the CSV file.')
+               .' '.&mt('This error has been logged.')
+               .' '.&mt('Please alert your LON-CAPA administrator.')
+               .'</p>'
+            );
             $CSVfile = undef;
         }
         #
@@ -2303,6 +2586,11 @@ END
             $grpfilter = 'all';
         }
     }
+    my %ltstatus = &Apache::lonlocal::texthash(
+                                                Active  => 'Active',
+                                                Future  => 'Future',
+                                                Expired => 'Expired',
+                                               );
     # Get groups, role, permanent e-mail so we can sort on them if
     # necessary.
     foreach my $user (keys(%{$userlist})) {
@@ -2330,7 +2618,8 @@ END
                 }
             } elsif ($env{'form.roletype'} eq 'author') {
                 ($uname,$udom,$role) = split(/:/,$user,-1);
-            } elsif ($env{'form.roletype'} eq 'course') {
+            } elsif (($env{'form.roletype'} eq 'course') || 
+                     ($env{'form.roletype'} eq 'community')) {
                 ($uname,$udom,$role) = split(/:/,$user);
             }
         } else {
@@ -2437,7 +2726,7 @@ END
         if ($clickers!~/\w/) { $clickers='-'; }
         $in{'clicker'} = $clickers; 
 	my $role = $in{'role'};
-        $in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}]); 
+        $in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}],$crstype); 
         if (! defined($in{'start'}) || $in{'start'} == 0) {
             $in{'start'} = &mt('none');
         } else {
@@ -2457,7 +2746,7 @@ END
                     $cellentry = '<b>'.&mt('auto').'</b>&nbsp;<label><input type="checkbox" name="chgauto" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;Change</label>';
                     $autocount ++;
                 } else {
-                    $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;Change</label></nobr></td></tr><tr><td><nobr>';
+                    $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><span class="LC_nobreak"><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;Change</label></span></td></tr><tr><td><span class="LC_nobreak">';
                     $manualcount ++;
                     if ($in{'lockedtype'}) {
                         $cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;'.&mt('Unlock').'</label>';
@@ -2466,7 +2755,7 @@ END
                         $cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" />&nbsp;'.&mt('Lock').'</label>';
                         $lockcount ++;
                     }
-                    $cellentry .= '</nobr></td></tr></table>';
+                    $cellentry .= '</span></td></tr></table>';
                 }
                 $r->print("<td>$cellentry</td>\n");
             } else {
@@ -2502,7 +2791,7 @@ END
                             }
                         }
                         $r->print('<td><input type="checkbox" name="'.
-                                  'actionlist" value="'.$checkval.'"></td>');
+                                  'actionlist" value="'.$checkval.'" /></td>');
                     } else {
                         $r->print('<td>&nbsp;</td>');
                     }
@@ -2515,6 +2804,12 @@ END
                     $r->print('<td>'.&print_username_link($mode,\%in).'</td>');
                 } elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) {
                     $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n");
+                } elsif ($item eq 'status') {
+                    my $showitem = $in{$item};
+                    if (defined($ltstatus{$in{$item}})) {
+                        $showitem = $ltstatus{$in{$item}};
+                    }
+                    $r->print('<td>'.$showitem.'</td>'."\n");
                 } else {
                     $r->print('<td>'.$in{$item}.'</td>'."\n");
                 }
@@ -2531,7 +2826,7 @@ END
                     }
                     if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
                         if ($displayphotos eq 'on' && $role eq 'st' && $in{'photo'} ne '') {
-                            $r->print('    <td align="right"><a href="javascript:photowindow('."'".$in{'photo'}."'".')"><img src="'.$in{'thumbnail'}.'" border="1"></a></td>');
+                            $r->print('    <td align="right"><a href="javascript:photowindow('."'".$in{'photo'}."'".')"><img src="'.$in{'thumbnail'}.'" border="1" alt="" /></a></td>');
                         } else {
                             $r->print('    <td>&nbsp;</td>  ');
                         }
@@ -2718,7 +3013,7 @@ sub print_username_link {
         $output = $in->{'username'};
     } else {
         $output = '<a href="javascript:username_display_launch('.
-                  "'$in->{'username'}','$in->{'domain'}'".')" />'.
+                  "'$in->{'username'}','$in->{'domain'}'".')">'.
                   $in->{'username'}.'</a>';
     }
     return $output;
@@ -2729,6 +3024,7 @@ sub role_type_names {
                          'domain' => 'Domain Roles',
                          'author' => 'Co-Author Roles',
                          'course' => 'Course Roles',
+                         'community' => 'Community Roles',
              );
     return %lt;
 }
@@ -2818,8 +3114,8 @@ sub select_actions {
             }
         }
         if ($choices{'sections'}) {
-            $output .= '<input type="hidden" name="retainsec" value= "" />'."\n".
-                       '<input type="hidden" name="newsecs" value= "" />'."\n";
+            $output .= '<input type="hidden" name="retainsec" value="" />'."\n".
+                       '<input type="hidden" name="newsecs" value="" />'."\n";
         }
     }
     return $output;
@@ -2833,9 +3129,9 @@ sub date_section_javascript {
         delete => "Check the boxes for any users for whom roles are to be deleted, and click 'Proceed'",
         none   => "Choose an action to take for selected users",
     );  
-    my $output = '
-<script type="text/javascript">'."\n";
-    $output .= <<"ENDONE";
+    my $output = <<"ENDONE";
+<script type="text/javascript">
+// <![CDATA[
     function opendatebrowser(callingform,formname,calledby) {
         var bulkaction = callingform.bulkaction.options[callingform.bulkaction.selectedIndex].value;
         var url = '/adm/createuser?';
@@ -2858,19 +3154,21 @@ ENDONE
         stdeditbrowser = open(url,title,options,'1');
         stdeditbrowser.focus();
     }
+// ]]>
 </script>
 ENDTWO
     return $output;
 }
 
 sub date_section_selector {
-    my ($context,$permission) = @_;
+    my ($context,$permission,$crstype) = @_;
     my $callingform = $env{'form.callingform'};
     my $formname = 'dateselect';  
     my $groupslist = &get_groupslist();
     my $sec_js = &setsections_javascript($formname,$groupslist);
     my $output = <<"END";
 <script type="text/javascript">
+// <![CDATA[
 
 $sec_js
 
@@ -2888,7 +3186,7 @@ END
         } else {
             opener.document.$callingform.retainsec.value = formname.retainsec.value;
         }
-        setSections(formname);
+        setSections(formname,'$crstype');
         if (seccheck == 'ok') {
             opener.document.$callingform.newsecs.value = formname.sections.value;
         }
@@ -2939,15 +3237,16 @@ END
 
 $verify_action_js
 
+// ]]>
 </script>
 ENDJS
     my %lt = &Apache::lonlocal::texthash (
                  chac => 'Access dates to apply for selected users',
                  chse => 'Changes in section affiliation to apply to selected users',
-                 fors => 'For student roles changing the section, will result in a section switch as students may only be in one section of a course at a time.',
-                 forn => 'For a role in a course that is not a student role, a user may have roles in more than one section of a course at a time.',
+                 fors => 'For student roles, changing the section will result in a section switch as students may only be in one section of a course at a time.',
+                 forn => 'For a course role that is not "student", users may have roles in more than one section at a time.',
                  reta => "Retain each user's current section affiliations?", 
-                 dnap => '(Does not apply to student roles).', 
+                 dnap => '(Does not apply to student roles).',
             );
     my ($date_items,$headertext);
     if ($env{'form.bulkaction'} eq 'chgsec') {
@@ -2961,13 +3260,18 @@ ENDJS
         }
         $date_items = &date_setting_table($starttime,undef,$context,
                                           $env{'form.bulkaction'},$formname,
-                                          $permission);
+                                          $permission,$crstype);
     }
     $output .= '<h3>'.$headertext.'</h3>'.
-               '<form name="'.$formname.'" method="post">'."\n".
+               '<form name="'.$formname.'" method="post" action="">'."\n".
                 $date_items;
     if ($context eq 'course' && $env{'form.bulkaction'} eq 'chgsec') {
         my ($cnum,$cdom) = &get_course_identity();
+        if ($crstype eq 'Community') {
+            $lt{'fors'} = &mt('For member roles, changing the section will result in a section switch, as members may only be in one section of a community at a time.');
+            $lt{'forn'} = &mt('For a community role that is not "member", users may have roles in more than one section at a time.');
+            $lt{'dnap'} = &mt('(Does not apply to member roles).'); 
+        }
         my $info;
         if ($env{'form.showrole'} eq 'st') {
             $output .= '<p>'.$lt{'fors'}.'</p>'; 
@@ -2993,23 +3297,23 @@ ENDJS
             $info = '<input type="hidden" name="retainsec" value="0" />'; 
         }
         my $rowtitle = &mt('New section to assign');
-        my $secbox = &section_picker($cdom,$cnum,$env{'form.showrole'},$rowtitle,$permission,$context);
+        my $secbox = &section_picker($cdom,$cnum,$env{'form.showrole'},$rowtitle,$permission,$context,'',$crstype);
         $output .= $info.$secbox;
     }
     $output .= '<p>'.
-'<input type="button" name="dateselection" value="'.&mt('Make changes').'" onclick="javascript:saveselections(this.form)" /></p>'."\n".
+'<input type="button" name="dateselection" value="'.&mt('Save').'" onclick="javascript:saveselections(this.form)" /></p>'."\n".
 '</form>';
     return $output;
 }
 
 sub section_picker {
-    my ($cdom,$cnum,$role,$rowtitle,$permission,$context,$mode) = @_;
+    my ($cdom,$cnum,$role,$rowtitle,$permission,$context,$mode,$crstype) = @_;
     my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
     my $sections_select .= &course_sections(\%sections_count,$role);
-    my $secbox = '<p>'.&Apache::lonhtmlcommon::start_pick_box()."\n";
+    my $secbox = '<div>'.&Apache::lonhtmlcommon::start_pick_box()."\n";
     if ($mode eq 'upload') {
         my ($options,$cb_script,$coursepick) =
-            &default_role_selector($context,1);
+            &default_role_selector($context,1,$crstype);
         $secbox .= &Apache::lonhtmlcommon::row_title(&mt('role'),'LC_oddrow_value').
                    $options. &Apache::lonhtmlcommon::row_closure(1)."\n";
     }
@@ -3019,7 +3323,7 @@ sub section_picker {
                    '<td align="center">'.&mt('Existing sections')."\n".
                    '<br />'.$sections_select.'</td><td align="center">'.
                    &mt('New section').'<br />'."\n".
-                   '<input type="text" name="newsec" size="15" />'."\n".
+                   '<input type="text" name="newsec" size="15" value="" />'."\n".
                    '<input type="hidden" name="sections" value="" />'."\n".
                    '</td></tr></table>'."\n";
     } else {
@@ -3028,31 +3332,55 @@ sub section_picker {
                    $env{'request.course.sec'};
     }
     $secbox .= &Apache::lonhtmlcommon::row_closure(1)."\n".
-               &Apache::lonhtmlcommon::end_pick_box().'</p>';
+               &Apache::lonhtmlcommon::end_pick_box().'</div>';
     return $secbox;
 }
 
 sub results_header_row {
-    my ($rolefilter,$statusmode,$context,$permission,$mode) = @_;
+    my ($rolefilter,$statusmode,$context,$permission,$mode,$crstype) = @_;
     my ($description,$showfilter);
     if ($rolefilter ne 'Any') {
         $showfilter = $rolefilter;
     }
     if ($context eq 'course') {
         if ($mode eq 'csv' || $mode eq 'excel') {
-            $description = &mt('Course - [_1]:',$env{'course.'.$env{'request.course.id'}.'.description'}).' ';
+            if ($crstype eq 'Community') {
+                $description = &mt('Community - [_1]:',$env{'course.'.$env{'request.course.id'}.'.description'}).' ';
+            } else {
+                $description = &mt('Course - [_1]:',$env{'course.'.$env{'request.course.id'}.'.description'}).' ';
+            }
         }
         if ($statusmode eq 'Expired') {
-            $description .= &mt('Users in course with expired [_1] roles',$showfilter);
+            if ($crstype eq 'Community') {
+                $description .= &mt('Users in community with expired [_1] roles',$showfilter);
+            } else {
+                $description .= &mt('Users in course with expired [_1] roles',$showfilter);
+            }
         } elsif ($statusmode eq 'Future') {
-            $description .= &mt('Users in course with future [_1] roles',$showfilter);
+            if ($crstype eq 'Community') {
+                $description .= &mt('Users in community with future [_1] roles',$showfilter);
+            } else {
+                $description .= &mt('Users in course with future [_1] roles',$showfilter);
+            }
         } elsif ($statusmode eq 'Active') {
-            $description .= &mt('Users in course with active [_1] roles',$showfilter);
+            if ($crstype eq 'Community') {
+                $description .= &mt('Users in community with active [_1] roles',$showfilter);
+            } else {
+                $description .= &mt('Users in course with active [_1] roles',$showfilter);
+            }
         } else {
             if ($rolefilter eq 'Any') {
-                $description .= &mt('All users in course');
+                if ($crstype eq 'Community') {
+                    $description .= &mt('All users in community');
+                } else {
+                    $description .= &mt('All users in course');
+                }
             } else {
-                $description .= &mt('All users in course with [_1] roles',$rolefilter);
+                if ($crstype eq 'Community') {
+                    $description .= &mt('All users in community with [_1] roles',$rolefilter);
+                } else {
+                    $description .= &mt('All users in course with [_1] roles',$rolefilter);
+                }
             }
         }
         my $constraint;
@@ -3060,7 +3388,7 @@ sub results_header_row {
         if ($viewablesec ne '') {
             if ($env{'form.showrole'} eq 'st') {
                 $constraint = &mt('only users in section "[_1]"',$viewablesec);
-            } elsif ($env{'form.showrole'} ne 'cc') {
+            } elsif (($env{'form.showrole'} ne 'cc') && ($env{'form.showrole'} ne 'co')) {
                 $constraint = &mt('only users affiliated with no section or section "[_1]"',$viewablesec);
             }
             if (($env{'form.grpfilter'} ne 'all') && ($env{'form.grpfilter'} ne '')) {
@@ -3145,22 +3473,32 @@ sub results_header_row {
                 if ($rolefilter eq 'Any') {
                     $description .= &mt('All users with co-author roles in domain',$showfilter);
                 } else {
-                    $description .= &mt('All co-authors in domain  with [_1] roles',$rolefilter);
+                    $description .= &mt('All co-authors in domain with [_1] roles',$rolefilter);
                 }
             }
-        } elsif ($env{'form.roletype'} eq 'course') {
+        } elsif (($env{'form.roletype'} eq 'course') || 
+                 ($env{'form.roletype'} eq 'community')) {
+
             my $coursefilter = $env{'form.coursepick'};
-            if ($coursefilter eq 'category') {
-                my $instcode = &instcode_from_coursefilter();
-                if ($instcode eq '.') {
+            if ($env{'form.roletype'} eq 'course') {
+                if ($coursefilter eq 'category') {
+                    my $instcode = &instcode_from_coursefilter();
+                    if ($instcode eq '.') {
+                        $description .= &mt('All courses in domain').' - ';
+                    } else {
+                        $description .= &mt('Courses in domain with institutional code: [_1]',$instcode).' - ';
+                    }
+                } elsif ($coursefilter eq 'selected') {
+                    $description .= &mt('Selected courses in domain').' - ';
+                } elsif ($coursefilter eq 'all') {
                     $description .= &mt('All courses in domain').' - ';
-                } else {
-                    $description .= &mt('Courses in domain with institutional code: [_1]',$instcode).' - ';
                 }
-            } elsif ($coursefilter eq 'selected') {
-                $description .= &mt('Selected courses in domain').' - ';
-            } elsif ($coursefilter eq 'all') {
-                $description .= &mt('All courses in domain').' - ';
+            } elsif ($env{'form.roletype'} eq 'community') {
+                if ($coursefilter eq 'selected') {
+                    $description .= &mt('Selected communities in domain').' - ';
+                } elsif ($coursefilter eq 'all') {
+                    $description .= &mt('All communities in domain').' - ';
+                }
             }
             if ($statusmode eq 'Expired') {
                 $description .= &mt('users with expired [_1] roles',$showfilter);
@@ -3197,7 +3535,7 @@ sub viewable_section {
 #################################################
 #################################################
 sub show_drop_list {
-    my ($r,$classlist,$nosort,$permission) = @_;
+    my ($r,$classlist,$nosort,$permission,$crstype) = @_;
     my $cid = $env{'request.course.id'};
     my ($cnum,$cdom) = &get_course_identity($cid);
     if (! exists($env{'form.sortby'})) {
@@ -3215,10 +3553,12 @@ sub show_drop_list {
 <input type="hidden" name="action" value="$action" />
 <input type="hidden" name="state"  value="done" />
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
 $check_uncheck_js
+// ]]>
 </script>
 <p>
-<input type="hidden" name="phase" value="four">
+<input type="hidden" name="phase" value="four" />
 END
     my ($indexhash,$keylist) = &make_keylist_array();
     my $studentcount = 0;
@@ -3241,7 +3581,11 @@ END
         }
     }
     if (!$studentcount) {
-        $r->print(&mt('There are no students to drop.'));
+        if ($crstype eq 'Community') {
+            $r->print(&mt('There are no members to drop.'));
+        } else {
+            $r->print(&mt('There are no students to drop.'));
+        }
         return;
     }
     my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
@@ -3249,11 +3593,16 @@ END
     my %lt=&Apache::lonlocal::texthash('usrn'   => "username",
                                        'dom'    => "domain",
                                        'sn'     => "student name",
+                                       'mn'     => "member name",
                                        'sec'    => "section",
                                        'start'  => "start date",
                                        'end'    => "end date",
                                        'groups' => "active groups",
                                       );
+    my $nametitle = $lt{'sn'};
+    if ($crstype eq 'Community') {
+        $nametitle = $lt{'mn'};
+    }
     if ($nosort) {
         $r->print(&Apache::loncommon::start_data_table().
                   &Apache::loncommon::start_data_table_header_row());
@@ -3262,7 +3611,7 @@ END
     <th>$lt{'usrn'}</th>
     <th>$lt{'dom'}</th>
     <th>ID</th>
-    <th>$lt{'sn'}</th>
+    <th>$nametitle</th>
     <th>$lt{'sec'}</th>
     <th>$lt{'start'}</th>
     <th>$lt{'end'}</th>
@@ -3281,7 +3630,7 @@ END
     </th><th>
        <a href="/adm/createuser?action=$action&sortby=id">ID</a>
     </th><th>
-       <a href="/adm/createuser?action=$action&sortby=fullname">$lt{'sn'}</a>
+       <a href="/adm/createuser?action=$action&sortby=fullname">$nametitle</a>
     </th><th>
        <a href="/adm/createuser?action=$action&sortby=section">$lt{'sec'}</a>
     </th><th>
@@ -3336,7 +3685,7 @@ END
         #
         $r->print(&Apache::loncommon::start_data_table_row());
         $r->print(<<"END");
-    <td><input type="checkbox" name="droplist" value="$studentkey"></td>
+    <td><input type="checkbox" name="droplist" value="$studentkey" /></td>
     <td>$username</td>
     <td>$domain</td>
     <td>$id</td>
@@ -3351,14 +3700,23 @@ END
     $r->print(&Apache::loncommon::end_data_table().'<br />');
     %lt=&Apache::lonlocal::texthash(
                        'dp'   => "Drop Students",
+                       'dm'   => "Drop Members",
                        'ca'   => "check all",
                        'ua'   => "uncheck all",
                                        );
+    my $btn = $lt{'dp'};
+    if ($crstype eq 'Community') {
+        $btn = $lt{'dm'}; 
+    }
     $r->print(<<"END");
-</p><p>
-<input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.studentform.droplist)"> &nbsp;
-<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.droplist)">
-<p><input type=submit value="$lt{'dp'}"></p>
+</p>
+<p>
+<input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.studentform.droplist)" /> &nbsp;
+<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.droplist)" />
+</p>
+<p>
+<input type="submit" value="$btn" />
+</p>
 END
     return;
 }
@@ -3369,24 +3727,36 @@ END
 sub print_first_users_upload_form {
     my ($r,$context) = @_;
     my $str;
-    $str  = '<input type="hidden" name="phase" value="two">';
+    $str  = '<input type="hidden" name="phase" value="two" />';
     $str .= '<input type="hidden" name="action" value="upload" />';
-    $str .= '<input type="hidden"   name="state"  value="got_file" />';
-    $str .= "<h3>".&mt('Upload a file containing information about users')."</h3>\n";
-    $str .= &Apache::loncommon::upfile_select_html();
-    $str .= '<p>';
-    $str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List",
-                         &mt("How do I create a users list from a spreadsheet")).
-                             "<br />\n";
-    $str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
-                           &mt("How do I create a CSV file from a spreadsheet"));
-    $str .= "</p>\n";
-    $str .= "<p>\n";
-    $str .= '<label><input type="checkbox" name="noFirstLine" /> '.
-        &mt('Ignore First Line')."</label></p>\n";
-    $str .= '<input type="submit" name="fileupload" value="'.
-        &mt('Go to next step').'">'."<br />\n";
-    $str .= &Apache::loncommon::end_page();
+    $str .= '<input type="hidden" name="state"  value="got_file" />';
+
+    $str .= '<h2>'.&mt('Upload a file containing information about users').'</h2>'."\n";
+
+    # Excel and CSV Help
+    $str .= '<div class="LC_left_float">'
+           .&Apache::loncommon::help_open_topic("Course_Create_Class_List",
+                &mt("How do I create a users list from a spreadsheet"))
+           .'</div><div class="LC_left_float">'."\n"
+           .&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
+                &mt("How do I create a CSV file from a spreadsheet"))
+           .'</div><br clear="all" />'."\n";
+    $str .= &Apache::lonhtmlcommon::start_pick_box()
+           .&Apache::lonhtmlcommon::row_title(&mt('File'))
+           .&Apache::loncommon::upfile_select_html()
+           .&Apache::lonhtmlcommon::row_closure()
+           .&Apache::lonhtmlcommon::row_title(
+                '<label for="noFirstLine">'
+               .&mt('Ignore First Line')
+               .'</label>')
+           .'<input type="checkbox" name="noFirstLine" id="noFirstLine" />'
+           .&Apache::lonhtmlcommon::row_closure(1)
+           .&Apache::lonhtmlcommon::end_pick_box();
+
+    $str .= '<p>'
+           .'<input type="submit" name="fileupload" value="'.&mt('Next').'" />'
+           .'</p>';
+
     $r->print($str);
     return;
 }
@@ -3430,11 +3800,25 @@ sub upfile_drop_add {
                                                 'ipwd_choice' => 'scalar',
                                                 'email_choice' => 'scalar',
                                                 'role_choice'  => 'scalar',
-                                                'domain_choice' => 'scalar'});
+                                                'domain_choice' => 'scalar',
+                                                'inststatus_choice' => 'scalar'});
     #
+    my ($cid,$crstype,$setting);
+    if ($context eq 'domain') {
+        $setting = $env{'form.roleaction'};
+    }
+    if ($env{'request.course.id'} ne '') {
+        $cid = $env{'request.course.id'};
+        $crstype = &Apache::loncommon::course_type();
+    } elsif ($setting eq 'course') {
+        if (&Apache::lonnet::is_course($env{'form.dcdomain'},$env{'form.dccourse'})) {
+            $cid = $env{'form.dcdomain'}.'_'.$env{'form.dccourse'};
+            $crstype = &Apache::loncommon::course_type($cid);
+        }
+    }
     my ($startdate,$enddate) = &get_dates_from_form();
     if ($env{'form.makedatesdefault'}) {
-        $r->print(&make_dates_default($startdate,$enddate,$context));
+        $r->print(&make_dates_default($startdate,$enddate,$context,$crstype));
     }
     # Determine domain and desired host (home server)
     my $defdom=$env{'request.role.domain'};
@@ -3486,43 +3870,36 @@ sub upfile_drop_add {
             $amode = ''; # This causes the loop below to be skipped
         }
     }
-    my ($cid,$defaultsec,$defaultrole,$setting);
+    my ($defaultsec,$defaultrole);
     if ($context eq 'domain') {
-        $setting = $env{'form.roleaction'};
         if ($setting eq 'domain') {
             $defaultrole = $env{'form.defaultrole'};
         } elsif ($setting eq 'course') {
             $defaultrole = $env{'form.courserole'};
             $defaultsec = $env{'form.sections'};
-        }  
+        }
     } elsif ($context eq 'author') {
         $defaultrole = $env{'form.defaultrole'};
     } elsif ($context eq 'course') {
         $defaultrole = $env{'form.defaultrole'};
         $defaultsec = $env{'form.sections'};
     }
-    if ($env{'request.course.id'} ne '') {
-        $cid = $env{'request.course.id'};
-    } elsif ($setting eq 'course') {
-        if (&Apache::lonnet::is_course($env{'form.dcdomain'},$env{'form.dccourse'})) {
-            $cid = $env{'form.dcdomain'}.'_'.$env{'form.dccourse'};
-        }
-    }
     # Check to see if user information can be changed
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
     my %canmodify;
     if (&Apache::lonnet::allowed('mau',$domain)) {
+        push(@userinfo,'inststatus');
         foreach my $field (@userinfo) {
             $canmodify{$field} = 1;
         }
     }
     my (%userlist,%modifiable_fields,@poss_roles);
     my $secidx = &Apache::loncoursedata::CL_SECTION();
-    my @courseroles = &roles_by_context('course',1);
+    my @courseroles = &roles_by_context('course',1,$crstype);
     if (!&Apache::lonnet::allowed('mau',$domain)) {
         if ($context eq 'course' || $context eq 'author') {
-            @poss_roles =  &curr_role_permissions($context);
+            @poss_roles =  &curr_role_permissions($context,'','',$crstype);
             my @statuses = ('active','future');
             my ($indexhash,$keylist) = &make_keylist_array();
             my %info;
@@ -3561,6 +3938,8 @@ sub upfile_drop_add {
         } else {
             $r->print('<h3>'.&mt('Adding/Modifying Users')."</h3>\n<p>\n");
         }
+        $r->rflush;
+
         my %counts = (
                        user => 0,
                        auth => 0,
@@ -3606,13 +3985,15 @@ sub upfile_drop_add {
             }
         }
         my (%curr_rules,%got_rules,%alerts);
-        my %customroles = &my_custom_roles();
-        my @permitted_roles = &roles_on_upload($context,$setting,%customroles); 
+        my %customroles = &my_custom_roles($crstype);
+        my @permitted_roles = 
+            &roles_on_upload($context,$setting,$crstype,%customroles); 
         # Get new users list
         foreach my $line (@userdata) {
             my @secs;
             my %entries=&Apache::loncommon::record_sep($line);
             # Determine user name
+            $entries{$fields{'username'}} =~ s/^\s+|\s+$//g;
             unless (($entries{$fields{'username'}} eq '') ||
                     (!defined($entries{$fields{'username'}}))) {
                 my ($fname, $mname, $lname,$gen) = ('','','','');
@@ -3635,11 +4016,17 @@ sub upfile_drop_add {
                 }
                 if ($entries{$fields{'username'}}
                     ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
+                    my $nowhitespace;
+                    if ($entries{$fields{'username'}} =~ /\s/) {
+                        $nowhitespace = ' - '.&mt('usernames may not contain spaces.');
+                    }
                     $r->print('<br />'.
-      &mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
-          $entries{$fields{'username'}},$fname,$mname,$lname,$gen));
+      &mt('[_1]: Unacceptable username for user [_2] [_3] [_4] [_5]',
+          '<b>'.$entries{$fields{'username'}}.'</b>',$fname,$mname,$lname,$gen).
+                              $nowhitespace);
                     next;
                 } else {
+                    $entries{$fields{'domain'}} =~ s/^\s+|\s+$//g;
                     if ($entries{$fields{'domain'}} 
                         ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
                         $r->print('<br />'. '<b>'.$entries{$fields{'domain'}}.
@@ -3656,10 +4043,10 @@ sub upfile_drop_add {
                             $entries{$fields{'sec'}} =~ s/\W//g;
                             my $item = $entries{$fields{'sec'}};
                             if ($item eq "none" || $item eq 'all') {
-                                $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.',$username,$fname,$mname,$lname,$gen,$item));
+                                $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item));
                                 next;
                             } elsif (exists($curr_groups{$item})) {
-                                $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.',$username,$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));
+                                $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));
                                 next;
                             } else {
                                 push(@secs,$item);
@@ -3671,7 +4058,7 @@ sub upfile_drop_add {
                         if (ref($userlist{$username.':'.$userdomain}) eq 'ARRAY') {
                             my $currsec = $userlist{$username.':'.$userdomain}[$secidx];
                             if ($currsec ne $env{'request.course.sec'}) {
-                                $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".',$username,$fname,$mname,$lname,$gen,$secs[0]).'<br />');
+                                $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$secs[0]).'<br />');
                                 if ($currsec eq '') {
                                     $r->print(&mt('This user already has an active/future student role in the course, unaffiliated to any section.'));
 
@@ -3698,9 +4085,18 @@ sub upfile_drop_add {
                     # determine email address
                     my $email='';
                     if (defined($fields{'email'})) {
+                        $entries{$fields{'email'}} =~ s/^\s+|\s+$//g;
                         if (defined($entries{$fields{'email'}})) {
                             $email=$entries{$fields{'email'}};
-                            unless ($email=~/^[^\@]+\@[^\@]+$/) { $email=''; }                        }
+                            unless ($email=~/^[^\@]+\@[^\@]+$/) { $email=''; }
+                        }
+                    }
+                    # determine affiliation
+                    my $inststatus='';
+                    if (defined($fields{'inststatus'})) {
+                        if (defined($entries{$fields{'inststatus'}})) {
+                            $inststatus=$entries{$fields{'inststatus'}};
+                        }
                     }
                     # determine user password
                     my $password = $genpwd;
@@ -3721,8 +4117,13 @@ sub upfile_drop_add {
                             }
                             if ($role eq '') {
                                 my $rolestr = join(', ',@permitted_roles);
-                                $r->print('<br />'.
-      &mt('<b>[_1]</b>: You do not have permission to add the requested role [_2] for the user.',$entries{$fields{'username'}},$entries{$fields{'role'}}).'<br />'.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n");
+                                $r->print('<br />'
+                                         .&mt('[_1]: You do not have permission to add the requested role [_2] for the user.'
+                                             ,'<b>'.$entries{$fields{'username'}}.'</b>'
+                                             ,$entries{$fields{'role'}})
+                                         .'<br />'
+                                         .&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n"
+                                );
                                 next;
                             }
                         }
@@ -3731,7 +4132,7 @@ sub upfile_drop_add {
                         $role = $defaultrole;
                     }
                     # Clean up whitespace
-                    foreach (\$id,\$fname,\$mname,\$lname,\$gen) {
+                    foreach (\$id,\$fname,\$mname,\$lname,\$gen,\$inststatus) {
                         $$_ =~ s/(\s+$|^\s+)//g;
                     }
                     # check against rules
@@ -3778,7 +4179,7 @@ sub upfile_drop_add {
                                 }
                             }
                             my @newinfo = (\$fname,\$mname,\$lname,\$gen,\$email,\$id);
-                            for (my $i=0; $i<@userinfo; $i++) {
+                            for (my $i=0; $i<@newinfo; $i++) {
                                 if (${$newinfo[$i]} ne '') {
                                     if (!$canmodify{$userinfo[$i]}) {
                                         ${$newinfo[$i]} = '';
@@ -3827,7 +4228,7 @@ sub upfile_drop_add {
                                      $fname,$mname,$lname,$gen,$sec,$enddate,
                                      $startdate,$env{'form.forceid'},
                                      $desiredhost,$email,'manual','',$cid,
-                                     '',$context);
+                                     '',$context,$inststatus);
                             $userresult = $roleresult;
                         } else {
                             if ($role ne '') { 
@@ -3836,7 +4237,7 @@ sub upfile_drop_add {
                                         $role = 'cr_'.$env{'user.domain'}.'_'.
                                                 $env{'user.name'}.'_'.$role;
                                     }
-                                    if ($role ne 'cc') { 
+                                    if (($role ne 'cc') && ($role ne 'co')) {
                                         if (@secs > 1) {
                                             $multiple = 1;
                                             foreach my $sec (@secs) {
@@ -3847,7 +4248,7 @@ sub upfile_drop_add {
                                                     $mname,$lname,$gen,$sec,
                                                     $env{'form.forceid'},$desiredhost,
                                                     $email,$role,$enddate,
-                                                    $startdate,$checkid);
+                                                    $startdate,$checkid,$inststatus);
                                             }
                                         } elsif (@secs > 0) {
                                             $singlesec = $secs[0];
@@ -3862,7 +4263,8 @@ sub upfile_drop_add {
                                                     $id,$amode,$password,$fname,
                                                     $mname,$lname,$gen,$singlesec,
                                                     $env{'form.forceid'},$desiredhost,
-                                                    $email,$role,$enddate,$startdate,$checkid);
+                                                    $email,$role,$enddate,$startdate,
+                                                    $checkid,$inststatus);
                             }
                         }
                         if ($multiple) {
@@ -3882,15 +4284,15 @@ sub upfile_drop_add {
                     } else {
                         if ($context eq 'course') {
                             $r->print('<br />'. 
-      &mt('<b>[_1]</b>: Unable to enroll.  No password specified.',$username)
+      &mt('[_1]: Unable to enroll. No password specified.','<b>'.$username.'</b>')
                                      );
                         } elsif ($context eq 'author') {
                             $r->print('<br />'.
-      &mt('<b>[_1]</b>: Unable to add co-author.  No password specified.',$username)
+      &mt('[_1]: Unable to add co-author. No password specified.','<b>'.$username.'</b>')
                                      );
                         } else {
                             $r->print('<br />'.
-      &mt('<b>[_1]</b>: Unable to add user.  No password specified.',$username)
+      &mt('[_1]: Unable to add user. No password specified.','<b>'.$username.'</b>')
                                      );
                         }
                     }
@@ -3898,7 +4300,7 @@ sub upfile_drop_add {
             }
         } # end of foreach (@userdata)
         # Flush the course logs so reverse user roles immediately updated
-        &Apache::lonnet::flushcourselogs();
+        $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
         $r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}).
                   "</p>\n");
         if ($counts{'role'} > 0) {
@@ -3993,7 +4395,7 @@ sub user_change_result {
         if ($userresult =~ /^error:(.+)$/) {
             my $error = $1;
             $r->print('<br />'.
-                  &mt('<b>[_1]</b>:  Unable to add/modify: [_2]',$username.':'.$userdomain,$error));
+                  &mt('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
         }
     } else {
         $counts->{'user'} ++;
@@ -4003,7 +4405,7 @@ sub user_change_result {
         if ($authresult =~ /^error:(.+)$/) {
             my $error = $1;
             $r->print('<br />'.
-                  &mt('<b>[_1]</b>:  Unable to modify authentication: [_2]',$username.':'.$userdomain,$error));
+                  &mt('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
         } 
     } else {
         $counts->{'auth'} ++;
@@ -4013,7 +4415,7 @@ sub user_change_result {
         if ($roleresult =~ /^error:(.+)$/) {
             my $error = $1;
             $r->print('<br />'.
-                  &mt('<b>[_1]</b>:  Unable to add role: [_2]',$username.':'.$userdomain,$error));
+                  &mt('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
         }
     } else {
         $counts->{'role'} ++;
@@ -4036,14 +4438,24 @@ sub user_change_result {
 
 # ========================================================= Menu Phase Two Drop
 sub print_drop_menu {
-    my ($r,$context,$permission) = @_;
-    $r->print('<h3>'.&mt("Drop Students").'</h3>'."\n".
+    my ($r,$context,$permission,$crstype) = @_;
+    my $heading;
+    if ($crstype eq 'Community') {
+        $heading = &mt("Drop Members");
+    } else {
+        $heading = &mt("Drop Students");
+    }
+    $r->print('<h3>'.$heading.'</h3>'."\n".
               '<form name="studentform" method="post">'."\n");
     my $classlist = &Apache::loncoursedata::get_classlist();
     if (! defined($classlist)) {
-        $r->print(&mt('There are no students currently enrolled.')."\n");
+        if ($crstype eq 'Community') {
+            $r->print(&mt('There are no members currently enrolled.')."\n");
+        } else {
+            $r->print(&mt('There are no students currently enrolled.')."\n");
+        }
     } else {
-        &show_drop_list($r,$classlist,'nosort',$permission);
+        &show_drop_list($r,$classlist,'nosort',$permission,$crstype);
     }
     $r->print('</form>'. &Apache::loncommon::end_page());
     return;
@@ -4052,9 +4464,12 @@ sub print_drop_menu {
 # ================================================================== Phase four
 
 sub update_user_list {
-    my ($r,$context,$setting,$choice) = @_;
+    my ($r,$context,$setting,$choice,$crstype) = @_;
     my $now = time;
     my $count=0;
+    if ($context eq 'course') {
+        $crstype = &Apache::loncommon::course_type();
+    }
     my @changelist;
     if ($choice eq 'drop') {
         @changelist = &Apache::loncommon::get_env_multiple('form.droplist');
@@ -4066,7 +4481,7 @@ sub update_user_list {
                                    'reenable' => 'Re-enabled',
                                    'activate' => 'Activated',
                                    'chgdates' => 'Changed Access Dates for',
-                                   'chgsec'   => 'Changed section for',
+                                   'chgsec'   => 'Changed section(s) for',
                                    'drop'     => 'Dropped',
                                  },
                         error => {'revoke'    => 'revoking',
@@ -4083,8 +4498,9 @@ sub update_user_list {
         ($startdate,$enddate) = &get_dates_from_form();
     }
     foreach my $item (@changelist) {
-        my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,@sections,
-            $scopestem);
+        my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,
+            @sections,$scopestem,$singlesec,$showsecs,$warn_singlesec,
+            $nothingtodo,$keepnosection);
         if ($choice eq 'drop') {
             ($uname,$udom,$sec) = split(/:/,$item,-1);
             $role = 'st';
@@ -4125,7 +4541,7 @@ sub update_user_list {
                 }
             }
         }
-        my $plrole = &Apache::lonnet::plaintext($role);
+        my $plrole = &Apache::lonnet::plaintext($role,$crstype);
         my $start = $env{'form.'.$item.'_start'};
         my $end = $env{'form.'.$item.'_end'};
         if ($choice eq 'drop') {
@@ -4182,15 +4598,24 @@ sub update_user_list {
                 }
             } elsif ($choice eq 'chgsec') {
                 my (@newsecs,$revresult,$nochg,@retained);
-                if ($role ne 'cc') {
-                    @newsecs = split(/,/,$env{'form.newsecs'});
+                if (($role ne 'cc') && ($role ne 'co')) {
+                    my @secs = sort(split(/,/,$env{'form.newsecs'}));
+                    if (@secs) {
+                        my %curr_groups = &Apache::longroup::coursegroups();
+                        foreach my $sec (@secs) {
+                            next if (($sec =~ /\W/) || ($sec eq 'none') ||
+                            (exists($curr_groups{$sec})));
+                            push(@newsecs,$sec);
+                        }
+                    }
                 }
                 # remove existing section if not to be retained.   
-                if (!$env{'form.retainsec'}) {
+                if (!$env{'form.retainsec'} || ($role eq 'st')) {
                     if ($sec eq '') {
                         if (@newsecs == 0) {
-                            $result = &mt('No change in section assignment (none)');
+                            $result = 'ok';
                             $nochg = 1;
+                            $nothingtodo = 1;
                         } else {
                             $revresult =
                                 &Apache::lonnet::revokerole($udom,$uname,
@@ -4217,13 +4642,23 @@ sub update_user_list {
                 } else {
                     if ($sec eq '') {
                         $nochg = 1;
+                        $keepnosection = 1;
                     } else { 
                         push(@retained,$sec);
                     }
                 }
                 # add new sections
+                my (@diffs,@shownew);
+                if (@retained) {
+                    @diffs = &Apache::loncommon::compare_arrays(\@retained,\@newsecs);
+                } else {
+                    @diffs = @newsecs;
+                }
                 if (@newsecs == 0) {
-                    if (!$nochg) {
+                    if ($nochg) {
+                        $result = 'ok';
+                        $nothingtodo = 1;
+                    } else {
                         if ($role eq 'st') {
                             $result = 
                                 &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context);
@@ -4232,15 +4667,41 @@ sub update_user_list {
                             $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start,'','',$context);
                         }
                     }
+                    $showsecs = &mt('No section');
+                } elsif (@diffs == 0) {
+                    $result = 'ok';
+                    $nothingtodo = 1;
                 } else {
                     foreach my $newsec (@newsecs) { 
                         if (!grep(/^\Q$newsec\E$/,@retained)) {
                             if ($role eq 'st') {
                                 $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context);
+                                if (@newsecs > 1) {
+                                    my $showsingle;
+                                    if ($newsec eq '') {
+                                        $showsingle = &mt('No section');
+                                    } else {
+                                        $showsingle = $newsec;
+                                    }
+                                    if ($crstype eq 'Community') {
+                                        $warn_singlesec = &mt('Although more than one section was indicated, a role was only added for the first section - [_1], as each community member may only be in one section at a time.','<i>'.$showsingle.'</i>');
+                                    } else {
+                                        $warn_singlesec = &mt('Although more than one section was indicated, a role was only added for the first section - [_1], as each student may only be in one section of a course at a time.','<i>'.$showsingle.'</i>');
+                                    }
+                                    $showsecs = $showsingle;
+                                    last;
+                                } else {
+                                    if ($newsec eq '') {
+                                        $showsecs = &mt('No section');
+                                    } else {
+                                        $showsecs = $newsec;
+                                    }
+                                }
                             } else {
                                 my $newscope = $scopestem;
                                 if ($newsec ne '') {
                                    $newscope .= '/'.$newsec;
+                                   push(@shownew,$newsec);
                                 }
                                 $result = &Apache::lonnet::assignrole($udom,$uname,
                                                         $newscope,$role,$end,$start);
@@ -4248,6 +4709,15 @@ sub update_user_list {
                         }
                     }
                 }
+                unless ($role eq 'st') {
+                    unless ($showsecs) {
+                        my @tolist = sort(@shownew,@retained);
+                        if ($keepnosection) {
+                            push(@tolist,&mt('No section'));
+                        }
+                        $showsecs = join(', ',@tolist);
+                    }
+                }
             }
         }
         my $extent = $scope;
@@ -4258,13 +4728,48 @@ sub update_user_list {
             }
         }
         if ($result eq 'ok' || $result eq 'ok:') {
-            $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for [_3]",
-                          $plrole,$extent,$uname.':'.$udom).'<br />');
-            $count++;
+            my $dates;
+            if (($choice eq 'chgsec') || ($choice eq 'chgdates')) {
+                $dates = &dates_feedback($start,$end,$now);
+            }
+            if ($choice eq 'chgsec') {
+                if ($nothingtodo) {
+                    $r->print(&mt("Section assignment for role of '[_1]' in [_2] for '[_3]' unchanged.",$plrole,$extent,'<i>'.
+                          &Apache::loncommon::plainname($uname,$udom).
+                          '</i>').' ');
+                    if ($sec eq '') {
+                        $r->print(&mt('[_1]No section[_2] - [_3]','<b>','</b>',$dates));
+                    } else {
+                        $r->print(&mt('Section(s): [_1] - [_2]',
+                                      '<b>'.$showsecs.'</b>',$dates));
+                    }
+                    $r->print('<br />');
+                } else {
+                    $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for '[_3]' to [_4] - [_5]",$plrole,$extent,
+                        '<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>',
+                        '<b>'.$showsecs.'</b>',$dates).'<br />');
+                   $count ++;
+               }
+               if ($warn_singlesec) {
+                   $r->print('<div class="LC_warning">'.$warn_singlesec.'</div>');
+               }
+            } elsif ($choice eq 'chgdates') {
+                $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for '[_3]' - [_4]",$plrole,$extent,
+                      '<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>',
+                      $dates).'<br />');
+               $count ++;
+            } else {
+                $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for '[_3]'.",$plrole,$extent,
+                      '<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>').
+                          '<br />');
+                $count ++;
+            }
         } else {
             $r->print(
-                &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]: [_4].",
-                    $plrole,$extent,$uname.':'.$udom,$result).'<br />');
+                &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for '[_3]': [_4].",
+                    $plrole,$extent,
+                    '<i>'.&Apache::loncommon::plainname($uname,$udom).'</i>',
+                    $result).'<br />');
         }
     }
     $r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n");
@@ -4280,17 +4785,17 @@ sub update_user_list {
             }
         }
     }
-    $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'</b></p>');
+    $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} for [quant,_1,user role,user roles,no user roles].",$count).'</b></p>');
     if ($count > 0) {
         if ($choice eq 'revoke' || $choice eq 'drop') {
-            $r->print('<p>'.&mt('Re-enabling will re-activate data for the role.</p>'));
+            $r->print('<p>'.&mt('Re-enabling will re-activate data for the role.').'</p>');
         }
         # Flush the course logs so reverse user roles immediately updated
-        &Apache::lonnet::flushcourselogs();
+        $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
     }
     if ($env{'form.makedatesdefault'}) {
         if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') {
-            $r->print(&make_dates_default($startdate,$enddate,$context));
+            $r->print(&make_dates_default($startdate,$enddate,$context,$crstype));
         }
     }
     my $linktext = &mt('Display User Lists');
@@ -4300,6 +4805,27 @@ sub update_user_list {
     $r->print('<a href="javascript:document.studentform.submit()">'.$linktext.'</a></form>'."\n");
 }
 
+sub dates_feedback {
+    my ($start,$end,$now) = @_;
+    my $dates;
+    if ($start < $now) {
+        if ($end == 0) {
+            $dates .= &mt('role(s) active now; no end date');
+        } elsif ($end > $now) {
+            $dates = &mt('role(s) active now; ends [_1].',&Apache::lonlocal::locallocaltime($end));
+        } else {
+            $dates = &mt('role(s) expired: [_1].',&Apache::lonlocal::locallocaltime($end));
+        }
+     } else {
+        if ($end == 0 || $end > $now) {
+            $dates = &mt('future role(s); starts: [_1].',&Apache::lonlocal::locallocaltime($start));
+        } else {
+            $dates = &mt('role(s) expired: [_1].',&Apache::lonlocal::locallocaltime($end));
+        }
+    }
+    return $dates;
+}
+
 sub classlist_drop {
     my ($scope,$uname,$udom,$now) = @_;
     my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
@@ -4377,7 +4903,7 @@ sub course_sections {
     my $output = '';
     my @sections = (sort {$a <=> $b} keys %{$sections_count});
     my $numsec = scalar(@sections);
-    my $is_selected = ' selected="selected" ';
+    my $is_selected = ' selected="selected"';
     if ($numsec <= 1) {
         $output = '<select name="currsec_'.$role.'" >'."\n".
                   '  <option value="">'.&mt('Select').'</option>'."\n";
@@ -4437,7 +4963,7 @@ sub get_groupslist {
 }
 
 sub setsections_javascript {
-    my ($formname,$groupslist,$mode,$checkauth) = @_;
+    my ($formname,$groupslist,$mode,$checkauth,$crstype) = @_;
     my ($checkincluded,$finish,$rolecode,$setsection_js);
     if ($mode eq 'upload') {
         $checkincluded = 'formname.name == "'.$formname.'"';
@@ -4476,8 +5002,11 @@ sub setsections_javascript {
     }
     my %alerts = &Apache::lonlocal::texthash(
                     secd => 'Section designations do not apply to Course Coordinator roles.',
+                    sedn => 'Section designations do not apply to Coordinator roles.',
                     accr => 'A course coordinator role will be added with access to all sections.',
+                    acor => 'A coordinator role will be added with access to all sections',
                     inea => 'In each course, each user may only have one student role at a time.',
+                    inco => 'In each community, each user may only have one member role at a time.',
                     youh => 'You had selected ',
                     secs => 'sections.',
                     plmo => 'Please modify your selections so they include no more than one section.',
@@ -4485,78 +5014,123 @@ sub setsections_javascript {
                     plch => 'Please choose a different section name.',
                     mnot => 'may not be used as a section name, as it is the name of a course group.',
                     secn => 'Section names and group names must be distinct. Please choose a different section name.',
+                    nonw => 'Section names may only contain letters or numbers.',
                  );                
     $setsection_js .= <<"ENDSECCODE";
 
-function setSections(formname) {
+function setSections(formname,crstype) {
     var re1 = /^currsec_/;
+    var re2 =/\\W/;
+    var trimleading = /^\\s+/;
+    var trimtrailing = /\\s+\$/;
     var groups = new Array($groupslist);
     for (var i=0;i<formname.elements.length;i++) {
         var str = formname.elements[i].name;
         var checkcurr = str.match(re1);
         if (checkcurr != null) {
+            var num = i;
             if ($checkincluded) {
                 $rolecode
-                if (role == 'cc') {
-                    alert("$alerts{'secd'}\\n$alerts{'accr'}");
-                }
-                else {
+                if (role == 'cc' || role == 'co') {
+                    if (role == 'cc') {
+                        alert("$alerts{'secd'}\\n$alerts{'accr'}");
+                    } else {
+                        alert("$alerts{'sedn'}\\n$alerts{'acor'}");
+                    }
+                } else {
                     var sections = '';
                     var numsec = 0;
-                    var sections;
-                    for (var j=0; j<formname.elements[i].length; j++) {
-                        if (formname.elements[i].options[j].selected == true ) {
-                            if (formname.elements[i].options[j].value != "") {
+                    var fromexisting = new Array();
+                    for (var j=0; j<formname.elements[num].length; j++) {
+                        if (formname.elements[num].options[j].selected == true ) {
+                            var addsec = formname.elements[num].options[j].value;
+                            if ((addsec != "") && (addsec != null)) {
+                                fromexisting.push(addsec);
                                 if (numsec == 0) {
-                                    if (formname.elements[i].options[j].value != "") {
-                                        sections = formname.elements[i].options[j].value;
-                                        numsec ++;
-                                    }
-                                }
-                                else {
-                                    sections = sections + "," +  formname.elements[i].options[j].value
-                                    numsec ++;
+                                    sections = addsec;
+                                } else {
+                                    sections = sections + "," +  addsec;
                                 }
+                                numsec ++;
                             }
                         }
                     }
-                    if (numsec > 0) {
-                        if (formname.elements[i+1].value != "" && formname.elements[i+1].value != null) {
-                            sections = sections + "," +  formname.elements[i+1].value;
-                        }
-                    }
-                    else {
-                        sections = formname.elements[i+1].value;
-                    }
-                    var newsecs = formname.elements[i+1].value;
-                    var numsplit;
+                    var newsecs = formname.elements[num+1].value;
+                    var validsecs = new Array();
+                    var validsecstr = '';
+                    var badsecs = new Array();
                     if (newsecs != null && newsecs != "") {
-                        numsplit = newsecs.split(/,/g);
-                        numsec = numsec + numsplit.length;
+                        var numsplit;
+                        if (newsecs.indexOf(',') == -1) {
+                            numsplit = new Array(newsecs);
+                        } else {
+                            numsplit = newsecs.split(/,/g);
+                        }
+                        for (var m=0; m<numsplit.length; m++) {
+                            var newsec = numsplit[m];
+                            newsec = newsec.replace(trimleading,'');
+                            newsec = newsec.replace(trimtrailing,'');
+                            if (re2.test(newsec) == true) {
+                                badsecs.push(newsec);
+                            } else {
+                                if (newsec != '') {
+                                    var isnew = 1;
+                                    if (fromexisting != null) {
+                                        for (var n=0; n<fromexisting.length; n++) {
+                                            if (newsec == fromexisting[n]) {
+                                                isnew = 0;
+                                            }
+                                        }
+                                    }
+                                    if (isnew == 1) {
+                                        validsecs.push(newsec);
+                                    }
+                                }
+                            }
+                        }
+                        if (badsecs.length > 0) {
+                            alert("$alerts{'nonw'}\\n$alerts{'plch'}");
+                            return;
+                        }
+                        numsec = numsec + validsecs.length;
                     }
-
                     if ((role == 'st') && (numsec > 1)) {
-                        alert("$alerts{'inea'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}")
+                        if (crstype == 'Community') {
+                            alert("$alerts{'inea'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}");
+                        } else {
+                            alert("$alerts{'inco'} $alerts{'youh'} "+numsec+" $alerts{'secs'}\\n$alerts{'plmo'}");
+                        }
                         return;
-                    }
-                    else {
-                        if (numsplit != null) {
-                            for (var j=0; j<numsplit.length; j++) {
-                                if ((numsplit[j] == 'all') ||
-                                    (numsplit[j] == 'none')) {
-                                    alert("'"+numsplit[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}");
+                    } else {
+                        if (validsecs != null) {
+                            for (var j=0; j<validsecs.length; j++) {
+                                if (validsecstr == '' || validsecstr == null) {
+                                    validsecstr = validsecs[j];
+                                } else {
+                                    validsecstr += ','+validsecs[j];
+                                }
+                                if ((validsecs[j] == 'all') ||
+                                    (validsecs[j] == 'none')) {
+                                    alert("'"+validsecs[j]+"' $alerts{'mayn'}\\n$alerts{'plch'}");
                                     return;
                                 }
                                 for (var k=0; k<groups.length; k++) {
-                                    if (numsplit[j] == groups[k]) {
-                                        alert("'"+numsplit[j]+"' $alerts{'mnot'}\\n$alerts{'secn'}");
+                                    if (validsecs[j] == groups[k]) {
+                                        alert("'"+validsecs[j]+"' $alerts{'mnot'}\\n$alerts{'secn'}");
                                         return;
                                     }
                                 }
                             }
                         }
-                        formname.elements[i+2].value = sections;
                     }
+                    if ((validsecstr != '') && (validsecstr != null)) {
+                        if ((sections == '') || (sections == null)) {
+                            sections = validsecstr;
+                        } else {
+                            sections = sections + "," + validsecstr;
+                        }
+                    }
+                    formname.elements[num+2].value = sections;
                 }
             }
         }
@@ -4576,7 +5150,7 @@ sub can_create_user {
     }
     if (ref($domconf{'usercreation'}) eq 'HASH') {
         if (ref($domconf{'usercreation'}{'cancreate'}) eq 'HASH') {
-            if ($context eq 'course' || $context eq 'author') {
+            if ($context eq 'course' || $context eq 'author' || $context eq 'requestcrs') {
                 my $creation = $domconf{'usercreation'}{'cancreate'}{$context};
                 if ($creation eq 'none') {
                     $cancreate = 0;
@@ -4674,27 +5248,36 @@ sub check_usertype {
 }
 
 sub roles_by_context {
-    my ($context,$custom) = @_;
+    my ($context,$custom,$crstype) = @_;
     my @allroles;
     if ($context eq 'course') {
-        @allroles = ('st','ad','ta','ep','in','cc');
+        @allroles = ('st');
+        if ($env{'request.role'} =~ m{^dc\./}) {
+            push(@allroles,'ad');
+        }
+        push(@allroles,('ta','ep','in'));
+        if ($crstype eq 'Community') {
+            push(@allroles,'co');
+        } else {
+            push(@allroles,'cc');
+        }
         if ($custom) {
             push(@allroles,'cr');
         }
     } elsif ($context eq 'author') {
         @allroles = ('ca','aa');
     } elsif ($context eq 'domain') {
-        @allroles = ('li','dg','sc','au','dc');
+        @allroles = ('li','ad','dg','sc','au','dc');
     }
     return @allroles;
 }
 
 sub get_permission {
-    my ($context,$roles) = @_;
+    my ($context,$crstype) = @_;
     my %permission;
     if ($context eq 'course') {
         my $custom = 1;
-        my @allroles = &roles_by_context($context,$custom);
+        my @allroles = &roles_by_context($context,$custom,$crstype);
         foreach my $role (@allroles) {
             if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) {
                 $permission{'cusr'} = 1;
@@ -4763,9 +5346,9 @@ sub authorpriv {
 }
 
 sub roles_on_upload {
-    my ($context,$setting,%customroles) = @_;
+    my ($context,$setting,$crstype,%customroles) = @_;
     my (@possible_roles,@permitted_roles);
-    @possible_roles = &curr_role_permissions($context,$setting,1);
+    @possible_roles = &curr_role_permissions($context,$setting,1,$crstype);
     foreach my $role (@possible_roles) {
         if ($role eq 'cr') {
             push(@permitted_roles,keys(%customroles));
@@ -4801,6 +5384,7 @@ sub dc_setcourse_js {
     my ($formname,$mode,$context) = @_;
     my ($dc_setcourse_code,$authen_check);
     my $cctext = &Apache::lonnet::plaintext('cc');
+    my $cotext = &Apache::lonnet::plaintext('co');
     my %alerts = &sectioncheck_alerts();
     my $role = 'role';
     if ($mode eq 'upload') {
@@ -4847,7 +5431,11 @@ function setCourse() {
             numsections = numsections + newsecs.length;
         }
         if ((userrole == 'st') && (numsections > 1)) {
-            alert("$alerts{'inea'}. $alerts{'youh'} "+numsections+" $alerts{'sect'}.\\n$alerts{'plsm'}.")
+            if (document.$formname.crstype.value == 'Community') {
+                alert("$alerts{'inco'}. $alerts{'youh'} "+numsections+" $alerts{'sect'}.\\n$alerts{'plsm'}.")
+            } else {
+                alert("$alerts{'inea'}. $alerts{'youh'} "+numsections+" $alerts{'sect'}.\\n$alerts{'plsm'}.")
+            }
             return;
         }
         for (var j=0; j<newsecs.length; j++) {
@@ -4859,7 +5447,11 @@ function setCourse() {
                 var groups = document.$formname.groups.value.split(/,/g);
                 for (var k=0; k<groups.length; k++) {
                     if (newsecs[j] == groups[k]) {
-                        alert("'"+newsecs[j]+"' $alerts{'mayt'}.\\n$alerts{'secn'}. $alerts{'plsc'}.");
+                        if (document.$formname.crstype.value == 'Community') {
+                            alert("'"+newsecs[j]+"' $alerts{'mayc'}.\\n$alerts{'secn'}. $alerts{'plsc'}.");
+                        } else {
+                            alert("'"+newsecs[j]+"' $alerts{'mayt'}.\\n$alerts{'secn'}. $alerts{'plsc'}.");
+                        }
                         return;
                     }
                 }
@@ -4869,13 +5461,21 @@ function setCourse() {
             alert("$alerts{'secd'} $cctext $alerts{'role'}.\\n$alerts{'accr'}.");
             section = "";
         }
+        if ((userrole == 'co') && (numsections > 0)) {
+            alert("$alerts{'secd'} $cotext $alerts{'role'}.\\n$alerts{'accr'}.");
+            section = "";
+        }
 SCRIPTTOP
     if ($mode ne 'upload') {
         $dc_setcourse_code .= (<<"ENDSCRIPT");
         var coursename = "_$env{'request.role.domain'}"+"_"+course+"_"+userrole
         var numcourse = getIndex(document.$formname.dccourse);
         if (numcourse == "-1") {
-            alert("$alerts{'thwa'}");
+            if (document.$formname.type == 'Community') {
+                alert("$alerts{'thwc'}");
+            } else {
+                alert("$alerts{'thwa'}");
+            }
             return;
         }
         else {
@@ -4984,19 +5584,22 @@ ENDSCRIPT
 
 sub sectioncheck_alerts {
     my %alerts = &Apache::lonlocal::texthash(
-                    curd => 'You must select a course in the current domain',
+                    curd => 'You must select a course or community in the current domain',
                     inea => 'In each course, each user may only have one student role at a time',
+                    inco => 'In each community, each user may only have one member role at a time',
                     youh => 'You had selected',
                     sect => 'sections',
                     plsm => 'Please modify your selections so they include no more than one section',
                     mayn => 'may not be used as the name for a section, as it is a reserved word',
                     plsc => 'Please choose a different section name',
                     mayt => 'may not be used as the name for a section, as it is the name of a course group',
+                    mayc => 'may not be used as the name for a section, as it is the name of a community group',
                     secn => 'Section names and group names must be distinct',
                     secd => 'Section designations do not apply to ',
                     role => 'roles',
                     accr => 'role will be added with access to all sections',
-                    thwa => 'There was a problem with your course selection'
+                    thwa => 'There was a problem with your course selection',
+                    thwc => 'There was a problem with your community selection',
                  );
     return %alerts;
 }