--- loncom/interface/loncreateuser.pm	2009/08/14 17:09:38	1.295.2.8
+++ loncom/interface/loncreateuser.pm	2009/08/06 05:48:56	1.304
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.295.2.8 2009/08/14 17:09:38 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.304 2009/08/06 05:48:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,7 +68,7 @@ use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::longroup;
 use Apache::lonuserutils;
-use Apache::loncoursequeueadmin;
+use Apache::selfenroll();
 use LONCAPA qw(:DEFAULT :match);
 
 my $loginscript; # piece of javascript used in two separate instances
@@ -216,8 +216,7 @@ END_SCRIPT
 
 sub build_tools_display {
     my ($ccuname,$ccdomain,$context) = @_;
-    my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
-        $colspan);
+    my (@usertools,%userenv,$output);
     my %lt = &Apache::lonlocal::texthash (
                    'blog'       => "Personal User Blog",
                    'aboutme'    => "Personal Information Page",
@@ -228,129 +227,61 @@ 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');
-        @options =('norequest','approve','autolimit','validate');
-        %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
-        %reqtitles = &courserequest_titles();
-        %reqdisplay = &courserequest_display();
-        $colspan = ' colspan="2"';
+                      'requestcourses.official','requestcourses.unofficial',
+                      'requestcourses.community');
+        @usertools = ('official','unofficial','community');
     } 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,
-            $currdisp,$custdisp,$custradio);
+        my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off);
         $cust_off = 'checked="checked" ';
         $tool_on = 'checked="checked" ';
         $curr_access =  
             &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
                                               $context);
-        if ($userenv{$context.'.'.$item} ne '') {
-            $cust_on = ' checked="checked" ';
-            $cust_off = '';
-        }
-        if ($context eq 'requestcourses') {
-            if ($userenv{$context.'.'.$item} eq '') {
-                $custom_access = &mt('Currently from default setting.');
-            } else {
-                $custom_access = &mt('Currently from custom setting.');
+        if ($userenv{$context.'.'.$item} eq '') {
+            $custom_access = 
+                &mt('Availability determined currently from default setting.');
+            if (!$curr_access) {
+                $tool_off = 'checked="checked" ';
+                $tool_on = '';
             }
         } 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 = '';
-                }
+            $custom_access = 
+                &mt('Availability determined currently from custom setting.');
+            $cust_on = ' checked="checked" ';
+            $cust_off = '';
+            if ($userenv{$context.'.'.$item} == 0) {
+                $tool_off = 'checked="checked" ';
+                $tool_on = '';
             }
         }
         $output .= '  <tr class="LC_info_row">'."\n".
-                   '   <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".
+                   '   <td>'.$lt{$item}.'</td>'."\n".
                    '  </tr>'."\n".
-                   &Apache::loncommon::start_data_table_row()."\n";
-        if ($context eq 'requestcourses') {
-            my ($curroption,$currlimit);
-            $curroption = $userenv{$context.'.'.$item};
-            if (!$curroption) {
-                $curroption = 'norequest';
-            }
-            if ($curroption =~ /^autolimit=(\d*)$/) {
-                $currlimit = $1;
-                $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.'" />';
-                 }
-                 $custdisp .= '</span></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::start_data_table_row()."\n".
+                   '  <td>'.$custom_access.('&nbsp;'x5).$lt{'avai'}.': '.
+                   ($curr_access?&mt('Yes'):&mt('No')).'</td>'."\n".
                    &Apache::loncommon::end_data_table_row()."\n".
                    &Apache::loncommon::start_data_table_row()."\n".
-                   '  <td style="vertical-align:top;"><span class="LC_nobreak">'.
-                   $lt{'chse'}.': <label>'.
+                   '  <td><span class="LC_nobreak">'.$lt{'chse'}.': <label>'.
                    '<input type="radio" name="custom'.$item.'" value="0" '.
-                   $cust_off.'/>'.$lt{'usde'}.'</label>'.('&nbsp;' x3).
-                   '<label><input type="radio" name="custom'.$item.'" value="1" '.
-                   $cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'.
+                   $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".
                    &Apache::loncommon::end_data_table_row()."\n";
     }
     return $output;
