--- loncom/interface/loncreateuser.pm	2009/02/08 20:01:54	1.279
+++ loncom/interface/loncreateuser.pm	2010/09/20 00:51:14	1.349
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.279 2009/02/08 20:01:54 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.349 2010/09/20 00:51:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,13 +51,14 @@ In LON-CAPA, roles are actually collecti
 Assistant", "Course Coordinator", and other such roles are really just
 collection of privileges that are useful in many circumstances.
 
-Creating custom roles can be done by the Domain Coordinator through
-the Create User functionality. That screen will show all privileges
-that can be assigned to users. For a complete list of privileges,
-please see C</home/httpd/lonTabs/rolesplain.tab>.
+Custom roles can be defined by a Domain Coordinator, Course Coordinator
+or Community Coordinator via the Manage User functionality.
+The custom role editor screen will show all privileges which can be
+assigned to users. For a complete list of privileges, please see 
+C</home/httpd/lonTabs/rolesplain.tab>.
 
-Custom role definitions are stored in the C<roles.db> file of the role
-author.
+Custom role definitions are stored in the C<roles.db> file of the creator
+of the role.
 
 =cut
 
@@ -68,7 +69,7 @@ use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::longroup;
 use Apache::lonuserutils;
-use Apache::selfenroll();
+use Apache::loncoursequeueadmin;
 use LONCAPA qw(:DEFAULT :match);
 
 my $loginscript; # piece of javascript used in two separate instances
@@ -110,6 +111,7 @@ sub initialize_authen_forms {
 
 sub auth_abbrev {
     my %abv_auth = (
+                     krb5     => 'krb',
                      krb4     => 'krb',
                      internal => 'int',
                      localuth => 'loc',
@@ -143,6 +145,7 @@ sub portfolio_quota {
     $custom_off = ' checked="checked" ';
     my $quota_javascript = <<"END_SCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function quota_changes(caller) {
     if (caller == "custom") {
         if (document.cu.customquota[0].checked) {
@@ -153,6 +156,7 @@ function quota_changes(caller) {
         document.cu.customquota[1].checked = true;
     }
 }
+// ]]>
 </script>
 END_SCRIPT
     if ($quotatype eq 'custom') {
@@ -214,7 +218,8 @@ END_SCRIPT
 
 sub build_tools_display {
     my ($ccuname,$ccdomain,$context) = @_;
-    my (@usertools,%userenv,$output);
+    my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
+        $colspan,$isadv,%domconfig);
     my %lt = &Apache::lonlocal::texthash (
                    'blog'       => "Personal User Blog",
                    'aboutme'    => "Personal Information Page",
@@ -225,67 +230,256 @@ sub build_tools_display {
                    'usde'       => "Use default",
                    'uscu'       => "Use custom",
                    'official'   => 'Can request creation of official courses',
-                   'unofficial' => 'Can request creation of unofficial courses',  
+                   'unofficial' => 'Can request creation of unofficial courses',
+                   'community'  => 'Can request creation of communities',
     );
     if ($context eq 'requestcourses') {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
-                      'requestcourses.official','requestcourses.unofficial');
-        @usertools = ('official','unofficial');
+                      'requestcourses.official','requestcourses.unofficial',
+                      'requestcourses.community');
+        @usertools = ('official','unofficial','community');
+        @options =('norequest','approval','autolimit','validate');
+        %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
+        %reqtitles = &courserequest_titles();
+        %reqdisplay = &courserequest_display();
+        $colspan = ' colspan="2"';
+        %domconfig =
+            &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain);
+        $isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain);
     } else {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                           'tools.aboutme','tools.portfolio','tools.blog');
         @usertools = ('aboutme','blog','portfolio');
     }
     foreach my $item (@usertools) {
-        my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off);
+        my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off,
+            $currdisp,$custdisp,$custradio);
         $cust_off = 'checked="checked" ';
         $tool_on = 'checked="checked" ';
         $curr_access =  
             &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
                                               $context);
-        if ($userenv{$context.'.'.$item} eq '') {
-            $custom_access = 'default';
-            if (!$curr_access) {
-                $tool_off = 'checked="checked" ';
-                $tool_on = '';
-            }
-        } else {
-            $custom_access = 'custom';
+        if ($userenv{$context.'.'.$item} ne '') {
             $cust_on = ' checked="checked" ';
             $cust_off = '';
-            if ($userenv{$context.'.'.$item} == 0) {
-                $tool_off = 'checked="checked" ';
-                $tool_on = '';
+        }
+        if ($context eq 'requestcourses') {
+            if ($userenv{$context.'.'.$item} eq '') {
+                $custom_access = &mt('Currently from default setting.');
+            } else {
+                $custom_access = &mt('Currently from custom setting.');
+            }
+        } else {
+            if ($userenv{$context.'.'.$item} eq '') {
+                $custom_access =
+                    &mt('Availability determined currently from default setting.');
+                if (!$curr_access) {
+                    $tool_off = 'checked="checked" ';
+                    $tool_on = '';
+                }
+            } else {
+                $custom_access =
+                    &mt('Availability determined currently from custom setting.');
+                if ($userenv{$context.'.'.$item} == 0) {
+                    $tool_off = 'checked="checked" ';
+                    $tool_on = '';
+                }
             }
         }
         $output .= '  <tr class="LC_info_row">'."\n".
-                   '   <td>'.$lt{$item}.'</td>'."\n".
+                   '   <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".
                    '  </tr>'."\n".
-                   &Apache::loncommon::start_data_table_row()."\n".
-                   '  <td>'.&mt('Availability determined currently from [_1] setting.',$custom_access).
-                   '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$lt{'avai'}.': '.
-                   ($curr_access?&mt('Yes'):&mt('No')).'</td>'."\n".
+                   &Apache::loncommon::start_data_table_row()."\n";
+        if ($context eq 'requestcourses') {
+            my ($curroption,$currlimit);
+            if ($userenv{$context.'.'.$item} ne '') {
+                $curroption = $userenv{$context.'.'.$item};
+            } else {
+                my (@inststatuses);
+                $curroption =
+                    &Apache::loncoursequeueadmin::get_processtype($ccuname,$ccdomain,$isadv,$ccdomain,
+                                                               $item,\@inststatuses,\%domconfig);
+            }
+            if (!$curroption) {
+                $curroption = 'norequest';
+            }
+            if ($curroption =~ /^autolimit=(\d*)$/) {
+                $currlimit = $1;
+                if ($currlimit eq '') {
+                    $currdisp = &mt('Yes, automatic creation');
+                } else {
+                    $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit);
+                }
+            } else {
+                $currdisp = $reqdisplay{$curroption};
+            }
+            $custdisp = '<table>';
+            foreach my $option (@options) {
+                my $val = $option;
+                if ($option eq 'norequest') {
+                    $val = 0;
+                }
+                if ($option eq 'validate') {
+                    my $canvalidate = 0;
+                    if (ref($validations{$item}) eq 'HASH') {
+                        if ($validations{$item}{'_custom_'}) {
+                            $canvalidate = 1;
+                        }
+                    }
+                    next if (!$canvalidate);
+                }
+                my $checked = '';
+                if ($option eq $curroption) {
+                    $checked = ' checked="checked"';
+                } elsif ($option eq 'autolimit') {
+                    if ($curroption =~ /^autolimit/) {
+                        $checked = ' checked="checked"';
+                    }
+                }
+                $custdisp .= '<tr><td><span class="LC_nobreak"><label>'.
+                             '<input type="radio" name="crsreq_'.$item.
+                             '" value="'.$val.'"'.$checked.' />'.
+                             $reqtitles{$option}.'</label>&nbsp;';
+                if ($option eq 'autolimit') {
+                    $custdisp .= '<input type="text" name="crsreq_'.
+                                 $item.'_limit" size="1" '.
+                                 'value="'.$currlimit.'" /></span><br />'.
+                                 $reqtitles{'unlimited'};
+                 } else {
+                     $custdisp .= '</span>';
+                 }
+                 $custdisp .= '</td></tr>';
+            }
+            $custdisp .= '</table>';
+            $custradio = '</span></td><td>'.&mt('Custom setting').'<br />'.$custdisp;
+        } else {
+            $currdisp = ($curr_access?&mt('Yes'):&mt('No'));
+            $custdisp = '<span class="LC_nobreak"><label>'.
+                        '<input type="radio" name="'.$context.'_'.$item.'"'.
+                        ' value="1"'. $tool_on.'/>'.&mt('On').'</label>&nbsp;<label>'.
+                        '<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
+                        $tool_off.'/>'.&mt('Off').'</label></span>';
+            $custradio = ('&nbsp;'x2).'--'.$lt{'cusa'}.':&nbsp;'.$custdisp.
+                          '</span>';
+        }
+        $output .= '  <td'.$colspan.'>'.$custom_access.('&nbsp;'x4).
+                   $lt{'avai'}.': '.$currdisp.'</td>'."\n".
                    &Apache::loncommon::end_data_table_row()."\n".
                    &Apache::loncommon::start_data_table_row()."\n".
-                   '  <td><span class="LC_nobreak">'.$lt{'chse'}.': <label>'.
+                   '  <td style="vertical-align:top;"><span class="LC_nobreak">'.
+                   $lt{'chse'}.': <label>'.
                    '<input type="radio" name="custom'.$item.'" value="0" '.
-                   $cust_off.'/>'.$lt{'usde'}.'</label>&nbsp;&nbsp;&nbsp;'.
-                    '<label><input type="radio" name="custom'.$item.'" value="1" '.
-                   $cust_on.'/>'.$lt{'uscu'}.'</label>&nbsp;&nbsp;--&nbsp;&nbsp;'.
-                   $lt{'cusa'}.':&nbsp;<label>'.
-                   '<input type="radio" name="'.$context.'_'.$item.'" value="1" '.
-                   $tool_on.'/>'.&mt('On').'</label>&nbsp;<label>'.
-                   '<input type="radio" name="'.$context.'_'.$item.'" value="0" '.
-                   $tool_off.'/>'.&mt('Off').'</label></span></td>'."\n".
+                   $cust_off.'/>'.$lt{'usde'}.'</label>'.('&nbsp;' x3).
+                   '<label><input type="radio" name="custom'.$item.'" value="1" '.
+                   $cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'.
                    &Apache::loncommon::end_data_table_row()."\n";
     }
     return $output;
 }
 
+sub coursereq_externaluser {
+    my ($ccuname,$ccdomain,$cdom) = @_;
+    my (@usertools,@options,%validations,%userenv,$output);
+    my %lt = &Apache::lonlocal::texthash (
+                   'official'   => 'Can request creation of official courses',
+                   'unofficial' => 'Can request creation of unofficial courses',
+                   'community'  => 'Can request creation of communities',
+    );
+
+    %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
+                      'reqcrsotherdom.official','reqcrsotherdom.unofficial',
+                      'reqcrsotherdom.community');
+    @usertools = ('official','unofficial','community');
+    @options = ('approval','validate','autolimit');
+    %validations = &Apache::lonnet::auto_courserequest_checks($cdom);
+    my $optregex = join('|',@options);
+    my %reqtitles = &courserequest_titles();
+    foreach my $item (@usertools) {
+        my ($curroption,$currlimit,$tooloff);
+        if ($userenv{'reqcrsotherdom.'.$item} ne '') {
+            my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});
+            foreach my $req (@curr) {
+                if ($req =~ /^\Q$cdom\E\:($optregex)=?(\d*)$/) {
+                    $curroption = $1;
+                    $currlimit = $2;
+                    last;
+                }
+            }
+            if (!$curroption) {
+                $curroption = 'norequest';
+                $tooloff = ' checked="checked"';
+            }
+        } else {
+            $curroption = 'norequest';
+            $tooloff = ' checked="checked"';
+        }
+        $output.= &Apache::loncommon::start_data_table_row()."\n".
+                  '  <td><span class="LC_nobreak">'.$lt{$item}.': </span></td><td>'.
+                  '<table><tr><td valign="top">'."\n".
+                  '<label><input type="radio" name="reqcrsotherdom_'.$item.
+                  '" value=""'.$tooloff.' />'.$reqtitles{'norequest'}.
+                  '</label></td>';
+        foreach my $option (@options) {
+            if ($option eq 'validate') {
+                my $canvalidate = 0;
+                if (ref($validations{$item}) eq 'HASH') {
+                    if ($validations{$item}{'_external_'}) {
+                        $canvalidate = 1;
+                    }
+                }
+                next if (!$canvalidate);
+            }
+            my $checked = '';
+            if ($option eq $curroption) {
+                $checked = ' checked="checked"';
+            }
+            $output .= '<td valign="top"><span class="LC_nobreak"><label>'.
+                       '<input type="radio" name="reqcrsotherdom_'.$item.
+                       '" value="'.$option.'"'.$checked.' />'.
+                       $reqtitles{$option}.'</label>';
+            if ($option eq 'autolimit') {
+                $output .= '&nbsp;<input type="text" name="reqcrsotherdom_'.
+                           $item.'_limit" size="1" '.
+                           'value="'.$currlimit.'" /></span>'.
+                           '<br />'.$reqtitles{'unlimited'};
+            } else {
+                $output .= '</span>';
+            }
+            $output .= '</td>';
+        }
+        $output .= '</td></tr></table></td>'."\n".
+                   &Apache::loncommon::end_data_table_row()."\n";
+    }
+    return $output;
+}
+
+sub courserequest_titles {
+    my %titles = &Apache::lonlocal::texthash (
+                                   official   => 'Official',
+                                   unofficial => 'Unofficial',
+                                   community  => 'Communities',
+                                   norequest  => 'Not allowed',
+                                   approval   => 'Approval by Dom. Coord.',
+                                   validate   => 'With validation',
+                                   autolimit  => 'Numerical limit',
+                                   unlimited  => '(blank for unlimited)',
+                 );
+    return %titles;
+}
+
+sub courserequest_display {
+    my %titles = &Apache::lonlocal::texthash (
+                                   approval   => 'Yes, need approval',
+                                   validate   => 'Yes, with validation',
+                                   norequest  => 'No',
+   );
+   return %titles;
+}
+
 # =================================================================== Phase one
 
 sub print_username_entry_form {
-    my ($r,$context,$response,$srch,$forcenewuser) = @_;
+    my ($r,$context,$response,$srch,$forcenewuser,$crstype) = @_;
     my $defdom=$env{'request.role.domain'};
     my $formtoset = 'crtuser';
     if (exists($env{'form.startrolename'})) {
@@ -299,13 +493,20 @@ sub print_username_entry_form {
 
     my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
         '<script type="text/javascript">'."\n".
-        &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}).
+        '// <![CDATA['."\n".
+        &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset})."\n".
+        '// ]]>'."\n".
         '</script>'."\n";
 
+    my %existingroles=&Apache::lonuserutils::my_custom_roles($crstype);
+    if (($env{'form.action'} eq 'custom') && (keys(%existingroles) > 0)
+        && (&Apache::lonnet::allowed('mcr','/'))) {
+        $jscript .= &customrole_javascript();
+    }
     my %loaditems = (
                 'onload' => "javascript:setFormElements(document.$formtoset)",
                     );
-    my %breadcrumb_text = &singleuser_breadcrumb();
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
     my $start_page =
 	&Apache::loncommon::start_page('User Management',
 				       $jscript,{'add_entries' => \%loaditems,});
@@ -327,48 +528,112 @@ sub print_username_entry_form {
     }
     my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',
                                                      $helpitem);
