--- loncom/interface/lonrequestcourse.pm	2009/09/07 06:30:49	1.30
+++ loncom/interface/lonrequestcourse.pm	2009/09/11 12:53:10	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.30 2009/09/07 06:30:49 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.35 2009/09/11 12:53:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -527,9 +527,9 @@ sub form_elements {
                      );
         if ($env{'form.sectotal'} > 0) {
             for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
-                $extras{'sec_'.$i} = 'checkbox',
-                $extras{'secnum_'.$i} = 'text',
-                $extras{'loncapasec_'.$i} = 'text',
+                $extras{'sec_'.$i} = 'radio';
+                $extras{'secnum_'.$i} = 'text';
+                $extras{'loncapasec_'.$i} = 'text';
             }
         }
         my $crosslisttotal = $env{'form.crosslisttotal'};
@@ -631,7 +631,7 @@ sub course_types {
                          official   => 'Official course',
                          unofficial => 'Unofficial course',
                          community  => 'Community',
-                    );
+                   );
     return (\@types,\%typename);
 }
 
@@ -724,7 +724,9 @@ END
 
 END
 
-    $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.'<div>'.
+    $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.
+             '<p>'.&mt('Request creation of a new course, or review your pending course requests.').'</p>'.
+             '<div>'.
               &Apache::lonhtmlcommon::start_pick_box().
               &Apache::lonhtmlcommon::row_title(&mt('Course Domain')).
               '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
@@ -755,7 +757,7 @@ END
             if ($type eq 'official') {
                 $selected = ' selected="selected"';
             }
-            $r->print('<option value="'.$type.'"'.$selected.'>'.$typename->{$type}.
+            $r->print('<option value="'.$type.'"'.$selected.'>'.&mt($typename->{$type}).
                       '</option>'."\n");
         }
     }
@@ -800,8 +802,15 @@ END
     }
     if ($action eq 'new') {
         my $jsextra;
-        unless (($state eq 'review') || ($state eq 'process')) {
+        if ($state eq 'courseinfo') {
             $jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);
+        } elsif ($state eq 'enrollment') {
+            if (($env{'form.crstype'} eq 'official') && 
+                (&Apache::lonnet::auto_run('',$dom))) {
+                $js .= "\n".&section_check_javascript()."\n".&enrollment_lcsec_js();
+            }
+        } elsif ($state eq 'personnel') {
+            $js .= "\n".&section_check_javascript()."\n".&personnel_lcsec_js();
         }
         $r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
         &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
@@ -849,8 +858,8 @@ END
                                                       other => 'Modify Request',
                                                       next => 'Cancel Request',
                                                      );
-            &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},
-                                $state,$other,$navtxt{'other'});
+            &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+                                $navtxt{'next'},$state,$other,$navtxt{'other'});
             $r->print('</form>');
         } elsif ($state eq 'cancel') {
             my ($result,$output) = &print_cancel_request($dom,$env{'form.origcnum'});
@@ -863,10 +872,11 @@ END
                                                       next => 'Confirm Cancellation',
                                                      );
             if ($result eq 'ok') {
-                &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,
+                &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
                                     $navtxt{'next'},$state);
             } else {
-                &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},undef,'',$state);
+                &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},undef,
+                                    '',$state);
             }
             $r->print('</form>');
         } elsif ($state eq 'removal') {
@@ -929,6 +939,166 @@ END
     return;
 }
 