@@ -358,7 +289,7 @@ sub build_tools_display {
 
 sub coursereq_externaluser {
     my ($ccuname,$ccdomain,$cdom) = @_;
-    my (@usertools,@options,%validations,%userenv,$output);
+    my (@usertools,%userenv,$output);
     my %lt = &Apache::lonlocal::texthash (
                    'official'   => 'Can request creation of official courses',
                    'unofficial' => 'Can request creation of unofficial courses',
@@ -369,83 +300,27 @@ sub coursereq_externaluser {
                       'reqcrsotherdom.official','reqcrsotherdom.unofficial',
                       'reqcrsotherdom.community');
     @usertools = ('official','unofficial','community');
-    @options = ('approve','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);
+        my ($tool_on,$tool_off);
+        $tool_off = 'checked="checked" ';
         if ($userenv{'reqcrsotherdom.'.$item} ne '') {
             my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});
-            if (grep(/^\Q$cdom\E:($optregex)=?(\d*)$/,@curr)) {
-                $curroption = $1;
-                $currlimit = $2;
-                if (!$curroption) {
-                    $curroption = 'norequest';
-                }
-            }
-        } else {
-            $curroption = 'norequest';
-            $tooloff = ' checked="checked"';
-        }
-        $output.= &Apache::loncommon::start_data_table_row()."\n".
-                  '  <td><span class="LC_nobreak">'.$lt{$item}.': '.
-                  '<label><input type="radio" name="reqcrsotherdom_'.$item.
-                  '" value="0"'.$tooloff.' />'.$reqtitles{'norequest'}.
-                  '</label>&nbsp;';
-        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 .= '<span class="LC_nobreak"><label>'.
-                       '<input type="radio" name="reqcrsotherdom_'.$item.
-                       '" value="'.$option.'"'.$checked.' />'.
-                       $reqtitles{$option}.'</label>&nbsp;';
-            if ($option eq 'autolimit') {
-                $output .= '<input type="text" name="reqcrsotherdom_'.
-                           $item.'_limit" size="1" '.
-                           'value="'.$currlimit.'" />';
+            if (grep(/^\Q$cdom\E$/,@curr)) {
+                $tool_on = 'checked="checked" ';
+                $tool_off = '';
             }
-            $output .= '&nbsp;'
         }
-        $output .= '</span></td>'."\n".
+        $output .= &Apache::loncommon::start_data_table_row()."\n".
+                   '  <td><span class="LC_nobreak">'.$lt{$item}.': <label>'.
+                   '<input type="radio" name="reqcrsotherdom_'.$item.'" value="1" '.
+                   $tool_on.'/>'.&mt('Yes').'</label>&nbsp;<label>'.
+                   '<input type="radio" name="reqcrsotherdom_'.$item.'" value="0" '.
+                   $tool_off.'/>'.&mt('No').'</label></span></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',
-                                   approve    => 'Approval by Dom. Coord.',
-                                   validate   => 'With validation',
-                                   autolimit  => 'Numerical limit',
-                 );
-    return %titles;   
-}                     
-    
-sub courserequest_display {
-    my %titles = &Apache::lonlocal::texthash (
-                                   approve    => 'Yes, need approval',
-                                   validate   => 'Yes, with validation',
-                                   norequest  => 'No',
-   );   
-   return %titles;
-}
-
 # =================================================================== Phase one
 
 sub print_username_entry_form {
@@ -633,7 +508,6 @@ sub user_modification_js {
     return <<END;
 <script type="text/javascript" language="Javascript">
 // <![CDATA[
-
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
                  "height=350,width=350,scrollbars=no,menubar=no");
@@ -708,13 +582,13 @@ ENDSCRIPT
               faq=>282,bug=>'Instructor Interface',});
         if ($env{'form.action'} eq 'singleuser') {
             $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
-                                                      'Course_Change_Privileges'));
+                                                          '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'));
+                                                          '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>');
@@ -745,13 +619,13 @@ ENDSCRIPT
         my ($uname,$udom) = split(/:/,$user);
         my $onclick;
         if ($context eq 'requestcrs') {
-            $onclick =
+            $onclick = 
                 'onclick="javascript:gochoose('."'$uname','$udom',".
                                                "'$srch_results->{$user}->{firstname}',".
                                                "'$srch_results->{$user}->{lastname}',".
                                                "'$srch_results->{$user}->{permanentemail}'".');"';
         } else {
-            $onclick =
+            $onclick = 
                 ' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"';
         }
         $r->print(&Apache::loncommon::start_data_table_row().
@@ -962,6 +836,7 @@ ENDTITLE
             &personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                    $inst_results{$ccuname.':'.$ccdomain});
         $r->print($personal_table);
