--- loncom/interface/lonrequestcourse.pm	2009/08/04 20:15:50	1.2
+++ loncom/interface/lonrequestcourse.pm	2009/08/12 14:24:35	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.2 2009/08/04 20:15:50 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.11 2009/08/12 14:24:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,7 +55,8 @@ use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
-use LONCAPA;
+use Apache::loncoursequeueadmin;
+use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
     my ($r) = @_;
@@ -112,7 +113,19 @@ sub handler {
         }
     }
 
+    my %trail = (
+                 crstype       => 'Course Request Action',
+                 codepick      => 'Category',
+                 courseinfo    => 'Description',
+                 enrollment    => 'Enrollment',
+                 personnel     => 'Personnel',
+                 review        => 'Review',
+                 process       => 'Result',
+                 pick_request  => 'Display Summary',
+                );
+
     my $page = 0;
+    my $crumb;
     if (defined($action)) {
         my $done = 0;
         my $i=0;
@@ -125,6 +138,28 @@ sub handler {
                 $i++;
             }
         }
+        for (my $i=0; $i<@{$states{$action}}; $i++) {
+            if ($state eq $states{$action}[$i]) {
+                &Apache::lonhtmlcommon::add_breadcrumb(
+                   {text=>"$trail{$state}"});
+                $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'); 
+                last;
+            } else {
+                if (($state eq 'process') && ($i > 0)) {
+                    &Apache::lonhtmlcommon::add_breadcrumb(
+    {href=>"javascript:backPage(document.requestcrs,'$states{$action}[0]')",
+     text=>"$trail{$states{$action}[$i]}"});
+                } else {
+                    &Apache::lonhtmlcommon::add_breadcrumb(
+     {href=>"javascript:backPage(document.requestcrs,'$states{$action}[$i]')",
+      text=>"$trail{$states{$action}[$i]}"});
+                }
+            }
+        }
+    } else {
+        &Apache::lonhtmlcommon::add_breadcrumb(
+                {text=>'Pick Action'});
+        $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
     }
 
     my %can_request;
@@ -132,23 +167,29 @@ sub handler {
     if ($action eq 'new') {
         if ($canreq) {
             if ($state eq 'crstype') {
-                &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems);
+                &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,
+                                 $crumb);
             } else {
                 &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
-                                        $loaditems);
+                                        $loaditems,$crumb);
             }
         } else {
-            $r->print(&header('Course Requests').
+            $r->print(&header('Course Requests').$crumb.
                       '<div class="LC_warning">'.
                       &mt('You do not have privileges to request creation of courses.').
                       '</div>'.&Apache::loncommon::end_page());
         }
     } elsif ($action eq 'view') {
-        &print_request_status($jscript,$loaditems);
+        if ($state eq 'crstype') {
+           &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);
+        } else {
+           &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
+                                   $loaditems,$crumb);
+        }
     } elsif ($action eq 'log') {
-        &print_request_logs($jscript,$loaditems);
+        &print_request_logs($jscript,$loaditems,$crumb);
     } else {
-        &print_main_menu($r,\%can_request,\%states,$dom,$jscript);
+        &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);
     }
     return OK;
 }