+sub enrollment_lcsec_js {
+    my %alerts = &section_check_alerts();
+    my $secname = $alerts{'badsec'};
+    my $secnone = $alerts{'reserved'};
+    my $output = '
+function validateEnrollSections(formname,nextstate) {
+    var badsectotal = 0;
+    var reservedtotal = 0;
+    var secTest = "";
+';
+    for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+        $output .= "
+    var selSec = 0;
+    for (var j=0; j<document.requestcrs.sec_".$i.".length; j++) {
+        if (document.requestcrs.sec_".$i."[j].checked) {
+            selSec = document.requestcrs.sec_".$i."[j].value;
+        }
+        if (selSec == 1) {
+            secTest = validsection(document.requestcrs.loncapasec_".$i.");
+            if (secTest == 'badsec') {
+                badsectotal++;
+            }
+            if (secTest == 'reserved') {
+                reservedtotal++;
+            }
+        }
+    }
+";
+    }
+    for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+        $output .= "
+    if (document.requestcrs.crosslist_".$i.".checked) {
+        secTest = validsection(document.requestcrs.crosslist_".$i."_lcsec);
+        if (secTest == 'badsec') {
+            badsectotal++;
+        }
+        if (secTest == 'reserved') {
+            reservedtotal++;
+        }
+    }
+";
+    }
+    $output .= "
+    if (badsectotal>0) {
+        alert('$secname');
+        return false;
+    }
+    if (reservedtotal>0) {
+        alert('$secnone');
+        return false;
+    }
+    formname.state.value= nextstate;
+    formname.submit();
+    return;
+}
+";
+    return $output;
+}
+
+sub personnel_lcsec_js {
+    my %alerts = &section_check_alerts();
+    my $secname = $alerts{'badsec'}.'\\n'.$alerts{'separate'};
+    my $secnone = $alerts{'reserved'};
+    my $output = '
+function validatePersonnelSections(formname,nextstate) {
+    var badsectotal = 0;
+    var reservedtotal = 0;
+    var secTest = "";
+';
+    for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+        $output .= "
+    if (document.requestcrs.person_".$i."_uname.value != '') {
+        secTest = validsection(document.requestcrs.person_".$i."_newsec,'1');
+        if (secTest == 'badsec') {
+            badsectotal++; 
+        }
+        if (secTest == 'reserved') {
+            reservedtotal++;
+        }
+    }
+";
+    }
+    $output .= "
+    if (badsectotal > 0) {
+        alert('$secname');
+        return false;
+    } else {
+        if (reservedtotal > 0) {
+            alert('$secnone');
+            return false;
+        }
+    }
+    formname.state.value = nextstate;
+    formname.submit();
+    return;
+}
+";
+    return $output;
+}
+
+sub section_check_alerts {
+    my %lt = 
+        &Apache::lonlocal::texthash(
+            reserved => "You need to change one or more LON-CAPA section names - none is a reserved word in the system, and may not be used.",
+            badsec => 'You need to change one or more LON-CAPA section names - names may only contain letters or numbers.',
+            separate => 'Separate multiple sections with a comma.'
+        );
+    return %lt;
+}
+
+sub section_check_javascript {
+    return <<"END";
+function validsection(field,mult) {
+    var str = field.value;
+    var badsec=0;
+    var reserved=0;
+    if (window.RegExp) {
+        var badsecnum=0;
+        var reservednum=0;
+        var pattern=/[^a-zA-Z0-9]/; 
+        str = str.replace(/(^\\s*)|(\\s*\$)/gi,"");
+        str = str.replace(/[ ]{2,}/gi," ");
+        if (mult == '1') {
+            var sections = new Array();
+            sections = str.split(/\\s*[\\s,;:]\\s*/);
+            var i;
+            for (i=0; i<sections.length; i++) {
+                if ((sections[i] != '') && (sections[i] != undefined) && (sections[i] != null)) {
+                    if (pattern.test(sections[i])) {
+                        badsecnum++;
+                    } else {
+                        if (sections[i] == 'none') {
+                            reservednum++;
+                        }
+                    }
+                }
+            }
+        } else {
+            if ((str != '') && (str != undefined) && (str != null)) {
+                if (pattern.test(str)) {
+                    badsecnum++;
+                } else {
+                    if (str == 'none') {
+                        reservednum++;
+                    }
+                }
+            }
+        }
+        if (badsecnum > 0) {
+            return 'badsec';
+        }
+        if (reservednum > 0) {
+            return 'reserved';
+        }
+    }
+    return;
+}
+END
+}
+
 sub close_popup_form {
     my $close= &mt('Close Window');
     return << "END";
@@ -966,7 +1136,7 @@ sub print_request_form {
                                                next => 'Next',
                                              );
     $crstype = $env{'form.crstype'};
-    $r->print('<form name="'.$formname.'" method="post" action="/adm/requestcourse">');
+    $r->print('<br /><form name="'.$formname.'" method="post" action="/adm/requestcourse">');
     my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk,
         @disallowed);
     if ($crstype eq 'official') {
@@ -1003,7 +1173,9 @@ sub print_request_form {
             $codepicker = &coursecode_form($dom,'instcode',\@codetitles,
                                            \%cat_titles,\%cat_order);
             if ($codepicker) {
-                $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box().$codepicker.
+                $r->print(&mt('Specify the course to be created.').
+                          '<div>'.&Apache::lonhtmlcommon::start_pick_box().
+                          $codepicker.
                           &Apache::lonhtmlcommon::end_pick_box().'</div>');
             } else {
                 $next = $states->{$action}[$page+2];
@@ -1168,7 +1340,8 @@ sub print_request_form {
         push(@excluded,'crosslisttotal');
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
-    &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state);
+    &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+                        $navtxt{'next'},$state);
     return;
 }
 
@@ -1242,7 +1415,7 @@ sub get_excluded_elements {
 sub print_enrollment_menu {
     my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
         $invalidcrosslist) =@_;
-    my ($sections,$autoenroll,$access_dates,$output);
+    my ($sections,$autoenroll,$access_dates,$output,$hasauto);
     my $starttime = time;
     my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
 
@@ -1261,7 +1434,8 @@ sub print_enrollment_menu {
             $section_form = &inst_section_selector($dom,$instcode);
             if ($section_form) {
                 $sections = &Apache::lonhtmlcommon::row_headline().
-                            '<h3>'.&mt('Sections for auto-enrollment').'</h3>'.
+                            '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Sections').
+                            '&nbsp;'.&mt('Sections for auto-enrollment').'</h3>'.
                             &Apache::lonhtmlcommon::row_closure(1).
                             $section_form;
             }
@@ -1288,26 +1462,29 @@ sub print_enrollment_menu {
                               &Apache::lonhtmlcommon::row_closure(1).
                               $crosslist_form;
             }
+            $hasauto = 1;
             $autoenroll = 
-                &Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')).
+                &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autoadd').'&nbsp;'.&mt('Add registered students automatically')).
                 '<span class="LC_nobreak"><label>'.
                 '<input type="radio" name="autoadds" value="1">'.
                 &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
                 '<input type="radio" name="autoadds" value="0" checked="checked">'.
                 &mt('No').'</label></span>'.
                 &Apache::lonhtmlcommon::row_closure(1).
-                &Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')).
+                &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autodrop').'&nbsp;'.&mt('Drop unregistered students automatically')).
                 '<span class="LC_nobreak"><label>'.
                 '<input type="radio" name="autodrops" value="1">'.
                 &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
                 '<input type="radio" name="autodrops" value="0" checked="checked">'.
                 &mt('No').'</label></span>'. 
                 &Apache::lonhtmlcommon::row_closure(1).
-                &date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles);
+                &date_setting_table($starttime,$endtime,$formname,'enroll',
+                                    $hasauto,%enrolltitles);
         }
     }
     my $access_dates = 