+#FIXME
         my ($home_server_pick,$numlib) = 
             &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
                                                       'default','hide');
@@ -1073,7 +948,7 @@ ENDCHANGEUSER
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<h3>'.&mt('User Can Request Creation of Courses in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table());
-            if ($env{'request.role.domain'} eq $ccdomain) {
+            if ($env{'request.role.domain'} eq $ccdomain) { 
                 $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
             } else {
                 $r->print(&coursereq_externaluser($ccuname,$ccdomain,
@@ -2075,7 +1950,7 @@ sub update_user_data {
 			 $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');
     my (%alerts,%rulematch,%inst_results,%curr_rules);
     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'});
     if ($env{'form.makeuser'}) {
@@ -2156,13 +2031,7 @@ sub update_user_data {
                 }
             }
             foreach my $item (@requestcourses) {
-                $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'};
-                    }
-                }
+                $newcustom{$item} = $env{'form.requestcourses_'.$item};
                 $changed{$item} = &tool_admin($item,$newcustom{$item},
                                               \%changeHash,'requestcourses');
             }
@@ -2443,13 +2312,13 @@ sub update_user_data {
         }
         &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv,
                       \%changeHash,\%changed,\%newaccess,\%newaccesstext);
-
         if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
             &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext,
                           \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
         } else {
             &tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext,
-                          \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
+                          \%userenv,
+                                  \%changeHash,\%changed,\%newaccess,\%newaccesstext);
         }
         if ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
             $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