-    my %existingroles=&Apache::lonuserutils::my_custom_roles();
-    my $choice=&Apache::loncommon::select_form('make new role','rolename',
-		('make new role' => 'Generate new role ...',%existingroles));
     my %lt=&Apache::lonlocal::texthash(
                     'srst' => 'Search for a user and enroll as a student',
+                    'srme' => 'Search for a user and enroll as a member',
                     'srad' => 'Search for a user and modify/add user information or roles',
 		    'usr'  => "Username",
                     'dom'  => "Domain",
-                    'ecrp' => "Edit Custom Role Privileges",
-                    'nr'   => "Name of Role",
-                    'cre'  => "Custom Role Editor",
+                    'ecrp' => "Define or Edit Custom Role",
+                    'nr'   => "role name",
+                    'cre'  => "Next",
 				       );
     $r->print($start_page."\n".$crumbs);
     if ($env{'form.action'} eq 'custom') {
         if (&Apache::lonnet::allowed('mcr','/')) {
-            $r->print(<<ENDCUSTOM);
-<form action="/adm/createuser" method="post" name="docustom">
-<input type="hidden" name="action" value="$env{'form.action'}" />
-<input type="hidden" name="phase" value="selected_custom_edit" />
-<h3>$lt{'ecrp'}</h3>
-$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
-<input name="customeditor" type="submit" value="$lt{'cre'}" />
-</form>
-ENDCUSTOM
+            my $newroletext = &mt('Define new custom role:');
+            $r->print('<form action="/adm/createuser" method="post" name="docustom">'.
+                      '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
+                      '<input type="hidden" name="phase" value="selected_custom_edit" />'.
+                      '<h3>'.$lt{'ecrp'}.'</h3>'.
+                      &Apache::loncommon::start_data_table().
+                      &Apache::loncommon::start_data_table_row().
+                      '<td>');
+            if (keys(%existingroles) > 0) {
+                $r->print('<br /><label><input type="radio" name="customroleaction" value="new" checked="checked" onclick="setCustomFields();" /><b>'.$newroletext.'</b></label>');
+            } else {
+                $r->print('<br /><input type="hidden" name="customroleaction" value="new" /><b>'.$newroletext.'</b>');
+            }
+            $r->print('</td><td align="center">'.$lt{'nr'}.'<br /><input type="text" size="15" name="newrolename" onfocus="setCustomAction('."'new'".');" /></td>'.
+                      &Apache::loncommon::end_data_table_row());
+            if (keys(%existingroles) > 0) {
+                $r->print(&Apache::loncommon::start_data_table_row().'<td><br />'.
+                          '<label><input type="radio" name="customroleaction" value="edit" onclick="setCustomFields();"/><b>'.
+                          &mt('View/Modify existing role:').'</b></label></td>'.
+                          '<td align="center"><br />'.
+                          '<select name="rolename" onchange="setCustomAction('."'edit'".');">'.
+                          '<option value="" selected="selected">'.
+                          &mt('Select'));
+                foreach my $role (sort(keys(%existingroles))) {
+                    $r->print('<option value="'.$role.'">'.$role.'</option>');
+                }
+                $r->print('</select>'.
+                          '</td>'.
+                          &Apache::loncommon::end_data_table_row());
+            }
+            $r->print(&Apache::loncommon::end_data_table().'<p>'.
+                      '<input name="customeditor" type="submit" value="'.
+                      $lt{'cre'}.'" /></p>'.
+                      '</form>');
         }
     } else {
         my $actiontext = $lt{'srad'};
         if ($env{'form.action'} eq 'singlestudent') {
-            $actiontext = $lt{'srst'};
+            if ($crstype eq 'Community') {
+                $actiontext = $lt{'srme'};
+            } else {
+                $actiontext = $lt{'srst'};
+            }
         }
-        $r->print("
-<h3>$actiontext</h3>");
+        $r->print("<h3>$actiontext</h3>");
         if ($env{'form.origform'} ne 'crtusername') {
             $r->print("\n".$response);
         }
-        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response));
+        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype));
     }
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub customrole_javascript {
+    my $js = <<"END";
+<script type="text/javascript">
+// <![CDATA[
+
+function setCustomFields() {
+    if (document.docustom.customroleaction.length > 0) {
+        for (var i=0; i<document.docustom.customroleaction.length; i++) {
+            if (document.docustom.customroleaction[i].checked) {
+                if (document.docustom.customroleaction[i].value == 'new') {
+                    document.docustom.rolename.selectedIndex = 0;
+                } else {
+                    document.docustom.newrolename.value = '';
+                }
+            }
+        }
+    }
+    return;
+}
+
+function setCustomAction(caller) {
+    if (document.docustom.customroleaction.length > 0) {
+        for (var i=0; i<document.docustom.customroleaction.length; i++) {
+            if (document.docustom.customroleaction[i].value == caller) {
+                document.docustom.customroleaction[i].checked = true;
+            }
+        }
+    }
+    setCustomFields();
+    return;
+}
+
+// ]]>
+</script>
+END
+    return $js;
+}
+
 sub entry_form {
-    my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_;
+    my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_;
     my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
     my ($usertype,$inexact);
     if (ref($srch) eq 'HASH') {
@@ -408,6 +673,7 @@ ENDBLOCK
         my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
         my %lt=&Apache::lonlocal::texthash(
                   'enro' => 'Enroll one student',
+                  'enrm' => 'Enroll one member',
                   'admo' => 'Add/modify a single user',
                   'crea' => 'create new user if required',
                   'uskn' => "username is known",
@@ -419,8 +685,12 @@ ENDBLOCK
         );
         my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain');
         my ($title,$buttontext,$showresponse);
-        if ($env{'form.action'} eq 'singlestudent') {   
-            $title = $lt{'enro'};
+        if ($env{'form.action'} eq 'singlestudent') {
+            if ($crstype eq 'Community') {
+                $title = $lt{'enrm'};
+            } else {
+                $title = $lt{'enro'};
+            }
             $buttontext = $lt{'enrl'};
         } else {
             $title = $lt{'admo'};
@@ -466,6 +736,7 @@ sub user_modification_js {
     
     return <<END;
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -483,14 +754,14 @@ sub user_modification_js {
     }
 
     $nondc_setsection_code
-
+// ]]>
 </script>
 END
 }
 
 # =================================================================== Phase two
 sub print_user_selection_page {
-    my ($r,$response,$srch,$srch_results,$srcharray,$context) = @_;
+    my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements,$crstype) = @_;
     my @fields = ('username','domain','lastname','firstname','permanentemail');
     my $sortby = $env{'form.sortby'};
 
@@ -502,6 +773,7 @@ sub print_user_selection_page {
 
     my $jscript = (<<ENDSCRIPT);
 <script type="text/javascript">
+// <![CDATA[
 function pickuser(uname,udom) {
     document.usersrchform.seluname.value=uname;
     document.usersrchform.seludom.value=udom;
@@ -510,42 +782,61 @@ function pickuser(uname,udom) {
 }
 
 $jsback
+// ]]>
 </script>
 ENDSCRIPT
 
     my %lt=&Apache::lonlocal::texthash(
                                        'usrch'          => "User Search to add/modify roles",
                                        'stusrch'        => "User Search to enroll student",
+                                       'memsrch'        => "User Search to enroll member",
                                        'usel'           => "Select a user to add/modify roles",
-                                       'stusel'         => "Select a user to enroll as a student", 
+                                       'stusel'         => "Select a user to enroll as a student",
+                                       'memsel'         => "Select a user to enroll as a member",
                                        'username'       => "username",
                                        'domain'         => "domain",
                                        'lastname'       => "last name",
                                        'firstname'      => "first name",
                                        'permanentemail' => "permanent e-mail",
                                       );
-    $r->print(&Apache::loncommon::start_page('User Management',$jscript));
+    if ($context eq 'requestcrs') {
+        $r->print('<div>');
+    } else {
+        $r->print(&Apache::loncommon::start_page('User Management',$jscript));
 
-    my %breadcrumb_text = &singleuser_breadcrumb();
-    &Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"javascript:backPage(document.usersrchform,'','')",
-          text=>$breadcrumb_text{'search'},
-          faq=>282,bug=>'Instructor Interface',},
-         {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
-          text=>$breadcrumb_text{'userpicked'},
-          faq=>282,bug=>'Instructor Interface',});
-    if ($env{'form.action'} eq 'singleuser') {
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
-                                                      'Course_Change_Privileges'));
-        $r->print("<b>$lt{'usrch'}</b><br />");
-        $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
-        $r->print('<h3>'.$lt{'usel'}.'</h3>');
-    } elsif ($env{'form.action'} eq 'singlestudent') {
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
-                                                      'Course_Add_Student'));
-        $r->print($jscript."<b>$lt{'stusrch'}</b><br />");
-        $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
-        $r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
+        my %breadcrumb_text = &singleuser_breadcrumb($crstype);
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"javascript:backPage(document.usersrchform,'','')",
+              text=>$breadcrumb_text{'search'},
+              faq=>282,bug=>'Instructor Interface',},
+             {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
+              text=>$breadcrumb_text{'userpicked'},
+              faq=>282,bug=>'Instructor Interface',});
+        if ($env{'form.action'} eq 'singleuser') {
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                          'Course_Change_Privileges'));
+            $r->print("<b>$lt{'usrch'}</b><br />");
+            $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
+            $r->print('<h3>'.$lt{'usel'}.'</h3>');
+        } elsif ($env{'form.action'} eq 'singlestudent') {
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+                                                          'Course_Add_Student'));
+            $r->print($jscript."<b>");
+            if ($crstype eq 'Community') {
+                $r->print($lt{'memsrch'});
+            } else {
+                $r->print($lt{'stusrch'});
+            }
+            $r->print("</b><br />");
+            $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
+            $r->print('</form><h3>');
+            if ($crstype eq 'Community') {
+                $r->print($lt{'memsel'});
+            } else {
+                $r->print($lt{'stusel'});
+            }
+            $r->print('</h3>');
+        }
     }
     $r->print('<form name="usersrchform" method="post">'.
               &Apache::loncommon::start_data_table()."\n".
@@ -570,8 +861,20 @@ ENDSCRIPT
 
     foreach my $user (@sorted_users) {
         my ($uname,$udom) = split(/:/,$user);
+        my $onclick;
+        if ($context eq 'requestcrs') {
+            $onclick =
+                'onclick="javascript:gochoose('."'$uname','$udom',".
+                                               "'$srch_results->{$user}->{firstname}',".
+                                               "'$srch_results->{$user}->{lastname}',".
+                                               "'$srch_results->{$user}->{permanentemail}'".');"';
+        } else {
+            $onclick =
+                ' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"';
+        }
         $r->print(&Apache::loncommon::start_data_table_row().
-                  '<td><input type="button" name="seluser" value="'.&mt('Select').'" onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".')" /></td>'.
+                  '<td><input type="button" name="seluser" value="'.&mt('Select').'" '.
+                  $onclick.' /></td>'.
                   '<td><tt>'.$uname.'</tt></td>'.
                   '<td><tt>'.$udom.'</tt></td>');
         foreach my $field ('lastname','firstname','permanentemail') {
@@ -591,7 +894,11 @@ ENDSCRIPT
               ' <input type="hidden" name="currstate" value="select" />'."\n".
               ' <input type="hidden" name="phase" value="get_user_info" />'."\n".
               ' <input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n");
-    $r->print($response.'</form>'.&Apache::loncommon::end_page());
+    if ($context eq 'requestcrs') {
+        $r->print($opener_elements.'</form></div>');
+    } else {
+        $r->print($response.'</form>'.&Apache::loncommon::end_page());
+    }
 }
 
 sub print_user_query_page {
@@ -603,11 +910,11 @@ sub print_user_query_page {
 }
 
 sub print_user_modification_page {
-    my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission) = @_;
+    my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission,$crstype) = @_;
     if (($ccuname eq '') || ($ccdomain eq '')) {
         my $usermsg = &mt('No username and/or domain provided.');
         $env{'form.phase'} = '';
-	&print_username_entry_form($r,$context,$usermsg);
+	&print_username_entry_form($r,$context,$usermsg,'','',$crstype);
         return;
     }
     my ($form,$formname);
@@ -631,19 +938,24 @@ sub print_user_modification_page {
             &Apache::lonuserutils::can_create_user($ccdomain,$context,
                                                    $usertype);
         if (!$cancreate) {
-            my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+            my $helplink = 'javascript:helpMenu('."'display'".')';
             my %usertypetext = (
                 official   => 'institutional',
                 unofficial => 'non-institutional',
             );
             my $response;
             if ($env{'form.origform'} eq 'crtusername') {
-                $response =  '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).
+                $response =  '<span class="LC_warning">'.&mt('No match found for the username [_1] in LON-CAPA domain: [_2]','<b>'.$ccuname.'</b>',$ccdomain).
                             '</span><br />';
             }
-            $response .= '<span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+            $response .= '<p class="LC_warning">'
+                        .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
+                        .' '
+                        .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+                            ,'<a href="'.$helplink.'">','</a>')
+                        .'</p><br />';
             $env{'form.phase'} = '';
-            &print_username_entry_form($r,$context,$response);
+            &print_username_entry_form($r,$context,$response,undef,undef,$crstype);
             return;
         }
         $newuser = 1;
@@ -667,7 +979,7 @@ sub print_user_modification_page {
                             'username');
                     }
                     $env{'form.phase'} = '';
-                    &print_username_entry_form($r,$context,$userchkmsg);
+                    &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype);
                     return;
                 }
             }
@@ -694,7 +1006,7 @@ sub print_user_modification_page {
     }
     my $start_page = 
 	&Apache::loncommon::start_page('User Management',$js,$args);
-    my %breadcrumb_text = &singleuser_breadcrumb();
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
     &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage($form)",
        text=>$breadcrumb_text{'search'},
@@ -726,10 +1038,24 @@ sub print_user_modification_page {
 <input type="hidden" name="pres_type"   value="" />
 <input type="hidden" name="pres_marker" value="" />
 ENDFORMINFO
-    my %inccourses;
-    foreach my $key (keys(%env)) {
-	if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
-	    $inccourses{$1.'_'.$2}=1;
+    my (%inccourses,$roledom);
+    if ($context eq 'course') {
+        $inccourses{$env{'request.course.id'}}=1;
+        $roledom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    } elsif ($context eq 'author') {
+        $roledom = $env{'request.role.domain'};
+    } elsif ($context eq 'domain') {
+        foreach my $key (keys(%env)) {
+            $roledom = $env{'request.role.domain'};
+            if ($key=~/^user\.priv\.cm\.\/($roledom)\/($match_username)/) {
+                $inccourses{$1.'_'.$2}=1;
+            }
+        }
+    } else {
+        foreach my $key (keys(%env)) {
+	    if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
+	        $inccourses{$1.'_'.$2}=1;
+            }
         }
     }
     if ($newuser) {
@@ -743,6 +1069,7 @@ ENDFORMINFO
         my %lt=&Apache::lonlocal::texthash(
                 'cnu'            => 'Create New User',
                 'ast'            => 'as a student',
+                'ame'            => 'as a member',
                 'ind'            => 'in domain',
                 'lg'             => 'Login Data',
                 'hs'             => "Home Server",
@@ -753,13 +1080,19 @@ $crumbs
 $response
 $forminfo
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
 $loginscript
+// ]]>
 </script>
 <input type='hidden' name='makeuser' value='1' />
 <h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
 ENDTITLE
         if ($env{'form.action'} eq 'singlestudent') {
-            $r->print(' ('.$lt{'ast'}.')');
+            if ($crstype eq 'Community') {
+                $r->print(' ('.$lt{'ame'}.')');
+            } else {
+                $r->print(' ('.$lt{'ast'}.')');
+            }
         }
         $r->print('</h2>'."\n".'<div class="LC_left_float">');
         my $personal_table = 
@@ -777,6 +1110,13 @@ $lt{'hs'}: $home_server_pick
         } else {
             $r->print($home_server_pick);
         }
+        if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+            $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
+                      &Apache::loncommon::start_data_table().
+                      &build_tools_display($ccuname,$ccdomain,
+                                           'requestcourses').
+                      &Apache::loncommon::end_data_table());
+        }
         $r->print('</div>'."\n".'<div class="LC_left_float"><h3>'.
                   $lt{'lg'}.'</h3>');
         my ($fixedauth,$varauth,$authmsg); 
@@ -810,7 +1150,7 @@ KERB
                             } else {
                                 if ($authtype eq 'int') {
                                     $varauth = '<br />'.
-&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
+&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onclick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
                                 } elsif ($authtype eq 'loc') {
                                     $varauth = '<br />'.
 &mt('[_1] Local Authentication with argument [_2]','','<input type="text" name="'.$authtype.'arg" value="" />')."\n";
@@ -845,6 +1185,7 @@ ENDAUTH
 	my %lt=&Apache::lonlocal::texthash(
                     'cup'  => "Modify existing user: ",
                     'ens'  => "Enroll one student: ",
+                    'enm'  => "Enroll one member: ",
                     'id'   => "in domain",
 				       );
 	$r->print(<<ENDCHANGEUSER);
@@ -854,7 +1195,11 @@ $forminfo
 <h2>
 ENDCHANGEUSER
         if ($env{'form.action'} eq 'singlestudent') {
-            $r->print($lt{'ens'});
+            if ($crstype eq 'Community') {
+                $r->print($lt{'enm'});
+            } else {
+                $r->print($lt{'ens'});
+            }
         } else {
             $r->print($lt{'cup'});
         }
@@ -868,10 +1213,15 @@ ENDCHANGEUSER
             $r->print(&Apache::lonuserutils::forceid_change($context));
         }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
-            $r->print('<h3>'.&mt('User Can Request Creation of Courses?').'</h3>'.
-                      &Apache::loncommon::start_data_table().
-                      &build_tools_display($ccuname,$ccdomain,'requestcourses').
-                      &Apache::loncommon::end_data_table());
+            $r->print('<h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
+                      &Apache::loncommon::start_data_table());
+            if ($env{'request.role.domain'} eq $ccdomain) {
+                $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
+            } else {
+                $r->print(&coursereq_externaluser($ccuname,$ccdomain,
+                                                  $env{'request.role.domain'}));
+            }
+            $r->print(&Apache::loncommon::end_data_table());
         }
         $r->print('</div>');
         my $user_auth_text =  &user_authentication($ccuname,$ccdomain,$formname);
@@ -901,7 +1251,7 @@ ENDNOPORTPRIV
             if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) {
                 my %lt=&Apache::lonlocal::texthash(
                     'utav'  => "User Tools Availability",
-                    'yodo'  => "You do not have privileges to modify Portfolio, Blog or Home Page settings for this user.",
+                    'yodo'  => "You do not have privileges to modify Portfolio, Blog or Personal Information Page settings for this user.",
                     'ifch'  => "If a change is required, contact a domain coordinator for the domain",
                 );
                 $user_tools_text = <<ENDNOTOOLSPRIV;
@@ -942,12 +1292,18 @@ ENDNOTOOLSPRIV
         }
         $r->print('</div><div class="LC_clear_float_footer"></div>');
         if ($env{'form.action'} ne 'singlestudent') {
-            &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses);
+            &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context,
+                                    $roledom,$crstype);
         }
     } ## End of new user/old user logic
-
     if ($env{'form.action'} eq 'singlestudent') {
-        $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onClick="setSections(this.form)" />'."\n");
+        my $btntxt;
+        if ($crstype eq 'Community') {
+            $btntxt = &mt('Enroll Member');
+        } else {
+            $btntxt = &mt('Enroll Student');
+        }
+        $r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n");
     } else {
         $r->print('<h3>'.&mt('Add Roles').'</h3>');
         my $addrolesdisplay = 0;
@@ -960,14 +1316,14 @@ ENDNOTOOLSPRIV
                 $addrolesdisplay = $add_domainroles;
             }
             $r->print(&course_level_dc($env{'request.role.domain'},'Course'));
