--- loncom/interface/lonrequestcourse.pm	2009/08/15 01:59:04	1.13
+++ loncom/interface/lonrequestcourse.pm	2009/08/17 04:39:15	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.13 2009/08/15 01:59:04 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.15 2009/08/17 04:39:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -395,7 +395,6 @@ sub form_elements {
         $people{'person_'.$i.'_role'}      = 'selectbox',
         $people{'person_'.$i.'_sec'}       = 'selectbox',
         $people{'person_'.$i.'_newsec'}    = 'text',
-        $people{'person_'.$i.'_sections'}  = 'hidden',
     }
     my %personnelhash = (%{$elements{'new'}{'personnel'}},%people);
     %{$elements{'new'}{'personnel'}} = %personnelhash;
@@ -553,7 +552,8 @@ END
 
     my $formname = 'requestcrs';
     my $nexttext = &mt('Next');
-    $r->print('<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'.
+    $r->print(
+              '<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'.
               &Apache::lonhtmlcommon::start_pick_box().
               &Apache::lonhtmlcommon::row_title('Action').'
 <input type="hidden" name="showdom" value="'.$dom.'" />
@@ -689,13 +689,13 @@ sub print_request_form {
                 $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box().$codepicker.
                           &Apache::lonhtmlcommon::end_pick_box().'</div>');
             } else {
-                $r->print(&courseinfo_form($dom,$formname,$crstype));
+                $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
             }
         } else {
-            $r->print(&courseinfo_form($dom,$formname,$crstype));
+            $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
         }
     } elsif ($prev eq 'codepick') {
-        $r->print(&courseinfo_form($dom,$formname,$crstype));
+        $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
     } elsif ($state eq 'enrollment') {
         if ($crstype eq 'official') {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
@@ -743,7 +743,7 @@ sub print_request_form {
         push(@excluded,'instcode');
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
-    &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'});
+    &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state);
     return;
 }
 
@@ -855,13 +855,13 @@ sub inst_section_selector {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime,$formname,$suffix,%datetitles) = @_;
+    my ($starttime,$endtime,$formname,$prefix,%datetitles) = @_;
     my ($perpetual,$table);
-    my $startform = &Apache::lonhtmlcommon::date_setter($formname,'start'.$suffix,
+    my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
                                                         $starttime,'','','',1,'','','',1);
-    my $endform = &Apache::lonhtmlcommon::date_setter($formname,'end'.$suffix,
+    my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
                                                       $endtime,'','','',1,'','','',1);
-    if ($suffix eq 'access') {
+    if ($prefix eq 'access') {
         $perpetual = ' <span class="LC_nobreak"><label>'.
                      '<input type="checkbox" name="no_end_date" />'.
                      &mt('No end date').'</label></span>';
@@ -965,9 +965,7 @@ sub print_personnel_menu {
                                $existmult.'>'."\n".$existops.'</select>'.('&nbsp;' x3);
         }
         $sectionselector .= $newtitle.
-            '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'.
-            '<input type="hidden" name="person_'.$i.'_sections" value="" />'."\n";
-         
+            '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'."\n";
         $output .= 
             &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel').'<br />'.
                                               '<span class="LC_nobreak">'.$userlink.
@@ -992,40 +990,56 @@ sub print_personnel_menu {
 
 sub print_request_status {
     my ($dom) = @_;
-    my %requests = &Apache::lonnet::dumpstore('courserequests',$env{'user.domain'},
-                                              $env{'user.name'});
-    my ($output,$formname,%queue_by_date);
-    foreach my $key (keys(%requests)) {
-        if (ref($requests{$key}) eq 'HASH') {
-            my ($cdom,$cnum) = split('_',$key);
-            next if ($cdom ne $dom);
-            my $entry;
-            my $timestamp = $requests{$key}{'timestamp'};
-            my $crstype = $requests{$key}{'crstype'};
-            my $status = $requests{$key}{'status'};
-            next unless (($env{'form.crstype'} eq 'all') || 
-                         ($env{'form.crstype'} eq $crstype));
-            next unless (($status eq 'approval') || ($status eq 'pending'));
-            if (ref($requests{$key}{'details'}) eq 'HASH') {
-                $entry = $key.':'.$crstype.':'.$requests{$key}{'details'}{'cdescr'};
-                if ($crstype eq 'official') {
-                    $entry .= ':'.$requests{$key}{'details'}{'instcode'}; 
-                }
-            }
-            if ($entry ne '') {
-                if (exists($queue_by_date{$timestamp})) {
-                    if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
-                        push(@{$queue_by_date{$timestamp}},$entry);
+    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',
+                                                 );
+    }
+    foreach my $key (keys(%statusinfo)) {
+        if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) { 
+            (undef,my($cdom,$cnum)) = split(':',$key);
+            next if ($cdom ne $dom);   
+            my $requestkey = $cdom.'_'.$cnum;
+            if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+                my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+                                                       $env{'user.domain'},$env{'user.name'});
+                my $entry;
+                my $timestamp = $history{'reqtime'};
+                my $crstype = $history{'crstype'};
+                my $disposition = $history{'disposition'};
+                next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
+                next unless (($env{'form.crstype'} eq 'any') || 
+                            ($env{'form.crstype'} eq $crstype));
+                next unless (($disposition eq 'approval') || 
+                             ($disposition eq 'pending'));
+                if (ref($history{'details'}) eq 'HASH') {
+                    $entry = $requestkey.':'.$crstype.':'.
+                             &escape($history{'details'}{'cdescr'});
+                    if ($crstype eq 'official') {
+                        $entry .= ':'.&escape($history{'details'}{'instcode'}); 
+                    }
+                }
+                if ($entry ne '') {
+                    if (exists($queue_by_date{$timestamp})) {
+                        if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
+                            push(@{$queue_by_date{$timestamp}},$entry);
+                        }
+                    } else {
+                        @{$queue_by_date{$timestamp}} = ($entry);
                     }
-                } else {
-                    @{$queue_by_date{$timestamp}} = ($entry);
                 }
             }
         }
     }
     $formname = 'requestcrs';
     my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
-    $output = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />'."\n".
+    $output = '<h3>'.&mt('Pending course requests').'</h3><div>'."\n".
+              '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />'."\n".
               '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
               '<input type="hidden" name="state" value="'.$env{'form.state'}.'" />'."\n".
               '<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n";
@@ -1033,11 +1047,12 @@ sub print_request_status {
         $output .= &Apache::loncommon::start_data_table().
                    &Apache::loncommon::start_data_table_header_row().
                    '<th>'.&mt('Action').'</th>'.
-                   '<th>'.&mt('Description').'</th>';
-        if ($env{'form.crstype'} eq 'all') {
+                   '<th>'.&mt('Course Description').'</th>'.
+                   '<th>'.&mt('Domain').'</th>';
+        if ($env{'form.crstype'} eq 'any') {
             $output .= '<th>'.&mt('Type').'</th>';
         }
-        if (($env{'form.crstype'} eq 'all') || ($env{'form.crstype'} eq 'official')) {
+        if (($env{'form.crstype'} eq 'any') || ($env{'form.crstype'} eq 'official')) {
             $output .= '<th>'.&mt('Institutional Code').'</th>';
         }
         $output .= '<th>'.&mt('Date requested').'</th>'.
@@ -1051,13 +1066,24 @@ sub print_request_status {
                     my ($cdom,$cnum) = split('_',$key);
                     $output .= &Apache::loncommon::start_data_table_row().
      '<td><input type="button" value="'.&mt('Select').'" onclick="javascript:viewrequest('."'$cdom','$cnum'".')" /></td>'.
-     '<td>'.$desc.'</td>';
-                    if ($env{'form.crstype'} eq 'all') {
-                        $output .= '<td>'.&course_types($type).'</td>';
+     '<td>'.&unescape($desc).'</td>'.
+     '<td>'.$cdom.'</td>';
+                    if ($env{'form.crstype'} eq 'any') {
+                        my $typename = $typenames{$type};
+                        if ($typename eq '') {
+                            $typename = &mt('Unknown type');
+                        }
+                        $output .= '<td>'.$typename.'</td>';
                     }
-                    if (($env{'form.crstype'} eq 'all') || 
+                    if (($env{'form.crstype'} eq 'any') || 
                         ($env{'form.crstype'} eq 'official')) {
-                        $output .= '<td>'.$instcode.'</td>';
+                        my $showinstcode;
+                        if ($type eq 'official') {
+                            $showinstcode = &unescape($instcode);
+                        } else {
+                            $showinstcode = &mt('Not applicable');
+                        }
+                        $output .= '<td>'.$showinstcode.'</td>';
                     }
                     $output .= '<td>'.$showtime.'</td>'.
                                &Apache::loncommon::end_data_table_row();
@@ -1069,8 +1095,8 @@ sub print_request_status {
         $output .= '<div>'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
     }
     $output .= '
-<input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
-</form>';
+<br /><input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
+</form></div>';
     return $output;
 }
 
@@ -1190,33 +1216,35 @@ sub print_review {
     $inst_headers .= '<th>'.&mt('Clone From').'</th>';
     if (($env{'form.clonecrs'} =~ /^$match_name$/) && 
         ($env{'form.clonedom'} =~ /^$match_domain$/)) {
-        my %coursehash = 
-            &Apache::lonnet::courseiddump($env{'form.clonedom'},'.',1,'.','.',
-                                          $env{'form.clonecrs'},undef,undef,'.');
-        my $cloneid = $env{'form.clonedom'}.'_'.$env{'form.clonecrs'};
-        if (ref($coursehash{$cloneid}) eq 'HASH') {
-            $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
-            my $clonedesc = $coursehash{$cloneid}{'description'};
-            my $cloneinst = $coursehash{$cloneid}{'inst_code'};
-
-            $inst_values .= '<td>'.$clonedesc.'&nbsp;';
-            if ($cloneinst ne '') {
-                $inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedom'}); 
-            } else {
-                $inst_values .= &mt('(from [_1])',$env{'form.clonedom'});
-            }
-            $inst_values .= '</td><td>';
-            if ($env{'form.datemode'} eq 'preserve') {
-                $inst_values .= $ctxt{'pcd'}; 
-            } elsif ($env{'form.datemode'} eq 'shift') {
-                $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
-            } else {
-                $inst_values .= $ctxt{'ncd'};
-            }
-            $inst_values .= '</td>';
-        } else {
-            $inst_values .= '<td>'.&mt('Unknown').'</td>';
-        }
+        my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+                           $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
+        if ($canclone) {
+            my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
+                              $env{'form.clonecrs'},('description','internal.coursecode'));
+            if (keys(%courseenv) > 0) {
+                $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
+                $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
+                my $cloneinst = $courseenv{'internal.coursecode'};
+                if ($cloneinst ne '') {
+                    $inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedom'});
+                } else {
+                    $inst_values .= &mt('(from [_1])',$env{'form.clonedom'});
+                }
+                $inst_values .= '</td><td>';
+                if ($env{'form.datemode'} eq 'preserve') {
+                    $inst_values .= $ctxt{'pcd'}; 
+                } elsif ($env{'form.datemode'} eq 'shift') {
+                    $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
+                } else {
+                    $inst_values .= $ctxt{'ncd'};
+                }
+                $inst_values .= '</td>';
+             } else {
+                 $inst_values .= '<td>'.&mt('Unknown').'</td>';
+             }
+         } else {
+             $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
+         }
     } else {
         $inst_values .= '<td>'.&mt('None').'</td>';
     }
@@ -1243,6 +1271,24 @@ sub print_review {
                          '<td>'.&mt('None').'</td></tr>';
     for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
         if ($env{'form.person_'.$i.'_uname'} ne '') {
+            my @allsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_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');
+                if ($sec ne '') {
+                    unless (grep(/^\Q$sec\E$/,@allsecs)) {
+                        push(@allsecs,$sec); 
+                    }
+                }
+            }
+            my $showsec = 'None';
+            if (@allsecs) {
+                $showsec = join(', ',@allsecs);
+            }
             $personnel_values .= 
                 '<tr><td>'.$env{'form.person_'.$i.'_firstname'}.' '.
                 $env{'form.person_'.$i.'_lastname'}.'</td>'.
@@ -1250,7 +1296,7 @@ sub print_review {
                 $env{'form.person_'.$i.'_dom'}.'</td>'.
                 '<td>'.&Apache::lonnet::plaintext($env{'form.person_'.$i.'_role'},
                                                   $container).'</td>'.
-                '<td>'.$env{'form.person_'.$i.'_sections'}.'</td></tr>';
+                '<td>'.$showsec.'</td></tr>';
         }
     }
     my $output =  '<p>'.&mt('Review the details of the course request before submission.').'</p>'.  
@@ -1302,9 +1348,26 @@ sub dates_from_form {
 }
 
 sub courseinfo_form {
-    my ($dom,$formname,$crstype) = @_;
-    my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
-                 &Apache::lonhtmlcommon::row_title('Course Description').
+    my ($dom,$formname,$crstype,$next) = @_;
+    my $nodescr = &mt('You must provide a (brief) course description.');
+    my $js_validate = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA['
+
+function validateForm() {
+    if ((document.$formname.cdescr.value == "")  || (document.$formname.cdescr.value == "undefined")) {
+        alert('$nodescr');
+        return;
+    }
+    nextPage(document.$formname,'$next');
+}
+// ]]
+</script>
+
+ENDJS
+
+    my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
+                  &Apache::lonhtmlcommon::row_title('Course Description').
                  '<input type="text" size="40" name="cdescr" />';
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
@@ -1466,7 +1529,7 @@ sub get_course_dom {
 }
 
 sub display_navbuttons {
-    my ($r,$formname,$prev,$prevtext,$next,$nexttext) = @_;
+    my ($r,$formname,$prev,$prevtext,$next,$nexttext,$state) = @_;
     $r->print('<div class="LC_navbuttons">');
     if ($prev) {
         $r->print('
@@ -1479,7 +1542,10 @@ sub display_navbuttons {
     onclick="javascript:history.back()"/>
    &nbsp;&nbsp;&nbsp;');
     }
-    if ($next) {
+    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."'".')" />');
@@ -1532,8 +1598,10 @@ sub print_request_outcome {
                 $crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'};
             }
         }
+    } else {
+        $enrollstart = '';
+        $enrollend = '';
     }
-
     for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
         my $uname = $env{'form.person_'.$i.'_uname'};
         my $udom = $env{'form.person_'.$i.'_uname'};
@@ -1559,15 +1627,17 @@ sub print_request_outcome {
                     if ($role eq 'cc') {
                         @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = ();
                     } else {
-                        my @currsec;
-                        if ($env{'form.person_'.$i.'_sections'} ne '') {
-                            my @sections = split(',',$env{'form.person_'.$i.'_sections'});
-                            foreach my $sec (@sections) {
-                                next if ($sec eq '');
-                                if (@currsec > 0) {
-                                    unless(grep(/^\Q$sec\E$/,@currsec)) {
-                                        push(@currsec,$sec);
-                                    }
+                        my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_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');
+                            if ($sec ne '') {
+                                unless (grep(/^\Q$sec\E$/,@currsec)) {
+                                    push(@currsec,$sec);
                                 }
                             }
                         }
@@ -1582,6 +1652,43 @@ sub print_request_outcome {
         }
     }
     my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+    my $autodrops = 0;
+    if ($env{'form.autodrops'}) {
+        $autodrops = $env{'form.autodrops'}; 
+    }
+    my $autoadds = 0;
+    if ($env{'form.autoadds'}) {
+        $autodrops = $env{'form.autoadds'};
+    }
+    my $sectotal = 0;
+    if ($env{'form.sectotal'}) {
+        $sectotal = $env{'form.sectotal'};
+    }
+    if ($env{'form.autoadds'}) {
+        $autodrops = $env{'form.autoadds'};
+    }
+    my $crosslisttotal = 0;
+    if ($env{'form.crosslisttotal'}) {
+        $crosslisttotal = $env{'form.crosslisttotal'};
+    }
+    my $instcode = '';
+    if (exists($env{'form.instcode'})) {
+        $instcode = $env{'form.instcode'};
+    }
+    my $clonecrs = '';
+    my $clonedom = '';
+    if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) && 
+        ($env{'form.clonedom'} =~ /^($match_domain)$/)) {
+        my $clonehome = &Apache::lonnet::homeserver($env{'form.clonedom'},$env{'form.clonecrs'});
+        if ($clonehome ne 'no_host') {  
+            my $canclone = &can_clone_course($env{'user.name'},$env{'user.domain'},
+                                             $env{'form.clonecrs'}, $env{'form.clonedom'});
+            if ($canclone) {
+                $clonecrs = $env{'form.clonecrs'};
+                $clonedom = $env{'form.clonedom'};
+            }
+        }
+    }
     my $details = {
                     owner          => $env{'user.name'},
                     domain         => $env{'user.domain'}, 
@@ -1590,17 +1697,17 @@ sub print_request_outcome {
                     coursehome     => $env{'form.chome'},
                     cdescr         => $env{'form.cdescr'},
                     crstype        => $env{'form.crstype'},
-                    instcode       => $env{'form.instcode'},
-                    clonedom       => $env{'form.clonedom'},
-                    clonecrs       => $env{'form.clonecrs'},
+                    instcode       => $instcode,
+                    clonedom       => $clonedom,
+                    clonecrs       => $clonecrs,
                     datemode       => $env{'form.datemode'},
-                    dateshift      => $env{'form.datshift'},
-                    sectotal       => $env{'form.sectotal'},
+                    dateshift      => $env{'form.dateshift'},
+                    sectotal       => $sectotal,
                     sections       => \%sections,
-                    crosslisttotal => $env{'form.crosslisttotal'},
+                    crosslisttotal => $crosslisttotal,
                     crosslists     => \%crosslistings,
-                    autoadds       => $env{'form.autoadds'},
-                    autodrops      => $env{'form.autodrops'},
+                    autoadds       => $autoadds,
+                    autodrops      => $autodrops,
                     enrollstart    => $enrollstart,
                     enrollend      => $enrollend,
                     accessstart    => $accessstart,
@@ -1620,9 +1727,9 @@ sub print_request_outcome {
             $output = &mt('Unrecognized course type: [_1]',$crstype);
         }
     } else {
-        my ($disposition,$message);
+        my ($disposition,$message,$reqstatus);
         my %reqhash = (
-                        timestamp => $now,
+                        reqtime   => $now,
                         crstype   => $crstype,
                         details   => $details,
                       );
@@ -1640,37 +1747,39 @@ sub print_request_outcome {
         } else {
             $disposition = 'approval';
         }
-        $reqhash{'status'} = $disposition;
+        $reqhash{'disposition'} = $disposition;
+        $reqstatus = $disposition;
         if ($disposition eq 'rejected') {
             $output = &mt('Your course request was rejected.');
             if ($message) {
                 $output .= '<div class="LC_warning">'.$message.'</div>';
             }
         } elsif ($disposition eq 'process') {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
+            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
+            my @roles = &Apache::lonuserutils::roles_by_context('course');
             my $type = 'Course';
             if ($crstype eq 'community') {
                 $type = 'Community';
             }
-            my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
-            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
-            my @roles = &Apache::lonuserutils::roles_by_context('course');
             foreach my $role (@roles) {
                 $longroles{$role}=&Apache::lonnet::plaintext($role,$type);
             }
-            my $owneremail;
-            my %emails = &Apache::loncommon::getemails();
-            foreach my $email ('permanentemail','critnotification','notification') {
-                $owneremail = $emails{$email};
-                last if ($owneremail ne '');
-            }
-            my %reqdetails = &build_batchcreatehash($dom,$details,$owneremail,\%domdefs);
-            my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',\%reqdetails,\%longroles,\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$output,\$keysmsg,$env{'user.domain'},$env{'user.name'},$cnum,$crstype);
-            $disposition = 'created';
-            if ($cid eq "/$dom/$cnum") {
+            my $result = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
+                                   'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
+                                   \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles);
+            if ($result eq 'created') {
                 $disposition = 'created';
-                $output = &mt('Your course request has been processed and the course has been created.').'<br />'.&mt('You will need to logout and log-in again to be able to select a role in the course.');
+                $reqstatus = 'created';
+                $output = &mt('Your course request has been processed and the course has been created.').
+                          '<br />'.
+                          &mt('You will need to logout and log-in again to be able to select a role in the course.');
             } else {
-                $output = &mt('An error occurred when processing your course request.').'<br />'.&mt('You may want to review the request details and submit the request again.');
+                $output = '<span class="LC_error">'.
+                          &mt('An error occurred when processing your course request.').
+                          '<br />'.
+                          &mt('You may want to review the request details and submit the request again.').
+                          '</span>';
             }
         } else {
             my $requestid = $cnum.'_'.$disposition;
@@ -1696,16 +1805,16 @@ sub print_request_outcome {
                 }
                 $output = &mt('Your course request has been recorded.').'<br />';
                 if ($disposition eq 'approval') {
-                    $output .= &mt('Your course request has been recorded.').'<br />'.
-                              &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').'<br />'.
-                              &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';
+                    $output .= &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').'<br />'.
+                               &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';
                     if ($address ne '') {     
                         $output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).'<br />';
                     }
                     if ($req_notifylist) {
                         my $fullname = &Apache::loncommon::plainname($env{'user.name'},
                                                                      $env{'user.domain'});
-                        &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,$fullname,$now,$dom,$details);
+                        my $sender = $env{'user.name'}.':'.$env{'user.domain'};
+                        &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,"$fullname ($env{'user.name'}:$env{'user.domain'})",$cnum,$env{'form.cdescr'},$now,'coursereq',$sender);
                     }
                 } else {
                     $output .= '<div class="LC_info">'.
@@ -1715,23 +1824,32 @@ sub print_request_outcome {
                                '</div>';
                 }
             } else {
-                $reqhash{'status'} = 'domainerror';
+                $reqstatus = 'domainerror';
                 $reqhash{'disposition'} = $disposition;
                 my $warning = &mt('An error occurred saving your request in the pending requests queue.');
                 $output = '<span class"LC_warning">'.$warning.'</span><br />';
                 
             }
         }
-        my $storeresult;
+        my ($storeresult,$statusresult);
         if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
             $storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
                                                            'courserequests');
+            if ($storeresult eq 'ok') {
+                my %status = (
+                                 'status:'.$dom.':'.$cnum => $reqstatus,
+                             );
+                $statusresult = &Apache::lonnet::put('courserequests',\%status); 
+            }
         } else {
             $storeresult = 'error: invalid requestkey format'; 
         }
         if ($storeresult ne 'ok') {
             $output .=  '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).'</span><br />';
             &Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
+        } elsif ($statusresult ne 'ok') {
+             $output .=  '<span class="LC_warning">'.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'</span><br />';
+            &Apache::lonnet::logthis("Error saving course request status for  $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
         }
     }
     return $output;
@@ -1853,38 +1971,6 @@ sub check_autolimit {
     return;
 }
 
-sub build_batchcreatehash {
-    my ($dom,$details,$owneremail,$domdefs) = @_;
-    my %batchhash;
-    my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users};
-    if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {
-        my $emailenc = &Apache::lonnet::escape($owneremail);
-        my $owner = $details->{'owner'}.':'.$details->{'domain'};
-        foreach my $item (@items) {
-            $batchhash{$item} = $details->{$item};
-        }
-        $batchhash{'title'} = $details->{'cdescr'};
-        $batchhash{'coursecode'} = $details->{'instcode'};
-        $batchhash{'emailenc'} = $emailenc;
-        $batchhash{'adds'} = $details->{'autoadds'};
-        $batchhash{'drops'} = $details->{'autodrops'};
-        $batchhash{'authtype'} = $domdefs->{'auth_def'};
-        $batchhash{'authparam'} = $domdefs->{'auth_arg_def'};
-        if ($details->{'crstype'} eq 'community') {
-            $batchhash{'crstype'} = 'Community';
-        } else {
-            $batchhash{'crstype'} = 'Course'; 
-        }
-        $batchhash{'users'}{$details->{$owner}} = {
-                                 firstname => $env{'environment.first'},
-                                 lastname  => $env{'environment.last'},
-                                 emailenc  => $emailenc,
-                                 email     => $owneremail,
-                             };
-    }
-    return %batchhash;
-}
-
 sub retrieve_settings {
     my ($dom,$request_id) = @_;
     my %reqinfo = &get_request_settings($request_id,$dom);