@@ -2476,7 +2345,8 @@ 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 '') {
@@ -2538,6 +2408,7 @@ sub update_user_data {
                              '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:'
@@ -2690,7 +2561,8 @@ END
                            'aboutme'    => "Personal Information Page Availability",
                            'portfolio'  => "Portfolio Availability",
                            'official'   => "Can Request Official Courses",
-                           'unofficial' => "Can Request Unofficial Course",
+                           'unofficial' => "Can Request Unofficial Courses",
+                           'community'  => "Can Request Communities",
                            'inststatus' => "Affiliation",
 					       );
             $r->print(<<"END");
@@ -2805,9 +2677,6 @@ sub tool_changes {
         return;
     }
     if ($context eq 'reqcrsotherdom') {
-        my @options = ('approve','validate','autolimit');
-        my $optregex = join('|',@options);
-        my %reqdisplay = &courserequest_display();
         my $cdom = $env{'request.role.domain'};
         foreach my $tool (@{$usertools}) {
             $oldaccesstext->{$tool} = &mt('no');
@@ -2819,41 +2688,30 @@ sub tool_changes {
                     if ($changed->{$tool}) {
                         $newaccesstext->{$tool} = &mt('yes');
                     } else {
-                        $newaccesstext->{$tool} = $oldaccesstext->{$tool};                    }
+                        $newaccesstext->{$tool} = $oldaccesstext->{$tool};
+                    }
                 }
             } else {
                 my @curr = split(',',$userenv->{$context.'.'.$tool});
                 my @new;
                 my $changedoms;
-                my $newop = $env{'form.'.$context.'_'.$tool};
-                if ($newop eq 'autolimit') {
-                    $newop .= '=';
-                    unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {
-                        $newop .= $env{'form.'.$context.'_'.$tool.'_limit'};
-                    }
-                }
-                if (grep(/^\Q$cdom:($optregex\=?\d*)\E$/,@curr)) {
+                if (grep(/^\Q$cdom\E$/,@curr)) {
                     $oldaccesstext->{$tool} = &mt('yes');
-                    my $oldop = $1;
-                    if ($oldop ne $newop) {
+                    unless ($env{'form.'.$context.'_'.$tool}) {
                         $changedoms = 1;
                         foreach my $dom (@curr) {
                             unless ($dom eq $cdom) {
                                 push(@new,$dom);
                             }
                         }
-                        if ($newop) {
-                            push(@new,$cdom.':'.$newop);
-                        }
-                        @new = sort(@new);
                     }
                 } elsif ($env{'form.'.$context.'_'.$tool}) {
                     $changedoms = 1;
-                    @new = sort(@curr,$cdom.':'.$newop);
+                    @new = sort(@curr,$cdom);
                 }
                 $newaccesstext->{$tool} = $oldaccesstext->{$tool};
                 if ($changedoms) {
-                    my $newdomstr;
+                    my $newdomstr; 
                     if (@new) {
                         $newdomstr = join(',',@new);
                     }
@@ -2861,17 +2719,9 @@ sub tool_changes {
                                                   $context);
                     if ($changed->{$tool}) {
                         if ($env{'form.'.$context.'_'.$tool}) {
-                            if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') {
-                                if ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {
-                                    $newaccesstext->{$tool} = &mt('Yes, processed automatically');
-                                } else {
-                                    $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user).',$env{'form.'.$context.'_'.$tool.'_limit'});
-                                }
-                            } else {
-                                $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};
-                            }
+                            $newaccesstext->{$tool} = &mt('yes'); 
                         } else {
-                            $newaccesstext->{$tool} = &mt('No');
+                            $newaccesstext->{$tool} = &mt('no');
                         }
                     }
                 }
@@ -2880,15 +2730,6 @@ sub tool_changes {
         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}) {
@@ -2898,12 +2739,12 @@ sub tool_changes {
             }
             $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
             if ($env{'form.custom'.$tool} == 1) {
-                if ($newval ne $userenv->{$context.'.'.$tool}) {
-                    $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
-                                                    $context);
+                if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) {
+                    $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
+                                                  $changeHash,$context);
                     if ($changed->{$tool}) {
                         $newaccess->{$tool} = &mt('custom');
-                        if ($newval) {
+                        if ($env{'form.'.$context.'_'.$tool}) {
                             $newaccesstext->{$tool} = &mt("availability set to 'on'");
                         } else {
                             $newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -2936,11 +2777,11 @@ sub tool_changes {
         } else {
             $oldaccess->{$tool} = &mt('default');
             if ($env{'form.custom'.$tool} == 1) {
-                $changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
-                                                $context);
+                $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
+                                                $changeHash,$context);
                 if ($changed->{$tool}) {
                     $newaccess->{$tool} = &mt('custom');
-                    if ($newval) {
+                    if ($env{'form.'.$context.'_'.$tool}) {
                         $newaccesstext->{$tool} = &mt("availability set to 'on'");
                     } else {
                         $newaccesstext->{$tool} = &mt("availability set to 'off'");
@@ -3449,16 +3290,16 @@ sub custom_role_editor {
     my ($jsback,$elements) = &crumb_utilities();
     my $button_code = "\n";
     my $head_script = "\n";
-    $head_script .= '<script type="text/javascript">'."\n".
-                    '// <![CDATA['."\n";
+    $head_script .= '<script type="text/javascript">'."\n"
+                   .'// <![CDATA['."\n";
     my @template_roles = ("cc","in","ta","ep","st");
     foreach my $role (@template_roles) {
         $head_script .= &make_script_template($role);
         $button_code .= &make_button_code($role).' ';
     }
-    $head_script .= "\n".$jsback."\n".
-                    '// ]]>'."\n".
-                    '</script>'."\n";
+    $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','')",
@@ -3601,11 +3442,11 @@ sub set_custom_role {
         return;
     }
     my ($jsback,$elements) = &crumb_utilities();
-    my $jscript = '<script type="text/javascript">'.
-                  '// <![CDATA['."\n".
-                  $jsback."\n".
-                  '// ]]>'."\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
@@ -3931,14 +3772,11 @@ 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");
-            $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
-                                                                       $cdom,$cnum));
-
+            &display_selfenroll_queue($r,$context,$permission,$cnum,$cdom);
         } elsif ($env{'form.state'} eq 'done') {
             &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/createuser?action=selfenrollqueue',
@@ -3946,8 +3784,7 @@ sub handler {
             $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result',
                                                           'Course_Self_Enrollment'));
             $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
-            $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
-                          $cdom,$cnum,$coursedesc));
+            &update_selfenroll_queue($r,$context,$permission,$cid,$cnum,$cdom);
         }
         $r->print(&Apache::loncommon::end_page());
     } elsif ($env{'form.action'} eq 'changelogs') {
@@ -3981,11 +3818,11 @@ sub header {
 
 sub add_script {
     my ($js) = @_;
-    return '<script type="text/javascript">'."\n".
-           '// <![CDATA['."\n".
-           "\n".$js."\n".
-           '// ]]>'."\n".
-           '</script>'."\n";
+    return '<script type="text/javascript">'."\n"
+          .'// <![CDATA['."\n"
+          .$js."\n"
+          .'// ]]>'."\n"
+          .'</script>'."\n";
 }
 
 sub verify_user_display {
@@ -4008,121 +3845,167 @@ END
 sub print_main_menu {
     my ($permission,$context) = @_;
     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 => 'Upload a File of Course Users',
-                                   singleuser => 'Add/Modify a Single Course User',
-                                   listusers => 'Display Class Lists and Manage Multiple Users',
-                                 },
+                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',
+                            },
                 );
+  my @menu = ( {categorytitle => 'Single Users', 
+         items =>
+         [
+            {
+             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.',
+            },
+         ]},
 
-    my @menu =
-        (
-          { text => $links{$context}{'upload'},
-            help => 'Course_Create_Class_List',
-            action => 'upload',
-            permission => $permission->{'cusr'},
+         {categorytitle => 'Multiple 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.',
             },
-          { text => $links{$context}{'singleuser'},
-            help => 'Course_Change_Privileges',
-            action => 'singleuser',
-            permission => $permission->{'cusr'},
+            {
+             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 => 'Administration',
+         items => [ ]},
+       );
+            
+    if ($context eq 'domain'){
+        
+        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.',
             },
-          { text => $links{$context}{'listusers'},
-            help => 'Course_View_Class_List',
-            action => 'listusers',
-            permission => ($permission->{'view'} || $permission->{'cusr'}),
-          },
         );
-    if ($context eq 'domain' || $context eq 'course') {
-        my $customlink =  { text => 'Edit Custom Roles',
-                            help => 'Course_Editing_Custom_Roles',
-                            action => 'custom',
-                            permission => $permission->{'custom'},
-                          };
-        push(@menu,$customlink);
-    }
-    if ($context eq 'course') {
+        
+    }elsif ($context eq 'course'){
         my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
-        my @courselinks =
-            (
-              { text => 'Enroll a Single Student',
-                 help => 'Course_Add_Student',
-                 action => 'singlestudent',
-                 permission => $permission->{'cusr'},
-                 },
-              { text => 'Drop Students',
-                help => 'Course_Drop_Student',
-                action => 'drop',
-                permission => $permission->{'cusr'},
-              });
-        if (!exists($permission->{'cusr_section'})) {
-            push(@courselinks,
-               { text => 'Automated Enrollment Manager',
-                 help => 'Course_Automated_Enrollment',
+    
+        push(@{ $menu[0]->{items} }, #Category: Single Users
+            {   
+             linktext => 'Add/Modify a 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} }, #Category: Multiple Users 
+            {
+             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.',
+            },
+        );
+        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 => '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 ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
+            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'}),
+                                     && $permission->{'cusr'}),
                  url  => '/adm/populate',
-                 },
-               { text => 'Configure User Self-enrollment',
-                 help => 'Course_Self_Enrollment',
-                 action => 'selfenroll',
+                 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.',
+                },
+            );
+        
         }
-        if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
-            push(@courselinks,
-                    {   text => 'Enrollment Requests',
-                        help => 'Course_Approve_Selfenroll',
-                        action => 'selfenrollqueue',
-                        permission => $permission->{'cusr'},
-                    });
-        }
-        push(@courselinks,
-               { text => 'Manage Course Groups',
-                 help => 'Course_Manage_Group',
-                 permission => $permission->{'grp_manage'},
-                 url => '/adm/coursegroups?refpage=cusr',
-               },
-               { text => 'View Change Logs',
-                 help => 'Course_User_Logs',
-                 action => 'changelogs',
-                 permission => $permission->{'cusr'},
-               },);
+    };
+return Apache::lonhtmlcommon::generate_menu(@menu);
 #               { text => 'View Log-in History',
 #                 help => 'Course_User_Logins',
 #                 action => 'logins',
 #                 permission => $permission->{'cusr'},
 #               });
-        push(@menu,@courselinks);
-    }
-    my $menu_html = '';
-    foreach my $menu_item (@menu) {
-        next if (! $menu_item->{'permission'});
-        $menu_html.='<p>';
-        if (exists($menu_item->{'help'})) {
-            $menu_html.=
-                &Apache::loncommon::help_open_topic($menu_item->{'help'});
-        }
-        $menu_html.='<font size="+1">';
-        if (exists($menu_item->{'url'})) {
-            $menu_html.=qq{<a href="$menu_item->{'url'}">};
-        } else {
-            $menu_html.=
-                qq{<a href="/adm/createuser?action=$menu_item->{'action'}">};      }
-        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
-        $menu_html.='</p>';
-    }
-    return $menu_html;
 }
 
 sub restore_prev_selections {
@@ -4350,9 +4233,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;
@@ -4584,6 +4465,279 @@ ENDSCRIPT
     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,@warn_approves,@warn_rejects);
+    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);
+                    my %userrequest = (
+                        $cdom.'_'.$cnum => {
+                           timestamp   => $now,
+                           section     => $usec,
+                           adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+                           status      => 'approved',
+                       }
+                    );
+                    my $userresult = 
+                        &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
+                    if ($userresult ne 'ok') {
+                        push(@warn_approves,$uname.':'.$udom);
+                    }
+                } 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);
+            my ($uname,$udom) = split(/:/,$user);
+            my %userrequest = (
+                $cdom.'_'.$cnum => {
+                    timestamp   => $now,
+                    adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, 
+                    status      => 'rejected',
+                }
+            );
+            my $userresult = 
+                &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
+            if ($userresult ne 'ok') {
+                push(@warn_rejects,$user);
+            }
+        }
+    }
+    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>');
+    }
+    if (@warn_approves) {
+        $r->print('<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>');
+        foreach my $user (@warn_approves) {
+            $r->print('<li>'.$user.'</li>');
+        }
+        $r->print('</ul></p>');
+    }
+    if (@warn_rejects) {
+        $r->print('<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>');
+        foreach my $user (@warn_rejects) {
+            $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);
@@ -4846,13 +5000,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;
@@ -4862,6 +5009,9 @@ sub print_userchangelogs_display {
             $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
         }
     }