-            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setCourse()" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n");
         } elsif ($context eq 'author') {
             if ($addrolesdisplay) {
                 $r->print('<br /><input type="button" value="'.&mt('Save').'"');
                 if ($newuser) {
-                    $r->print(' onClick="auth_check()" \>'."\n");
+                    $r->print(' onclick="auth_check()" \>'."\n");
                 } else {
-                    $r->print('onClick="this.form.submit()" \>'."\n");
+                    $r->print('onclick="this.form.submit()" \>'."\n");
                 }
             } else {
                 $r->print('<br /><a href="javascript:backPage(document.cu)">'.
@@ -975,7 +1331,7 @@ ENDNOTOOLSPRIV
             }
         } else {
             $r->print(&course_level_table(%inccourses));
-            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setSections(this.form)" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n");
         }
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
@@ -986,9 +1342,14 @@ ENDNOTOOLSPRIV
 }
 
 sub singleuser_breadcrumb {
+    my ($crstype) = @_;
     my %breadcrumb_text;
     if ($env{'form.action'} eq 'singlestudent') {
-        $breadcrumb_text{'search'} = 'Enroll a student';
+        if ($crstype eq 'Community') {
+            $breadcrumb_text{'search'} = 'Enroll a member';
+        } else {
+            $breadcrumb_text{'search'} = 'Enroll a student';
+        }
         $breadcrumb_text{'userpicked'} = 'Select a user',
         $breadcrumb_text{'modify'} = 'Set section/dates',
     } else {
@@ -1043,18 +1404,18 @@ sub validation_javascript {
                                    $nondc_setsection_code,$groupslist);
     my ($jsback,$elements) = &crumb_utilities();
     $js .= "\n".
-           '<script type="text/javascript">'."\n".$jsback."\n".'</script>';
+           '<script type="text/javascript">'."\n".
+           '// <![CDATA['."\n".
+           $jsback."\n".
+           '// ]]>'."\n".
+           '</script>'."\n";
     return $js;
 }
 
 sub display_existing_roles {
-    my ($r,$ccuname,$ccdomain,$inccourses) = @_;
-    my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
-    # Build up table of user roles to allow revocation and re-enabling of roles.
-    my ($tmp) = keys(%rolesdump);
-    if ($tmp !~ /^(con_lost|error)/i) {
-        my $now=time;
-        my %lt=&Apache::lonlocal::texthash(
+    my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype) = @_;
+    my $now=time;
+    my %lt=&Apache::lonlocal::texthash(
                     'rer'  => "Existing Roles",
                     'rev'  => "Revoke",
                     'del'  => "Delete",
@@ -1064,188 +1425,260 @@ sub display_existing_roles {
                     'sta'  => "Start",
                     'end'  => "End",
                                        );
-        my (%roletext,%sortrole,%roleclass,%rolepriv);
-        foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);
-                                    my $b1=join('_',(split('_',$b))[1,0]);
-                                    return $a1 cmp $b1;
-                                } keys(%rolesdump)) {
-            next if ($area =~ /^rolesdef/);
-            my $envkey=$area;
-            my $role = $rolesdump{$area};
-            my $thisrole=$area;
-            $area =~ s/\_\w\w$//;
-            my ($role_code,$role_end_time,$role_start_time) =
-                split(/_/,$role);
+    my (%rolesdump,%roletext,%sortrole,%roleclass,%rolepriv);
+    if ($context eq 'course' || $context eq 'author') {
+        my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype);
+        my %roleshash = 
+            &Apache::lonnet::get_my_roles($ccuname,$ccdomain,'userroles',
+                              ['active','previous','future'],\@roles,$roledom,1);
+        foreach my $key (keys(%roleshash)) {
+            my ($start,$end) = split(':',$roleshash{$key});
+            next if ($start eq '-1' || $end eq '-1');
+            my ($rnum,$rdom,$role,$sec) = split(':',$key);
+            if ($context eq 'course') {
+                next unless (($rnum eq $env{'course.'.$env{'request.course.id'}.'.num'})
+                             && ($rdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}));
+            } elsif ($context eq 'author') {
+                next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'}));
+            }
+            my ($newkey,$newvalue,$newrole);
+            $newkey = '/'.$rdom.'/'.$rnum;
+            if ($sec ne '') {
+                $newkey .= '/'.$sec;
+            }
+            $newvalue = $role;
+            if ($role =~ /^cr/) {
+                $newrole = 'cr';
+            } else {
+                $newrole = $role;
+            }
+            $newkey .= '_'.$newrole;
+            if ($start ne '' && $end ne '') {
+                $newvalue .= '_'.$end.'_'.$start;
+            } elsif ($end ne '') {
+                $newvalue .= '_'.$end;
+            }
+            $rolesdump{$newkey} = $newvalue;
+        }
+    } else {
+        %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
+    }
+    # Build up table of user roles to allow revocation and re-enabling of roles.
+    my ($tmp) = keys(%rolesdump);
+    return if ($tmp =~ /^(con_lost|error)/i);
+    foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);
+                                my $b1=join('_',(split('_',$b))[1,0]);
+                                return $a1 cmp $b1;
+                            } keys(%rolesdump)) {
+        next if ($area =~ /^rolesdef/);
+        my $envkey=$area;
+        my $role = $rolesdump{$area};
+        my $thisrole=$area;
+        $area =~ s/\_\w\w$//;
+        my ($role_code,$role_end_time,$role_start_time) =
+            split(/_/,$role);
 # Is this a custom role? Get role owner and title.
-            my ($croleudom,$croleuname,$croletitle)=
-                ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
-            my $allowed=0;
-            my $delallowed=0;
-            my $sortkey=$role_code;
-            my $class='Unknown';
-            if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
-                $class='Course';
-                my ($coursedom,$coursedir) = ($1,$2);
-                $sortkey.="\0$coursedom";
-                # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
-                my %coursedata=
-                    &Apache::lonnet::coursedescription($1.'_'.$2);
-                my $carea;
-                if (defined($coursedata{'description'})) {
-                    $carea=$coursedata{'description'}.
-                        '<br />'.&mt('Domain').': '.$coursedom.('&nbsp;'x8).
-     &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom);
-                    $sortkey.="\0".$coursedata{'description'};
-                    $class=$coursedata{'type'};
+        my ($croleudom,$croleuname,$croletitle)=
+            ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
+        my $allowed=0;
+        my $delallowed=0;
+        my $sortkey=$role_code;
+        my $class='Unknown';
+        if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
+            $class='Course';
+            my ($coursedom,$coursedir) = ($1,$2);
+            my $cid = $1.'_'.$2;
+            # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
+            my %coursedata=
+                &Apache::lonnet::coursedescription($cid);
+            if ($coursedir =~ /^$match_community$/) {
+                $class='Community';
+            }
+            $sortkey.="\0$coursedom";
+            my $carea;
+            if (defined($coursedata{'description'})) {
+                $carea=$coursedata{'description'}.
+                    '<br />'.&mt('Domain').': '.$coursedom.('&nbsp;'x8).
+    &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom);
+                $sortkey.="\0".$coursedata{'description'};
+            } else {
+                if ($class eq 'Community') {
+                    $carea=&mt('Unavailable community').': '.$area;
+                    $sortkey.="\0".&mt('Unavailable community').': '.$area;
                 } else {
                     $carea=&mt('Unavailable course').': '.$area;
                     $sortkey.="\0".&mt('Unavailable course').': '.$area;
                 }
-                $sortkey.="\0$coursedir";
-                $inccourses->{$1.'_'.$2}=1;
-                if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) ||
-                    (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
-                    $allowed=1;
-                }
-                if ((&Apache::lonnet::allowed('dro',$1)) ||
-                    (&Apache::lonnet::allowed('dro',$ccdomain))) {
-                    $delallowed=1;
+            }
+            $sortkey.="\0$coursedir";
+            $inccourses->{$cid}=1;
+            if ((&Apache::lonnet::allowed('c'.$role_code,$coursedom.'/'.$coursedir)) ||
+                (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
+                $allowed=1;
+            }
+            unless ($allowed) {
+                my $isowner = &is_courseowner($cid,$coursedata{'internal.courseowner'});
+                if ($isowner) {
+                    if (($role_code eq 'co') && ($class eq 'Community')) {
+                        $allowed = 1;
+                    } elsif (($role_code eq 'cc') && ($class eq 'Course')) {
+                        $allowed = 1;
+                    }
                 }
+            } 
+            if ((&Apache::lonnet::allowed('dro',$coursedom)) ||
+                (&Apache::lonnet::allowed('dro',$ccdomain))) {
+                $delallowed=1;
+            }
 # - custom role. Needs more info, too
-                if ($croletitle) {
-                    if (&Apache::lonnet::allowed('ccr',$1.'/'.$2)) {
-                        $allowed=1;
-                        $thisrole.='.'.$role_code;
-                    }
+            if ($croletitle) {
+                if (&Apache::lonnet::allowed('ccr',$coursedom.'/'.$coursedir)) {
+                    $allowed=1;
+                    $thisrole.='.'.$role_code;
                 }
-                # Compute the background color based on $area
-                if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
-                    $carea.='<br />Section: '.$3;
-                    $sortkey.="\0$3";
-                    if (!$allowed) {
-                        if ($env{'request.course.sec'} eq $3) {
-                            if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) {
-                                $allowed = 1;
-                            }
+            }
+            if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
+                $carea.='<br />Section: '.$3;
+                $sortkey.="\0$3";
+                if (!$allowed) {
+                    if ($env{'request.course.sec'} eq $3) {
+                        if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) {
+                            $allowed = 1;
                         }
                     }
                 }
-                $area=$carea;
-            } else {
-                $sortkey.="\0".$area;
-                # Determine if current user is able to revoke privileges
-                if ($area=~m{^/($match_domain)/}) {
-                    if ((&Apache::lonnet::allowed('c'.$role_code,$1)) ||
-                       (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
-                        $allowed=1;
-                    }
-                    if (((&Apache::lonnet::allowed('dro',$1))  ||
-                         (&Apache::lonnet::allowed('dro',$ccdomain))) &&
-                        ($role_code ne 'dc')) {
-                        $delallowed=1;
-                    }
-                } else {
-                    if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
-                        $allowed=1;
-                    }
+            }
+            $area=$carea;
+        } else {
+            $sortkey.="\0".$area;
+            # Determine if current user is able to revoke privileges
+            if ($area=~m{^/($match_domain)/}) {
+                if ((&Apache::lonnet::allowed('c'.$role_code,$1)) ||
+                   (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
+                   $allowed=1;
                 }
-                if ($role_code eq 'ca' || $role_code eq 'au') {
-                    $class='Construction Space';
-                } elsif ($role_code eq 'su') {
-                    $class='System';
-                } else {
-                    $class='Domain';
+                if (((&Apache::lonnet::allowed('dro',$1))  ||
+                    (&Apache::lonnet::allowed('dro',$ccdomain))) &&
+                    ($role_code ne 'dc')) {
+                    $delallowed=1;
                 }
-            }
-            if (($role_code eq 'ca') || ($role_code eq 'aa')) {
-                $area=~m{/($match_domain)/($match_username)};
-                if (&Apache::lonuserutils::authorpriv($2,$1)) {
+            } else {
+                if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
                     $allowed=1;
-                } else {
-                    $allowed=0;
                 }
             }
-            my $row = '';
-            $row.= '<td>';
-            my $active=1;
-            $active=0 if (($role_end_time) && ($now>$role_end_time));
-            if (($active) && ($allowed)) {
-                $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />';
+            if ($role_code eq 'ca' || $role_code eq 'au') {
+                $class='Construction Space';
+            } elsif ($role_code eq 'su') {
+                $class='System';
             } else {
-                if ($active) {
-                   $row.='&nbsp;';
-                } else {
-                   $row.=&mt('expired or revoked');
-                }
+                $class='Domain';
             }
-            $row.='</td><td>';
-            if ($allowed && !$active) {
-                $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';
-            } else {
-                $row.='&nbsp;';
-            }
-            $row.='</td><td>';
-            if ($delallowed) {
-                $row.= '<input type="checkbox" name="del:'.$thisrole.'" />';
-            } else {
-                $row.='&nbsp;';
-            }
-            my $plaintext='';
-            if (!$croletitle) {
-                $plaintext=&Apache::lonnet::plaintext($role_code,$class)
-            } else {
-                $plaintext=
-        "Customrole '$croletitle'<br />defined by $croleuname\@$croleudom";
-            }
-            $row.= '</td><td>'.$plaintext.
-                   '</td><td>'.$area.
-                   '</td><td>'.($role_start_time?localtime($role_start_time)
-                                                : '&nbsp;' ).
-                   '</td><td>'.($role_end_time  ?localtime($role_end_time)
-                                                : '&nbsp;' )
-                   ."</td>";
-            $sortrole{$sortkey}=$envkey;
-            $roletext{$envkey}=$row;
-            $roleclass{$envkey}=$class;
-            $rolepriv{$envkey}=$allowed;
-            #$r->print($row);
-        } # end of foreach        (table building loop)
-        my $rolesdisplay = 0;
-        my %output = ();
-        foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
-            $output{$type} = '';
-            foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
-                if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
-                    $output{$type}.=
-                          &Apache::loncommon::start_data_table_row().
-                          $roletext{$sortrole{$which}}.
-                          &Apache::loncommon::end_data_table_row();
-                }
-            }
-            unless($output{$type} eq '') {
-                $output{$type} = '<tr class="LC_info_row">'.
-                          "<td align='center' colspan='7'>".&mt($type)."</td></tr>".
-                           $output{$type};
-                $rolesdisplay = 1;
+        }
+        if (($role_code eq 'ca') || ($role_code eq 'aa')) {
+            $area=~m{/($match_domain)/($match_username)};
+            if (&Apache::lonuserutils::authorpriv($2,$1)) {
+                $allowed=1;
+            } else {
+                $allowed=0;
             }
         }
-        if ($rolesdisplay == 1) {
-            $r->print('
+        my $row = '';
+        $row.= '<td>';
+        my $active=1;
+        $active=0 if (($role_end_time) && ($now>$role_end_time));
+        if (($active) && ($allowed)) {
+            $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />';
+        } else {
+            if ($active) {
+               $row.='&nbsp;';
+            } else {
+               $row.=&mt('expired or revoked');
+            }
+        }
+        $row.='</td><td>';
+        if ($allowed && !$active) {
+            $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';
+        } else {
+            $row.='&nbsp;';
+        }
+        $row.='</td><td>';
+        if ($delallowed) {
+            $row.= '<input type="checkbox" name="del:'.$thisrole.'" />';
+        } else {
+            $row.='&nbsp;';
+        }
+        my $plaintext='';
+        if (!$croletitle) {
+            $plaintext=&Apache::lonnet::plaintext($role_code,$class)
+        } else {
+            $plaintext=
+                &mt('Customrole [_1][_2]defined by [_3]',
+                        '"'.$croletitle.'"',
+                        '<br />',
+                        $croleuname.':'.$croleudom);
+        }
+        $row.= '</td><td>'.$plaintext.
+               '</td><td>'.$area.
+               '</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time)
+                                            : '&nbsp;' ).
+               '</td><td>'.($role_end_time  ?&Apache::lonlocal::locallocaltime($role_end_time)
+                                            : '&nbsp;' )
+               ."</td>";
+        $sortrole{$sortkey}=$envkey;
+        $roletext{$envkey}=$row;
+        $roleclass{$envkey}=$class;
+        $rolepriv{$envkey}=$allowed;
+    } # end of foreach        (table building loop)
+
+    my $rolesdisplay = 0;
+    my %output = ();
+    foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
+        $output{$type} = '';
+        foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
+            if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
+                 $output{$type}.=
+                      &Apache::loncommon::start_data_table_row().
+                      $roletext{$sortrole{$which}}.
+                      &Apache::loncommon::end_data_table_row();
+            }
+        }
+        unless($output{$type} eq '') {
+            $output{$type} = '<tr class="LC_info_row">'.
+                      "<td align='center' colspan='7'>".&mt($type)."</td></tr>".
+                      $output{$type};
+            $rolesdisplay = 1;
+        }
+    }
+    if ($rolesdisplay == 1) {
+        my $contextrole='';
+        if ($env{'request.course.id'}) {
+            if (&Apache::loncommon::course_type() eq 'Community') {
+                $contextrole = &mt('Existing Roles in this Community');
+            } else {
+                $contextrole = &mt('Existing Roles in this Course');
+            }
+        } elsif ($env{'request.role'} =~ /^au\./) {
+            $contextrole = &mt('Existing Co-Author Roles in your Construction Space');
+        } else {
+            $contextrole = &mt('Existing Roles in this Domain');
+        }
+        $r->print('
 <h3>'.$lt{'rer'}.'</h3>'.
+'<div>'.$contextrole.'</div>'.
 &Apache::loncommon::start_data_table("LC_createuser").
 &Apache::loncommon::start_data_table_header_row().
 '<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
 '</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
 '</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
 &Apache::loncommon::end_data_table_header_row());
-           foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
-                if ($output{$type}) {
-                    $r->print($output{$type}."\n");
-                }
+        foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
+            if ($output{$type}) {
+                $r->print($output{$type}."\n");
             }
-            $r->print(&Apache::loncommon::end_data_table());
         }
-    }  # End of check for keys in rolesdump
+        $r->print(&Apache::loncommon::end_data_table());
+    }
     return;
 }
 