@@ -156,13 +197,16 @@ sub handler {
 sub header {
     my ($bodytitle,$jscript,$loaditems,$jsextra) = @_;
     if ($jscript) {
-        $jscript = '<script type="text/javascript">'.
-                   $jscript.'</script>'."\n";
+        $jscript = '<script type="text/javascript">'."\n".
+                   '// <![CDATA['."\n".
+                   $jscript."\n".'// ]]>'."\n".'</script>'."\n";
     }
     if ($loaditems) {
-        $loaditems = {'add_entries' => $loaditems,}; 
-    } 
-    return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$loaditems);
+        $loaditems = {'add_entries' => $loaditems,};
+        return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$loaditems);
+    } else {
+        return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra);
+    }
 }
 
 sub form_elements {
@@ -304,8 +348,9 @@ sub onload_action {
 sub check_can_request {
     my ($dom,$can_request) = @_;
     my $canreq = 0;
-    if (ref($can_request) eq 'HASH') {
-        foreach my $type ('official','unofficial','community') {
+    my ($types,$typename) = &course_types();
+    if ((ref($can_request) eq 'HASH') && (ref($types) eq 'ARRAY')) {
+        foreach my $type (@{$types}) {
             if (&Apache::lonnet::usertools_access($env{'user.name'},
                                                   $env{'user.domain'},
                                                   $type,undef,'requestcourses')) {
@@ -330,8 +375,20 @@ sub check_can_request {
     return $canreq;
 }
 
+sub course_types {
+    my @types = ('official','unofficial','community');
+    my %typename = (
+                         official   => 'Official course',
+                         unofficial => 'Unofficial course',
+                         community  => 'Community',
+                    );
+    return (\@types,\%typename);
+}
+
+
 sub print_main_menu {
-    my ($r,$can_request,$states,$dom,$jscript,$loaditems) = @_;
+    my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb) = @_;
+    my ($types,$typename) = &course_types();
     my $onchange;
     unless ($env{'form.interface'} eq 'textual') {
         $onchange = 1;
@@ -415,11 +472,11 @@ END
 
 END
 
-    $r->print(&header('Course Requests',$js.$jscript,$loaditems).
-              '<p><div>'.
+    $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.
+              '<div>'.
               '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
               &Apache::lonhtmlcommon::start_pick_box().
-              &Apache::lonhtmlcommon::row_title('Domain').
+              &Apache::lonhtmlcommon::row_title('Course Domain').
               &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange));
     if (!$onchange) {
         $r->print('&nbsp;<input type="submit" name="godom" value="'.
@@ -442,11 +499,18 @@ END
               &Apache::lonhtmlcommon::row_closure().
               &Apache::lonhtmlcommon::row_title('Course Type').'
 <select size="1" name="crstype">
- <option value="any">'.&mt('All types').'</option>
- <option value="official" selected="selected">'.&mt('Official course').'</option>
- <option value="unofficial">'.&mt('Unofficial course').'</option>
- <option value="community">'.&mt('Community').'</option>
-</select>
+ <option value="any">'.&mt('All types').'</option>');
+    if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
+        foreach my $type (@{$types}) {
+            my $selected = '';
+            if ($type eq 'official') {
+                $selected = ' selected="selected"';
+            }
+            $r->print('<option value="'.$type.'"'.$selected.'>'.$typename->{$type}.
+                      '</option>'."\n");
+        }
+    }
+    $r->print('</select>
 <input type="hidden" name="state" value="crstype" />'.
               &Apache::lonhtmlcommon::row_closure(1).
               &Apache::lonhtmlcommon::end_pick_box().'<br />
@@ -457,7 +521,7 @@ END
 }
 
 sub request_administration {
-    my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems) = @_;
+    my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb) = @_;
     my $js;
     if (($action eq 'new') || ($action eq 'view')) {
         $js =  <<END;
@@ -478,18 +542,15 @@ END
         unless (($state eq 'review') || ($state eq 'process')) {
             $jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);
         }
-        $r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra));
-        if ($state eq 'review') {
-            &print_review($r,$state,$dom);
-        } elsif ($state eq 'process') {
-            &print_request_outcome($r,$state,$dom);
-        } else {
-            &print_request_form($r,$action,$state,$page,$states,$dom);
-        }
+        $r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
+        &print_request_form($r,$action,$state,$page,$states,$dom);
     } elsif ($action eq 'view') {
-        $r->print(&header('Manage course requests',$js.$jscript,$loaditems));
+        $r->print(&header('Manage course requests',$js.$jscript,$loaditems).$crumb);
+        if ($state eq 'pick_request') {
+            $r->print(&print_request_status($dom));
+        }
     } elsif ($action eq 'log') {
-        $r->print(&coursereq_log('View request log',$jscript,$loaditems));       
+        $r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb);
     }
     $r->print(&Apache::loncommon::end_page());
     return;
@@ -501,17 +562,23 @@ sub print_request_form {
     my ($next,$prev,$message,$output,$codepicker,$crstype);
     $prev = $states->{$action}[$page-1];
     $next = $states->{$action}[$page+1];
+    my %navtxt = &Apache::lonlocal::texthash (
+                                               prev => 'Back',
+                                               next => 'Next',
+                                             );
     $crstype = $env{'form.crstype'};
     $r->print('<form name="'.$formname.'" method="post" action="/adm/requestcourse">');
     my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
     if ($crstype eq 'official') {
-        &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
-                                                 \%cat_order,\@code_order);
         if ($env{'form.instcode'} ne '') {
             $instcode = $env{'form.instcode'};
         }
     }
     if ($prev eq 'codepick') {
+        if ($crstype eq 'official') {
+            &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+                                                     \%cat_order,\@code_order);
+        }
         if (@code_order > 0) {
             my $message;
             if ($instcode eq '') {
@@ -545,6 +612,10 @@ sub print_request_form {
         }
     }
     if ($prev eq 'crstype') {
+        if ($crstype eq 'official') {
+            &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+                                                     \%cat_order,\@code_order);
+        }
         if (@code_order > 0) {
             $codepicker = &coursecode_form($dom,'instcode',\@codetitles,
                                            \%cat_titles,\%cat_order);
@@ -560,10 +631,26 @@ sub print_request_form {
     } elsif ($prev eq 'codepick') {
         $r->print(&courseinfo_form($dom,$formname,$crstype));
     } elsif ($state eq 'enrollment') {
+        if ($crstype eq 'official') {
+            &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+                                                     \%cat_order,\@code_order);
+        }
         $r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
                                          \%cat_titles,\%cat_order,\@code_order));
     } elsif ($state eq 'personnel') {
-        $r->print(&print_personnel_menu($dom,$formname));
+        $r->print(&print_personnel_menu($dom,$formname,$crstype));
+    } elsif ($state eq 'review') {
+        &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+                                                 \%cat_order,\@code_order);
+        $r->print(&print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
+                                \@code_order));
+        $navtxt{'next'} = &mt('Submit course request');
+    }  elsif ($state eq 'process') {
+        if ($crstype eq 'official') {
+            &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+                                                     \%cat_order,\@code_order);
+        }
+        my $result = &print_request_outcome($dom,\@codetitles,\@code_order);
     }
     my @excluded = ('counter');
     my %elements = &form_elements($dom);