+
+    # Collect user change log data
+    my $content = '';
     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'}));
@@ -4883,10 +5033,7 @@ sub print_userchangelogs_display {
         }
         $count ++;
         next if ($count < $minshown);
-        if (!$showntablehdr) {
-            $r->print($tablehdr);
-            $showntablehdr = 1;
-        }
+
         if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') {
             $whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} =
                 &Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'});
@@ -4925,20 +5072,41 @@ sub print_userchangelogs_display {
         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");
+        $content .=
+            &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();
+    }
+
+    # Form Footer
+    my $form_footer =
+        '<input type="hidden" name="page" value="'.$curr{'page'}.'" />'
+       .'<input type="hidden" name="action" value="changelogs" />'
+       .'</form>';
+
+    # Only display table, if content is available (has been collected above)
+    if (!$content) {
+        $r->print('<p class="LC_info">'
+                 .&mt('There are no records to display.')
+                 .'</p>'
+        );
+        $r->print($form_footer);
+        return;
     }
-    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");
+
+    # Content to display, so create navigation and display table
+
+    # Create Navigation:
+    # Navigation Script
+    my $nav_script = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
 function chgPage(caller) {
@@ -4954,14 +5122,50 @@ function chgPage(caller) {
 // ]]>
 </script>
 ENDSCRIPT
-        }
-    } else {
-        $r->print('<p class="LC_info">'.
-                  &mt('There are no records to display').
-                  '</p>');
-    }
-    $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
-              '<input type="hidden" name="action" value="changelogs" /></form>');
+    # Navigation Buttons
+    my $nav_links;
+    $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'})
+                         .'" />';
+        }
+    }
+    $nav_links .= '</p>';
+
+    # 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();
+
+    # Print Content
+    $r->print(
+        $nav_script
+       .$nav_links
+       .&Apache::loncommon::start_data_table()
+       .$tableheader
+       .$content
+       .&Apache::loncommon::end_data_table()
+       .$nav_links
+       .$form_footer
+    );
     return;
 }
 