@@ -1283,7 +1716,7 @@ sub new_coauthor_roles {
                   &Apache::loncommon::end_data_table_header_row()."\n".
                   &Apache::loncommon::start_data_table_row().'
            <td>
-            <input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" />
+            <input type="checkbox" name="act_'.$cudom.'_'.$cuname.'_ca" />
            </td>
            <td>'.$lt{'cau'}.'</td>
            <td>'.$cudom.'_'.$cuname.'</td>
@@ -1295,7 +1728,7 @@ sub new_coauthor_roles {
 "javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
               &Apache::loncommon::end_data_table_row()."\n".
               &Apache::loncommon::start_data_table_row()."\n".
-'<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
+'<td><input type="checkbox" name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
 <td>'.$lt{'caa'}.'</td>
 <td>'.$cudom.'_'.$cuname.'</td>
 <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
@@ -1335,8 +1768,10 @@ sub new_domain_roles {
     &mt('Extent').'</th>'.
     '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
     &Apache::loncommon::end_data_table_header_row();
+    my @allroles = &Apache::lonuserutils::roles_by_context('domain');
     foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
-        foreach my $role ('dc','li','dg','au','sc') {
+        foreach my $role (@allroles) {
+            next if ($role eq 'ad');
             if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
                my $plrole=&Apache::lonnet::plaintext($role);
                my %lt=&Apache::lonlocal::texthash(
@@ -1346,7 +1781,7 @@ sub new_domain_roles {
                $num_domain_level ++;
                $domaintext .=
 &Apache::loncommon::start_data_table_row().
-'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>
+'<td><input type="checkbox" name="act_'.$thisdomain.'_'.$role.'" /></td>
 <td>'.$plrole.'</td>
 <td>'.$thisdomain.'</td>
 <td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" />
@@ -1387,7 +1822,9 @@ sub user_authentication {
             my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
             $outcome = <<ENDBADAUTH;
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
 $loginscript
+// ]]>
 </script>
 <span class="LC_error">$lt{'err'}:
 $lt{'uuas'} ($currentauth). $lt{'sldb'}.</span>
@@ -1416,7 +1853,9 @@ ENDBADAUTH
                                                );
             $outcome =
                        '<script type="text/javascript" language="Javascript">'."\n".
+                       '// <![CDATA['."\n".
                        $loginscript."\n".
+                       '// ]]>'."\n".
                        '</script>'."\n".
                        '<h3>'.$lt{'ld'}.'</h3>'.
                        &Apache::loncommon::start_data_table().
@@ -1524,16 +1963,19 @@ sub modify_login_block {
 
 sub personal_data_display {
     my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
-    my ($output,$showforceid,%userenv,%canmodify);
+    my ($output,$showforceid,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
     my $rowcount = 0;
     my $editable = 0;
+    %canmodify_status = 
+        &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
+                                                   ['inststatus'],$rolesarray);
     if (!$newuser) {
         # Get the users information
         %userenv = &Apache::lonnet::get('environment',
                    ['firstname','middlename','lastname','generation',
-                    'permanentemail','id'],$ccdomain,$ccuname);
+                    'permanentemail','id','inststatus'],$ccdomain,$ccuname);
         %canmodify =
             &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
                                                        \@userinfo,$rolesarray);
@@ -1549,7 +1991,8 @@ sub personal_data_display {
                 'generation'     => "Generation",
                 'permanentemail' => "Permanent e-mail address",
                 'id'             => "Student/Employee ID",
-                'lg'             => "Login Data"
+                'lg'             => "Login Data",
+                'inststatus'     => "Affiliation",
     );
     my %textboxsize = (
                        firstname      => '15',
@@ -1587,11 +2030,15 @@ sub personal_data_display {
                 }
             } else {
                 if ($context eq 'selfcreate') {
-                    if ($canmodify{$item}) {
-                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
-                        $editable ++;
+                    if (($item eq 'permanentemail') && ($newuser eq 'email')) {
+                        $row .= $ccuname;
                     } else {
-                        $hiderow = 1;
+                        if ($canmodify{$item}) {
+                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                            $editable ++;
+                        } else {
+                            $hiderow = 1;
+                        }
                     }
                 } else {
                     $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
@@ -1613,6 +2060,43 @@ sub personal_data_display {
             $rowcount ++;
         }
     }
+    if (($canmodify_status{'inststatus'}) || ($context ne 'selfcreate')) {
+        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($ccdomain);
+        if (ref($types) eq 'ARRAY') {
+            if (@{$types} > 0) {
+                my ($hiderow,$shown);
+                if ($canmodify_status{'inststatus'}) {
+                    $shown = &pick_inst_statuses($userenv{'inststatus'},$usertypes,$types);
+                } else {
+                    if ($userenv{'inststatus'} eq '') {
+                        $hiderow = 1;
+                    } else {
+                        my @showitems;
+                        foreach my $item ( map { &unescape($_); } split(':',$userenv{'inststatus'})) {
+                            if (exists($usertypes->{$item})) {
+                                push(@showitems,$usertypes->{$item});
+                            } else {
+                                push(@showitems,$item);
+                            }
+                        }
+                        if (@showitems) {
+                            $shown = join(', ',@showitems);
+                        } else {
+                            $hiderow = 1;
+                        }
+                    }
+                }
+                if (!$hiderow) {
+                    my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n".
+                              $shown.&Apache::lonhtmlcommon::row_closure(1); 
+                    if ($context eq 'selfcreate') {
+                        $rowcount ++;
+                    }
+                    $output .= $row;
+                }
+            }
+        }
+    }
     $output .= &Apache::lonhtmlcommon::end_pick_box();
     if (wantarray) {
         if ($context eq 'selfcreate') {
@@ -1625,6 +2109,48 @@ sub personal_data_display {
     }
 }
 
+sub pick_inst_statuses {
+    my ($curr,$usertypes,$types) = @_;
+    my ($output,$rem,@currtypes);
+    if ($curr ne '') {
+        @currtypes = map { &unescape($_); } split(/:/,$curr);
+    }
+    my $numinrow = 2;
+    if (ref($types) eq 'ARRAY') {
+        $output = '<table>';
+        my $lastcolspan; 
+        for (my $i=0; $i<@{$types}; $i++) {
+            if (defined($usertypes->{$types->[$i]})) {
+                my $rem = $i%($numinrow);
+                if ($rem == 0) {
+                    if ($i<@{$types}-1) {
+                        if ($i > 0) { 
+                            $output .= '</tr>';
+                        }
+                        $output .= '<tr>';
+                    }
+                } elsif ($i==@{$types}-1) {
+                    my $colsleft = $numinrow - $rem;
+                    if ($colsleft > 1) {
+                        $lastcolspan = ' colspan="'.$colsleft.'"';
+                    }
+                }
+                my $check = ' ';
+                if (grep(/^\Q$types->[$i]\E$/,@currtypes)) {
+                    $check = ' checked="checked" ';
+                }
+                $output .= '<td class="LC_left_item"'.$lastcolspan.'>'.
+                           '<span class="LC_nobreak"><label>'.
+                           '<input type="checkbox" name="inststatus" '.
+                           'value="'.$types->[$i].'"'.$check.'/>'.
+                           $usertypes->{$types->[$i]}.'</label></span></td>';
+            }
+        }
+        $output .= '</tr></table>';
+    }
+    return $output;
+}
+
 sub selfcreate_canmodify {
     my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_;
     if (ref($inst_results) eq 'HASH') {
@@ -1653,7 +2179,7 @@ sub get_inststatuses {
 
 # ================================================================= Phase Three
 sub update_user_data {
-    my ($r,$context) = @_; 
+    my ($r,$context,$crstype) = @_; 
     my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
                                           $env{'form.ccdomain'});
     # Error messages
@@ -1673,8 +2199,11 @@ sub update_user_data {
     my $newuser = 0;
     my ($jsback,$elements) = &crumb_utilities();
     my $jscript = '<script type="text/javascript">'."\n".
-                  $jsback."\n".'</script>'."\n";
-    my %breadcrumb_text = &singleuser_breadcrumb();
+                  '// <![CDATA['."\n".
+                  $jsback."\n".
+                  '// ]]>'."\n".
+                  '</script>'."\n";
+    my %breadcrumb_text = &singleuser_breadcrumb($crstype);
     my $args;
     if ($env{'form.popup'}) {
         $args->{'no_nav_bar'} = 1;
@@ -1713,8 +2242,8 @@ sub update_user_data {
     }
     if (  $env{'form.ccuname'} ne 
 	  &LONCAPA::clean_username($env{'form.ccuname'}) ) {
-	$r->print($error.&mt('Invalid login name').'.  '.
-		  &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'.
+	$r->print($error.&mt('Invalid login name.').'  '.
+		  &mt('Only letters, numbers, periods, dashes, @, and underscores are valid.').
 		  $end.$rtnlink);
 	return;
     }
@@ -1724,8 +2253,8 @@ sub update_user_data {
     }
     if (  $env{'form.ccdomain'} ne
 	  &LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
-	$r->print($error.&mt ('Invalid domain name').'.  '.
-		  &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'.
+	$r->print($error.&mt('Invalid domain name.').'  '.
+		  &mt('Only letters, numbers, periods, dashes, and underscores are valid.').
 		  $end.$rtnlink);
 	return;
     }
@@ -1771,9 +2300,17 @@ sub update_user_data {
 
     $r->print('<h3>'.&mt('User [_1] in domain [_2]',
 			 $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');
+    $r->print('<p class="LC_info">'.&mt('Please be patient').'</p>');
+
     my (%alerts,%rulematch,%inst_results,%curr_rules);
+    my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
     my @usertools = ('aboutme','blog','portfolio');
-    my @requestcourses = ('official','unofficial');
+    my @requestcourses = ('official','unofficial','community');
+    my ($othertitle,$usertypes,$types) = 
+        &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
+    my %canmodify_status =
+        &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},
+                                                   ['inststatus']);
     if ($env{'form.makeuser'}) {
 	$r->print('<h3>'.&mt('Creating new account.').'</h3>');
         # Check for the authentication mode and password
@@ -1833,36 +2370,52 @@ sub update_user_data {
 	$r->print(&mt('Generating user').': '.$result);
         $uhome = &Apache::lonnet::homeserver($env{'form.ccuname'},
                                                $env{'form.ccdomain'});
-        my (%changeHash,%newcustom,%changed);
+        my (%changeHash,%newcustom,%changed,%changedinfo);
         if ($uhome ne 'no_host') {
-            if ($env{'form.customquota'} == 1) {
-                if ($env{'form.portfolioquota'} eq '') {
-                    $newcustom{'quota'} = 0;
-                } else {
-                    $newcustom{'quota'} = $env{'form.portfolioquota'};
-                    $newcustom{'quota'} =~ s/[^\d\.]//g;
+            if ($context eq 'domain') {
+                if ($env{'form.customquota'} == 1) {
+                    if ($env{'form.portfolioquota'} eq '') {
+                        $newcustom{'quota'} = 0;
+                    } else {
+                        $newcustom{'quota'} = $env{'form.portfolioquota'};
+                        $newcustom{'quota'} =~ s/[^\d\.]//g;
+                    }
+                    $changed{'quota'} = &quota_admin($newcustom{'quota'},\%changeHash);
+                }
+                foreach my $item (@usertools) {
+                    if ($env{'form.custom'.$item} == 1) {
+                        $newcustom{$item} = $env{'form.tools_'.$item};
+                        $changed{$item} = &tool_admin($item,$newcustom{$item},
+                                                     \%changeHash,'tools');
+                    }
+                }
+                foreach my $item (@requestcourses) {
+                    if ($env{'form.custom'.$item} == 1) {
+                        $newcustom{$item} = $env{'form.crsreq_'.$item};
+                        if ($env{'form.crsreq_'.$item} eq 'autolimit') {
+                            $newcustom{$item} .= '=';
+                            unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) {
+                                $newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'};
+                            }
+                        }
+                        $changed{$item} = &tool_admin($item,$newcustom{$item},
+                                                      \%changeHash,'requestcourses');
+                    }
                 }
-                $changed{'quota'} = &quota_admin($newcustom{'quota'},\%changeHash);
             }
-            foreach my $item (@usertools) {
-                if ($env{'form.custom'.$item} == 1) {
-                    $newcustom{$item} = $env{'form.tools_'.$item};
-                    $changed{$item} = &tool_admin($item,$newcustom{$item},
-                                                 \%changeHash,'tools');
-                }
-            }
-            foreach my $item (@requestcourses) {
-                $newcustom{$item} = $env{'form.requestcourses_'.$item};
-                $changed{$item} = &tool_admin($item,$newcustom{$item},
-                                              \%changeHash,'requestcourses');
+            if ($canmodify_status{'inststatus'}) {
+                if (exists($env{'form.inststatus'})) {
+                    my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus');
+                    if (@inststatuses > 0) {
+                        $changeHash{'inststatus'} = join(',',@inststatuses);
+                        $changed{'inststatus'} = $changeHash{'inststatus'};
+                    }
+                }
             }
             if (keys(%changed)) {
-                $changeHash{'firstname'}  = $env{'form.cfirstname'};
-                $changeHash{'middlename'} = $env{'form.cmiddlename'};
-                $changeHash{'lastname'}   = $env{'form.clastname'};
-                $changeHash{'generation'} = $env{'form.cgeneration'};
-                $changeHash{'id'}         = $env{'form.cid'};
-                $changeHash{'permanentemail'} = $env{'form.cpermanentemail'};
+                foreach my $item (@userinfo) {
+                    $changeHash{$item}  = $env{'form.c'.$item};
+                }
                 my $chgresult =
                      &Apache::lonnet::put('environment',\%changeHash,
                                           $env{'form.ccdomain'},$env{'form.ccuname'});
@@ -1890,10 +2443,14 @@ sub update_user_data {
 	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end);    
 	}
     }
+
+    $r->rflush(); # Finish display of header before time consuming actions start
+
     ##
-    my (@userroles,%userupdate,$cnum,$cdom,$namechanged);
+    my (@userroles,%userupdate,$cnum,$cdom,%namechanged);
     if ($context eq 'course') {
         ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+        $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
     }
     if (! $env{'form.makeuser'} ) {
         # Check for need to change
@@ -1901,7 +2458,9 @@ sub update_user_data {
             ('environment',['firstname','middlename','lastname','generation',
              'id','permanentemail','portfolioquota','inststatus','tools.aboutme',
              'tools.blog','tools.portfolio','requestcourses.official',
-             'requestcourses.unofficial'],
+             'requestcourses.unofficial','requestcourses.community',
+             'reqcrsotherdom.official','reqcrsotherdom.unofficial',
+             'reqcrsotherdom.community'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
@@ -1975,10 +2534,9 @@ sub update_user_data {
             if ($role eq 'cr') {
                 push(@longroles,'Custom');
             } else {
-                push(@longroles,&Apache::lonnet::plaintext($role)); 
+                push(@longroles,&Apache::lonnet::plaintext($role,$crstype)); 
             }
         }
-        my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
         my %canmodify = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},\@userinfo,\@userroles);
         foreach my $item (@userinfo) {
             # Strip leading and trailing whitespace
@@ -2003,7 +2561,7 @@ sub update_user_data {
             (!$forceid)) {
             if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {
                 $env{'form.cid'} = $userenv{'id'};
-                $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.')
+                $no_forceid_alert = &mt('New student/employee ID does not match existing ID for this user.')
                                    .'<br />'
                                    .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
                                    .'<br />'."\n";
@@ -2024,81 +2582,138 @@ sub update_user_data {
                 }
             }
         }
-        my ($quotachanged,$oldportfolioquota,$newportfolioquota,
-            $inststatus,$oldisdefault,$newisdefault,$olddefquotatext,
-            $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext);
-        my ($defquota,$settingstatus) = 
-            &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
-        my ($showquota,$showtools,$showrequestcourses);
+        my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus,
+            $newinststatus,$oldisdefault,$newisdefault,%oldsettings,
+            %oldsettingstext,%newsettings,%newsettingstext,@disporder,
+            $olddefquota,$oldsettingstatus,$newdefquota,$newsettingstatus);
+        @disporder = ('inststatus');
+        if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) {
+            push(@disporder,'requestcourses');
+        } else {
+            push(@disporder,'reqcrsotherdom');
+        }
+        push(@disporder,('quota','tools'));
+        $oldinststatus = $userenv{'inststatus'};
+        ($olddefquota,$oldsettingstatus) = 
+            &Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus);
+        ($newdefquota,$newsettingstatus) = ($olddefquota,$oldsettingstatus);
+        my %canshow;
         if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
-            $showquota = 1;
+            $canshow{'quota'} = 1;
         }
         if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
-            $showtools = 1;
+            $canshow{'tools'} = 1;
         }
         if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
-            $showrequestcourses = 1;
+            $canshow{'requestcourses'} = 1;
+        } elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+            $canshow{'reqcrsotherdom'} = 1;
+        }
+        if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
+            $canshow{'inststatus'} = 1;
         }
         my (%changeHash,%changed);
+        if ($oldinststatus eq '') {
+            $oldsettings{'inststatus'} = $othertitle; 
+        } else {
+            if (ref($usertypes) eq 'HASH') {
+                $oldsettings{'inststatus'} = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'})));
+            } else {
+                $oldsettings{'inststatus'} = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'})));
+            }
+        }
+        $changeHash{'inststatus'} = $userenv{'inststatus'};
+        if ($canmodify_status{'inststatus'}) {
+            $canshow{'inststatus'} = 1;
+            if (exists($env{'form.inststatus'})) {
+                my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus');
+                if (@inststatuses > 0) {
+                    $newinststatus = join(':',map { &escape($_); } @inststatuses);
+                    $changeHash{'inststatus'} = $newinststatus;
+                    if ($newinststatus ne $oldinststatus) {
+                        $changed{'inststatus'} = $newinststatus;
+                        ($newdefquota,$newsettingstatus) =
+                            &Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus);
+                    }
+                    if (ref($usertypes) eq 'HASH') {
+                        $newsettings{'inststatus'} = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); 
+                    } else {
+                        $newsettings{'inststatus'} = join(', ',@inststatuses);
+                    }
+                }
+            } else {
+                $newinststatus = '';
+                $changeHash{'inststatus'} = $newinststatus;
+                $newsettings{'inststatus'} = $othertitle;
+                if ($newinststatus ne $oldinststatus) {
+                    $changed{'inststatus'} = $changeHash{'inststatus'};
+                    ($newdefquota,$newsettingstatus) =
+                        &Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus);
+                }
+            }
+        } elsif ($context ne 'selfcreate') {
+            $canshow{'inststatus'} = 1;
+            $newsettings{'inststatus'} = $oldsettings{'inststatus'};
+        }
         $changeHash{'portfolioquota'} = $userenv{'portfolioquota'};
-        if ($userenv{'portfolioquota'} ne '') {
-            $oldportfolioquota = $userenv{'portfolioquota'};
-            if ($env{'form.customquota'} == 1) {
-                if ($env{'form.portfolioquota'} eq '') {
-                    $newportfolioquota = 0;
+        if ($context eq 'domain') {
+            if ($userenv{'portfolioquota'} ne '') {
+                $oldportfolioquota = $userenv{'portfolioquota'};
+                if ($env{'form.customquota'} == 1) {
+                    if ($env{'form.portfolioquota'} eq '') {
+                        $newportfolioquota = 0;
+                    } else {
+                        $newportfolioquota = $env{'form.portfolioquota'};
+                        $newportfolioquota =~ s/[^\d\.]//g;
+                    }
+                    if ($newportfolioquota != $oldportfolioquota) {
+                        $changed{'quota'} = &quota_admin($newportfolioquota,\%changeHash);
+                    }
                 } else {
-                    $newportfolioquota = $env{'form.portfolioquota'};
-                    $newportfolioquota =~ s/[^\d\.]//g;
-                }
-                if ($newportfolioquota != $oldportfolioquota) {
-                    $changed{'quota'} = &quota_admin($newportfolioquota,\%changeHash);
+                    $changed{'quota'} = &quota_admin('',\%changeHash);
+                    $newportfolioquota = $newdefquota;
+                    $newisdefault = 1;
                 }
             } else {
-                $changed{'quota'} = &quota_admin('',\%changeHash);
-                $newportfolioquota = $defquota;
-                $newisdefault = 1; 
-            }
-        } else {
-            $oldisdefault = 1;
-            $oldportfolioquota = $defquota;
-            if ($env{'form.customquota'} == 1) {
-                if ($env{'form.portfolioquota'} eq '') {
-                    $newportfolioquota = 0;
+                $oldisdefault = 1;
+                $oldportfolioquota = $olddefquota;
+                if ($env{'form.customquota'} == 1) {
+                    if ($env{'form.portfolioquota'} eq '') {
+                        $newportfolioquota = 0;
+                    } else {
+                        $newportfolioquota = $env{'form.portfolioquota'};
+                        $newportfolioquota =~ s/[^\d\.]//g;
+                    }
+                    $changed{'quota'} = &quota_admin($newportfolioquota,\%changeHash);
                 } else {
-                    $newportfolioquota = $env{'form.portfolioquota'};
-                    $newportfolioquota =~ s/[^\d\.]//g;
+                    $newportfolioquota = $newdefquota;
+                    $newisdefault = 1;
                 }
-                $changed{'quota'} = &quota_admin($newportfolioquota,\%changeHash);
+            }
+            if ($oldisdefault) {
+                $oldsettingstext{'quota'} = &get_defaultquota_text($oldsettingstatus);
+            }
+            if ($newisdefault) {
+                $newsettingstext{'quota'} = &get_defaultquota_text($newsettingstatus);
+            }
+            &tool_changes('tools',\@usertools,\%oldsettings,\%oldsettingstext,\%userenv,
+                          \%changeHash,\%changed,\%newsettings,\%newsettingstext);
+            if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
+                &tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext,
+                              \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
             } else {
-                $newportfolioquota = $defquota;
-                $newisdefault = 1;
+                &tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
+                              \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
             }
         }
-        if ($oldisdefault) {
-            $olddefquotatext = &get_defaultquota_text($settingstatus);
-        }
-        if ($newisdefault) {
-            $newdefquotatext = &get_defaultquota_text($settingstatus);
-        }
-        &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv,
-                      \%changeHash,\%changed,\%newaccess,\%newaccesstext);
-        &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext,
-                      \%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext);
-        if ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
-            $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
-            $env{'form.clastname'}   ne $userenv{'lastname'}   ||
-            $env{'form.cgeneration'} ne $userenv{'generation'} ||
-            $env{'form.cid'} ne $userenv{'id'}                 ||
-            $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} ) {
-            $namechanged = 1;
-        }
-        if (($namechanged) || (keys(%changed) > 0)) {
-            $changeHash{'firstname'}  = $env{'form.cfirstname'};
-            $changeHash{'middlename'} = $env{'form.cmiddlename'};
-            $changeHash{'lastname'}   = $env{'form.clastname'};
-            $changeHash{'generation'} = $env{'form.cgeneration'};
-            $changeHash{'id'}         = $env{'form.cid'};
-            $changeHash{'permanentemail'} = $env{'form.cpermanentemail'};
+        foreach my $item (@userinfo) {
+            if ($env{'form.c'.$item} ne $userenv{$item}) {
+                $namechanged{$item} = 1;
+            }
+        }
+        $oldsettings{'quota'} = $oldportfolioquota.' Mb';
+        $newsettings{'quota'} = $newportfolioquota.' Mb';
+        if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) {
             my ($chgresult,$namechgresult);
             if (keys(%changed) > 0) {
                 $chgresult = 
@@ -2109,12 +2724,12 @@ sub update_user_data {
                         ($env{'user.domain'} eq $env{'form.ccdomain'})) {
                         my %newenvhash;
                         foreach my $key (keys(%changed)) {
-                            if (($key eq 'official') || ($key eq 'unofficial')) {
+                            if (($key eq 'official') || ($key eq 'unofficial')
+                                || ($key eq 'community')) {
                                 $newenvhash{'environment.requestcourses.'.$key} =
                                     $changeHash{'requestcourses.'.$key};
                                 if ($changeHash{'requestcourses.'.$key} ne '') {
-                                    $newenvhash{'environment.canrequest.'.$key} =
-                                        $changeHash{'requestcourses.'.$key};
+                                    $newenvhash{'environment.canrequest.'.$key} = 1;
                                 } else {
                                     $newenvhash{'environment.canrequest.'.$key} =
           &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
@@ -2138,14 +2753,17 @@ sub update_user_data {
                     }
                 }
             }
-            if ($namechanged) {
-            # Make the change
+            if (keys(%namechanged) > 0) {
+                foreach my $field (@userinfo) {
+                    $changeHash{$field}  = $env{'form.c'.$field};
+                }
+# Make the change
                 $namechgresult =
                     &Apache::lonnet::modifyuser($env{'form.ccdomain'},
                         $env{'form.ccuname'},$changeHash{'id'},undef,undef,
                         $changeHash{'firstname'},$changeHash{'middlename'},
                         $changeHash{'lastname'},$changeHash{'generation'},
-                        $changeHash{'id'},undef,$changeHash{'permanentemail'});
+                        $changeHash{'id'},undef,$changeHash{'permanentemail'},undef,\@userinfo);
                 %userupdate = (
                                lastname   => $env{'form.clastname'},
                                middlename => $env{'form.cmiddlename'},
@@ -2154,110 +2772,13 @@ sub update_user_data {
                                id         => $env{'form.cid'},
                              );
             }
-            if (($namechanged && $namechgresult eq 'ok') || 
+            if (((keys(%namechanged) > 0) && $namechgresult eq 'ok') || 
                 ((keys(%changed) > 0) && $chgresult eq 'ok')) {
             # Tell the user we changed the name
-		my %lt=&Apache::lonlocal::texthash(
-                             'uic'        => "User Information Changed",             
-                             'frst'       => "First",
-                             'mddl'       => "Middle",
-                             'lst'        => "Last",
-			     'gen'        => "Generation",
-                             'id'         => "Student/Employee ID",
-                             'mail'       => "Permanent E-mail",
-                             'disk'       => "Disk space allocated to portfolio files",
-                             'blog'       => "Blog Availability",
-                             'aboutme'    => "Home Page Availability",
-                             'portfolio'  => "Portfolio Availability",
-                             'official'   => "Can Request Official Courses",
-                             'unofficial' => "Can Request Unofficial Courses",
-                             'prvs'       => "Previous",
-                             'chto'       => "Changed To"
-						   );
-                $r->print('<h4>'.$lt{'uic'}.'</h4>'.
-                          &Apache::loncommon::start_data_table().
-                          &Apache::loncommon::start_data_table_header_row());
-                $r->print(<<"END");
-    <th>&nbsp;</th>
-    <th>$lt{'frst'}</th>
-    <th>$lt{'mddl'}</th>
-    <th>$lt{'lst'}</th>
-    <th>$lt{'gen'}</th>
-    <th>$lt{'id'}</th>
-    <th>$lt{'mail'}</th>
-END
-                if ($showrequestcourses) {
-                    foreach my $item (@requestcourses) {
-                        $r->print("
-    <th>$lt{$item}</th>\n");
-                    }
-                }
-                if ($showquota) {
-                    $r->print("
-    <th>$lt{'disk'}</th>\n");
-                }
-                if ($showtools) {
-                    foreach my $item (@usertools) {
-                        $r->print("
-    <th>$lt{$item}</th>\n");
-                    }
-                }
-                $r->print(&Apache::loncommon::end_data_table_header_row().
-                          &Apache::loncommon::start_data_table_row());
-                $r->print(<<"END");
-    <td><b>$lt{'prvs'}</b></td>
-    <td>$userenv{'firstname'}  </td>
-    <td>$userenv{'middlename'} </td>
-    <td>$userenv{'lastname'}   </td>
-    <td>$userenv{'generation'} </td>
-    <td>$userenv{'id'}</td>
-    <td>$userenv{'permanentemail'} </td>
-END
-                if ($showrequestcourses) {
-                    foreach my $item (@requestcourses) {
-                        $r->print("
-    <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
-                    }
-                }
-                if ($showquota) {
-                    $r->print("
-    <td>$oldportfolioquota Mb $olddefquotatext </td>\n");
-                }
-                if ($showtools) {
-                    foreach my $item (@usertools) {
-                        $r->print("
-    <td>$oldaccess{$item} $oldaccesstext{$item} </td>\n");
-                    }
-                }
-                $r->print(&Apache::loncommon::end_data_table_row().
-                          &Apache::loncommon::start_data_table_row());
-                $r->print(<<"END");
-    <td><span class="LC_nobreak"><b>$lt{'chto'}</b></span></td>
-    <td>$env{'form.cfirstname'}  </td>
-    <td>$env{'form.cmiddlename'} </td>
-    <td>$env{'form.clastname'}   </td>
-    <td>$env{'form.cgeneration'} </td>
-    <td>$env{'form.cid'} </td>
-    <td>$env{'form.cpermanentemail'} </td>
-END
-                if ($showrequestcourses) {
-                    foreach my $item (@requestcourses) {
-                        $r->print("
-    <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
-                    }
-                }
-                if ($showquota) {
-                    $r->print("
-    <td>$newportfolioquota Mb $newdefquotatext </td>\n");
-                }
-                if ($showtools) {
-                    foreach my $item (@usertools) {
-                        $r->print("
-    <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
-                    }
-                }
-                $r->print(&Apache::loncommon::end_data_table_row().
-                          &Apache::loncommon::end_data_table().'<br />');
+                &display_userinfo($r,1,\@disporder,\%canshow,\@requestcourses,
+                                  \@usertools,\%userenv,\%changed,\%namechanged,
+                                  \%oldsettings, \%oldsettingstext,\%newsettings,
+                                  \%newsettingstext);
                 if ($env{'form.cid'} ne $userenv{'id'}) {
                     &Apache::lonnet::idput($env{'form.ccdomain'},
                          ($env{'form.ccuname'} => $env{'form.cid'}));
@@ -2283,44 +2804,13 @@ END
                       $env{'form.ccuname'}.' '.&mt('in domain').' '.
                       $env{'form.ccdomain'}.'</span><br />');
             }
-        }  else { # End of if ($env ... ) logic
+        } else { # End of if ($env ... ) logic
             # They did not want to change the users name, quota, tool availability,
             # or ability to request creation of courses, 
             # but we can still tell them what the name and quota and availabilities are  
-	    my %lt=&Apache::lonlocal::texthash(
-                           'id'         => "Student/Employee ID",
-                           'mail'       => "Permanent e-mail",
-                           'disk'       => "Disk space allocated to user's portfolio files",
-                           'blog'       => "Blog Availability",
-                           'aboutme'    => "Home Page Availability",
-                           'portfolio'  => "Portfolio Availability",
-                           'official'   => "Can Request Official Courses",
-                           'unofficial' => "Can Request Unofficial Course",
-					       );
-            $r->print(<<"END");
-<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
-END
-            if ($userenv{'permanentemail'} ne '') {
-                $r->print('<br />['.$lt{'mail'}.': '.
-                          $userenv{'permanentemail'}.']');
-            }
-            if ($showrequestcourses) {
-                foreach my $item (@requestcourses) {
-                    $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
-                              $newaccesstext{$item}.']'."\n");
-                }
-            }
-            if ($showtools) {
-                foreach my $item (@usertools) {
-                    $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
-                              $newaccesstext{$item}.']'."\n");
-                }
-            }
-            if ($showquota) {
-                $r->print('<br />['.$lt{'disk'}.': '.$oldportfolioquota.' Mb '.
-                          $olddefquotatext.']');
-            }
-            $r->print('</h4>');
+            &display_userinfo($r,undef,\@disporder,\%canshow,\@requestcourses,
+                              \@usertools,\%userenv,\%changed,\%namechanged,\%oldsettings,
+                              \%oldsettingstext,\%newsettings,\%newsettingstext);
         }
         if (@mod_disallowed) {
             my ($rolestr,$contextname);
@@ -2345,8 +2835,11 @@ END
             } else {
                 $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname));
             }
-            $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'.
-                      &mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
+            my $helplink = 'javascript:helpMenu('."'display'".')';
+            $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'
+                     .&mt('Please contact your [_1]helpdesk[_2] for more information.'
+                         ,'<a href="'.$helplink.'">','</a>')
+                      .'<br />');
         }
         $r->print('<span class="LC_warning">'
                   .$no_forceid_alert
@@ -2354,12 +2847,17 @@ END
                   .'</span>');
     }
     if ($env{'form.action'} eq 'singlestudent') {
-        &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context);
-        $r->print('<p><a href="javascript:backPage(document.userupdate)">'.
-                  &mt('Enroll Another Student').'</a></p>');
+        &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype);
+        $r->print('<p><a href="javascript:backPage(document.userupdate)">');
+        if ($crstype eq 'Community') {
+            $r->print(&mt('Enroll Another Member'));
+        } else {
+            $r->print(&mt('Enroll Another Student'));
+        }
+        $r->print('</a></p>');
     } else {
         my @rolechanges = &update_roles($r,$context);
-        if ($namechanged) {
+        if (keys(%namechanged) > 0) {
             if ($context eq 'course') {
                 if (@userroles > 0) {
                     if ((@rolechanges == 0) || 
@@ -2388,6 +2886,136 @@ END
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub display_userinfo {
+    my ($r,$changed,$order,$canshow,$requestcourses,$usertools,$userenv,
+        $changedhash,$namechangedhash,$oldsetting,$oldsettingtext,
+        $newsetting,$newsettingtext) = @_;
+    return unless (ref($order) eq 'ARRAY' &&
+                   ref($canshow) eq 'HASH' && 
+                   ref($requestcourses) eq 'ARRAY' && 
+                   ref($usertools) eq 'ARRAY' && 
+                   ref($userenv) eq 'HASH' &&
+                   ref($changedhash) eq 'HASH' &&
+                   ref($oldsetting) eq 'HASH' &&
+                   ref($oldsettingtext) eq 'HASH' &&
+                   ref($newsetting) eq 'HASH' &&
+                   ref($newsettingtext) eq 'HASH');
+    my %lt=&Apache::lonlocal::texthash(
+         'ui'             => 'User Information (unchanged)',
+         'uic'            => 'User Information Changed',
+         'firstname'      => 'First Name',
+         'middlename'     => 'Middle Name',
+         'lastname'       => 'Last Name',
+         'generation'     => 'Generation',
+         'id'             => 'Student/Employee ID',
+         'permanentemail' => 'Permanent e-mail address',
+         'quota'          => 'Disk space allocated to portfolio files',
+         'blog'           => 'Blog Availability',
+         'aboutme'        => 'Personal Information Page Availability',
+         'portfolio'      => 'Portfolio Availability',
+         'official'       => 'Can Request Official Courses',
+         'unofficial'     => 'Can Request Unofficial Courses',
+         'community'      => 'Can Request Communities',
+         'inststatus'     => "Affiliation",
+         'prvs'           => 'Previous Value:',
+         'chto'           => 'Changed To:'
+    );
+    my $title = $lt{'ui'}; 
+    if ($changed) {
+        $title = $lt{'uic'};
+    }
+    $r->print('<h4>'.$title.'</h4>'.
+              &Apache::loncommon::start_data_table().
+              &Apache::loncommon::start_data_table_header_row());
+    if ($changed) {
+        $r->print("<th>&nbsp;</th>\n");
+    }
+    my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
+    foreach my $item (@userinfo) {
+        $r->print("<th>$lt{$item}</th>\n");
+    }
+    foreach my $entry (@{$order}) {
+        if ($canshow->{$entry}) {
+            if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) {
+                foreach my $item (@{$requestcourses}) {
+                    $r->print("<th>$lt{$item}</th>\n");
+                }
+            } elsif ($entry eq 'tools') {
+                foreach my $item (@{$usertools}) {
+                    $r->print("<th>$lt{$item}</th>\n");
+                }
+            } else {
+                $r->print("<th>$lt{$entry}</th>\n");
+            }
+        }
+    }
+    $r->print(&Apache::loncommon::end_data_table_header_row().
+             &Apache::loncommon::start_data_table_row());
+    if ($changed) {
+        $r->print('<td><b>'.$lt{'prvs'}.'</b></td>'."\n");
+    }
+    foreach my $item (@userinfo) {
+        $r->print('<td>'.$userenv->{$item}.' </td>'."\n");
+    }
+    foreach my $entry (@{$order}) {
+        if ($canshow->{$entry}) {
+            if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) {
+                foreach my $item (@{$requestcourses}) {
+                    $r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n");
+                }
+            } elsif ($entry eq 'tools') {
+                foreach my $item (@{$usertools}) {
+                    $r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n");
+                }
+            } else {
+                $r->print("<td>$oldsetting->{$entry} $oldsettingtext->{$entry} </td>\n");
+            }
+        }
+    }
+    $r->print(&Apache::loncommon::end_data_table_row());
+    if ($changed) {
+        $r->print(&Apache::loncommon::start_data_table_row().
+                  '<td><span class="LC_nobreak"><b>'.$lt{'chto'}.'</b></span></td>'."\n");
+        foreach my $item (@userinfo) {
+            my $value = $env{'form.c'.$item};
+            if ($namechangedhash->{$item}) {
+                $value = '<span class="LC_cusr_emph">'.$value.'</span>';
+            }
+            $r->print("<td>$value </td>\n");
+        }
+        foreach my $entry (@{$order}) {
+            if ($canshow->{$entry}) {
+                if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) {
+                    foreach my $item (@{$requestcourses}) {
+                        my $value = $newsetting->{$item}.' '.$newsettingtext->{$item};
+                        if ($changedhash->{$item}) {
+                            $value = '<span class="LC_cusr_emph">'.$value.'</span>';
+                        }
+                        $r->print("<td>$value </td>\n");
+                    }
+                } elsif ($entry eq 'tools') {
+                    foreach my $item (@{$usertools}) {
+                        my $value = $newsetting->{$item}.' '.$newsettingtext->{$item};
+                        if ($changedhash->{$item}) {
+                            $value = '<span class="LC_cusr_emph">'.$value.'</span>';
+                        }
+                        $r->print("<td>$value </td>\n");
+                    }
+                } else {
+                    my $value = $newsetting->{$entry}.' '.$newsettingtext->{$entry};
+                    if ($changedhash->{$entry}) {
+                        $value = '<span class="LC_cusr_emph">'.$value.'</span>';
+                    }
+                    $r->print("<td>$value </td>\n");
+                }
+            }
+        }
+        $r->print(&Apache::loncommon::end_data_table_row());
+    }
+    $r->print(&Apache::loncommon::end_data_table().'<br />');
+    return;
+}
+
 sub tool_changes {
     my ($context,$usertools,$oldaccess,$oldaccesstext,$userenv,$changeHash,
         $changed,$newaccess,$newaccesstext) = @_;
@@ -2397,7 +3025,101 @@ sub tool_changes {
           (ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) {
         return;
     }
+    if ($context eq 'reqcrsotherdom') {
+        my @options = ('approval','validate','autolimit');
+        my $optregex = join('|',@options);
+        my %reqdisplay = &courserequest_display();
+        my $cdom = $env{'request.role.domain'};
+        foreach my $tool (@{$usertools}) {
+            $oldaccesstext->{$tool} = &mt('No');
+            $newaccesstext->{$tool} = $oldaccesstext->{$tool};
+            $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
+            my $newop;
+            if ($env{'form.'.$context.'_'.$tool}) {
+                $newop = $env{'form.'.$context.'_'.$tool};
+                if ($newop eq 'autolimit') {
+                    my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};
+                    $limit =~ s/\D+//g;
+                    $newop .= '='.$limit;
+                }
+            }
+            if ($userenv->{$context.'.'.$tool} eq '') {
+                if ($newop) {
+                    $changed->{$tool}=&tool_admin($tool,$cdom.':'.$newop,
+                                                  $changeHash,$context);
+                    if ($changed->{$tool}) {
+                        $newaccesstext->{$tool} = &mt('Yes');
+                    } else {
+                        $newaccesstext->{$tool} = $oldaccesstext->{$tool};
+                    }
+                }
+            } else {
+                my @curr = split(',',$userenv->{$context.'.'.$tool});
+                my @new;
+                my $changedoms;
+                foreach my $req (@curr) {
+                    if ($req =~ /^\Q$cdom\E\:($optregex\=?\d*)$/) {
+                        $oldaccesstext->{$tool} = &mt('Yes');
+                        my $oldop = $1;
+                        if ($oldop ne $newop) {
+                            $changedoms = 1;
+                            foreach my $item (@curr) {
+                                my ($reqdom,$option) = split(':',$item);
+                                unless ($reqdom eq $cdom) {
+                                    push(@new,$item);
+                                }
+                            }
+                            if ($newop) {
+                                push(@new,$cdom.':'.$newop);
+                            }
+                            @new = sort(@new);
+                        }
+                        last;
+                    }
+                }
+                if ((!$changedoms) && ($newop)) {
+                    $changedoms = 1;
+                    @new = sort(@curr,$cdom.':'.$newop);
+                }
+                if ($changedoms) {
+                    my $newdomstr;
+                    if (@new) {
+                        $newdomstr = join(',',@new);
+                    }
+                    $changed->{$tool}=&tool_admin($tool,$newdomstr,$changeHash,
+                                                  $context);
+                    if ($changed->{$tool}) {
+                        if ($env{'form.'.$context.'_'.$tool}) {
+                            if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') {
+                                my $limit = $env{'form.'.$context.'_'.$tool.'_limit'};
+                                $limit =~ s/\D+//g;
+                                if ($limit) {
+                                    $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user.',$limit);
+                                } else {
+                                    $newaccesstext->{$tool} = &mt('Yes, processed automatically');
+                                }
+                            } else {
+                                $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};
+                            }
+                        } else {
+                            $newaccesstext->{$tool} = &mt('No');
+                        }
+                    }
+                }
+            }
+        }
+        return;
+    }
     foreach my $tool (@{$usertools}) {
+        my $newval;
+        if ($context eq 'requestcourses') {
+            $newval = $env{'form.crsreq_'.$tool};
+            if ($newval eq 'autolimit') {
+                $newval .= '='.$env{'form.crsreq_'.$tool.'_limit'};
+            }
+        } else {
+            $newval = $env{'form.'.$context.'_'.$tool};
+        }
         if ($userenv->{$context.'.'.$tool} ne '') {
             $oldaccess->{$tool} = &mt('custom');
             if ($userenv->{$context.'.'.$tool}) {
@@ -2407,12 +3129,12 @@ sub tool_changes {
             }
             $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
             if ($env{'form.custom'.$tool} == 1) {
-                if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) {
-                    $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
-                                                  $changeHash,$context);
+                if ($newval ne $userenv->{$context.'.'.$tool}) {
+                    $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
+                                                    $context);
                     if ($changed->{$tool}) {
                         $newaccess->{$tool} = &mt('custom');
-                        if ($env{'form.'.$context.'_'.$tool}) {
+                        if ($newval) {
                             $newaccesstext->{$tool} = &mt("availability set to 'on'");
                         } else {
                             $newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -2436,20 +3158,20 @@ sub tool_changes {
                 } else {
                     $newaccess->{$tool} = $oldaccess->{$tool};
                     if ($userenv->{$context.'.'.$tool}) {
-                         $newaccesstext->{$tool} = &mt("availability set to 'on'");
+                        $newaccesstext->{$tool} = &mt("availability set to 'on'");
                     } else {
-                         $newaccesstext->{$tool} = &mt("availability set to 'off'");
+                        $newaccesstext->{$tool} = &mt("availability set to 'off'");
                     }
                 }
             }
         } else {
             $oldaccess->{$tool} = &mt('default');
             if ($env{'form.custom'.$tool} == 1) {
-                $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
-                                                $changeHash,$context);
+                $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
+                                                $context);
                 if ($changed->{$tool}) {
                     $newaccess->{$tool} = &mt('custom');
-                    if ($env{'form.'.$context.'_'.$tool}) {
+                    if ($newval) {
                         $newaccesstext->{$tool} = &mt("availability set to 'on'");
                     } else {
                         $newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -2532,8 +3254,8 @@ sub update_roles {
 	    if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
                 my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
 # Delete custom role
-                $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',
-                      $rolename,$rnam,$rdom,$url).': <b>'.
+                $r->print(&mt('Deleting custom role [_1] by [_2] in [_3]',
+                      $rolename,$rnam.':'.$rdom,$url).': <b>'.
                       &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
                          0,1,$context).'</b><br />');
@@ -2584,8 +3306,8 @@ sub update_roles {
                 my $result = &Apache::lonnet::assigncustomrole(
                                $env{'form.ccdomain'}, $env{'form.ccuname'},
                                $url,$rdom,$rnam,$rolename,0,$now,undef,$context);
-                $r->print(&mt('Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]',
-                          $rolename,$rnam,$rdom,$url,'<b>'.$result.'</b>').'<br />');
+                $r->print(&mt('Re-enabling custom role [_1] by [_2] in [_3]: [_4]',
+                          $rolename,$rnam.':'.$rdom,$url,'<b>'.$result.'</b>').'<br />');
                 if (!grep(/^cr$/,@rolechanges)) {
                     push(@rolechanges,'cr');
                 }
@@ -2723,7 +3445,7 @@ sub update_roles {
 	}
     } # End of foreach (keys(%env))
 # Flush the course logs so reverse user roles immediately updated
-    &Apache::lonnet::flushcourselogs();
+    $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
     if (@rolechanges == 0) {
         $r->print(&mt('No roles to modify'));
     }
@@ -2731,8 +3453,14 @@ sub update_roles {
 }
 
 sub enroll_single_student {
-    my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_;
-    $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
+    my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype) = @_;
+    $r->print('<h3>');
+    if ($crstype eq 'Community') {
+        $r->print(&mt('Enrolling Member'));
+    } else {
+        $r->print(&mt('Enrolling Student'));
+    }
+    $r->print('</h3>');
 
     # Remove non alphanumeric values from section
     $env{'form.sections'}=~s/\W//g;
@@ -2765,7 +3493,13 @@ sub enroll_single_student {
         }
         $r->print('.<br />'.$showstart.'; '.$showend);
         if ($startdate <= $now && !$newuser) {
-            $r->print("<p> ".&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')."</p>");
+            $r->print('<p> ');
+            if ($crstype eq 'Community') {
+                $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));
+            } else {
+                $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.'));
+           }
+           $r->print('</p>');
         }
     } else {
         $r->print(&mt('unable to enroll').": ".$enroll_result);
@@ -2835,6 +3569,10 @@ sub tool_admin {
         if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
             $canchange = 1;
         }
+    } elsif ($context eq 'reqcrsotherdom') {
+        if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+            $canchange = 1;
+        }
     } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
         # Current user has quota modification privileges
         $canchange = 1;
@@ -2886,18 +3624,27 @@ sub build_roles {
 
 sub custom_role_editor {
     my ($r) = @_;
-    my $rolename=$env{'form.rolename'};
-
-    if ($rolename eq 'make new role') {
-	$rolename=$env{'form.newrolename'};
+    my $action = $env{'form.customroleaction'};
+    my $rolename; 
+    if ($action eq 'new') {
+        $rolename=$env{'form.newrolename'};
+    } else {
+        $rolename=$env{'form.rolename'};
     }
 
     $rolename=~s/[^A-Za-z0-9]//gs;
-
     if (!$rolename || $env{'form.phase'} eq 'pickrole') {
 	&print_username_entry_form($r);
         return;
     }
+    my ($crstype,$context);
+    if ($env{'request.course.id'}) {
+        $crstype = &Apache::loncommon::course_type();
+        $context = 'course';
+    } else {
+        $context = 'domain';
+        $crstype = $env{'form.templatecrstype'};
+    }
 # ------------------------------------------------------- What can be assigned?
     my %full=();
     my %courselevel=();
@@ -2906,7 +3653,6 @@ sub custom_role_editor {
     my $dompriv='';
     my $coursepriv='';
     my $body_top;
-    my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]);
     my ($rdummy,$roledef)=
 			 &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
 # ------------------------------------------------------- Does this role exist?
@@ -2915,6 +3661,9 @@ sub custom_role_editor {
 	$body_top .= &mt('Existing Role').' "';
 # ------------------------------------------------- Get current role privileges
 	($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
+        if ($crstype eq 'Community') {
+            $syspriv =~ s/bre\&S//;   
+        }
     } else {
 	$body_top .= &mt('New Role').' "';
 	$roledef='';
@@ -2954,13 +3703,55 @@ sub custom_role_editor {
     my ($jsback,$elements) = &crumb_utilities();
     my $button_code = "\n";
     my $head_script = "\n";
-    $head_script .= '<script type="text/javascript">'."\n";
-    my @template_roles = ("cc","in","ta","ep","st");
+    $head_script .= '<script type="text/javascript">'."\n"
+                   .'// <![CDATA['."\n";
+    my @template_roles = ("in","ta","ep");
+    if ($context eq 'domain') {
+        push(@template_roles,"ad");
+    }
+    push(@template_roles,"st");
+    if ($crstype eq 'Community') {
+        unshift(@template_roles,'co');
+    } else {
+        unshift(@template_roles,'cc');
+    }
     foreach my $role (@template_roles) {
-        $head_script .= &make_script_template($role);
-        $button_code .= &make_button_code($role).' ';
+        $head_script .= &make_script_template($role,$crstype);
+        $button_code .= &make_button_code($role,$crstype).' ';
     }
-    $head_script .= "\n".$jsback."\n".'</script>'."\n";
+    my $context_code;
+    if ($context eq 'domain') {
+        my $checkedCommunity = '';
+        my $checkedCourse = ' checked="checked"';
+        if ($env{'form.templatecrstype'} eq 'Community') {
+            $checkedCommunity = $checkedCourse;
+            $checkedCourse = '';
+        }
+        $context_code = '<label>'.
+                        '<input type="radio" name="templatecrstype" value="Course"'.$checkedCourse.' onclick="this.form.submit();">'.
+                        &mt('Course').
+                        '</label>'.('&nbsp;' x2).
+                        '<label>'.
+                        '<input type="radio" name="templatecrstype" value="Community"'.$checkedCommunity.' onclick="this.form.submit();">'.
+                        &mt('Community').
+                        '</label>'.
+                        '</fieldset>'.
+                        '<input type="hidden" name="customroleaction" value="'.
+                        $action.'" />';
+        if ($env{'form.customroleaction'} eq 'new') {
+            $context_code .= '<input type="hidden" name="newrolename" value="'.
+                             $rolename.'" />';
+        } else {
+            $context_code .= '<input type="hidden" name="rolename" value="'.
+                             $rolename.'" />';
+        }
+        $context_code .= '<input type="hidden" name="action" value="custom" />'.
+                         '<input type="hidden" name="phase" value="selected_custom_edit" />';
+    }
+
+    $head_script .= "\n".$jsback."\n"
+                   .'// ]]>'."\n"
+                   .'</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
    &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.form1,'pickrole','')",
@@ -2979,13 +3770,22 @@ sub custom_role_editor {
                     'dml'  => "Domain Level",
                     'ssl'  => "System Level");
 
-    $r->print('<div>'
+
+    $r->print('<div class="LC_left_float">'
              .'<form action=""><fieldset>'
              .'<legend>'.&mt('Select a Template').'</legend>'
              .$button_code
-             .'</fieldset></form>'
-             .'</div>'
-    );
+             .'</fieldset></form></div>');
+    if ($context_code) {
+        $r->print('<div class="LC_left_float">'
+                 .'<form action="/adm/createuser" method="post"><fieldset>'
+                 .'<legend>'.&mt('Context').'</legend>'
+                 .$context_code
+                 .'</form>'
+                 .'</div>'
+        );
+    }
+    $r->print('<br clear="all" />');
 
     $r->print(<<ENDCCF);
 <form name="form1" method="post">
@@ -2997,32 +3797,36 @@ ENDCCF
 '<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}.
 '</th><th>'.$lt{'ssl'}.'</th>'.
               &Apache::loncommon::end_data_table_header_row());
-    foreach my $priv (sort keys %full) {
-        my $privtext = &Apache::lonnet::plaintext($priv);
+    foreach my $priv (sort(keys(%full))) {
+        my $privtext = &Apache::lonnet::plaintext($priv,$crstype);
         $r->print(&Apache::loncommon::start_data_table_row().
 	          '<td>'.$privtext.'</td><td>'.
-    ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c" '.
-    ($courselevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
-    '</td><td>'.
-    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d" '.
-    ($domainlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'.
+    ($courselevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;').
     '</td><td>'.
-    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s" '.
-    ($systemlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
-    '</td>'.
-             &Apache::loncommon::end_data_table_row());
+    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'.
+    ($domainlevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;').
+    '</td><td>');
+        if ($priv eq 'bre' && $crstype eq 'Community') {
+            $r->print('&nbsp;');  
+        } else {
+            $r->print($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'.
+                      ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;');
+        }
+        $r->print('</td>'.
+                  &Apache::loncommon::end_data_table_row());
     }
     $r->print(&Apache::loncommon::end_data_table().
    '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
    '<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}.
    '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".   
    '<input type="reset" value="'.&mt("Reset").'" />'."\n".
-   '<input type="submit" value="'.&mt('Define Role').'" /></form>'.
+   '<input type="submit" value="'.&mt('Save').'" /></form>'.
 	      &Apache::loncommon::end_page());
 }
 # --------------------------------------------------------
 sub make_script_template {
-    my ($role) = @_;
+    my ($role,$crstype) = @_;
     my %full_c=();
     my %full_d=();
     my %full_s=();
@@ -3036,6 +3840,7 @@ sub make_script_template {
         $full_d{$priv}=1;
     }
     foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+        next if (($crstype eq 'Community') && ($item eq 'bre&S'));
         my ($priv,$restrict)=split(/\&/,$item);
         $full_s{$priv}=1;
     }
@@ -3088,9 +3893,9 @@ sub make_script_template {
 }
 # ----------------------------------------------------------
 sub make_button_code {
-    my ($role) = @_;
-    my $label = &Apache::lonnet::plaintext($role);
-    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';
+    my ($role,$crstype) = @_;
+    my $label = &Apache::lonnet::plaintext($role,$crstype);
+    my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
     return ($button_code);
 }
 # ---------------------------------------------------------- Call to definerole
@@ -3103,7 +3908,11 @@ sub set_custom_role {
         return;
     }
     my ($jsback,$elements) = &crumb_utilities();
-    my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>';
+    my $jscript = '<script type="text/javascript">'
+                 .'// <![CDATA['."\n"
+                 .$jsback."\n"
+                 .'// ]]>'."\n"
+                 .'</script>'."\n";
 
     $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -3185,9 +3994,10 @@ sub handler {
        $r->send_http_header;
        return OK;
     }
-    my $context;
+    my ($context,$crstype);
     if ($env{'request.course.id'}) {
         $context = 'course';
+        $crstype = &Apache::loncommon::course_type();
     } elsif ($env{'request.role'} =~ /^au\./) {
         $context = 'author';
     } else {
@@ -3200,10 +4010,13 @@ sub handler {
     if ($env{'form.action'} ne 'dateselect') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"/adm/createuser",
-              text=>"User Management"});
+              text=>"User Management",
+              help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'});
     }
+    #SD Following files not added to help, because the corresponding .tex-files seem to
+    #be missing: Course_Approve_Selfenroll,Course_User_Logs,
     my ($permission,$allowed) = 
-        &Apache::lonuserutils::get_permission($context);
+        &Apache::lonuserutils::get_permission($context,$crstype);
     if (!$allowed) {
         $env{'user.error.msg'}=
             "/adm/createuser:cst:0:0:Cannot create/modify user data ".
@@ -3218,7 +4031,7 @@ sub handler {
     if (! exists($env{'form.action'})) {
         $r->print(&header());
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
-        $r->print(&print_main_menu($permission,$context));
+        $r->print(&print_main_menu($permission,$context,$crstype));
         $r->print(&Apache::loncommon::end_page());
     } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
         $r->print(&header());
@@ -3234,7 +4047,7 @@ sub handler {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         } elsif ($env{'form.state'} eq 'got_file') {
             &Apache::lonuserutils::print_upload_manager_form($r,$context,
-                                                             $permission);
+                                                             $permission,$crstype);
         } elsif ($env{'form.state'} eq 'enrolling') {
             if ($env{'form.datatoken'}) {
                 &Apache::lonuserutils::upfile_drop_add($r,$context,$permission);
@@ -3259,13 +4072,13 @@ sub handler {
                 if ($env{'form.srchterm'} !~ /^$match_username$/) {
                     my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
                     $env{'form.phase'} = '';
-                    &print_username_entry_form($r,$context,$response,$srch);
+                    &print_username_entry_form($r,$context,$response,$srch,undef,$crstype);
                 } else {
                     my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
                     my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
                     &print_user_modification_page($r,$ccuname,$ccdomain,
                                                   $srch,$response,$context,
-                                                  $permission);
+                                                  $permission,$crstype);
                 }
             } elsif ($env{'form.phase'} eq 'get_user_info') {
                 my ($currstate,$response,$forcenewuser,$results) = 
@@ -3275,7 +4088,7 @@ sub handler {
                 }
                 if ($currstate eq 'select') {
                     &print_user_selection_page($r,$response,$srch,$results,
-                                               \@search,$context);
+                                               \@search,$context,undef,$crstype);
                 } elsif ($currstate eq 'modify') {
                     my ($ccuname,$ccdomain);
                     if (($srch->{'srchby'} eq 'uname') && 
@@ -3293,24 +4106,24 @@ sub handler {
                     }
                     &print_user_modification_page($r,$ccuname,$ccdomain,
                                                   $srch,$response,$context,
-                                                  $permission);
+                                                  $permission,$crstype);
                 } elsif ($currstate eq 'query') {
                     &print_user_query_page($r,'createuser');
                 } else {
                     $env{'form.phase'} = '';
                     &print_username_entry_form($r,$context,$response,$srch,
-                                               $forcenewuser);
+                                               $forcenewuser,$crstype);
                 }
             } elsif ($env{'form.phase'} eq 'userpicked') {
                 my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
                 my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
                 &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
-                                              $context,$permission);
+                                              $context,$permission,$crstype);
             }
         } elsif ($env{'form.phase'} eq 'update_user_data') {
-            &update_user_data($r,$context);
+            &update_user_data($r,$context,$crstype);
         } else {
-            &print_username_entry_form($r,$context,undef,$srch);
+            &print_username_entry_form($r,$context,undef,$srch,undef,$crstype);
         }
     } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
         if ($env{'form.phase'} eq 'set_custom_roles') {
@@ -3332,7 +4145,7 @@ sub handler {
             $r->print(&Apache::lonhtmlcommon::breadcrumbs("Update Users",
                                                           'Course_View_Class_List'));
             if ($permission->{'cusr'}) {
-                &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice);
+                &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice,$crstype);
                 $r->print(&Apache::loncommon::end_page());
             } else {
                 $r->print(&mt('You are not authorized to make bulk changes to user roles'));
@@ -3345,10 +4158,22 @@ sub handler {
                   text=>"List Users"});
             my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
             my $formname = 'studentform';
-            if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
-                ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = 
-                    &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
-                                                            $formname);
+            if (($context eq 'domain') && (($env{'form.roletype'} eq 'course') ||
+                ($env{'form.roletype'} eq 'community'))) {
+                if ($env{'form.roletype'} eq 'course') {
+                    ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = 
+                        &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
+                                                                $formname);
+                } elsif ($env{'form.roletype'} eq 'community') {
+                    $cb_jscript = 
+                        &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'});
+                    my %elements = (
+                                      coursepick => 'radio',
+                                      coursetotal => 'text',
+                                      courselist => 'text',
+                                   );
+                    $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements);
+                }
                 $jscript .= &verify_user_display();
                 my $js = &add_script($jscript).$cb_jscript;
                 my $loadcode = 
@@ -3369,19 +4194,25 @@ sub handler {
         }
     } elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {
         $r->print(&header());
+        my $brtext;
+        if ($crstype eq 'Community') {
+            $brtext = 'Drop Members';
+        } else {
+            $brtext = 'Drop Students';
+        }
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/createuser?action=drop',
-              text=>"Drop Students"});
+              text=>$brtext});
         if (!exists($env{'form.state'})) {
-            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext,
                                                           'Course_Drop_Student'));
 
-            &Apache::lonuserutils::print_drop_menu($r,$context,$permission);
+            &Apache::lonuserutils::print_drop_menu($r,$context,$permission,$crstype);
         } elsif ($env{'form.state'} eq 'done') {
             &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/createuser?action=drop',
               text=>"Result"});
-            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext,
                                                           'Course_Drop_Student'));
             &Apache::lonuserutils::update_user_list($r,$context,undef,
                                                     $env{'form.action'});
@@ -3391,7 +4222,7 @@ sub handler {
         if ($permission->{'cusr'}) {
             $r->print(&header(undef,undef,{'no_nav_bar' => 1}).
                       &Apache::lonuserutils::date_section_selector($context,
-                                                                   $permission).
+                                                                   $permission,$crstype).
                       &Apache::loncommon::end_page());
         } else {
             $r->print(&header().
@@ -3426,11 +4257,13 @@ sub handler {
         my $cid = $env{'request.course.id'};
         my $cdom = $env{'course.'.$cid.'.domain'};
         my $cnum = $env{'course.'.$cid.'.num'};
+        my $coursedesc = $env{'course.'.$cid.'.description'};
         if (!exists($env{'form.state'})) {
             $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment requests',
                                                           'Course_SelfEnrollment_Approval'));
             $r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n");
-            &display_selfenroll_queue($r,$context,$permission,$cnum,$cdom);
+            $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
+                                                                       $cdom,$cnum));
         } elsif ($env{'form.state'} eq 'done') {
             &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/createuser?action=selfenrollqueue',
@@ -3438,7 +4271,8 @@ sub handler {
             $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result',
                                                           'Course_Self_Enrollment'));
             $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
-            &update_selfenroll_queue($r,$context,$permission,$cid,$cnum,$cdom);
+            $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
+                          $cdom,$cnum,$coursedesc));
         }
         $r->print(&Apache::loncommon::end_page());
     } elsif ($env{'form.action'} eq 'changelogs') {
@@ -3453,7 +4287,7 @@ sub handler {
     } else {
         $r->print(&header());
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
-        $r->print(&print_main_menu($permission,$context));
+        $r->print(&print_main_menu($permission,$context,$crstype));
         $r->print(&Apache::loncommon::end_page());
     }
     return OK;
@@ -3472,7 +4306,11 @@ sub header {
 
 sub add_script {
     my ($js) = @_;
-    return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+    return '<script type="text/javascript">'."\n"
+          .'// <![CDATA['."\n"
+          .$js."\n"
+          .'// ]]>'."\n"
+          .'</script>'."\n";
 }
 
 sub verify_user_display {
@@ -3493,143 +4331,219 @@ END
 ###############################################################
 #  Menu Phase One
 sub print_main_menu {
-    my ($permission,$context) = @_;
+    my ($permission,$context,$crstype) = @_;
+    my $linkcontext = $context;
+    my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));
+    if (($context eq 'course') && ($crstype eq 'Community')) {
+        $linkcontext = lc($crstype);
+        $stuterm = 'Members';
+    }
     my %links = (
-                       domain => {
-                                   upload => 'Upload a File of Users',
-                                   singleuser => 'Add/Modify a Single User',
-                                   listusers => 'Manage Multiple Users',
-                                 },
-                       author => {
-                                   upload => 'Upload a File of Co-authors',
-                                   singleuser => 'Add/Modify a Single Co-author',
-                                   listusers => 'Display Co-authors and Manage Multiple Users',
-                                 },
-                       course => {
-                                   upload => 'File of Course Users',
-                                   singleuser => 'Single Course User',
-                                   listusers => 'Course User Lists',
-                                 },
-                     );
-  my @menu = ( {categorytitle => 'Add Users',
-	     items =>
-	     [{
-	         linktext => $links{$context}{'upload'},
-	         icon => 'sctr.png',
-	         #help => 'Course_Create_Class_List',
-	         url => '/adm/createuser?action=upload',
-	         permission => $permission->{'cusr'},
-	         linktitle => 'Upload a CSV or a text file containing users.',
-	     },
-	     {
-	         linktext => $links{$context}{'singleuser'},
-	         icon => 'edit-redo.png',
-	         #help => 'Course_Change_Privileges',
-	         url => '/adm/createuser?action=singleuser',
-	         permission => $permission->{'cusr'},
-	         linktitle => 'Add a user with a certain role to this course.',
-	     }]},
-	     {categorytitle => 'Administration',
-	     items =>
-	     [{	
-	         linktext => $links{$context}{'listusers'},
-                 icon => 'edit-find.png',
-                 #help => 'Course_View_Class_List',
-                 url => '/adm/createuser?action=listusers',
-	         permission => ($permission->{'view'} || $permission->{'cusr'}),
-	         linktitle => 'Show and manage users of this course.',
-	     }]},
-	     {categorytitle => 'Configuration',
-	     items =>
-	     [
-	     ]},
-	   );
-			
+                domain => {
+                            upload     => 'Upload a File of Users',
+                            singleuser => 'Add/Modify a User',
+                            listusers  => 'Manage Users',
+                            },
+                author => {
+                            upload     => 'Upload a File of Co-authors',
+                            singleuser => 'Add/Modify a Co-author',
+                            listusers  => 'Manage Co-authors',
+                            },
+                course => {
+                            upload     => 'Upload a File of Course Users',
+                            singleuser => 'Add/Modify a Course User',
+                            listusers  => 'Manage Course Users',
+                            },
+                community => {
+                            upload     => 'Upload a File of Community Users',
+                            singleuser => 'Add/Modify a Community User',
+                            listusers  => 'Manage Community Users',
+                           },
+                );
+     my %linktitles = (
+                domain => {
+                            singleuser => 'Add a user to the domain, and/or a course or community in the domain.',
+                            listusers  => 'Show and manage users in this domain.',
+                            },
+                author => {
+                            singleuser => 'Add a user with a co- or assistant author role.',
+                            listusers  => 'Show and manage co- or assistant authors.',
+                            },
+                course => {
+                            singleuser => 'Add a user with a certain role to this course.',
+                            listusers  => 'Show and manage users in this course.',
+                            },
+                community => {
+                            singleuser => 'Add a user with a certain role to this community.',
+                            listusers  => 'Show and manage users in this community.',
+                           },
+                );
+  my @menu = ( {categorytitle => 'Single Users', 
+         items =>
+         [
+            {
+             linktext => $links{$linkcontext}{'singleuser'},
+             icon => 'edit-redo.png',
+             #help => 'Course_Change_Privileges',
+             url => '/adm/createuser?action=singleuser',
+             permission => $permission->{'cusr'},
+             linktitle => $linktitles{$linkcontext}{'singleuser'},
+            },
+         ]},
+
+         {categorytitle => 'Multiple Users',
+         items => 
+         [
+            {
+             linktext => $links{$linkcontext}{'upload'},
+             icon => 'uplusr.png',
+             #help => 'Course_Create_Class_List',
+             url => '/adm/createuser?action=upload',
+             permission => $permission->{'cusr'},
+             linktitle => 'Upload a CSV or a text file containing users.',
+            },
+            {
+             linktext => $links{$linkcontext}{'listusers'},
+             icon => 'mngcu.png',
+             #help => 'Course_View_Class_List',
+             url => '/adm/createuser?action=listusers',
+             permission => ($permission->{'view'} || $permission->{'cusr'}),
+             linktitle => $linktitles{$linkcontext}{'listusers'}, 
+            },
+
+         ]},
+
+         {categorytitle => 'Administration',
+         items => [ ]},
+       );
+            
     if ($context eq 'domain'){
-		
-		push(@{ $menu[1]->{items} },
-		{	linktext => 'Custom Roles',
-			icon => 'emblem-photos.png',
-			#help => 'Course_Editing_Custom_Roles',
-			url => '/adm/createuser?action=custom',
-			permission => $permission->{'custom'},
-			linktitle => 'Configure a custom role.',
-		});
-		
+        
+        push(@{ $menu[2]->{items} }, #Category: Administration
+            {
+             linktext => 'Custom Roles',
+             icon => 'emblem-photos.png',
+             #help => 'Course_Editing_Custom_Roles',
+             url => '/adm/createuser?action=custom',
+             permission => $permission->{'custom'},
+             linktitle => 'Configure a custom role.',
+            },
+        );
+        
     }elsif ($context eq 'course'){
-    	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
-	
-        push(@{ $menu[0]->{items} },
-		{	linktext => 'Single Student',
-            		#help => 'Course_Add_Student',
-			icon => 'list-add.png',
-            		url => '/adm/createuser?action=singlestudent',
-			permission => $permission->{'cusr'},
-            		linktitle => 'Add a user with the role student to this course.',
-        	});
-		
-        push(@{ $menu[1]->{items} },  
-		{	linktext => 'Drop Students',
-			icon => 'edit-undo.png',
-           		#help => 'Course_Drop_Student',
-           		url => '/adm/createuser?action=drop',
-			permission => $permission->{'cusr'},
-           		linktitle =>'Remove a student from this course.',
-        	},
-		{	linktext => 'Custom Roles',
-			icon => 'emblem-photos.png',
-           		#help => 'Course_Editing_Custom_Roles',
-           		url => '/adm/createuser?action=custom',
-			permission => $permission->{'custom'},
-			linktitle => 'Configure a custom role.',
-        	});
+        my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+
+        my %linktext = (
+                         'Course'    => {
+                                          single => 'Add/Modify a Student', 
+                                          drop   => 'Drop Students',
+                                          groups => 'Course Groups',
+                                        },
+                         'Community' => {
+                                          single => 'Add/Modify a Member', 
+                                          drop   => 'Drop Members',
+                                          groups => 'Community Groups',
+                                        },
+                       );
+
+        my %linktitle = (
+            'Course' => {
+                  single => 'Add a user with the role of student to this course',
+                  drop   => 'Remove a student from this course.',
+                  groups => 'Manage course groups',
+                        },
+            'Community' => {
+                  single => 'Add a user with the role of member to this community',
+                  drop   => 'Remove a member from this community.',
+                  groups => 'Manage community groups',
+                           },
+        );
+
+        push(@{ $menu[0]->{items} }, #Category: Single Users
+            {   
+             linktext => $linktext{$crstype}{'single'},
+             #help => 'Course_Add_Student',
+             icon => 'list-add.png',
+             url => '/adm/createuser?action=singlestudent',
+             permission => $permission->{'cusr'},
+             linktitle => $linktitle{$crstype}{'single'},
+            },
+        );
+        
+        push(@{ $menu[1]->{items} }, #Category: Multiple Users 
+            {
+             linktext => $linktext{$crstype}{'drop'},
+             icon => 'edit-undo.png',
+             #help => 'Course_Drop_Student',
+             url => '/adm/createuser?action=drop',
+             permission => $permission->{'cusr'},
+             linktitle => $linktitle{$crstype}{'drop'},
+            },
+        );
+        push(@{ $menu[2]->{items} }, #Category: Administration
+            {    
+             linktext => 'Custom Roles',
+             icon => 'emblem-photos.png',
+             #help => 'Course_Editing_Custom_Roles',
+             url => '/adm/createuser?action=custom',
+             permission => $permission->{'custom'},
+             linktitle => 'Configure a custom role.',
+            },
+            {
+             linktext => $linktext{$crstype}{'groups'},
+             icon => 'grps.png',
+             #help => 'Course_Manage_Group',
+             url => '/adm/coursegroups?refpage=cusr',
+             permission => $permission->{'grp_manage'},
+             linktitle => $linktitle{$crstype}{'groups'},
+            },
+            {
+             linktext => 'Change Log',
+             icon => 'document-properties.png',
+             #help => 'Course_User_Logs',
+             url => '/adm/createuser?action=changelogs',
+             permission => $permission->{'cusr'},
+             linktitle => 'View change log.',
+            },
+        );
         if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
-            push(@{ $menu[1]->{items} },
-                    {   linktext => 'Enrollment Requests',
-                        icon => 'selfenrl-queue.png',
-                        #help => 'Course_Approve_Selfenroll',
-                        url => '/adm/createuser?action=selfenrollqueue',
-                        permission => $permission->{'cusr'},
-                        linktitle =>'Approve or reject enrollment requests.',
-                });
+            push(@{ $menu[2]->{items} },
+                    {   
+                     linktext => 'Enrollment Requests',
+                     icon => 'selfenrl-queue.png',
+                     #help => 'Course_Approve_Selfenroll',
+                     url => '/adm/createuser?action=selfenrollqueue',
+                     permission => $permission->{'cusr'},
+                     linktitle =>'Approve or reject enrollment requests.',
+                    },
+            );
         }
-		
+        
         if (!exists($permission->{'cusr_section'})){
-        	
-		push(@{ $menu[2]->{items} },
-		{	linktext => 'Automated Enrollment',
-			icon => 'roles.png',
-         		#help => 'Course_Automated_Enrollment',
-        		permission => (&Apache::lonnet::auto_run($cnum,$cdom)
-                                	&& $permission->{'cusr'}),
-			url  => '/adm/populate',
-			linktitle => 'Automated enrollment manager.',
-		},
-		{	linktext => 'User Self-Enrollment',
-			icon => 'cstr.png',
-	       		#help => 'Course_Self_Enrollment',
-			url => '/adm/createuser?action=selfenroll',
-			permission => $permission->{'cusr'},
-			linktitle => 'Configure user self enrollment.',
-       		});
-		
-	}
-
-	push(@{ $menu[2]->{items} },
-	{	linktext => 'Course Groups',
-		icon => 'conf.png',
-        	#help => 'Course_Manage_Group',
-           	url => '/adm/coursegroups?refpage=cusr',
-		permission => $permission->{'grp_manage'},
-		linktitle => 'Manage course groups.',
-        },
-        {	linktext => 'Change Logs',
-		icon => 'document-properties.png',
-        	#help => 'Course_User_Logs',
-        	url => '/adm/createuser?action=changelogs',
-		permission => $permission->{'cusr'},
-		linktitle => 'View change log.',
-        });
+            if ($crstype ne 'Community') {
+                push(@{ $menu[2]->{items} },
+                    {
+                     linktext => 'Automated Enrollment',
+                     icon => 'roles.png',
+                     #help => 'Course_Automated_Enrollment',
+                     permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                         && $permission->{'cusr'}),
+                     url  => '/adm/populate',
+                     linktitle => 'Automated enrollment manager.',
+                    }
+                );
+            }
+            push(@{ $menu[2]->{items} }, 
+                {
+                 linktext => 'User Self-Enrollment',
+                 icon => 'self_enroll.png',
+                 #help => 'Course_Self_Enrollment',
+                 url => '/adm/createuser?action=selfenroll',
+                 permission => $permission->{'cusr'},
+                 linktitle => 'Configure user self-enrollment.',
+                },
+            );
+        }
     };
 return Apache::lonhtmlcommon::generate_menu(@menu);
 #               { text => 'View Log-in History',
@@ -3652,6 +4566,7 @@ sub restore_prev_selections {
 
 sub print_selfenroll_menu {
     my ($r,$context,$permission) = @_;
+    my $crstype = &Apache::loncommon::course_type();
     my $formname = 'enrollstudent';
     my $nolink = 1;
     my ($row,$lt) = &get_selfenroll_titles();
@@ -3833,15 +4748,18 @@ ENDSCRIPT
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my $output = '<script type="text/javascript">'."\n".
+                 '// <![CDATA['."\n".
                  $setsec_js."\n".$selfenroll_js."\n".
+                 '// ]]>'."\n".
                  '</script>'."\n".
                  '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
     my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
     if (ref($visactions) eq 'HASH') {
         if ($visible) {
-            $output .= '<p>'.$visactions->{'vis'}.'</p>';
+            $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>';
         } else {
-            $output .= $visactions->{'miss'}.'<br />'.$visactions->{'yous'}.
+            $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>'
+                      .$visactions->{'yous'}.
                        '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};
             if (ref($vismsgs) eq 'ARRAY') {
                 $output .= '<br />'.$visactions->{'make'}.'<ul>';
@@ -3861,9 +4779,7 @@ ENDSCRIPT
             if (ref($lt) eq 'HASH') {
                 $title = $lt->{$item};
             }
-            $output .= 
-                &Apache::lonhtmlcommon::row_title($title,
-                             'LC_selfenroll_pick_box_title','LC_oddrow_value')."\n";
+            $output .= &Apache::lonhtmlcommon::row_title($title);
             if ($item eq 'types') {
                 my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'};
                 my $showdomdesc = 1;
@@ -4012,8 +4928,12 @@ ENDSCRIPT
                            &mt('No').'</label>';
                 my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);
                 my (@ccs,%notified);
-                if ($advhash{'cc'}) {
-                    @ccs = split(/,/,$advhash{'cc'});
+                my $ccrole = 'cc';
+                if ($crstype eq 'Community') {
+                    $ccrole = 'co';
+                }
+                if ($advhash{$ccrole}) {
+                    @ccs = split(/,/,$advhash{$ccrole});
                 }
                 if ($currnotified) {
                     foreach my $current (split(/,/,$currnotified)) {
@@ -4042,7 +4962,7 @@ ENDSCRIPT
                                    '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'" />'.
                                    &Apache::loncommon::plainname($ccuname,$ccudom).
                                    '</label></span></td>';
-                        $count;
+                        $count ++;
                     }
                     my $rem = $count%$numcols;
                     if ($rem) {
@@ -4059,7 +4979,7 @@ ENDSCRIPT
                 my $cid = $env{'request.course.id'};
                 my $currlim = $env{'course.'.$cid.'.internal.selfenroll_limit'};
                 my $currcap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
-                my $nolimit = ' checked="checked" ';
+                $nolimit = ' checked="checked" ';
                 if ($currlim eq 'allstudents') {
                     $crslimit = ' checked="checked" ';
                     $selflimit = ' ';
@@ -4089,255 +5009,23 @@ ENDSCRIPT
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box().
                '<br /><input type="button" name="selfenrollconf" value="'
-               .&mt('Save changes').'" onclick="validate_types(this.form);" />'
+               .&mt('Save').'" onclick="validate_types(this.form);" />'
                .'<input type="hidden" name="action" value="selfenroll" /></form>';
     $r->print($output);
     return;
 }
 
-sub display_selfenroll_queue {
-    my ($r,$context,$permission,$cnum,$cdom) = @_;
-    my $namespace = 'selfenrollrequests';
-    my ($output,%queue_by_date);
-    my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
-    if (keys(%requesthash) > 0) {
-        $r->print('<form method="post" name="changequeue" action="/adm/createuser" />'.
-                  '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
-                  '<input type="hidden" name="state" value="done" />'.
-                  &Apache::loncommon::start_data_table().
-                  &Apache::loncommon::start_data_table_header_row().
-                  '<th>'.&mt('Action').'</th>'.
-                  '<th>'.&mt('Requestor').'</th>'.
-                  '<th>'.&mt('Section').'</th>'.
-                  '<th>'.&mt('Date requested').'</th>'.
-                  &Apache::loncommon::end_data_table_header_row());
-        foreach my $item (keys(%requesthash)) {
-            my ($timestamp,$usec) = split(/:/,$requesthash{$item});
-            if (exists($queue_by_date{$timestamp})) {
-                if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
-                    push(@{$queue_by_date{$timestamp}},$item.':'.$usec);
-                }
-            } else {
-                @{$queue_by_date{$timestamp}} = ($item.':'.$usec);
-            }
-        }
-        my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
-        my $count = 0;
-        foreach my $item (@sortedtimes) {
-            if (ref($queue_by_date{$item}) eq 'ARRAY') {
-                foreach my $request (sort(@{$queue_by_date{$item}})) {
-                    my ($puname,$pudom,$pusec) = split(/:/,$request);
-                    my $showsec = $pusec;
-                    if ($showsec eq '') {
-                        $showsec = &mt('none');
-                    }
-                    my $namelink = &Apache::loncommon::aboutmewrapper(
-                                     &Apache::loncommon::plainname($puname,$pudom),
-                                     $puname,$pudom);
-                    $r->print(&Apache::loncommon::start_data_table_row().
-                              '<td><span class="LC_nobreak"><label>'.
-                              '<input type="checkbox" value="'.$count.':'.$puname.':'.$pudom.':'.$pusec.'" name="approvereq" />'.&mt('Approve').'</label></span><br />'.
-                              '<span class="LC_nobreak"><label>'.
-                              '<input type="checkbox" value="'.$puname.':'.$pudom.'" name="rejectreq" />'.&mt('Reject').'</label></span><br /></td>'.
-                              '<td>'.$namelink.'</td>'.
-                              '<td>'.$showsec.'</td>'.
-                              '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
-                              &Apache::loncommon::end_data_table_row());
-                    $count ++;
-                }
-            }
-        }
-        $r->print(&Apache::loncommon::end_data_table().
-                  '<input type="submit" name="processqueue" value="'.&mt('Save').'" /></form>');
-    } else {
-        $r->print(&mt('There are currently no enrollment requests.'));  
-    }
-    return;
-}
-
-sub update_selfenroll_queue {
-    my ($r,$context,$permission,$cid,$cnum,$cdom) = @_;
-    my @approvals = &Apache::loncommon::get_env_multiple('form.approvereq');
-    my @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq');
-    my $access_start =  $env{'course.'.$cid.'.internal.selfenroll_start_access'};
-    my $access_end =  $env{'course.'.$cid.'.internal.selfenroll_end_access'};
-    my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'}; 
-    my $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'};
-    my $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'};
-    my $namespace = 'selfenrollrequests';
-    my ($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum);
-    my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
-    my $coursedesc = $env{'course.'.$cid.'.description'};
-    my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
-    my $hostname = &Apache::lonnet::hostname($chome);
-    my $protocol = $Apache::lonnet::protocol{$chome};
-    $protocol = 'http' if ($protocol ne 'https');
-    my (@existing,@missingreq,@invalidusers,@limitexceeded,@enrolled,@enrollerrors,);
-    my $now = time;
-    my $sender = $env{'user.name'}.':'.$env{'user.domain'};
-    my $approvedmsg = [{
-                        mt => 'Your request for enrollment has been approved.',
-                      },
-                      {
-                        mt => 'Visit [_1], to log-in and access the course',
-                        args => [$protocol.'://'.$hostname],
-                      }];
-                      
-    my $rejectedmsg =  [{
-                         mt => 'Your request for enrollment has not been approved.',
-                       }];
-    foreach my $item (sort {$a <=> $b} @approvals) {
-        my ($num,$uname,$udom,$usec) = split(/:/,$item);
-        my $uhome = &Apache::lonnet::homeserver($uname,$udom);
-        if ($uhome ne 'no_host') {
-            if (exists($requesthash{$uname.':'.$udom})) {
-               
-                if (exists($classlist->{$uname.':'.$udom})) {
-                    if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
-                        if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') ||
-                            ($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Future')) {
-                            push(@existing,$uname.':'.$udom);
-                            next;
-                        }
-                    }
-                }
-            } else {
-                push(@missingreq,$uname.':'.$udom);
-                next;
-            }
-            if (!grep(/^\Q$item\E$/,@rejections)) {
-                if ($limit eq 'allstudents') {
-                    if ($stucounts->{$limit} >= $cap) {
-                        push(@limitexceeded,$uname.':'.$udom);
-                        last;
-                    }
-                } elsif ($limit eq 'selfenrolled') {
-                    if ($stucounts->{$limit} >= $cap) {
-                        push(@limitexceeded,$uname.':'.$udom);
-                        last;
-                    }
-                }
-                my $result = 
-                    &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1);
-                if ($result eq 'ok') {
-                    push(@enrolled,$uname.':'.$udom);
-                    $stucounts->{'allstudents'} ++;
-                    $stucounts->{'selfenrolled'} ++;
-                    &Apache::selfenroll::send_notification($uname.':'.$udom,$approvedmsg,$cid,
-                                               $coursedesc,$now,'enroller',$sender);
-                } else {
-                    push(@enrollerrors,$uname.':'.$udom);
-                }
-            }
-        } else {
-            push(@invalidusers,$uname.':'.$udom);
-        }
-    }
-    my @changes = (@enrolled,@rejections);
-    if (@rejections) {
-        foreach my $user (@rejections) {
-            &Apache::selfenroll::send_notification($user,$rejectedmsg,$cid,
-                                                   $coursedesc,$now,'enroller',$sender);
-        }
-    }
-    if (@changes) {
-        my $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum);
-        if ($delresult eq 'ok') {
-            my $namelink = 
-                &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')';
-            my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
-            my ($approvedlist,$rejectedlist);
-            if (@enrolled) {
-                $approvedlist = join("\n",@enrolled);
-                $r->print('<p>'.&mt('The following were enrolled in the course:').'<ul>');
-                foreach my $user (@enrolled) {
-                    my ($uname,$udom) = split(/:/,$user); 
-                    my $userlink = 
-                        &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom);
-                    $r->print('<li>'.$userlink.'</li>');
-                }
-                $r->print('</ul></p>');
-            }
-            if (@rejections) {
-                $rejectedlist = join("\n",@rejections);
-                $r->print('<p>'.&mt('The following enrollment requests were rejected:').'<ul>');
-                foreach my $user (@rejections) {
-                    $r->print('<li>'.$user.'</li>');
-                }
-                $r->print('</ul></p>');
-            }
-            &Apache::selfenroll::send_notification($notifylist,$chgmsg,$cid,
-                                                   $coursedesc,$now,'managers',
-                                                   $sender,$approvedlist,$rejectedlist);
-        }
-    }
-    if (@existing) {
-        $r->print('<p>'.&mt('The following enrollment requests were deleted because the user is already enrolled in the course:').'<ul>');
-        foreach my $user (@existing) {
-            $r->print('<li>'.$user.'</li>');
-        }
-        $r->print('</ul></p>');
-    }
-    if (@missingreq) {
-        $r->print('<p>'.&mt('The following enrollment requests were ignored because the request is no longer in the enrollment queue:').'<ul>');
-        foreach my $user (@missingreq) {
-            $r->print('<li>'.$user.'</li>');
-        }
-        $r->print('</ul></p>');
-    }
-    if (@invalidusers) {
-        $r->print('<p>'.&mt('The following enrollment requests were deleted because the requestor does not have a LON-CAPA account:').'<ul>');
-        foreach my $user (@invalidusers) {
-            $r->print('<li>'.$user.'</li>');
-        }
-        $r->print('</ul></p>');
-    }
-    if (@limitexceeded) {
-        $r->print('<p>'.&mt('The following enrollment requests were skipped because the enrollment limit has been reached for the course:').'<ul>');
-        foreach my $user (@limitexceeded) {
-            $r->print('<li>'.$user.'</li>');
-        }
-        $r->print('</ul></p>');
-    }
-    if (@enrollerrors) {
-        $r->print('<p>'.&mt('The following enrollment requests could not be processed because an error occurred:').'<ul>');
-        foreach my $user (@enrollerrors) {
-            $r->print('<li>'.$user.'</li>');
-        }
-        $r->print('</ul></p>');
-    }
-    return;
-}
-
-sub get_student_counts {
-    my ($cdom,$cnum) = @_;
-    my (%idx,%stucounts);
-    my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum);
-    $idx{'type'} = &Apache::loncoursedata::CL_TYPE();
-    $idx{'status'} = &Apache::loncoursedata::CL_STATUS();
-    while (my ($student,$data) = each(%$classlist)) {
-        if (($data->[$idx{'status'}] eq 'Active') ||
-            ($data->[$idx{'status'}] eq 'Future')) {
-            if ($data->[$idx{'type'}] eq 'selfenroll') {
-                $stucounts{'selfenroll'} ++;
-            }
-            $stucounts{'allstudents'} ++;
-        }
-    }
-    return (\%stucounts,\%idx,$classlist);
-}
-
 sub visible_in_cat {
     my ($cdom,$cnum) = @_;
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
     my ($cathash,%settable,@vismsgs,$cansetvis);
     my %visactions = &Apache::lonlocal::texthash(
-                   vis => 'Your course currently appears in the Course Catalog for this domain.',
+                   vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.',
                    gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
-                   miss => 'Your course does not currently appear in the Course Catalog for this domain.',
+                   miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.',
                    yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
                    coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
-                   make => 'Make any changes to self-enrollment settings below, click "Save changes", then take action to include the course in the Catalog:',
+                   make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
                    take => 'Take the following action to ensure the course appears in the Catalog:',
                    dc_unhide  => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
                    dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
@@ -4347,9 +5035,9 @@ sub visible_in_cat {
                    dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
                    dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
     );
-    $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','"<a href="/adm/parmset?action=crsenv">','</a>"');
-    $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/parmset?action=crsenv">','</a>"');
-    $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','"<a href="/adm/parmset?action=crsenv">','</a>"');
+    $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
+    $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
+    $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"');
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
         if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
             $settable{'togglecats'} = 1;
@@ -4550,10 +5238,10 @@ sub print_userchangelogs_display {
     my $formname = 'roleslog';
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = &Apache::loncommon::course_type();
     my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum);
     if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); }
 
-    $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">');
     my %saveable_parameters = ('show' => 'scalar',);
     &Apache::loncommon::store_course_settings('roles_log',
                                               \%saveable_parameters);
@@ -4588,14 +5276,6 @@ sub print_userchangelogs_display {
     }
     my (%whodunit,%changed,$version);
     ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/);
-    $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version));
-    my $showntablehdr = 0;
-    my $tablehdr = &Apache::loncommon::start_data_table().
-                   &Apache::loncommon::start_data_table_header_row().
-                   '<th>&nbsp;</th><th>'.&mt('When').'</th><th>'.&mt('Who made the change').
-                   '</th><th>'.&mt('Changed User').'</th><th>'.&mt('Role').'</th><th>'.&mt('Section').'</th><th>'.
-                   &mt('Context').'</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
-                   &Apache::loncommon::end_data_table_header_row();
     my ($minshown,$maxshown);
     $minshown = 1;
     my $count = 0;
@@ -4605,6 +5285,30 @@ sub print_userchangelogs_display {
             $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
         }
     }
+
+    # Form Header
+    $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'.
+              &role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype));
+
+    # Create navigation
+    my ($nav_script,$nav_links) = &userlogdisplay_nav($formname,\%curr,$more_records);
+    my $showntableheader = 0;
+
+    # Table Header
+    my $tableheader = 
+        &Apache::loncommon::start_data_table_header_row()
+       .'<th>&nbsp;</th>'
+       .'<th>'.&mt('When').'</th>'
+       .'<th>'.&mt('Who made the change').'</th>'
+       .'<th>'.&mt('Changed User').'</th>'
+       .'<th>'.&mt('Role').'</th>'
+       .'<th>'.&mt('Section').'</th>'
+       .'<th>'.&mt('Context').'</th>'
+       .'<th>'.&mt('Start').'</th>'
+       .'<th>'.&mt('End').'</th>'
+       .&Apache::loncommon::end_data_table_header_row();
+
+    # Display user change log data
     foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) {
         next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) ||
                  ($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'}));
@@ -4626,9 +5330,13 @@ sub print_userchangelogs_display {
         }
         $count ++;
         next if ($count < $minshown);
-        if (!$showntablehdr) {
-            $r->print($tablehdr);
-            $showntablehdr = 1;
+        unless ($showntableheader) {
+            $r->print($nav_script
+                     .$nav_links
+                     .&Apache::loncommon::start_data_table()
+                     .$tableheader);
+            $r->rflush();
+            $showntableheader = 1;
         }
         if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') {
             $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} =
@@ -4664,25 +5372,51 @@ sub print_userchangelogs_display {
         if ($roleslog{$id}{'logentry'}{'selfenroll'}) {
             $chgcontext = 'selfenroll';
         }
-        my %lt = &rolechg_contexts();
+        my %lt = &rolechg_contexts($crstype);
         if ($chgcontext ne '' && $lt{$chgcontext} ne '') {
             $chgcontext = $lt{$chgcontext};
         }
-        $r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td><td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td><td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td><td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).'</td><td>'.$sec.'</td><td>'.$chgcontext.'</td><td>'.$rolestart.'</td><td>'.$roleend.'</td>'.&Apache::loncommon::end_data_table_row()."\n");
+        $r->print(
+            &Apache::loncommon::start_data_table_row()
+           .'<td>'.$count.'</td>'
+           .'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>'
+           .'<td>'.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.'</td>'
+           .'<td>'.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.'</td>'
+           .'<td>'.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).'</td>'
+           .'<td>'.$sec.'</td>'
+           .'<td>'.$chgcontext.'</td>'
+           .'<td>'.$rolestart.'</td>'
+           .'<td>'.$roleend.'</td>'
+           .&Apache::loncommon::end_data_table_row()."\n");
+    }
+
+    if ($showntableheader) { # Table footer, if content displayed above
+        $r->print(&Apache::loncommon::end_data_table()
+                 .$nav_links);
+    } else { # No content displayed above
+        $r->print('<p class="LC_info">'
+                 .&mt('There are no records to display.')
+                 .'</p>'
+        );
     }
-    if ($showntablehdr) {
-        $r->print(&Apache::loncommon::end_data_table().'<br />');
-        if (($curr{'page'} > 1) || ($more_records)) {
-            $r->print('<table><tr>');
-            if ($curr{'page'} > 1) {
-                $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
-            }
-            if ($more_records) {
-                $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
-            }
-            $r->print('</tr></table>');
-            $r->print(<<"ENDSCRIPT");
+
+    # Form Footer
+    $r->print( 
+        '<input type="hidden" name="page" value="'.$curr{'page'}.'" />'
+       .'<input type="hidden" name="action" value="changelogs" />'
+       .'</form>');
+    return;
+}
+
+sub userlogdisplay_nav {
+    my ($formname,$curr,$more_records) = @_;
+    my ($nav_script,$nav_links);
+    if (ref($curr) eq 'HASH') {
+        # Create Navigation:
+        # Navigation Script
+        $nav_script = <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function chgPage(caller) {
     if (caller == 'previous') {
         document.$formname.page.value --;
@@ -4690,26 +5424,40 @@ function chgPage(caller) {
     if (caller == 'next') {
         document.$formname.page.value ++;
     }
-    document.$formname.submit(); 
+    document.$formname.submit();
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
+        # Navigation Buttons
+        $nav_links = '<p>';
+        if (($curr->{'page'} > 1) || ($more_records)) {
+            if ($curr->{'page'} > 1) {
+                $nav_links .= '<input type="button"'
+                             .' onclick="javascript:chgPage('."'previous'".');"'
+                             .' value="'.&mt('Previous [_1] changes',$curr->{'show'})
+                             .'" /> ';
+            }
+            if ($more_records) {
+                $nav_links .= '<input type="button"'
+                             .' onclick="javascript:chgPage('."'next'".');"'
+                             .' value="'.&mt('Next [_1] changes',$curr->{'show'})
+                             .'" />';
+            }
         }
-    } else {
-        $r->print(&mt('There are no records to display'));
+        $nav_links .= '</p>';
     }
-    $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
-              '<input type="hidden" name="action" value="changelogs" /></form>');
-    return;
+    return ($nav_script,$nav_links);
 }
 
 sub role_display_filter {
-    my ($formname,$cdom,$cnum,$curr,$version) = @_;
+    my ($formname,$cdom,$cnum,$curr,$version,$crstype) = @_;
     my $context = 'course';
+    my $lctype = lc($crstype);
     my $nolink = 1;
     my $output = '<table><tr><td valign="top">'.
-                 '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.
+                 '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
                  &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).
                  '</td><td>&nbsp;&nbsp;</td>';
@@ -4721,23 +5469,27 @@ sub role_display_filter {
         &Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date',
                                             $curr->{'rolelog_end_date'},undef,
                                             undef,undef,undef,undef,undef,undef,$nolink);
-    my %lt = &rolechg_contexts();
-    $output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br /><table><tr><td>'.&mt('After:').
-               '</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'.
-               $endform.'</td></tr></table></td><td>&nbsp;&nbsp;</td>'.
+    my %lt = &rolechg_contexts($crstype);
+    $output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').'</b><br />'.
+               '<table><tr><td>'.&mt('After:').
+               '</td><td>'.$startform.'</td></tr>'.
+               '<tr><td>'.&mt('Before:').'</td>'.
+               '<td>'.$endform.'</td></tr></table>'.
+               '</td>'.
+               '<td>&nbsp;&nbsp;</td>'.
                '<td valign="top"><b>'.&mt('Role:').'</b><br />'.
                '<select name="role"><option value="any"';
     if ($curr->{'role'} eq 'any') {
         $output .= ' selected="selected"';
     }
     $output .=  '>'.&mt('Any').'</option>'."\n";
-    my @roles = &Apache::lonuserutils::course_roles($context,undef,1);
+    my @roles = &Apache::lonuserutils::course_roles($context,undef,1,$lctype);
     foreach my $role (@roles) {
         my $plrole;
         if ($role eq 'cr') {
             $plrole = &mt('Custom Role');
         } else {
-            $plrole=&Apache::lonnet::plaintext($role);
+            $plrole=&Apache::lonnet::plaintext($role,$crstype);
         }
         my $selstr = '';
         if ($role eq $curr->{'role'}) {
@@ -4745,29 +5497,41 @@ sub role_display_filter {
         }
         $output .= '  <option value="'.$role.'"'.$selstr.'>'.$plrole.'</option>';
     }
-    $output .= '</select></td><td>&nbsp;&nbsp;</td><td valign="top"><b>'.
+    $output .= '</select></td>'.
+               '<td>&nbsp;&nbsp;</td>'.
+               '<td valign="top"><b>'.
                &mt('Context:').'</b><br /><select name="chgcontext">';
-    foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
+    foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll','requestcourses') {
         my $selstr = '';
         if ($curr->{'chgcontext'} eq $chgtype) {
-            $output .= $selstr = ' selected="selected"';
+            $selstr = ' selected="selected"';
         }
         if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) {
             next if (!&Apache::lonnet::auto_run($cnum,$cdom));
         }
         $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
     }
-    $output .= '</select></td><td>&nbsp;&nbsp;</td><td valign="middle"><input type="submit" value="'.
-               &mt('Update Display').'" /></tr></table>'.
-               '<span class="LC_roleslog_note">'.
-               &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
+    $output .= '</select></td>'
+              .'</tr></table>';
+
+    # Update Display button
+    $output .= '<p>'
+              .'<input type="submit" value="'.&mt('Update Display').'" />'
+              .'</p>';
+
+    # Server version info
+    $output .= '<p class="LC_info">'
+              .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+                  ,'2.6.99.0');
     if ($version) {
-        $output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version);    }
-    $output .= '</span><hr noshade><br />';
+        $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
+    }
+    $output .= '</p><hr />';
     return $output;
 }
 
 sub rolechg_contexts {
+    my ($crstype) = @_;
     my %lt = &Apache::lonlocal::texthash (
                                              any          => 'Any',
                                              auto         => 'Automated enrollment',
@@ -4775,8 +5539,14 @@ sub rolechg_contexts {
                                              createcourse => 'Course Creation',
                                              course       => 'User Management in course',
                                              domain       => 'User Management in domain',
-                                             selfenroll   => 'Self-enrolled', 
+                                             selfenroll   => 'Self-enrolled',
+                                             requestcourses => 'Course Request',
                                          );
+    if ($crstype eq 'Community') {
+        $lt{'createcourse'} = &mt('Community Creation');
+        $lt{'course'} = &mt('User Management in community');
+        $lt{'requestcourses'} = &mt('Community Request');
+    }
     return %lt;
 }
 
@@ -4860,6 +5630,15 @@ sub user_search_result {
                                 &build_search_response($context,$srch,%srch_results);
                         } else {
                             $currstate = 'modify';
+                            my $uname = $srch->{'srchterm'};
+                            my $udom = $srch->{'srchdomain'};
+                            $srch_results{$uname.':'.$udom} =
+                                { &Apache::lonnet::get('environment',
+                                                       ['firstname',
+                                                        'lastname',
+                                                        'permanentemail'],
+                                                         $udom,$uname)
+                                };
                         }
                     } else {
                         %srch_results = &Apache::lonnet::usersearch($srch);
@@ -5096,12 +5875,12 @@ sub build_search_response {
     my ($context,$srch,%srch_results) = @_;
     my ($currstate,$response,$forcenewuser);
     my %names = (
-          'uname' => 'username',
-          'lastname' => 'last name',
+          'uname'     => 'username',
+          'lastname'  => 'last name',
           'lastfirst' => 'last name, first name',
-          'crs' => 'this course',
-          'dom' => 'LON-CAPA domain: ',
-          'instd' => 'the institutional directory for domain: ',
+          'crs'       => 'this course',
+          'dom'       => 'LON-CAPA domain',
+          'instd'     => 'the institutional directory for domain',
     );
 
     my %single = (
@@ -5121,14 +5900,20 @@ sub build_search_response {
             $currstate = 'modify';
             $response = &mt("$single{$srch->{'srchtype'}} was found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'});
             if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') {
-                $response .= &display_domain_info($srch->{'srchdomain'});
+                $response .= ': '.&display_domain_info($srch->{'srchdomain'});
             }
-        } else {
-            $response = '<span class="LC_warning">'.&mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}",$srch->{'srchterm'});
+        } else { # Search has nothing found. Prepare message to user.
+            $response = '<span class="LC_warning">';
             if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') {
-                $response .= &display_domain_info($srch->{'srchdomain'});
+                $response .= &mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} [_1] in $names{$srch->{'srchin'}}: [_2]",
+                                 '<b>'.$srch->{'srchterm'}.'</b>',
+                                 &display_domain_info($srch->{'srchdomain'}));
+            } else {
+                $response .= &mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} [_1] in $names{$srch->{'srchin'}}.",
+                                 '<b>'.$srch->{'srchterm'}.'</b>');
             }
             $response .= '</span>';
