[LON-CAPA-cvs] cvs: loncom(GCI_2) /interface loncreateuser.pm

gci gci@source.lon-capa.org
Wed, 23 Sep 2009 03:47:53 -0000


This is a MIME encoded message

--gci1253677673
Content-Type: text/plain

gci		Wed Sep 23 03:47:53 2009 EDT

  Modified files:              (Branch: GCI_2)
    /loncom/interface	loncreateuser.pm 
  Log:
  - loncreateuser.pm for GCI_2 updated to 2.9.X
  - Reversing changes in 1.265 (not included in 2.9.X).
  - Self-enroll request approval link needed.
  - Backport 1.296, 1.300, part of 1.301, part of 1.303, 1.304, 1.305, 1.306, 1.307, 1.308, 1.309, 1.310, 1.311, 1.312, 1.313, 1.314
  
  
--gci1253677673
Content-Type: text/plain
Content-Disposition: attachment; filename="gci-20090923034753.txt"

Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.295 loncom/interface/loncreateuser.pm:1.295.8.1
--- loncom/interface/loncreateuser.pm:1.295	Mon May 18 16:08:07 2009
+++ loncom/interface/loncreateuser.pm	Wed Sep 23 03:47:53 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.295 2009/05/18 16:08:07 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.295.8.1 2009/09/23 03:47:53 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,7 +68,7 @@
 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 +110,7 @@
 
 sub auth_abbrev {
     my %abv_auth = (
+                     krb5     => 'krb',
                      krb4     => 'krb',
                      internal => 'int',
                      localuth => 'loc',
@@ -143,6 +144,7 @@
     $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 +155,7 @@
         document.cu.customquota[1].checked = true;
     }
 }
+// ]]>
 </script>
 END_SCRIPT
     if ($quotatype eq 'custom') {
@@ -214,7 +217,8 @@
 
 sub build_tools_display {
     my ($ccuname,$ccdomain,$context) = @_;
-    my (@usertools,%userenv,$output);
+    my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay,
+        $colspan);
     my %lt = &Apache::lonlocal::texthash (
                    'blog'       => "Personal User Blog",
                    'aboutme'    => "Personal Information Page",
@@ -225,63 +229,240 @@
                    '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',
     );
     if ($context eq 'requestcourses') {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'requestcourses.official','requestcourses.unofficial');
         @usertools = ('official','unofficial');
+        @options =('norequest','approval','autolimit','validate');
+        %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
+        %reqtitles = &courserequest_titles();
+        %reqdisplay = &courserequest_display();
+        $colspan = ' colspan="2"';
     } 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);
+            $curroption = $userenv{$context.'.'.$item};
+            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 {
@@ -299,7 +480,9 @@
 
     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 %loaditems = (
@@ -466,6 +649,7 @@
     
     return <<END;
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -483,14 +667,14 @@
     }
 
     $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) = @_;
     my @fields = ('username','domain','lastname','firstname','permanentemail');
     my $sortby = $env{'form.sortby'};
 
@@ -502,6 +686,7 @@
 
     my $jscript = (<<ENDSCRIPT);
 <script type="text/javascript">
+// <![CDATA[
 function pickuser(uname,udom) {
     document.usersrchform.seluname.value=uname;
     document.usersrchform.seludom.value=udom;
@@ -510,6 +695,7 @@
 }
 
 $jsback
+// ]]>
 </script>
 ENDSCRIPT
 
@@ -524,28 +710,32 @@
                                        '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();
+        &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>');
+        }
     }
     $r->print('<form name="usersrchform" method="post">'.
               &Apache::loncommon::start_data_table()."\n".
@@ -570,8 +760,20 @@
 
     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 +793,11 @@
               ' <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 {
@@ -758,7 +964,9 @@
 $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
@@ -782,6 +990,13 @@
         } 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 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); 
@@ -815,7 +1030,7 @@
                             } 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";
@@ -873,10 +1088,15 @@
             $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 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);
@@ -952,7 +1172,7 @@
     } ## 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");
+        $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onclick="setSections(this.form)" />'."\n");
     } else {
         $r->print('<h3>'.&mt('Add Roles').'</h3>');
         my $addrolesdisplay = 0;
@@ -965,14 +1185,14 @@
                 $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)">'.