@@ -4983,9 +5187,13 @@ sub role_display_filter {
                                             $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>'.
+    $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') {
@@ -5006,7 +5214,9 @@ 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') {
         my $selstr = '';
@@ -5027,13 +5237,13 @@ sub role_display_filter {
               .'</p>';
 
     # Server version info
-    $output .= '<p style="font-size: smaller;" class="LC_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 LON-CAPA server is version [_1]',$version);
     }
-    $output .= '</p><hr /><br />';
+    $output .= '</p><hr />';
     return $output;
 }
 
@@ -5421,27 +5631,17 @@ sub build_search_response {
                     $response .= '<br />'.&mt('You may want to broaden your search to the selected LON-CAPA 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)) {
+            if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) {
                 my $cancreate =
-                    &Apache::lonuserutils::can_create_user($createdom,$context);
-                my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>';
+                    &Apache::lonuserutils::can_create_user($env{'request.role.domain'},$context);
                 if ($cancreate) {
-                    my $showdom = &display_domain_info($createdom);
+                    my $showdom = &display_domain_info($env{'request.role.domain'}); 
                     $response .= '<br /><br />'
                                 .'<b>'.&mt('To add a new user:').'</b>'
-                                .'<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>'
+                                .'<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>'
                                 .&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>')
@@ -5452,13 +5652,10 @@ sub build_search_response {
                                 .'</li></ul><br />';
                 } else {
                     my $helplink = ' href="javascript:helpMenu('."'display'".')"';
-                    $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 />'
+                    $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('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
                                     ,' <a'.$helplink.'>'
                                     ,'</a>')