+
             if ($srch->{'srchin'} ne 'alc') {
                 $forcenewuser = 1;
                 my $cansrchinst = 0; 
@@ -5151,17 +5936,27 @@ sub build_search_response {
                     $response .= '<br />'.&mt('You may want to broaden your search to the selected LON-CAPA domain.');
                 }
             }
-            if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) {
+            my $createdom = $env{'request.role.domain'};
+            if ($context eq 'requestcrs') {
+                if ($env{'form.coursedom'} ne '') {
+                    $createdom = $env{'form.coursedom'};
+                }
+            }
+            if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) {
                 my $cancreate =
-                    &Apache::lonuserutils::can_create_user($env{'request.role.domain'},$context);
+                    &Apache::lonuserutils::can_create_user($createdom,$context);
+                my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>';
                 if ($cancreate) {
-                    my $showdom = &display_domain_info($env{'request.role.domain'}); 
+                    my $showdom = &display_domain_info($createdom); 
                     $response .= '<br /><br />'
                                 .'<b>'.&mt('To add a new user:').'</b>'
-                                .'<br />'
-                                .&mt("(You can only create new users in your current role's domain - [_1])"
-                                    ,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')
-                                .'<ul><li>'
+                                .'<br />';
+                    if ($context eq 'requestcrs') {
+                        $response .= &mt("(You can only define new users in the new course's domain - [_1])",$targetdom);
+                    } else {
+                        $response .= &mt("(You can only create new users in your current role's domain - [_1])",$targetdom);
+                    }
+                    $response .='<ul><li>'
                                 .&mt("Set 'Domain/institution to search' to: [_1]",'<span class="LC_cusr_emph">'.$showdom.'</span>')
                                 .'</li><li>'
                                 .&mt("Set 'Search criteria' to: [_1]username is ..... in selected LON-CAPA domain[_2]",'<span class="LC_cusr_emph">','</span>')
@@ -5172,14 +5967,17 @@ sub build_search_response {
                                 .'</li></ul><br />';
                 } else {
                     my $helplink = ' href="javascript:helpMenu('."'display'".')"';
-                    $response .= '<br /><br />'
-                                .&mt("You are not authorized to create new users in your current role's domain - [_1]."
-                                    ,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')
-                                .'<br />'
-                                .&mt('Contact the [_1]helpdesk[_2] if you need to create a new user.'
+                    $response .= '<br /><br />';
+                    if ($context eq 'requestcrs') {
+                        $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom);
+                    } else {
+                        $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom);
+                    }
+                    $response .= '<br />'
+                                 .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
                                     ,' <a'.$helplink.'>'
                                     ,'</a>')
-                                .'<br /><br />';
+                                 .'<br /><br />';
                 }
             }
         }