-        &date_setting_table($starttime,$endtime,$formname,'access',%accesstitles);
+        &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
+                            %accesstitles);
     $output .= &Apache::lonhtmlcommon::start_pick_box();
     if ($sections) {
         $output .=  $sections;
@@ -1361,18 +1538,23 @@ sub inst_section_selector {
                     '<th>'.&mt('Include?').'<input type="hidden" name="sectotal" '.
                     'value="'.$sectotal.'"  /></th>'.
                     '<th>'.&mt('Institutional Section').'</th>'.
-                    '<th>'.&mt('LON-CAPA section').'</th>'.
+                    '<th>'.&Apache::loncommon::help_open_topic('Course_Request_LCSection').
+                          '&nbsp;'.&mt('LON-CAPA section').'</th>'.
                     &Apache::loncommon::end_data_table_row();
         for (my $i=0; $i<@sections; $i++) {
             my $colflag = $i%2;
-            my $checked = ' checked="checked"';
+            my $secon = ' checked="checked"';
+            my $secoff = '';
             if ($env{'form.origcnum'}) {
-                $checked='';
+                $secoff = $secon;
+                $secon='';
             }
             $output .= &Apache::loncommon::start_data_table_row().
-                       '<td><input type="checkbox" name="sec_'.$i.
-                       '"'.$checked.' value="1" /></td>'.
-                       '<td>'.$sections[$i].
+                       '<td><label><input type="radio" name="sec_'.$i.
+                       '"'.$secon.' value="1" />'.&mt('Yes').'</label>'.
+                       ('&nbsp;'x2).'<label><input type="radio" name="sec_'.$i.
+                        '"'.$secoff.' value="0" />'.&mt('No').'</label></td>'.
+                       '<td align="center">'.$sections[$i].
                        '<input type="hidden" name="secnum_'.$i.'" value="'.
                        $sections[$i].'" /></td>'.
                        '<td><input type="text" size="10" name="loncapasec_'.$i.
@@ -1386,7 +1568,7 @@ sub inst_section_selector {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime,$formname,$prefix,%datetitles) = @_;
+    my ($starttime,$endtime,$formname,$prefix,$hasauto,%datetitles) = @_;
     my ($perpetual,$table);
     my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
                                                         $starttime,'','','',1,'','','',1);
@@ -1399,11 +1581,27 @@ sub date_setting_table {
                      &mt('No end date').'</label></span>';
         $closure = '1';
     }
-    $table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}).
-             $startform.
+
+    my %help_item = (
+                      access => {
+                                  start => 'Course_Request_Access_Start', 
+                                  end   => 'Course_Request_Access_End',
+                                },
+                      enroll => {
+                                  start => 'Course_Request_Enroll_Start',
+                                  end   => 'Course_Request_Enroll_End',
+                                },
+                     );
+    if ($hasauto) {
+        $help_item{'access'}{'start'} = 'Course_Request_RegAccess_Start';
+        $help_item{'access'}{'end'}   = 'Course_Request_RegAccess_End';
+    }
+
+    $table = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'start'}).
+             '&nbsp;'.$datetitles{'start'}).$startform.
              &Apache::lonhtmlcommon::row_closure(1).