@@ -980,7 +1200,7 @@
             }
         } 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']));
@@ -1048,7 +1268,11 @@
                                    $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;
 }
 
@@ -1349,8 +1573,10 @@
     &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(
@@ -1401,7 +1627,9 @@
             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>
@@ -1430,7 +1658,9 @@
                                                );
             $outcome =
                        '<script type="text/javascript" language="Javascript">'."\n".
+                       '// <![CDATA['."\n".
                        $loginscript."\n".
+                       '// ]]>'."\n".
                        '</script>'."\n".
                        '<h3>'.$lt{'ld'}.'</h3>'.
                        &Apache::loncommon::start_data_table().
@@ -1761,7 +1991,10 @@
     my $newuser = 0;
     my ($jsback,$elements) = &crumb_utilities();
     my $jscript = '<script type="text/javascript">'."\n".
-                  $jsback."\n".'</script>'."\n";
+                  '// <![CDATA['."\n".
+                  $jsback."\n".
+                  '// ]]>'."\n".
+                  '</script>'."\n";
     my %breadcrumb_text = &singleuser_breadcrumb();
     my $args;
     if ($env{'form.popup'}) {
@@ -1942,7 +2175,13 @@
                 }
             }
             foreach my $item (@requestcourses) {
-                $newcustom{$item} = $env{'form.requestcourses_'.$item};
+                $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');
             }
@@ -1998,7 +2237,9 @@
             ('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) { 
@@ -2127,7 +2368,7 @@
             $oldinststatuses,$newinststatuses);
         my ($defquota,$settingstatus) = 
             &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
-        my ($showquota,$showtools,$showrequestcourses,$showinststatus);
+        my ($showquota,$showtools,$showrequestcourses,$showinststatus,$showreqotherdom);
         if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
             $showquota = 1;
         }
@@ -2136,6 +2377,8 @@
         }
         if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
             $showrequestcourses = 1;
+        } elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+            $showreqotherdom = 1;
         }
         if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
             $showinststatus = 1;
@@ -2219,8 +2462,13 @@
         }
         &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.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);
+        }
         if ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
             $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
             $env{'form.clastname'}   ne $userenv{'lastname'}   ||
@@ -2333,6 +2581,11 @@
                         $r->print("
     <th>$lt{$item}</th>\n");
                     }