@@ -5265,12 +6063,13 @@ sub course_level_table {
             'end'  => "End"
     );
 
-    foreach my $protectedcourse (sort( keys(%inccourses))) {
+    foreach my $protectedcourse (sort(keys(%inccourses))) {
 	my $thiscourse=$protectedcourse;
 	$thiscourse=~s:_:/:g;
 	my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
+        my $isowner = &is_courseowner($protectedcourse,$coursedata{'internal.courseowner'});
 	my $area=$coursedata{'description'};
-        my $type=$coursedata{'type'};
+        my $crstype=$coursedata{'type'};
 	if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
 	my ($domain,$cnum)=split(/\//,$thiscourse);
         my %sections_count;
@@ -5280,12 +6079,13 @@ sub course_level_table {
 		    &Apache::loncommon::get_sections($domain,$cnum);
             }
         }
-        my @roles = &Apache::lonuserutils::roles_by_context('course');
+        my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype);
 	foreach my $role (@roles) {
-            my $plrole=&Apache::lonnet::plaintext($role);
-	    if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
+            my $plrole=&Apache::lonnet::plaintext($role,$crstype);
+	    if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) ||
+                ((($role eq 'cc') || ($role eq 'co')) && ($isowner))) {
                 $table .= &course_level_row($protectedcourse,$role,$area,$domain,
-                                            $plrole,\%sections_count,\%lt);    
+                                            $plrole,\%sections_count,\%lt);
             } elsif ($env{'request.course.sec'} ne '') {
                 if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'.
                                              $env{'request.course.sec'})) {
@@ -5295,7 +6095,8 @@ sub course_level_table {
             }
         }
         if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