-             &Apache::lonhtmlcommon::row_title($datetitles{'end'}).
-             $endform.$perpetual.
+             &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'end'}).
+             '&nbsp;'.$datetitles{'end'}).$endform.$perpetual.
              &Apache::lonhtmlcommon::row_closure($closure);
     return $table;
 }
@@ -1466,8 +1664,13 @@ sub print_personnel_menu {
     }
 
     if ($persontotal) {
+        my %lt = &Apache::lonlocal::texthash(
+            community => 'Requestor is automatically assigned Coordinator role.',
+            official => 'Requestor is automatically assigned Course Coordinator role.',
+        );
+        $lt{'unofficial'} = $lt{'official'};
         $output .= &Apache::lonhtmlcommon::row_headline().
-                   '<h3>'.&mt('Requestor is automatically assigned Course Coordinator role.').' '.&mt('Include other personnel?').'</h3>';
+                  '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').'&nbsp;'.$lt{$crstype}.' '.&mt('Include other personnel?').'</h3>';
     }
     for (my $i=0; $i<$persontotal; $i++) { 
         my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
@@ -1509,8 +1712,9 @@ sub print_personnel_menu {
             '<td align="center" valign="top">'.&mt('First Name').'<br />'.$form_elems{'firstname'}.'</td>'."\n".
             '<td align="center" valign="top">'.&mt('Last Name').'<br />'.$form_elems{'lastname'}.'</td>'."\n".
             '<td align="center" valign="top">'.&mt('E-mail').'<br />'.$form_elems{'emailaddr'}.'</td></tr>'."\n".
-            '<tr><td align="center" valign="top">'.&mt('Role').'<br />'.$roleselector.'</td>'."\n".
-            '<td'.$seccolspan.' align="center" valign="top">'.&mt('Section(s)').'<br />'.$sectionselector.'</td>'."\n".
+            '<tr><td align="center" valign="top">'.&Apache::loncommon::help_open_topic('Course_Roles').'&nbsp;'.&mt('Role').'<br />'.$roleselector.'</td>'."\n".
+            '<td'.$seccolspan.' align="center" valign="top">'.
+            &Apache::loncommon::help_open_topic('Course_Request_Rolesection').'&nbsp;'.&mt('LON-CAPA Section(s)').'<br />'.$sectionselector.'</td>'."\n".
             '</tr></table>'.&Apache::lonhtmlcommon::row_closure();
     }
     $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another?')).
@@ -1518,7 +1722,8 @@ sub print_personnel_menu {
                '<input name="addperson" type="checkbox" value="'.$persontotal.'"'.
                ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
                "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1).
-               &Apache::lonhtmlcommon::end_pick_box().'</div>';
+               &Apache::lonhtmlcommon::end_pick_box().'</div>'.
+               '<p>'.&mt('You may also add users later, once the course has been created, by using the "Manage course users" link, accessible from the "Main Menu".').'</p>';
     return $output;
 }
 
@@ -1526,10 +1731,12 @@ sub current_lc_sections {
     my @currsecs;
     if ($env{'form.sectotal'}) {
         for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
-            if (defined($env{'form.loncapasec_'.$i})) {
-                my $lcsec = $env{'form.loncapasec_'.$i};
-                unless (grep(/^\Q$lcsec\E$/,@currsecs)) {
-                    push(@currsecs,$lcsec);
+            if ($env{'form.sec_'.$i}) { 
+                if (defined($env{'form.loncapasec_'.$i})) {
+                    my $lcsec = $env{'form.loncapasec_'.$i};
+                    unless (grep(/^\Q$lcsec\E$/,@currsecs)) {
+                        push(@currsecs,$lcsec);
+                    }
                 }
             }
         }
@@ -1541,14 +1748,8 @@ sub print_request_status {
     my ($dom) = @_;
     my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
                                            $env{'user.name'},'^status:'.$dom);
-    my ($output,$formname,%queue_by_date,%typenames);
-    if ($env{'form.crstype'} eq 'any') {
-        %typenames = &Apache::lonlocal::texthash (
-                                                   official   => 'Official course',
-                                                   unofficial => 'Unofficial course',
-                                                   community  => 'Community',
-                                                 );
-    }
+    my ($output,$formname,%queue_by_date);
+    my ($types,$typenames) = &course_types();
     foreach my $key (keys(%statusinfo)) {
         if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) { 
             (undef,my($cdom,$cnum)) = split(':',$key);
@@ -1619,7 +1820,10 @@ sub print_request_status {
      '<td>'.&unescape($desc).'</td>'.
      '<td>'.$cdom.'</td>';
                     if ($env{'form.crstype'} eq 'any') {
-                        my $typename = $typenames{$type};
+                        my $typename;
+                        if (ref($typenames) eq 'HASH') {
+                            $typename = &mt($typenames->{$type});
+                        }
                         if ($typename eq '') {
                             $typename = &mt('Unknown type');
                         }
@@ -1772,7 +1976,7 @@ sub print_review {
     $crstypename = $env{'form.crstype'};
     if (ref($typename) eq 'HASH') {
         unless ($typename->{$env{'form.crstype'}} eq '') {
-            $crstypename = $typename->{$env{'form.crstype'}};
+            $crstypename = &mt($typename->{$env{'form.crstype'}});
         }
     }
     my $category = 'Course';
@@ -1933,14 +2137,22 @@ sub print_review {
             if (ref($disallowed) eq 'ARRAY') {
                 next if (grep(/^$i$/,@{$disallowed}));
             } 
-            my @allsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+            my @officialsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+            my @allsecs;
+            foreach my $sec (@officialsecs) {
+                next unless ($sec =~ /\w/);
+                next if ($sec =~ /\W/);
+                next if ($sec eq 'none');
+                push(@allsecs,$sec);
+            }
             my $newsec = $env{'form.person_'.$i.'_newsec'};
             $newsec =~ s/^\s+//;
             $newsec =~s/\s+$//;
-            my @newsecs = split(/[\s,;]+/,$newsec);
+            my @newsecs = split(/\s*[\s,;:]\s*/,$newsec);
             foreach my $sec (@newsecs) {
+                next unless ($sec =~ /\w/); 
                 next if ($sec =~ /\W/);
-                next if ($newsec eq 'none');
+                next if ($sec eq 'none');
                 if ($sec ne '') {
                     unless (grep(/^\Q$sec\E$/,@allsecs)) {
                         push(@allsecs,$sec); 
@@ -2027,14 +2239,18 @@ sub dates_from_form {
 
 sub courseinfo_form {
     my ($dom,$formname,$crstype,$next) = @_;
-    my $nodescr = &mt('You must provide a (brief) course description.');
+    my %lt = &Apache::lonlocal::texthash(
+                official => 'You must provide a (brief) course description.',
+                community => 'You must provide a (brief) community description.'
+             );
+    $lt{'unofficial'} = $lt{'official'};
     my $js_validate = <<"ENDJS";
 <script type="text/javascript">
 // <![CDATA['
 
 function validateForm() {
     if ((document.$formname.cdescr.value == "")  || (document.$formname.cdescr.value == "undefined")) {
-        alert('$nodescr');
+        alert('$lt{$crstype}');
         return;
     }
     nextPage(document.$formname,'$next');
@@ -2049,7 +2265,7 @@ ENDJS
     }
     my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
                   &Apache::lonhtmlcommon::row_headline().
-                  '<h3>'.$title.'</h3>'.
+                  '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Description').'&nbsp;'.$title.'</h3>'.
                   &Apache::lonhtmlcommon::row_closure(1).
                   &Apache::lonhtmlcommon::row_title(&mt('Description')).
                  '<input type="text" size="40" name="cdescr" />';
@@ -2063,7 +2279,7 @@ ENDJS
     $output .= $home_server_pick.
                &Apache::lonhtmlcommon::row_closure().
                &Apache::lonhtmlcommon::row_headline().
-               '<h3>'.&mt('Clone content and settings from an existing course?').'</h3>'. 
+               '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.&mt('Clone content and settings from an existing course?').'</h3>'. 
                &Apache::lonhtmlcommon::row_closure(1).
                &clone_form($dom,$formname,$crstype).
                &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
@@ -2076,14 +2292,14 @@ sub clone_form {
     if ($crstype eq 'community') {
         $type = 'Community';
     }
-    my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').
+    my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').'&nbsp;'.
                     &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
     my %lt = &clone_text();
     my $output .= 
         &Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
         '<input type="text" size="25" name="clonecrs" value=""  />'.
-        '</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.
-        &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.
+        '</label>'.&Apache::lonhtmlcommon::row_closure(1).
+        &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'<label>'.
         $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
         '<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
@@ -2115,6 +2331,10 @@ sub coursecode_form {
                     instcode  => 'Course Category',
                     crosslist => 'Cross Listed Course',
                    );
+    my %helpitem = ( 
+                     instcode => 'Course_Request_Category',
+                     crosslist => 'Course_Request_Crosslist',
+                   );
     if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH') && 
         (ref($cat_order))) {
         my ($sel,$instsec,$lcsec);
@@ -2130,7 +2350,7 @@ sub coursecode_form {
             my $lastitem = pop(@{$codetitles});
             my $lastinput = '<input type="text" size="5" name="'.$sel.'_'.                                            $lastitem.'" />';
             if (@{$codetitles} > 0) {
-                $output = &Apache::lonhtmlcommon::row_title($rowtitle{$context}).
+                $output = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($helpitem{$context}).'&nbsp;'.$rowtitle{$context}).
                           '<table><tr>';
                 if ($context eq 'crosslist') {
                     $output .= '<td>'.&mt('Include?').'<br />'.
@@ -2242,11 +2462,11 @@ sub get_course_dom {
 }
 
 sub display_navbuttons {
-    my ($r,$formname,$prev,$prevtext,$next,$nexttext,$state,$other,$othertext) = @_;
+    my ($r,$dom,$formname,$prev,$prevtext,$next,$nexttext,$state,$other,$othertext) = @_;
     $r->print('<div class="LC_navbuttons">');
     if ($prev) {
         $r->print('<input type="button" name="previous" value = "'.$prevtext.'" '.
-                  'onclick="javascript:backPage(document.'.$formname.','."'".$prev."'".')"/>'.
+                  'onclick="javascript:backPage('."document.$formname,'$prev'".')"/>'.
                   ('&nbsp;'x3));
     } elsif ($prevtext) {
         $r->print('<input type="button" name="previous" value = "'.$prevtext.'" '.
@@ -2254,16 +2474,34 @@ sub display_navbuttons {
     }
     if ($state eq 'details') {
         $r->print(' <input type="button" name="other" value="'.$othertext.'" '.
-                  'onclick="javascript:nextPage(document.'.$formname.','."'".$other."'".
+                  'onclick="javascript:nextPage('."document.$formname,'$other'".
                   ')" />');
     }
+    my $gotnext;
     if ($state eq 'courseinfo') {
         $r->print('<input type="button" name="next" value="'.$nexttext.'" '.
                   'onclick="javascript:validateForm();" />');
-    } elsif ($next) {
-        $r->print('
-      <input type="button" name="next" value="'.$nexttext.'" '.
-      'onclick="javascript:nextPage(document.'.$formname.','."'".$next."'".')" />');
+        $gotnext = 1;
+    } elsif ($state eq 'enrollment') {
+        if (($env{'form.crstype'} eq 'official') && 
+            (&Apache::lonnet::auto_run('',$dom))) {
+            $r->print('<input type="button" name="next" value="'.$nexttext.'" '.
+                      'onclick="javascript:validateEnrollSections('."document.$formname,'$next'".');" />');
+                $gotnext = 1;
+        }
+    } elsif ($state eq 'personnel') {
+        if ($env{'form.persontotal'} > 0) { 
+            $r->print('<input type="button" name="next" value="'.$nexttext.'" '.
+                      'onclick="javascript:validatePersonnelSections('."document.$formname,'$next'".');" />');
+            $gotnext = 1;
+        }
+    }
+    unless ($gotnext) {
+        if ($next) {
+            $r->print('
+                      <input type="button" name="next" value="'.$nexttext.'" '.
+      'onclick="javascript:nextPage('."document.$formname,'$next'".')" />');
+        }
     }
     $r->print('</div>');
 }
@@ -2353,20 +2591,27 @@ sub print_request_outcome {
                         @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = ();
                     } else {
                         my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+                        my @allsecs;
+                        foreach my $sec (@currsec) {
+                            next unless ($sec =~ /\w/);
+                            next if ($sec =~ /\W/);
+                            next if ($sec eq 'none');
+                            push(@allsecs,$sec);
+                        }
                         my $newsec = $env{'form.person_'.$i.'_newsec'};
                         $newsec =~ s/^\s+//;
                         $newsec =~s/\s+$//;
                         my @newsecs = split(/[\s,;]+/,$newsec);
                         foreach my $sec (@newsecs) {
                             next if ($sec =~ /\W/);
-                            next if ($newsec eq 'none');
+                            next if ($sec eq 'none');
                             if ($sec ne '') {
-                                unless (grep(/^\Q$sec\E$/,@currsec)) {
-                                    push(@currsec,$sec);
+                                unless (grep(/^\Q$sec\E$/,@allsecs)) {
+                                    push(@allsecs,$sec);
                                 }
                             }
                         }
-                        @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @currsec;
+                        @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @allsecs;
                     }
                 }
             } else {
@@ -2609,85 +2854,90 @@ sub update_requestors_roles {
     my $owner = $env{'user.name'}.':'.$env{'user.domain'};
     if (ref($details) eq 'HASH') {
         if (ref($details->{'personnel'}) eq 'HASH') {
-            if (ref($details->{'personnel'}{$owner}) eq 'HASH') {
-                my @roles;
-                if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
-                    @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
-                    unless (grep(/^cc$/,@roles)) {
-                        push(@roles,'cc');
-                    }
-                } else {
-                    @roles = ('cc');
+            unless (ref($details->{'personnel'}{$owner}) eq 'HASH') {
+                $details->{'personnel'}{$owner} = {
+                                                    'roles' => ['cc'],
+                                                    'cc'    => { 'usec' => [] },
+                                                  };
+            }
+            my @roles;
+            if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
+                @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
+                unless (grep(/^cc$/,@roles)) {
+                    push(@roles,'cc');
                 }
-                foreach my $role (@roles) {
-                    my $start = $now;
-                    my $end = '0';
-                    if ($role eq 'st') {
-                        if ($details->{'accessstart'} ne '') {
-                            $start = $details->{'accessstart'};
-                        }
-                        if ($details->{'accessend'} ne '') {
-                            $end = $details->{'accessend'};
-                        }
-                    }
-                    my @usecs;
-                    if ($role ne 'cc') {
-                        if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
-                            @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
-                        }
-                    } 
-                    if ($role eq 'st') {
-                        if (@usecs > 1) {
-                            my $firstsec = $usecs[0];
-                            @usecs = ($firstsec);
-                        }
-                    }
-                    if (@usecs == 0) {
-                        push(@usecs,'');
-                    }
-                    foreach my $usec (@usecs) {
-                        my (%userroles,%newrole,%newgroups,$spec,$area);
-                        my $area = '/'.$dom.'/'.$cnum;
-                        my $spec = $role.'.'.$area;
-                        if ($usec ne '') {
-                           $spec .= '/'.$usec;
-                           $area .= '/'.$usec;
-                        }
+            } else {
+                @roles = ('cc');
+            }
+            foreach my $role (@roles) {
+                my $start = $now;
+                my $end = '0';
+                if ($role eq 'st') {
+                    if ($details->{'accessstart'} ne '') {
+                        $start = $details->{'accessstart'};
+                    }
+                    if ($details->{'accessend'} ne '') {
+                        $end = $details->{'accessend'};
+                    }
+                }
+                my @usecs;
+                if ($role ne 'cc') {
+                    if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
+                        @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
+                    }
+                } 
+                if ($role eq 'st') {
+                    if (@usecs > 1) {
+                        my $firstsec = $usecs[0];
+                        @usecs = ($firstsec);
+                    }
+                }
+                if (@usecs == 0) {
+                    push(@usecs,'');
+                }
+                foreach my $usec (@usecs) {
+                    my (%userroles,%newrole,%newgroups,$spec,$area);
+                    my $area = '/'.$dom.'/'.$cnum;
+                    my $spec = $role.'.'.$area;
+                    if ($usec ne '') {
+                       $spec .= '/'.$usec;
+                       $area .= '/'.$usec;
+                    }
+                    if ($role =~ /^cr\//) {
+                        &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
+                                                          $cnum,$spec,$area);
+                    } else {
+                        &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
+                                                            $spec,$cnum,$area);
+                    }
+                    &Apache::lonnet::set_userprivs(\%userroles,\%newrole,
+                                                   \%newgroups);
+                    $userroles{'user.role.'.$spec} = $start.'.'.$end;
+                    &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
+                    if (($end == 0) || ($end > $now)) {
+                        my $showrole = $role;
                         if ($role =~ /^cr\//) {
-                            &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
-                                                              $cnum,$spec,$area);
-                        } else {
-                            &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
-                                                                $spec,$cnum,$area);
+                            $showrole = &Apache::lonnet::plaintext($role,$crstype);
+                        } elsif (ref($longroles) eq 'HASH') {
+                            if ($longroles->{$role} ne '') {
+                                $showrole = $longroles->{$role};
+                            }
                         }
-                        &Apache::lonnet::set_userprivs(\%userroles,\%newrole,
-                                                       \%newgroups);
-                        $userroles{'user.role.'.$spec} = $start.'.'.$end;
-                        &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
-                        if (($end == 0) || ($end > $now)) {
-                            my $showrole = $role;
-                            if ($role =~ /^cr\//) {
-                                $showrole = &Apache::lonnet::plaintext($role,$crstype);
-                            } elsif (ref($longroles) eq 'HASH') {
-                                if ($longroles->{$role} ne '') {
-                                    $showrole = $longroles->{$role};
-                                }
+                        if ($start <= $now) {
+                            $active .= '<li><a href="/adm/roles?selectrole=1&'.
+                                       $spec.'=1">'.$showrole;
+                            if ($usec ne '') {
+                                $active .= ' - '.&mt('section:').' '.$usec; 
                             }
-                            if ($start <= $now) {
-                                $active .= '<li><a href="/adm/roles?selectrole=1&'.                                             $spec.'=1">'.$showrole;
-                                if ($usec ne '') {
-                                    $active .= ' - '.&mt('section:').' '.$usec; 
-                                }
-                                $active .= '</a></li>';
-                                $numactive ++;
-                            } else { 
-                                $future .= '<li>'.$showrole;
-                                if ($usec ne '') {
-                                    $future .= ' - '.&mt('section:').' '.$usec;
-                                }
-                                $future .= '</li>';
-                                $numfuture ++;
+                            $active .= '</a></li>';
+                            $numactive ++;
+                        } else { 
+                            $future .= '<li>'.$showrole;
+                            if ($usec ne '') {
+                                $future .= ' - '.&mt('section:').' '.$usec;
                             }
+                            $future .= '</li>';
+                            $numfuture ++;
                         }
                     }
                 }