+                } elsif ($showreqotherdom) {
+                    foreach my $item (@requestcourses) {
+                        $r->print("
+    <th>$lt{$item}</th>\n");
+                    }
                 }
                 if ($showquota) {
                     $r->print("
@@ -2364,6 +2617,11 @@
                         $r->print("
     <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
                     }
+                } elsif ($showreqotherdom) {
+                    foreach my $item (@requestcourses) {
+                        $r->print("
+    <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
+                    }
                 }
                 if ($showquota) {
                     $r->print("
@@ -2395,6 +2653,11 @@
                         $r->print("
     <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
                     }
+                } elsif ($showreqotherdom) {
+                    foreach my $item (@requestcourses) {
+                        $r->print("
+    <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
+                    }
                 }
                 if ($showquota) {
                     $r->print("
@@ -2445,7 +2708,7 @@
                            'aboutme'    => "Personal Information Page Availability",
                            'portfolio'  => "Portfolio Availability",
                            'official'   => "Can Request Official Courses",
-                           'unofficial' => "Can Request Unofficial Course",
+                           'unofficial' => "Can Request Unofficial Courses",
                            'inststatus' => "Affiliation",
 					       );
             $r->print(<<"END");
@@ -2463,6 +2726,11 @@
                     $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
                               $newaccesstext{$item}.']'."\n");
                 }
+            } elsif ($showreqotherdom) {
+                foreach my $item (@requestcourses) {
+                    $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
+                              $newaccesstext{$item}.']'."\n");
+                }
             }
             if ($showtools) {
                 foreach my $item (@usertools) {
@@ -2554,7 +2822,101 @@
           (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}) {
@@ -2564,12 +2926,12 @@
             }
             $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'");
@@ -2593,20 +2955,20 @@
                 } 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'");
@@ -2992,6 +3354,10 @@
         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;
@@ -3111,13 +3477,16 @@
     my ($jsback,$elements) = &crumb_utilities();
     my $button_code = "\n";
     my $head_script = "\n";
-    $head_script .= '<script type="text/javascript">'."\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".'</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','')",
@@ -3247,7 +3616,7 @@
 sub make_button_code {
     my ($role) = @_;
     my $label = &Apache::lonnet::plaintext($role);
-    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';
+    my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
     return ($button_code);
 }
 # ---------------------------------------------------------- Call to definerole
@@ -3260,7 +3629,11 @@
         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>';
 
     $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -3586,11 +3959,14 @@
         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',
@@ -3598,7 +3974,8 @@
             $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') {
@@ -3632,7 +4009,11 @@
 
 sub add_script {
     my ($js) = @_;
-    return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+    return '<script type="text/javascript">'."\n".
+           '// <![CDATA['."\n".
+           "\n".$js."\n".
+           '// ]]>'."\n".
+           '</script>'."\n";
 }
 
 sub verify_user_display {
@@ -3666,137 +4047,110 @@
                                    listusers => 'Display Co-authors and Manage Multiple Users',
                                  },
                        course => {
-                                   upload => 'File of Course Users',
-                                   singleuser => 'Single Course User',
-                                   listusers => 'Course User Lists',
+                                   upload => 'Upload a File of Course Users',
+                                   singleuser => 'Add/Modify a Single Course User',
+                                   listusers => 'Display Class Lists and Manage Multiple Users',
                                  },
-                     );
-  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 =>
-	     [
-	     ]},
-	   );
-			
-    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.',
-		});
-		
-    }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 @menu =
+        (
+          { text => $links{$context}{'upload'},
+            help => 'Course_Create_Class_List',
+            action => 'upload',
+            permission => $permission->{'cusr'},
+            },
+          { text => $links{$context}{'singleuser'},
+            help => 'Course_Change_Privileges',
+            action => 'singleuser',
+            permission => $permission->{'cusr'},
+            },
+          { 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') {
+        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',
+                 permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                && $permission->{'cusr'}),
+                 url  => '/adm/populate',
+                 },
+               { text => 'Configure User Self-enrollment',
+                 help => 'Course_Self_Enrollment',
+                 action => 'selfenroll',
+                 permission => $permission->{'cusr'},
+               });
+        }
         if ($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',
+            push(@courselinks,
+                    {   text => 'Enrollment Requests',
+                        help => 'Course_Approve_Selfenroll',
+                        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.',
-        });
-    };
-return Apache::lonhtmlcommon::generate_menu(@menu);
+        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'},
+               },);
 #               { 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 {
@@ -3993,7 +4347,9 @@
     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);
@@ -4256,279 +4612,6 @@
     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);
@@ -4885,6 +4968,7 @@
             $r->print('</tr></table>');
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
+// <![CDATA[
 function chgPage(caller) {
     if (caller == 'previous') {
         document.$formname.page.value --;
@@ -4895,11 +4979,14 @@
     document.$formname.submit(); 
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
         }
     } else {
-        $r->print(&mt('There are no records to display'));
+        $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>');
@@ -4911,7 +4998,7 @@
     my $context = 'course';
     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>';
@@ -4952,20 +5039,29 @@
     foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
         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 style="font-size: smaller;" 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 /><br />';
     return $output;
 }
 
@@ -4977,7 +5073,8 @@
                                              createcourse => 'Course Creation',
                                              course       => 'User Management in course',
                                              domain       => 'User Management in domain',
-                                             selfenroll   => 'Self-enrolled', 
+                                             selfenroll   => 'Self-enrolled',
+                                             requestcourses => 'Course Request',
                                          );
     return %lt;
 }
@@ -5062,6 +5159,15 @@
                                 &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);
@@ -5353,17 +5459,27 @@
                     $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>')
@@ -5374,10 +5490,13 @@
                                 .'</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 />'
+                    $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>')
@@ -5594,7 +5713,7 @@
                  '<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><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
                      '<td><select name="role">'."\n";
     foreach my $role (@roles) {
         my $plrole=&Apache::lonnet::plaintext($role);
@@ -5885,7 +6004,7 @@
                                 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");

--gci1253677673--