-            foreach my $cust (sort keys %customroles) {
+            foreach my $cust (sort(keys(%customroles))) {
+                next if ($crstype eq 'Community' && $customroles{$cust} =~ /bre\&S/);
                 my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust;
                 $table .= &course_level_row($protectedcourse,$role,$area,$domain,
                                             $cust,\%sections_count,\%lt);
@@ -5326,7 +6127,7 @@ sub course_level_row {
               $protectedcourse.'_'.$role.'" /></td>'."\n".
               ' <td>'.$plrole.'</td>'."\n".
               ' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
-    if ($role eq 'cc') {
+    if (($role eq 'cc') || ($role eq 'co')) {
         $row .= '<td>&nbsp;</td>';
     } elsif ($env{'request.course.sec'} ne '') {
         $row .= ' <td><input type="hidden" value="'.
@@ -5374,8 +6175,8 @@ sub course_level_dc {
                       '<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse" value="" />';
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
-            ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
-    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
+            ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Community','crstype').'</b>';
+    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser');
     my %lt=&Apache::lonlocal::texthash(
                     'rol'  => "Role",
                     'grs'  => "Section",
@@ -5386,14 +6187,14 @@ sub course_level_dc {
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
                   );
-    my $header = '<h4>'.&mt('Course Level').'</h4>'.
+    my $header = '<h4>'.&mt('Course/Community Level').'</h4>'.
                  &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row().
                  '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
                  &Apache::loncommon::end_data_table_header_row();
     my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
-                     '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
-                     '<td><select name="role">'."\n";
+                     '<td><br /><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" /></td>'."\n".
+                     '<td valign><br /><select name="role">'."\n";
     foreach my $role (@roles) {
         my $plrole=&Apache::lonnet::plaintext($role);
         $otheritems .= '  <option value="'.$role.'">'.$plrole;
@@ -5413,13 +6214,14 @@ sub course_level_dc {
                      '<td valign="top">&nbsp;<b>'.$lt{'new'}.'</b><br />'.
                      '<input type="text" name="newsec" value="" />'.
                      '<input type="hidden" name="section" value="" />'.
-                     '<input type="hidden" name="groups" value="" /></td>'.
+                     '<input type="hidden" name="groups" value="" />'.
+                     '<input type="hidden" name="crstype" value="" /></td>'.
                      '</tr></table></td>';
     $otheritems .= <<ENDTIMEENTRY;
-<td><input type="hidden" name="start" value='' />
+<td><br /><input type="hidden" name="start" value='' />
 <a href=
 "javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type="hidden" name="end" value='' />
+<td><br /><input type="hidden" name="end" value='' />
 <a href=
 "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY
@@ -5483,7 +6285,8 @@ sub update_selfenroll_config {
                             $newnum ++;
                         }
                     }
-                    for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) {                        if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) {
+                    for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) {
+                        if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) {
                             my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$j);
                             if (@types > 0) {
                                 @types = sort(@types);
@@ -5571,7 +6374,7 @@ sub update_selfenroll_config {
                         }
                     } else {
                         my @differences =  
-                            &compare_arrays(\@currnotified,\@newnotified);
+                            &Apache::loncommon::compare_arrays(\@currnotified,\@newnotified);
                         if (@differences > 0) {
                             if (@newnotified > 0) {
                                 $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
@@ -5581,7 +6384,7 @@ sub update_selfenroll_config {
                         }
                     }
                 } else {
-                    my @differences = &compare_arrays(\@currnotified,\@newnotified);
+                    my @differences = &Apache::loncommon::compare_arrays(\@currnotified,\@newnotified);
                     if (@differences > 0) {
                         if (@newnotified > 0) {
                             $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
@@ -5683,7 +6486,7 @@ sub update_selfenroll_config {
                                 if ($currlimit eq 'allstudents') {
                                     $newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap);
                                 } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') {
-                                    $newval =  &mt('New self-enrollment no longer allowed when total umber of self-enrolled students reaches [_1].',$newcap);
+                                    $newval =  &mt('New self-enrollment no longer allowed when total number of self-enrolled students reaches [_1].',$newcap);
                                 }
                             }
                             $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval).'</li>'."\n");
@@ -5771,22 +6574,6 @@ sub update_selfenroll_config {
     return;
 }
 
-sub compare_arrays {
-    my ($arrayref1,$arrayref2) = @_;
-    my (@difference,%count);
-    @difference = ();
-    %count = ();
-    if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) { 
-        foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
-        foreach my $element (keys(%count)) {
-            if ($count{$element} == 1) {
-                push(@difference,$element);
-            }
-        }
-    }
-    return @difference;
-}
-
 sub get_selfenroll_titles {
     my @row = ('types','registered','enroll_dates','access_dates','section',
                'approval','limit');
@@ -5802,6 +6589,21 @@ sub get_selfenroll_titles {
     return (\@row,\%lt);
 }
 
+sub is_courseowner {
+    my ($thiscourse,$courseowner) = @_;
+    if ($courseowner eq '') {
+        if ($env{'request.course.id'} eq $thiscourse) {
+            $courseowner = $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'};
+        }
+    }
+    if ($courseowner ne '') {
+        if ($courseowner eq $env{'user.name'}.':'.$env{'user.domain'}) {
+            return 1;
+        }
+    }
+    return;
+}
+
 #---------------------------------------------- end functions for &phase_two
 
 #--------------------------------- functions for &phase_two and &phase_three