@@ -589,7 +676,7 @@ sub print_request_form {
         push(@excluded,'instcode');
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
-    &display_navbuttons($r,$formname,$prev,'Previous',$next,'Next');
+    &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'});
     return;
 }
 
@@ -722,7 +809,7 @@ sub date_setting_table {
 }
 
 sub print_personnel_menu {
-    my ($dom,$formname) = @_;
+    my ($dom,$formname,$crstype) = @_;
     my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box();
     my $persontotal = $env{'form.persontotal'};
     if (!defined($persontotal)) {
@@ -736,8 +823,12 @@ sub print_personnel_menu {
 
     my $roleoptions;
     my @roles = &Apache::lonuserutils::roles_by_context('course');
+    my $type = 'Course';
+    if ($crstype eq 'community') {
+        $type = 'Community';
+    }
     foreach my $role (@roles) {
-        my $plrole=&Apache::lonnet::plaintext($role);
+        my $plrole=&Apache::lonnet::plaintext($role,$type);
         $roleoptions .= '  <option value="'.$role.'">'.$plrole.'</option>'."\n";
     }
     my %customroles=&Apache::lonuserutils::my_custom_roles();
@@ -783,13 +874,13 @@ sub print_personnel_menu {
     for (my $i=0; $i<$persontotal; $i++) { 
         my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
         my $linkargstr = join("','",@linkargs);
-        my $userlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$userlinktxt);
+        my $userlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,$userlinktxt);
         my $uname_form = '<input type="text" name="person_'.$i.'_uname" value=""'.
                          ' onFocus="this.blur();'.
-                         'openuserbrowser('."'$formname','$linkargstr'".');" />';
+                         'openuserbrowser('."'$formname','$linkargstr','$dom'".');" />';
         my $onchange = 'javascript:fix_domain('."'$formname','person_".$i."_dom',".
                        "'person_".$i."_hidedom'".');'.
-                       'openuserbrowser('."'$formname','$linkargstr'".');';
+                       'openuserbrowser('."'$formname','$linkargstr','$dom'".');';
         my $udom_form = &Apache::loncommon::select_dom_form($dom,'person_'.$i.'_dom','',
                                                             1,$onchange).
                         '<input type="hidden" name="person_'.$i.'_hidedom" value="'.$dom.'" />';
@@ -833,16 +924,314 @@ sub print_personnel_menu {
 }
 
 sub print_request_status {
-    return;
+    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'}{'cdesc'};
+                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);
+                    }
+                } 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".
+              '<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";
+    if (@sortedtimes > 0) {
+        $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') {
+            $output .= '<th>'.&mt('Type').'</th>';
+        }
+        if (($env{'form.crstype'} eq 'all') || ($env{'form.crstype'} eq 'official')) {
+            $output .= '<th>'.&mt('Institutional Code').'</th>';
+        }
+        $output .= '<th>'.&mt('Date requested').'</th>'.
+                   &Apache::loncommon::end_data_table_header_row();
+        my $count = 0;
+        foreach my $item (@sortedtimes) {
+            my $showtime = &Apache::lonlocal::locallocaltime($item);
+            if (ref($queue_by_date{$item}) eq 'ARRAY') {
+                foreach my $request (sort(@{$queue_by_date{$item}})) {
+                    my ($key,$type,$desc,$instcode) = split(':',$request);
+                    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>';
+                    }
+                    if (($env{'form.crstype'} eq 'all') || 
+                        ($env{'form.crstype'} eq 'official')) {
+                        $output .= '<td>'.$instcode.'</td>';
+                    }
+                    $output .= '<td>'.$showtime.'</td>'.
+                               &Apache::loncommon::end_data_table_row();
+                }
+            }
+        }
+        $output .= &Apache::loncommon::end_data_table();
+    } else {
+        $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>';
+    return $output;
 }
 
 sub print_request_logs {
+    my ($jscript,$loaditems,$crumb) = @_;
     return;
 }
 
 sub print_review {
-    my ($r,$state,$dom) = @_;
-    return;
+    my ($formname,$dom,$codetitles,$cat_titles,$cat_order,$code_order) = @_;
+    my ($types,$typename) = &course_types();
+    my ($owner,$ownername,$owneremail);
+    $owner = $env{'user.name'}.':'.$env{'user.domain'};
+    $ownername = &Apache::loncommon::plainname($env{'user.name'},
+                                               $env{'user.domain'},'first');
+    my %emails = &Apache::loncommon::getemails();
+    foreach my $email ('permanentemail','critnotification','notification') {
+        $owneremail = $emails{$email};
+        last if ($owneremail ne '');
+    }
+    my ($inst_headers,$inst_values,$crstypename,$enroll_headers,$enroll_values,
+        $section_headers,$section_values,$personnel_headers,$personnel_values);
+
+    $crstypename = $env{'form.crstype'};
+    if (ref($typename) eq 'HASH') {
+        unless ($typename->{$env{'form.crstype'}} eq '') {
+            $crstypename = $typename->{$env{'form.crstype'}};
+        }
+    }
+
+    $inst_headers = '<th>'.&mt('Description').'</th><th>'.&mt('Type').'</th>';
+    $inst_values = '<td>'.$env{'form.cdescr'}.'</td><td>'.$crstypename.'</td>';
+
+    if ($env{'form.crstype'} eq 'official') {
+        if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH')) {
+            foreach my $title (@{$codetitles}) {
+                if ($env{'form.instcode_'.$title} ne '') {
+                    $inst_headers .= '<th>'.$title.'</th>';
+                    my $longitem = $env{'form.instcode_'.$title};
+                    if (ref($cat_titles->{$title}) eq 'HASH') {
+                        if ($cat_titles->{$title}{$env{'form.instcode_'.$title}} ne '') {
+                            $longitem = $cat_titles->{$title}{$env{'form.instcode_'.$title}};
+                        }
+                    }
+                    $inst_values .= '<td>'.$longitem.'</td>';
+                }
+            }
+        }
+        if (&Apache::lonnet::auto_run('',$dom)) {
+            $enroll_headers = '<th>'.&mt('Automatic Adds').'</th>'.
+                              '<th>'.&mt('Automatic Drops').'</th>'.
+                              '<th>'.&mt('Enrollment Starts').'</th>'.
+                              '<th>'.&mt('Enrollment Ends').'</th>';
+            $section_headers = '<th>'.&mt('Sections').'</th>'.
+                               '<th>'.&mt('Crosslistings').'</th>';
+
+            my ($startenroll,$endenroll) = &dates_from_form('startenroll','endenroll');
+            my @autoroster = (&mt('No'),&mt('Yes'));
+            $enroll_values = '<td>'.$autoroster[$env{'form.autoadds'}].'</td>'.
+                             '<td>'.$autoroster[$env{'form.autodrops'}].'</td>'.
+                             '<td>'.&Apache::lonlocal::locallocaltime($startenroll).'</td>'.
+                             '<td>'.&Apache::lonlocal::locallocaltime($endenroll).'</td>';
+            $section_values = '<td><table class="LC_innerpickbox"><tr><th>'.
+                              &mt('Institutional section').'</th>'.
+                              '<th>'.&mt('LON-CAPA section').'</th></tr>';
+            my $secinfo;
+            if ($env{'form.sectotal'} > 0) {
+                for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+                    if ($env{'form.sec_'.$i}) {
+                        $secinfo .= '<tr><td>'.$env{'form.secnum_'.$i}.'</td><td>';
+                        if ($env{'form.loncapasec_'.$i} ne '') {
+                            $secinfo .= $env{'form.loncapasec_'.$i};
+                        } else {
+                            $secinfo .= &mt('None');
+                        }
+                        $secinfo .= '</td></tr>';
+                    }
+                }
+            }
+            if ($secinfo eq '') {
+                $secinfo = '<tr><td colspan="2">'.&mt('None').'</td></tr>';
+            }
+            $section_values .= $secinfo.'</table></td><td>'.
+                               '<table class="LC_innerpickbox"><tr><th>'.
+                               &mt('Institutional course/section').'</th>'.
+                               '<th>'.&mt('LON-CAPA section').'</th></tr>';
+            my $xlistinfo;
+            if ($env{'form.crosslisttotal'}) {
+                for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+                    if ($env{'form.crosslist_'.$i}) {
+                        $xlistinfo .= '<tr><td>';
+                        if (ref($code_order) eq 'ARRAY') {
+                            if (@{$code_order} > 0) {
+                                foreach my $item (@{$code_order}) {
+                                    $xlistinfo .= $env{'form.crosslist_'.$i.'_'.$item};
+                                }
+                            }
+                        }
+                        $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}.'</td><td>';
+                        if ($env{'form.crosslist_'.$i.'_lcsec'}) {
+                            $xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'};
+                        } else {
+                            $xlistinfo .= &mt('None');
+                        }
+                        $xlistinfo .= '</td></tr>';
+                    }
+                }
+            }
+            if ($xlistinfo eq '') {
+                $xlistinfo = '<tr><td colspan="2">'.&mt('None').'</td></tr>';
+            }
+            $section_values .= $xlistinfo.'</table></td>';
+        }
+    }
+
+    my %ctxt = &clone_text();
+    $inst_headers .= '<th>'.&mt('Clone From').'</th>';
+    if (($env{'form.clonecourse'} =~ /^$match_name$/) && 
+        ($env{'form.clonedomain'} =~ /^$match_domain$/)) {
+        my %coursehash = 
+            &Apache::lonnet::courseiddump($env{'form.clonedomain'},'.',1,'.','.',
+                                          $env{'form.clonecourse'},undef,undef,'.');
+        my $cloneid = $env{'form.clonedomain'}.'_'.$env{'form.clonecourse'};
+        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.clonedomain'}); 
+            } else {
+                $inst_values .= &mt('(from [_1])',$env{'form.clonedomain'});
+            }
+            $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('None').'</td>';
+    }
+    $enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
+                       '<th>'.&mt('Access Ends').'</th>';
+    my ($startaccess,$endaccess) = &dates_from_form('startaccess','endaccess');
+    $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($startaccess).'</td>';
+    if ($endaccess == 0) {
+        $enroll_values .= '<td>'.&mt('No end date').'</td>';
+    } else {
+        $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($endaccess).'</td>';
+    }
+
+    my $container = 'Course';
+    if ($env{'form.crstype'} eq 'community') {
+        $container = 'Community';
+    }
+
+    $personnel_headers = '<th>'.&mt('Name').'</th><th>'.&mt('Username:Domain').
+                         '</th><th>'.&mt('Role').'</th><th>'.&mt('LON-CAPA Sections').
+                         '</th>';
+    $personnel_values .= '<tr><td>'.$ownername.'</td><td>'.$owner.'</td>'.
+                         '<td>'.&Apache::lonnet::plaintext('cc',$container).'</td>'.
+                         '<td>'.&mt('None').'</td></tr>';
+    for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+        if ($env{'form.person_'.$i.'_uname'} ne '') {
+            $personnel_values .= 
+                '<tr><td>'.$env{'form.person_'.$i.'_first'}.' '.
+                $env{'form.person_'.$i.'_last'}.'</td>'.
+                '<td>'.$env{'form.person_'.$i.'_uname'}.':'.
+                $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>';
+        }
+    }
+    my $output =  '<p>'.&mt('Review the details of the course request before submission.').'</p>'.  
+                  '<div>'.&Apache::lonhtmlcommon::start_pick_box().
+                  &Apache::lonhtmlcommon::row_title(&mt('Owner')).
+                  '<table class="LC_innerpickbox"><tr>'.
+                  '<th>'.&mt('Name').'</th>'.
+                  '<th>'.&mt('Username:Domain').'</th>'.
+                  '<th>'.&mt('E-mail address').'</th>'.
+                  '</tr><tr>'."\n".
+                  '<td>'.$ownername.'</td><td>'.$owner.'</td>'.
+                  '<td>'.$owneremail.'</td>'.
+                  '</tr></table>'."\n".
+                  &Apache::lonhtmlcommon::row_closure().
+                  &Apache::lonhtmlcommon::row_title(&mt('Description')).
+                  '<table class="LC_innerpickbox"><tr>'.$inst_headers.'</tr>'."\n".
+                  '<tr>'.$inst_values.'</tr></table>'."\n".
+                  &Apache::lonhtmlcommon::row_closure().
+                  &Apache::lonhtmlcommon::row_title(&mt('Enrollment')).
+                  '<table class="LC_innerpickbox"><tr>'.$enroll_headers.'</tr>'."\n".
+                  '<tr>'.$enroll_values.'</tr></table>'."\n".
+                  &Apache::lonhtmlcommon::row_closure();
+    if ($section_headers ne '') {
+        $output .= &Apache::lonhtmlcommon::row_title(&mt('Sections')).
+                   '<table class="LC_innerpickbox"><tr>'.$section_headers.'</tr>'."\n".
+                   '<tr>'.$section_values.'</tr></table>'."\n".
+                   &Apache::lonhtmlcommon::row_closure();
+    }
+    $output .= &Apache::lonhtmlcommon::row_title(&mt('Personnel')).
+               '<table class="LC_innerpickbox"><tr>'.$personnel_headers.'</tr>'."\n".
+               $personnel_values.'</table>'."\n".
+               &Apache::lonhtmlcommon::row_closure(1).
+               &Apache::lonhtmlcommon::end_pick_box();
+    my $cnum = &Apache::lonnet::generate_coursenum($dom);
+    $output .= '<input type="hidden" name="cnum" value="'.$cnum.'" />';
+    return $output;
+}
+
+sub dates_from_form {
+    my ($startname,$endname) = @_;
+    my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname);
+    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form($endname);
+    if ($endname eq 'endaccess') {
+        if (exists($env{'form.no_end_date'}) ) {
+            $enddate = 0;
+        }
+    }
+    return ($startdate,$enddate);
 }
 
 sub courseinfo_form {
@@ -864,14 +1253,7 @@ sub clone_form {
     }
     my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedomain').
                     &Apache::loncommon::selectcourse_link($formname,'clonecourse','clonedomain','','','',$type);
-    my %lt = &Apache::lonlocal::texthash(
-                    'cid'  => 'Course ID',
-                    'dmn'  => 'Domain',
-                    'dsh'  => 'Date Shift',
-                    'ncd'  => 'Do not clone date parameters',
-                    'prd'  => 'Clone date parameters as-is',
-                    'shd'  => 'Shift date parameters by number of days',
-    );
+    my %lt = &clone_text();
     my $output .= 
         &Apache::lonhtmlcommon::start_pick_box(). 
         &Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
@@ -893,6 +1275,17 @@ sub clone_form {
     return $output;
 }
 
+sub clone_text { 
+    return &Apache::lonlocal::texthash(
+               'cid'  => 'Course ID',
+               'dmn'  => 'Domain',
+               'dsh'  => 'Date Shift',
+               'ncd'  => 'Do not clone date parameters',
+               'prd'  => 'Clone date parameters as-is',
+               'shd'  => 'Shift date parameters by number of days',
+        );
+}
+
 sub coursecode_form {
     my ($dom,$context,$codetitles,$cat_titles,$cat_order,$num) = @_;
     my $output;
@@ -1019,9 +1412,342 @@ sub display_navbuttons {
 }
 
 sub print_request_outcome {
+    my ($dom,$codetitles,$code_order) = @_;
+    my ($output,$cnum,$now,$req_notifylist,$crstype,$startenroll,$endenroll,
+        %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
+    $cnum = $env{'form.cnum'};
+    unless ($cnum =~ /^$match_courseid$/) {
+        $output = &mt('Invalid LON-CAPA course number for the new course')."\n"; 
+        return $output;
+    }
+
+    %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
+    if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+        if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
+            $req_notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'};
+        }
+    }
+    $now = time;
+    $crstype = $env{'form.crstype'};
+    if ($crstype eq 'official') {
+        if (&Apache::lonnet::auto_run('',$dom)) {
+            ($startenroll,$endenroll)=&dates_from_form('startenroll','endenroll');
+        }
+        for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+            if ($env{'form.sec_'.$i}) {
+                if ($env{'form.secnum_'.$i} ne '') {
+                    $sections{$env{'form.secnum_'.$i}} = $env{'form.loncapasec_'.$i};
+                }
+            }
+        }
+        for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+            if ($env{'form.crosslist_'.$i}) {
+                my $xlistinfo = '';
+                if (ref($code_order) eq 'ARRAY') {
+                    if (@{$code_order} > 0) {
+                        foreach my $item (@{$code_order}) {
+                            $xlistinfo .= $env{'form.crosslist_'.$i.'_'.$item};
+                        }
+                    }
+                }
+                $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'};
+                $crosslistings{$xlistinfo} = $env{'form.crosslist_'.$i.'_lcsec'};
+            }
+        }
+    }
+
+    for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+        my $uname = $env{'form.person_'.$i.'_uname'};
+        my $udom = $env{'form.person_'.$i.'_uname'};
+        if (($uname =~ /^$match_username$/) && ($udom =~ /^$match_domain$/)) {
+            if (&Apache::lonnet::domain($udom) ne '') {
+                $personnel{$uname.':'.$udom} = {
+                         first    => $env{'form.person_'.$i.'_first'},
+                         last     => $env{'form.person_'.$i.'_last'},
+                         email    => $env{'form.person_'.$i.'_email'},
+                         role     => $env{'form.person_'.$i.'_role'},
+                         sections => $env{'form.person_'.$i.'_sections'},
+                                               };
+            } else {
+                push(@missingdom,$uname.':'.$udom);
+            }
+        } else {
+            push(@baduname,$uname.':'.$udom);
+        }
+    }
+
+    my ($startaccess,$endaccess) = &dates_from_form('startaccess','endacess');
+    my $details = {
+                    owner          => $env{'user.name'},
+                    domain         => $env{'user.domain'}, 
+                    cdom           => $dom,
+                    cnum           => $cnum,
+                    cdesc          => $env{'form.cdesc'},
+                    crstype        => $env{'form.crstype'},
+                    instcode       => $env{'form.instcode'},
+                    clonedomain    => $env{'form.clonedomain'},
+                    clonecourse    => $env{'form.clonecourse'},
+                    datemode       => $env{'form.datemode'},
+                    dateshift      => $env{'form.datshift'},
+                    sectotal       => $env{'form.sectotal'},
+                    sections       => \%sections,
+                    crosslisttotal => $env{'form.crosslisttotal'},
+                    crosslistings  => \%crosslistings,
+                    autoadds       => $env{'form.autoadds'},
+                    autodrops      => $env{'form.autodrops'},
+                    startenroll    => $startenroll,
+                    endenroll      => $endenroll,
+                    startaccess    => $startaccess,
+                    endaccess      => $endaccess,
+                    personnel      => \%personnel,
+                  };
+    my @inststatuses;
+    my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
+    if ($val eq '') {
+        if ($crstype eq 'official') {
+            $output = &mt('You are not permitted to request creation of official courses');
+        } elsif ($crstype eq 'unofficial') {
+            $output = &mt('You are not permitted to request creation of unofficial courses');
+        } elsif ($crstype eq 'community') {
+            $output = &mt('You are not permitted to request creation of communities');
+        } else {
+            $output = &mt('Unrecognized course type: [_1]',$crstype);
+        }
+    } else {
+        my ($disposition,$message);
+        my %reqhash = (
+                        timestamp => $now,
+                        crstype   => $crstype,
+                        details   => $details,
+                      );
+        my $requestkey = $dom.'_'.$cnum;
+        if ($val eq 'autolimit=') {
+            $disposition = 'process';
+        } elsif ($val =~ /^autolimit=(\d+)$/) {
+            my $limit = $1;
+            $disposition = &check_autolimit($env{'user.name'},$env{'user.domain'},
+                                            $dom,$crstype,$limit,\$message);
+        } elsif ($val eq 'validate') {
+            $disposition =
+                &Apache::lonnet::auto_courserequest_validation($dom,$details,
+                                                              \@inststatuses,\$message);
+        } else {
+            $disposition = 'approval';
+        }
+        $reqhash{'status'} = $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 $type = 'Course';
+            if ($crstype eq 'community') {
+                $type = 'Community';
+            }
+            my ($logmsg,$newusermsg,$addresult,$enrollcount,$output,$keysmsg,%longroles);
+            my @roles = &Apache::lonuserutils::roles_by_context('course');
+            foreach my $role (@roles) {
+                $longroles{$role}=&Apache::lonnet::plaintext($role,$type);
+            }
+            my %reqdetails = &build_batchcreatehash($details);
+            my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'request',\%reqdetails,\%longroles,\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$output,\$keysmsg,$env{'user.domain'},$env{'user.name'},$cnum);
+            $disposition = 'created';
+            if ($cid eq $cnum) {
+                $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.');
+            } 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.');
+            }
+        } else {
+            my $requestid = $cnum.'_'.$disposition;
+            my $request = { 
+                            $requestid => {
+                                            timestamp   => $now,
+                                            crstype     => $crstype,
+                                            ownername   => $env{'user.name'},
+                                            ownerdom    => $env{'user.domain'},
+                                            description => $env{'form.cdesc'}, 
+                                          },
+                          };
+            my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
+                                                        $dom);
+            if ($putresult eq 'ok') {
+                my %emails = &Apache::loncommon::getemails();
+                my $address;
+                if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
+                    $address = $emails{'permanentemail'};
+                    if ($address eq '') {
+                        $address = $emails{'notification'};
+                    }
+                }
+                $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 />';
+                    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);
+                    }
+                } else {
+                    $output .= '<div class="LC_info">'.
+&mt('Your request has been placed in a queue pending administrative action.').'<br />'.
+&mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").'<br />'.
+&mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.').
+                               '</div>';
+                }
+            } else {
+                $reqhash{'status'} = '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;
+        if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+            $storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
+                                                           'courserequests');
+        } 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.').'</span><br />';
+            &logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
+        }
+    }
+    return $output;
+}
+
+sub get_processtype {
+    my ($dom,$crstype,$inststatuses,$domconfig) = @_;
+    return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH'));
+    my (%userenv,%settings,$val);
+    my @options = ('autolimit','validate','approve');
+    if ($dom eq $env{'user.domain'}) {
+        %userenv = 
+            &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+                'requestcourses.'.$crstype,'inststatus');
+        if ($userenv{'requestcourses.'.$crstype}) {
+            $val = $userenv{'requestcourses.'.$crstype};
+            @{$inststatuses} = ('_custom_');
+        } else {
+            my ($task,%alltasks);
+            if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
+                %settings = %{$domconfig->{'requestcourses'}};
+                if (ref($settings{$crstype}) eq 'HASH') {
+                    if (($env{'user.adv'}) && (exists($settings{$crstype}{'_LC_adv'}))) {
+                        $val = $settings{$crstype}{'_LC_adv'};
+                        @{$inststatuses} = ('_LC_adv_');
+                    } else {
+                        if ($userenv{'inststatus'} ne '') {
+                            @{$inststatuses} = split(',',$userenv{'inststatus'});
+                        } else {
+                            @{$inststatuses} = ('other');
+                        }
+                        foreach my $status (@{$inststatuses}) {
+                            if (exists($settings{$crstype}{$status})) {
+                                my $value = $settings{$crstype}{$status};
+                                next unless ($value); 
+                                unless (exists($alltasks{$value})) {
+                                    if (ref($alltasks{$value}) eq 'ARRAY') {
+                                        unless(grep(/^\Q$status\E$/,@{$alltasks{$value}})) {
+                                            push(@{$alltasks{$value}},$status); 
+                                        }
+                                    } else {
+                                        @{$alltasks{$value}} = ($status);
+                                    }
+                                }
+                            }
+                        }
+                        my $maxlimit = 0;
+                        foreach my $key (sort(keys(%alltasks))) {
+                            if ($key =~ /^autolimit=(\d*)$/) {
+                                if ($1 eq '') {
+                                    $val ='autolimit=';
+                                    last;
+                                } elsif ($1 > $maxlimit) {
+                                    $maxlimit = $1; 
+                                }
+                            }
+                        }
+                        if ($maxlimit) {
+                            $val = 'autolimit='.$maxlimit;
+                        } else {
+                            foreach my $option (@options) {
+                                if ($alltasks{$option}) {
+                                    $val = $option;
+                                    last;  
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } else {
+        %userenv = &Apache::lonnet::userenvironment($env{'user.domain'},
+                      $env{'user.name'},'reqcrsotherdom.'.$env{'form.crstype'});
+        if ($userenv{'reqcrsotherdom'}) {
+            my @doms = split(',',$userenv{'reqcrsotherdom'});
+            my $optregex = join('|',@options); 
+            if (grep(/^\Q$dom\E:($optregex=?\d*)/,@doms)) {
+                $val = $1;
+            }
+            @{$inststatuses} = ('_external_');
+        }
+    }
+    return $val;
+}
+
+sub check_autolimit {
+    my ($uname,$udom,$dom,$crstype,$limit,$message) = @_;
+    my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},
+                                        'userroles',['active','future'],['cc'],[$dom]);
+    my ($types,$typename) = &course_types();
+    my %requests = &Apache::lonnet::dumpstore('courserequests',$udom,$uname);
+    my %count;
+    if (ref($types) eq 'ARRAY') {
+        foreach my $type (@{$types}) {
+            $count{$type} = 0;
+        }
+    }
+    foreach my $key (keys(%requests)) {
+        my ($cdom,$cnum) = split('_',$key);
+        if (exists($crsroles{$cnum.':'.$cdom.':cc'})) {
+            if (ref($requests{$key}) eq 'HASH') {
+                my $type = $requests{$key}{'crstype'};
+                if ($type =~ /^official|unofficial|community$/) {
+                    $count{$type} ++;
+                }
+            }
+        }
+    }
+    if ($count{$crstype} < $limit) {
+        return 'process';
+    } else {
+        if (ref($typename) eq 'HASH') {
+            $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.').'<br />'.&mt("Your $typename->{$crstype} limit is [_1].",$limit);
+        }
+        return 'rejected';
+    }
     return;
 }
 
+sub build_batchcreatehash {
+    my ($details) = @_;
+    my %batchhash;
+    if (ref($details) eq 'HASH') {
+
+    }
+    return %batchhash;
+}
+
 sub retrieve_settings {
     my ($dom,$request_id) = @_;
     my %reqinfo = &get_request_settings($request_id,$dom);