--- loncom/interface/lonrequestcourse.pm	2009/08/21 13:18:46	1.20
+++ loncom/interface/lonrequestcourse.pm	2009/08/31 14:57:06	1.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.20 2009/08/21 13:18:46 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.27 2009/08/31 14:57:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,6 +44,8 @@ described at http://www.lon-capa.org.
 
 =item handler()
 
+=item get_breadcrumbs()
+
 =item header()
 
 =item form_elements()
@@ -58,10 +60,16 @@ described at http://www.lon-capa.org.
 
 =item request_administration()
 
+=item close_popup_form()
+
+=item get_instcode()
+
 =item print_request_form()
 
 =item print_enrollment_menu()
 
+=item show_invalid_crosslists()
+
 =item inst_section_selector()
 
 =item date_setting_table()
@@ -100,6 +108,10 @@ described at http://www.lon-capa.org.
 
 =item get_request_settings()
 
+=item extract_instcode() 
+
+=item generate_date_items()
+
 =back
 
 =cut
@@ -122,38 +134,16 @@ sub handler {
         return OK;
     }
 
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['action','showdom','cnum','state']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $dom = &get_course_dom();
     my $action = $env{'form.action'};
     my $state = $env{'form.state'};
-    my %stored;
-    my $jscript;
-    if ((defined($state)) && (defined($action))) {
-        if (($action eq 'view') && ($state eq 'details')) {
-            if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) {
-                my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'});
-            }
-        }
-        my %elements =  &form_elements($dom);
-        my $elementsref = {};
-        if (ref($elements{$action}) eq 'HASH') {
-            if (ref($elements{$action}{$state}) eq 'HASH') {
-                $elementsref = $elements{$action}{$state};
-            }
-        }
-        if (($state eq 'courseinfo') && ($env{'form.clonedom'} eq '')) {
-            $env{'form.clonedom'} = $dom;
-        }
-        $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
-    }
+    my (%states,%stored);
+    my ($jscript,$uname,$udom,$result,$warning);
 
-    if ($state eq 'personnel') {
-        $jscript .= "\n".&Apache::loncommon::userbrowser_javascript();
-    }
-
-    my $loaditems = &onload_action($action,$state);
-
-    my %states;
+    $states{'display'} = ['details'];
     $states{'view'} = ['pick_request','details','cancel','removal'];
     $states{'log'} = ['filter','display'];
     $states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
@@ -170,6 +160,7 @@ sub handler {
         }
     }
 
+    my @invalidcrosslist;
     my %trail = (
                  crstype       => 'Course Request Action',
                  codepick      => 'Category',
@@ -186,46 +177,102 @@ sub handler {
 
     if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
         $trail{'enrollment'} = 'Enrollment';
-    } 
+    }
 
-    my $page = 0;
-    my $crumb;
-    if (defined($action)) {
-        my $done = 0;
-        my $i=0;
-        if (ref($states{$action}) eq 'ARRAY') {
-            while ($i<@{$states{$action}} && !$done) {
-                if ($states{$action}[$i] eq $state) {
-                    $page = $i;
-                    $done = 1;
-                }
-                $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]}"});
+    my ($page,$crumb,$newinstcode,$codechk,$checkedcode) = 
+        &get_breadcrumbs($dom,$action,\$state,\%states,\%trail);
+    if ($action eq 'display') {
+        if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
+            my $namespace = 'courserequestqueue';
+            if ($env{'form.cnum'} ne '') {
+                my $cnum = $env{'form.cnum'};
+                my $reqkey = $cnum.'_approval';
+                my $namespace = 'courserequestqueue';
+                my $domconfig = &Apache::lonnet::get_domainconfiguser($dom);
+                my %queued =
+                    &Apache::lonnet::get($namespace,[$reqkey],$dom,$domconfig);
+                if (ref($queued{$reqkey}) eq 'HASH') {
+                    $uname = $queued{$reqkey}{'ownername'};
+                    $udom  = $queued{$reqkey}{'ownerdom'};
+                    if (($udom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/)) {
+                        $result = &retrieve_settings($dom,$cnum,$udom,$uname);
+                    } else {
+                        $warning = &mt('Invalid username or domain for course requestor');
+                    }
                 } else {
-                    &Apache::lonhtmlcommon::add_breadcrumb(
-     {href=>"javascript:backPage(document.requestcrs,'$states{$action}[$i]')",
-      text=>"$trail{$states{$action}[$i]}"});
+                    $warning = &mt('No information was found for this course request.');
                 }
+            } else {
+                $warning = &mt('No course request ID provided.');
             }
+        } else {
+            $warning = &mt('You do not have rights to view course request information.');
         }
-    } else {
-        &Apache::lonhtmlcommon::add_breadcrumb(
-                {text=>'Pick Action'});
-        $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+    } elsif ((defined($state)) && (defined($action))) {
+        if (($action eq 'view') && ($state eq 'details')) {
+            if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) {
+                my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'});
+            }
+        } elsif ($env{'form.crstype'} eq 'official') {
+            if (&Apache::lonnet::auto_run('',$dom)) {
+                if (($action eq 'new') && (($state eq 'enrollment') || 
+                    ($state eq 'personnel'))) {
+                    my $checkcrosslist = 0;
+                    for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+                        if ($env{'form.crosslist_'.$i}) {
+                            $checkcrosslist ++;
+                        }
+                    }
+                    if ($checkcrosslist) {
+                        my %codechk;
+                        my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
+                        &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,
+                                                                 \%cat_titles,
+                                                                 \%cat_order,
+                                                                 \@code_order);
+                        my $numtitles = scalar(@codetitles);
+                        if ($numtitles) {
+                            for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+                                if ($env{'form.crosslist_'.$i}) {
+                                    my $codecheck;
+                                    my $crosslistcode = '';
+                                    foreach my $item (@code_order) {
+                                        $crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item}; 
+                                    }
+                                    if ($crosslistcode ne '') { 
+                                         $codechk{$i} = 
+                                            &Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode);
+                                    }
+                                    unless ($codechk{$i} eq 'valid') {
+                                        $env{'form.crosslist_'.$i} = '';
+                                        push(@invalidcrosslist,$crosslistcode);
+                                    } 
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        my %elements =  &form_elements($dom);
+        my $elementsref = {};
+        if (ref($elements{$action}) eq 'HASH') {
+            if (ref($elements{$action}{$state}) eq 'HASH') {
+                $elementsref = $elements{$action}{$state};
+            }
+        }
+        if (($state eq 'courseinfo') && ($env{'form.clonedom'} eq '')) {
+            $env{'form.clonedom'} = $dom;
+        }
+        $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
     }
 
+    if ($state eq 'personnel') {
+        $jscript .= "\n".&Apache::loncommon::userbrowser_javascript();
+    }
+
+    my $loaditems = &onload_action($action,$state);
+
     my %can_request;
     my $canreq = &check_can_request($dom,\%can_request);
     if ($action eq 'new') {
@@ -234,8 +281,9 @@ sub handler {
                 &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,
                                  $crumb);
             } else {
-                &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
-                                        $loaditems,$crumb);
+                &request_administration($r,$action,$state,$page,\%states,$dom,
+                                        $jscript,$loaditems,$crumb,$newinstcode,
+                                        $codechk,$checkedcode,\@invalidcrosslist);
             }
         } else {
             $r->print(&header('Course Requests').$crumb.
@@ -245,10 +293,21 @@ sub handler {
         }
     } elsif ($action eq 'view') {
         if ($state eq 'crstype') {
-           &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb);
+            &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 'display') {
+        if ($warning ne '') {
+            my $args = { only_body => 1 };
+            $r->print(&header('Course Requests','','',$args).$crumb.
+                      '<h3>'.&mt('Course Request Details').'</h3>'.
+                      '<div class="LC_warning">'.$warning.'</div>'.
+                      &close_popup_form());
         } else {
-           &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
-                                   $loaditems,$crumb);
+            &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
+                                    $loaditems,$crumb,'','','','',$uname,$udom);
         }
     } elsif ($action eq 'log') {
         &print_request_logs($jscript,$loaditems,$crumb);
@@ -258,19 +317,100 @@ sub handler {
     return OK;
 }
 
+sub get_breadcrumbs {
+    my ($dom,$action,$state,$states,$trail) = @_;
+    my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles);
+    my $page = 0;
+    if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
+        if (defined($action)) {
+            my $done = 0;
+            my $i=0;
+            if (ref($states->{$action}) eq 'ARRAY') {
+                while ($i<@{$states->{$action}} && !$done) {
+                    if ($states->{$action}[$i] eq $$state) {
+                        $page = $i;
+                        $done = 1;
+                    }
+                    $i++;
+                }
+            }
+            if ($env{'form.crstype'} eq 'official') {
+                if ($page > 1) {
+                    if ($states->{$action}[$page-1] eq 'codepick') {
+                        if ($env{'form.instcode'} eq '') {
+                            ($newinstcode,$numtitles) = &get_instcode($dom);
+                            if ($numtitles) {
+                                if ($newinstcode eq '') {
+                                    $$state = 'codepick';
+                                    $page --;
+                                } else {
+                                    $codechk = 
+                                        &Apache::lonnet::auto_validate_instcode('',
+                                            $dom,$newinstcode);
+                                    if ($codechk ne 'valid') {
+                                        $$state = 'codepick';
+                                        $page --;
+                                    }
+                                    $checkedcode = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            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') || ($$state eq 'removal')) {
+                        &Apache::lonhtmlcommon::add_breadcrumb(
+                            { href => '/adm/requestcourse',
+                              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');
+        }
+    } else {
+        &Apache::lonhtmlcommon::add_breadcrumb(
+                {text=>'Pick Action'});
+        $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+    }
+    return ($page,$crumb,$newinstcode,$codechk,$checkedcode);
+}
+
 sub header {
-    my ($bodytitle,$jscript,$loaditems,$jsextra) = @_;
+    my ($bodytitle,$jscript,$loaditems,$jsextra,$args) = @_;
     if ($jscript) {
         $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);
-    } else {
-        return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra);
+        if (ref($args) eq 'HASH') {
+            my %loadhash = (
+                             'add_entries' => $loaditems,
+                           );
+            my %arghash = (%loadhash,%{$args});
+            $args = \%arghash;                  
+        } else {
+            $args = {'add_entries' => $loaditems,};
+        }
     }
+    return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$args);
 }
 
 sub form_elements {
@@ -354,7 +494,6 @@ sub form_elements {
                        enrollend_year     => 'text',
                        enrollend_minute   => 'text',
                        enrollend_second   => 'text',
-                       crosslisttotal     => 'hidden',
                        addcrosslist       => 'checkbox',
                        autoadds           => 'radio',
                        autodrops          => 'radio',
@@ -363,30 +502,29 @@ sub form_elements {
             for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
                 $extras{'sec_'.$i} = 'checkbox',
                 $extras{'secnum_'.$i} = 'text',
-                $extras{'loncapasec_'.$i} = 'checkbox',
+                $extras{'loncapasec_'.$i} = 'text',
             }
         }
         my $crosslisttotal = $env{'form.crosslisttotal'};
         if ($env{'form.addcrosslist'}) {
             $crosslisttotal ++;
         }
-        if (!defined($crosslisttotal)) {
+        if (!$crosslisttotal) {
             $crosslisttotal = 1;
         }
-        if ($crosslisttotal > 0) {
-            for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
-                if ($numtitles) {
-                    $extras{'crosslist_'.$i.'_'.$lastitem} = 'text';
-                }
-                if (@codetitles > 0) {
-                    foreach my $item (@codetitles) {
-                        $extras{'crosslist_'.$i.'_'.$item} = 'selectbox';
-                    }
+
+        for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+            if ($numtitles) {
+                $extras{'crosslist_'.$i.'_'.$lastitem} = 'text';
+            }
+            if (@codetitles > 0) {
+                foreach my $item (@codetitles) {
+                    $extras{'crosslist_'.$i.'_'.$item} = 'selectbox';
                 }
-                $extras{'crosslist_'.$i} = 'checkbox';
-                $extras{'crosslist_'.$i.'_instsec'} = 'text',
-                $extras{'crosslist_'.$i.'_lcsec'} = 'text',
             }
+            $extras{'crosslist_'.$i} = 'checkbox';
+            $extras{'crosslist_'.$i.'_instsec'} = 'text',
+            $extras{'crosslist_'.$i.'_lcsec'} = 'text',
         }
         my %mergedhash = (%{$elements{'new'}{'enrollment'}},%extras);
         %{$elements{'new'}{'enrollment'}} = %mergedhash;
@@ -491,14 +629,16 @@ sub print_main_menu {
     my $js = <<"END";
 
 function nextPage(formname) {
-    var crschoice = document.requestcrs.crstype.value;
-    var actionchoice = document.requestcrs.action.value;
+    var crschoice = document.mainmenu_coursetype.crstype.value;
+    var actionchoice = document.mainmenu_action.action.value;
     if (check_can_request(crschoice,actionchoice) == true) {
         if ((actionchoice == 'new') && (crschoice == 'official')) {
             nextstate = 'codepick';
         } else {
 $nextstate_setter 
-        } 
+        }
+        formname.crstype.value = crschoice;
+        formname.action.value = actionchoice; 
         formname.state.value= nextstate;
         formname.submit();
     }
@@ -553,33 +693,29 @@ END
 
 END
 
-    $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.
-              '<div>'.
-              '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
+    $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.'<div>'.
               &Apache::lonhtmlcommon::start_pick_box().
-              &Apache::lonhtmlcommon::row_title('Course Domain').
+              &Apache::lonhtmlcommon::row_title(&mt('Course Domain')).
+              '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
               &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange));
     if (!$onchange) {
         $r->print('&nbsp;<input type="submit" name="godom" value="'.
                    &mt('Change').'" />');
     }
-    $r->print(&Apache::lonhtmlcommon::row_closure(1).
-              &Apache::lonhtmlcommon::end_pick_box().'</form></div>');
+    $r->print('</form>'.&Apache::lonhtmlcommon::row_closure());
 
     my $formname = 'requestcrs';
     my $nexttext = &mt('Next');
-    $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.'" />
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
+<form name="mainmenu_action" method="post" action=""> 
 <select size="1" name="action" >
  <option value="new">'.&mt('New request').'</option>
  <option value="view">'.&mt('View/Modify/Cancel pending requests').'</option>
  <option value="log">'.&mt('View request history').'</option>
-</select>'.
-              &Apache::lonhtmlcommon::row_closure().
-              &Apache::lonhtmlcommon::row_title('Course Type').'
+</select></form>'.
+              &Apache::lonhtmlcommon::row_closure(1).
+              &Apache::lonhtmlcommon::row_title(&mt('Course Type')).'
+<form name="mainmenu_coursetype" method="post" action="">
 <select size="1" name="crstype">
  <option value="any">'.&mt('All types').'</option>');
     if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
@@ -592,18 +728,24 @@ END
                       '</option>'."\n");
         }
     }
-    $r->print('</select>
-<input type="hidden" name="state" value="crstype" />'.
-              &Apache::lonhtmlcommon::row_closure(1).
-              &Apache::lonhtmlcommon::end_pick_box().'<br />
-<input type="button" name="next" value="'.$nexttext.'" onclick="javascript:nextPage(document.'.$formname.')" />
-</form></div>');
+    $r->print('</select></form>'."\n".
+              &Apache::lonhtmlcommon::row_closure(1)."\n".
+              &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
+              '<div><form name="'.$formname.'" method="post" action="">'."\n".
+              '<input type="hidden" name="state" value="crstype" />'."\n".
+              '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
+              '<input type="hidden" name="crstype" value="" />'."\n".
+              '<input type="hidden" name="action" value="" />'."\n".
+              '<input type="button" name="next" value="'.$nexttext.
+              '" onclick="javascript:nextPage(document.'.$formname.')" />'."\n".
+              '</form></div>');
     $r->print(&Apache::loncommon::end_page());
     return;
 }
 
 sub request_administration {
-    my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb) = @_;
+    my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb,
+        $newinstcode,$codechk,$checkedcode,$invalidcrosslist,$uname,$udom) = @_;
     my $js;
     if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) {
         $js =  <<END;
@@ -631,7 +773,8 @@ END
             $jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);
         }
         $r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
-        &print_request_form($r,$action,$state,$page,$states,$dom);
+        &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
+                            $codechk,$checkedcode,$invalidcrosslist);
     } elsif ($action eq 'view') {
         my $jsextra;
         my $formname = 'requestcrs';
@@ -663,7 +806,7 @@ END
                                                          \%cat_order,\@code_order);
             }
             $r->print('<h3>'.&mt('Course Request Details').'</h3><div>'."\n".$form."\n".
-                      &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
+                      &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
                                     \@code_order)."\n".
                       '<input name="origcnum" value="'.$origcnum.'" type="hidden" />'."\n");
             my @excluded = &get_excluded_elements($dom,$states,'new','review');
@@ -736,6 +879,18 @@ END
             }
             $r->print('</form>');
         }
+    } elsif ($action eq 'display') {
+        my $formname = 'requestcrs';
+        my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
+        if ($env{'form.crstype'} eq 'official') {
+            &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+                                                     \%cat_order,\@code_order);
+        }
+        $r->print(&header('Course Request','','','',{ 'only_body' => 1}).
+                  $crumb."\n".'<h3>'.&mt('Course Request Details').'</h3>'.
+                  &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
+                                \@code_order,$uname,$udom)."\n".'</div>'.
+                  &close_popup_form());
     } elsif ($action eq 'log') {
         $r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb);
     }
@@ -743,8 +898,34 @@ END
     return;
 }
 
+sub close_popup_form {
+    my $close= &mt('Close Window');
+    return << "END";
+<p><form name="displayreq" action="" method="post">
+<input type="button" name="closeme" value="$close" onclick="javascript:self.close();" />
+</form></p>
+END
+}
+
+sub get_instcode {
+    my ($dom) = @_;
+    my ($instcode,$numtitles);
+    my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
+    &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+                                             \%cat_order,\@code_order);
+    $numtitles = scalar(@codetitles);
+    if (@code_order > 0) {
+        my $message;
+        foreach my $item (@code_order) {
+            $instcode .= $env{'form.instcode_'.$item};
+        }
+    }
+    return ($instcode,$numtitles);
+}
+
 sub print_request_form {
-    my ($r,$action,$state,$page,$states,$dom) = @_;
+    my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode,
+        $invalidcrosslist) = @_;
     my $formname = 'requestcrs';
     my ($next,$prev,$message,$output,$codepicker,$crstype);
     $prev = $states->{$action}[$page-1];
@@ -759,40 +940,23 @@ sub print_request_form {
     if ($crstype eq 'official') {
         if ($env{'form.instcode'} ne '') {
             $instcode = $env{'form.instcode'};
+        } elsif ($newinstcode ne '') {
+            $instcode = $newinstcode;
         }
-    }
-    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 '') {
-                foreach my $item (@code_order) {
-                    $instcode .= $env{'form.instcode_'.$item};
-                }
-                $r->print('<input type="hidden" name="instcode" value="'.$instcode.'" />'."\n");
-            }
-            if ($instcode ne '') {
-                $code_chk = &Apache::lonnet::auto_validate_instcode('',$dom,$instcode);
-                if ($code_chk eq 'valid') {
-                    $message = '<div class="LC_info">'.
-                               &mt('The chosen course category [_1] is valid.','<b>'.
-                               $instcode.'</b>').'</div>';
-                } else {
-                    $message = '<div class="LC_warning">'.
-                               &mt('No course was found matching your choice of institutional course category.');
-                    if ($code_chk ne '') {
-                        $message .= '<br />'.$code_chk;
-                    }
-                    $message .= '</div>';
-                }
+        if ($checkedcode) {
+            if ($codechk eq 'valid') {
+                $message = '<div class="LC_info">'.
+                           &mt('The chosen course category [_1] is valid.','<b>'.
+                           $instcode.'</b>').
+                           '<input type="hidden" name="instcode" value="'.
+                           $instcode.'" /></div>';
             } else {
                 $message = '<div class="LC_warning">'.
-                           &mt('No course was found matching your choice of institutional course category.');
-            }
-            unless ($code_chk eq 'ok') {
+                            &mt('No course was found matching your choice of institutional course category.');
+                if ($codechk ne '') {
+                    $message .= '<br />'.$codechk;
+                }
+                $message .= '</div>';
                 $prev = 'crstype';
             }
             $r->print($message);
@@ -820,7 +984,7 @@ sub print_request_form {
             $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
         }
     } elsif ($prev eq 'codepick') {
-        if ($env{'form.instcode'} eq '') {
+        if ($instcode eq '') {
             $prev = $states->{$action}[$page-2];
         }
         $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
@@ -830,9 +994,10 @@ sub print_request_form {
                                                      \%cat_order,\@code_order);
         }
         $r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
-                                         \%cat_titles,\%cat_order,\@code_order));
+                                         \%cat_titles,\%cat_order,\@code_order,
+                                         $invalidcrosslist));
     } elsif ($state eq 'personnel') {
-        $r->print(&print_personnel_menu($dom,$formname,$crstype));
+        $r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist));
     } elsif ($state eq 'review') {
         my $cnum;
         if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {
@@ -842,9 +1007,8 @@ sub print_request_form {
         }
         &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                  \%cat_order,\@code_order);
-        $r->print('<p>'.&mt('Review the details of the course request before submission.').'</p>'.
-                  &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
-                                \@code_order).
+        $r->print('<h3>'.&mt('Review course request details before submission').'</h3>'.
+                  &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order).
                   '<input type="hidden" name="cnum" value="'.$cnum.'" />');
         $navtxt{'next'} = &mt('Submit course request');
     }  elsif ($state eq 'process') {
@@ -852,10 +1016,26 @@ sub print_request_form {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                      \%cat_order,\@code_order);
         }
-        my $result = &print_request_outcome($dom,\@codetitles,\@code_order);
+        my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
+                                                           \@code_order);
         $r->print($result);
+        if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
+            $r->print('<p>');
+            if ($storeresult eq 'ok') {
+                $r->print('<a href="/adm/requestcourse?action=view&state=details&showdom='.$dom.'&cnum='. $env{'form.cnum'}.'">'.
+                          &mt('Modify this request').'</a>'.('&nbsp;'x4));
+            }
+            $r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
+            return;
+        }
     }
     my @excluded = &get_excluded_elements($dom,$states,$action,$state);
+    if ($state eq 'personnel') {
+        push(@excluded,'persontotal');
+    }
+    if ($state eq 'enrollment') {
+        push(@excluded,'crosslisttotal');
+    }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
     &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state);
     return;
@@ -890,8 +1070,9 @@ sub get_excluded_elements {
 }
 
 sub print_enrollment_menu {
-    my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order) =@_;
-    my ($sections,$autoenroll,$access_dates);
+    my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
+        $invalidcrosslist) =@_;
+    my ($sections,$autoenroll,$access_dates,$output);
     my $starttime = time;
     my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
 
@@ -905,10 +1086,17 @@ sub print_enrollment_menu {
                        );
     if ($env{'form.crstype'} eq 'official') {
         if (&Apache::lonnet::auto_run('',$dom)) {
-            my ($section_form,$crosslist_form,$autoenroll_form);
+            $output = &show_invalid_crosslists($invalidcrosslist);
+            my ($section_form,$crosslist_form);
             $section_form = &inst_section_selector($dom,$instcode);
+            if ($section_form) {
+                $sections = &Apache::lonhtmlcommon::row_headline().
+                            '<h3>'.&mt('Sections for auto-enrollment').'</h3>'.
+                            &Apache::lonhtmlcommon::row_closure(1).
+                            $section_form;
+            }
             my $crosslisttotal = $env{'form.crosslisttotal'};
-            if (!defined($crosslisttotal)) {
+            if (!$crosslisttotal) {
                 $crosslisttotal = 1;
             }
             if ($env{'form.addcrosslist'}) {
@@ -924,65 +1112,96 @@ sub print_enrollment_menu {
                     '<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.
                     '<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.
                     ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
-                   "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1);
-            }
-            if ($section_form || $crosslist_form) {
-                $sections = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
-                            $section_form.$crosslist_form.
-                            &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+                   "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
+                $sections .=  &Apache::lonhtmlcommon::row_headline.
+                              '<h3>'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
+                              &Apache::lonhtmlcommon::row_closure(1).
+                              $crosslist_form;
             }
-            $autoenroll_form = 
+            $autoenroll = 
                 &Apache::lonhtmlcommon::row_title(&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().
+                &Apache::lonhtmlcommon::row_closure(1).
                 &Apache::lonhtmlcommon::row_title(&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().
+                &Apache::lonhtmlcommon::row_closure(1).
                 &date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles);
-            if ($autoenroll_form) {
-                $autoenroll = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
-                              $autoenroll_form.
-                              &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
-            }
         }
     }
-    my $access_dates_form = 
+    my $access_dates = 
         &date_setting_table($starttime,$endtime,$formname,'access',%accesstitles);
-    if ($access_dates_form) {
-        $access_dates = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
-                        $access_dates_form.
-                        &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+    $output .= &Apache::lonhtmlcommon::start_pick_box();
+    if ($sections) {
+        $output .=  $sections;
+    }
+    if ($autoenroll) {
+        $output .= &Apache::lonhtmlcommon::row_headline('Auto-enroll').
+                   '<h3>'.&mt('Auto-enrollment settings').'</h3>'.
+                   &Apache::lonhtmlcommon::row_closure(1).
+                   $autoenroll;
+    }
+    if ($access_dates) {
+        my $header = &mt('Access dates for students');
+        if ($env{'form.crstype'} eq 'community') {
+            $header = &mt('Access dates for community members');
+        }
+        $output .= &Apache::lonhtmlcommon::row_headline('Access').
+                   '<h3>'.$header.'</h3>'.
+                   &Apache::lonhtmlcommon::row_closure(1).
+                   $access_dates
     }
-    return $sections.$autoenroll.$access_dates;
+    return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+           &Apache::lonhtmlcommon::end_pick_box().'</div>';
 }
 
+sub show_invalid_crosslists {
+    my ($invalidcrosslist) = @_;
+    my $output;
+    if (ref($invalidcrosslist) eq 'ARRAY') {
+        if (@{$invalidcrosslist} > 0) {
+            $output = '<div class="LC_warning">'.
+                      &mt('The following crosslisted courses were invalid:').'<ul>';
+            foreach my $item (@{$invalidcrosslist}) {
+                $output .= '<li>'.$item.'</li>';
+            }
+            $output .= '</ul></div><br />';
+        }
+    }
+    return $output;
+}
+
+
 sub inst_section_selector {
     my ($dom,$instcode) = @_;
     my @sections = &Apache::lonnet::auto_get_sections(undef,$dom,$instcode);
     my $sectotal = scalar(@sections);
     my $output;
     if ($sectotal) {
-        $output .=  &Apache::lonhtmlcommon::row_title('Sections').
+        $output .=  &Apache::lonhtmlcommon::row_title(&mt('Sections of [_1]',$instcode)).
                     &Apache::loncommon::start_data_table().
                     &Apache::loncommon::start_data_table_row().
                     '<th>'.&mt('Include?').'<input type="hidden" name="sectotal" '.
-                    'value="'.$sectotal.'"</th>'.
+                    'value="'.$sectotal.'"  /></th>'.
                     '<th>'.&mt('Institutional Section').'</th>'.
                     '<th>'.&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"';
+            if ($env{'form.origcnum'}) {
+                $checked='';
+            }
             $output .= &Apache::loncommon::start_data_table_row().
                        '<td><input type="checkbox" name="sec_'.$i.
-                       '" checked="checked" /></td>'.
+                       '"'.$checked.' value="1" /></td>'.
                        '<td>'.$sections[$i].
                        '<input type="hidden" name="secnum_'.$i.'" value="'.
                        $sections[$i].'" /></td>'.
@@ -1003,23 +1222,31 @@ sub date_setting_table {
                                                         $starttime,'','','',1,'','','',1);
     my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
                                                       $endtime,'','','',1,'','','',1);
+    my $closure = '';
     if ($prefix eq 'access') {
         $perpetual = ' <span class="LC_nobreak"><label>'.
                      '<input type="checkbox" name="no_end_date" />'.
                      &mt('No end date').'</label></span>';
+        $closure = '1';
     }
     $table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}).
              $startform.
-             &Apache::lonhtmlcommon::row_closure().
+             &Apache::lonhtmlcommon::row_closure(1).
              &Apache::lonhtmlcommon::row_title($datetitles{'end'}).
              $endform.$perpetual.
-             &Apache::lonhtmlcommon::row_closure(1);
+             &Apache::lonhtmlcommon::row_closure($closure);
     return $table;
 }
 
 sub print_personnel_menu {
-    my ($dom,$formname,$crstype) = @_;
-    my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box();
+    my ($dom,$formname,$crstype,$invalidcrosslist) = @_;
+    my $output;
+    if ($crstype eq 'official') {
+        if (&Apache::lonnet::auto_run('',$dom)) {
+            $output .= &show_invalid_crosslists($invalidcrosslist);
+        }  
+    }
+    $output .= '<div>'.&Apache::lonhtmlcommon::start_pick_box();
     my $persontotal = $env{'form.persontotal'};
     if ((!defined($persontotal)) || (!$persontotal)) {
         $persontotal = 1;
@@ -1080,6 +1307,10 @@ sub print_personnel_menu {
         $newtitle = &mt('Other').':&nbsp;';
     }
 
+    if ($persontotal) {
+        $output .= &Apache::lonhtmlcommon::row_headline().
+                   '<h3>'.&mt('Requestor is automatically assigned Course Coordinator role.').' '.&mt('Include other personnel?').'</h3>';
+    }
     for (my $i=0; $i<$persontotal; $i++) { 
         my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
         my $linkargstr = join("','",@linkargs);
@@ -1345,13 +1576,16 @@ sub print_request_logs {
 }
 
 sub print_review {
-    my ($formname,$dom,$codetitles,$cat_titles,$cat_order,$code_order) = @_;
+    my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom) = @_;
     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();
+    if ($uname eq '' || $udom eq '') {
+        $uname = $env{'user.name'};
+        $udom = $env{'user.domain'};
+    }
+    $owner = $uname.':'.$udom;
+    $ownername = &Apache::loncommon::plainname($uname,$udom,'first');
+    my %emails = &Apache::loncommon::getemails($uname,$udom);
     foreach my $email ('permanentemail','critnotification','notification') {
         $owneremail = $emails{$email};
         last if ($owneremail ne '');
@@ -1430,32 +1664,35 @@ sub print_review {
                                &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};
-                                }
+            my $crosslisttotal = $env{'form.crosslisttotal'};
+            if (!$crosslisttotal) {
+                $crosslisttotal = 1;
+            }
+            for (my $i=0; $i<$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>';
                     }
+                    $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>';
+            $section_values .= $xlistinfo;
         }
+        $section_values .= '</table></td>';
     }
 
     my %ctxt = &clone_text();
@@ -1531,10 +1768,16 @@ sub print_review {
                     }
                 }
             }
-            my $showsec = 'None';
+            my $showsec;
             if (@allsecs) {
                 $showsec = join(', ',@allsecs);
             }
+            if ($showsec eq '') {
+                $showsec = &mt('None');
+            }
+            if ($env{'form.person_'.$i.'_role'} eq 'cc') {
+                $showsec = &mt('None');
+            }
             $personnel_values .= 
                 '<tr><td>'.$env{'form.person_'.$i.'_firstname'}.' '.
                 $env{'form.person_'.$i.'_lastname'}.'</td>'.
@@ -1575,7 +1818,7 @@ sub print_review {
                '<table class="LC_innerpickbox"><tr>'.$personnel_headers.'</tr>'."\n".
                $personnel_values.'</table>'."\n".
                &Apache::lonhtmlcommon::row_closure(1).
-               &Apache::lonhtmlcommon::end_pick_box();
+               &Apache::lonhtmlcommon::end_pick_box().'</div>';
     return $output;
 }
 
@@ -1609,9 +1852,15 @@ function validateForm() {
 </script>
 
 ENDJS
-
+    my $title = &mt('Brief Course Description');
+    if ($crstype eq 'community') {
+        $title = &mt('Brief Community Description');
+    }
     my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
-                  &Apache::lonhtmlcommon::row_title('Course Description').
+                  &Apache::lonhtmlcommon::row_headline().
+                  '<h3>'.$title.'</h3>'.
+                  &Apache::lonhtmlcommon::row_closure(1).
+                  &Apache::lonhtmlcommon::row_title(&mt('Description')).
                  '<input type="text" size="40" name="cdescr" />';
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
@@ -1621,9 +1870,12 @@ ENDJS
                    &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
     }
     $output .= $home_server_pick.
+               &Apache::lonhtmlcommon::row_closure().
+               &Apache::lonhtmlcommon::row_headline().
+               '<h3>'.&mt('Clone content and settings from an existing course?').'</h3>'. 
                &Apache::lonhtmlcommon::row_closure(1).
-               &Apache::lonhtmlcommon::end_pick_box().'</div>'.
-               '<div>'.&clone_form($dom,$formname,$crstype).'</div>'."\n";
+               &clone_form($dom,$formname,$crstype).
+               &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
     return $output;
 }
 
@@ -1637,13 +1889,12 @@ sub clone_form {
                     &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
     my %lt = &clone_text();
     my $output .= 
-        &Apache::lonhtmlcommon::start_pick_box(). 
         &Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
         '<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();'.
         'opencrsbrowser('."'$formname','clonecrs','clonedom','','','','$type'".');" />'.
         '</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.
         &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.
-        $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure().
+        $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
         '<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
         '</label><br /><label>'.
@@ -1652,8 +1903,7 @@ sub clone_form {
         '<input type="radio" name="datemode" value="shift" checked="checked" /> '.
         $lt{'shd'}.'</label>'.
         '<input type="text" size="5" name="dateshift" value="365" />'.
-        &Apache::lonhtmlcommon::row_closure(1).
-        &Apache::lonhtmlcommon::end_pick_box();
+        &Apache::lonhtmlcommon::row_closure(1);
     return $output;
 }
 
@@ -1832,6 +2082,8 @@ sub print_request_outcome {
     my ($dom,$codetitles,$code_order) = @_;
     my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
         %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
+    my $sectotal = $env{'form.sectotal'};
+    my $crosslisttotal = 0;
     $cnum = $env{'form.cnum'};
     unless ($cnum =~ /^$match_courseid$/) {
         $output = &mt('Invalid LON-CAPA course number for the new course')."\n"; 
@@ -1873,8 +2125,11 @@ sub print_request_outcome {
                         }
                     }
                 }
-                $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'};
-                $crosslistings{$i}{'inst'} = $xlistinfo;
+                $crosslistings{$i}{'instcode'} = $xlistinfo;
+                if ($xlistinfo ne '') {
+                    $crosslisttotal ++;
+                }
+                $crosslistings{$i}{'instsec'} = $env{'form.crosslist_'.$i.'_instsec'}; 
                 $crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'};
             }
         }
@@ -1940,17 +2195,9 @@ sub print_request_outcome {
     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'};
@@ -1996,7 +2243,7 @@ sub print_request_outcome {
                     accessend      => $accessend,
                     personnel      => \%personnel,
                   };
-    my @inststatuses;
+    my (@inststatuses,$storeresult,$creationresult);
     my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
     if ($val eq '') {
         if ($crstype eq 'official') {
@@ -2008,6 +2255,7 @@ sub print_request_outcome {
         } else {
             $output = &mt('Unrecognized course type: [_1]',$crstype);
         }
+        $storeresult = 'notpermitted'; 
     } else {
         my ($disposition,$message,$reqstatus);
         my %reqhash = (
@@ -2024,7 +2272,7 @@ sub print_request_outcome {
             $disposition = &check_autolimit($env{'user.name'},$env{'user.domain'},
                                             $dom,$crstype,$limit,\$message);
         } elsif ($val eq 'validate') {
-            my $inststatuslist;
+            my ($inststatuslist,$validationchk,$validation);
             if (@inststatuses > 0) {
                 $inststatuslist = join(',',@inststatuses);
             }
@@ -2032,23 +2280,20 @@ sub print_request_outcome {
             if (@instsections > 0) {
                 $instseclist = join(',',@instsections);
             }
-            my $validation = 
-                &Apache::lonnet::auto_validate_instcode('',$dom,$instcode,
-                    $env{'user.name'}.':'.$env{'user.domain'},$inststatuslist,
-                    $instseclist);
-            if ($validation eq 'valid') {
-                $disposition = 'process';
-            } elsif ($validation eq 'rejected') {
-                $disposition = 'rejected';
-            } elsif ($validation eq 'pending') {
-                $disposition = 'pending';
-            } elsif ($disposition eq 'approval') {
-                $disposition = 'approval';
-            } elsif ($disposition =~ /^error(.*)$/) {
+            $validationchk = 
+                &Apache::lonnet::auto_courserequest_validation($dom,
+                    $env{'user.name'}.':'.$env{'user.domain'},$crstype,
+                    $inststatuslist,$instcode,$instseclist);
+            if ($validationchk =~ /:/) {
+                ($validation,$message) = split(':',$validationchk);
+            } else {
+                $validation = $validationchk;
+            }
+            if ($validation =~ /^error(.*)$/) {
                 $disposition = 'approval';
                 $validationerror = $1;
             } else {
-                $disposition = 'approval';  
+                $disposition = $validation;
             }
         } else {
             $disposition = 'approval';
@@ -2061,6 +2306,7 @@ sub print_request_outcome {
             if ($message) {
                 $output .= '<div class="LC_warning">'.$message.'</div>';
             }
+            $storeresult = 'rejected';
         } elsif ($disposition eq 'process') {
             my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
             my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
@@ -2081,12 +2327,14 @@ sub print_request_outcome {
                 $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.');
+                $creationresult = 'created';
             } else {
                 $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>';
+                $creationresult = 'error';
             }
         } else {
             my $requestid = $cnum.'_'.$disposition;
@@ -2104,9 +2352,10 @@ sub print_request_outcome {
                                                    $env{'user.domain'},$env{'user.name'});
             if ($userreqhash{$statuskey} ne '') {
                 $modified = 1;
-                my %queuehash = &Apache::lonnet::get_dom('courserequestqueue',
-                                                         [$cnum.'_approval',
-                                                          $cnum.'_pending'],$dom);
+                my $uname = &Apache::lonnet::get_domainconfiguser($dom);
+                my %queuehash = &Apache::lonnet::get('courserequestqueue',
+                                                     [$cnum.'_approval',
+                                                      $cnum.'_pending'],$dom,$uname);
                 if (($queuehash{$cnum.'_approval'} ne '') || 
                     ($queuehash{$cnum.'_pending'} ne '')) {
                     $queued = 1;
@@ -2127,7 +2376,7 @@ sub print_request_outcome {
                 }
             }
         }
-        my ($storeresult,$statusresult);
+        my ($statusresult);
         if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
             $storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
                                                            'courserequests');
@@ -2135,7 +2384,7 @@ sub print_request_outcome {
                 my %status = (
                                  'status:'.$dom.':'.$cnum => $reqstatus,
                              );
-                $statusresult = &Apache::lonnet::put('courserequests',\%status); 
+                $statusresult = &Apache::lonnet::put('courserequests',\%status);
             }
         } else {
             $storeresult = 'error: invalid requestkey format'; 
@@ -2155,7 +2404,11 @@ sub print_request_outcome {
             $output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
         }
     }
-    return $output;
+    if ($creationresult ne '') {
+        return ($creationresult,$output);
+    } else {
+        return ($storeresult,$output);
+    }
 }
 
 sub notification_information {
@@ -2212,7 +2465,7 @@ sub get_processtype {
             if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
                 %settings = %{$domconfig->{'requestcourses'}};
                 if (ref($settings{$crstype}) eq 'HASH') {
-                    if (($env{'user.adv'}) && (exists($settings{$crstype}{'_LC_adv'}))) {
+                    if (($env{'user.adv'}) && ($settings{$crstype}{'_LC_adv'} ne '')) {
                         $val = $settings{$crstype}{'_LC_adv'};
                         @{$inststatuses} = ('_LC_adv_');
                     } else {
@@ -2318,11 +2571,14 @@ sub check_autolimit {
 }
 
 sub retrieve_settings {
-    my ($dom,$cnum) = @_;
-    my ($result,%reqinfo) = &get_request_settings($dom,$cnum);
+    my ($dom,$cnum,$udom,$uname) = @_;
+    if ($udom eq '' || $uname eq '') {
+        $udom = $env{'user.domain'};
+        $uname = $env{'user.name'};
+    }
+    my ($result,%reqinfo) = &get_request_settings($dom,$cnum,$udom,$uname);
     if ($result eq 'ok') {
-        if (($env{'user.name'} eq $reqinfo{'owner'}) && 
-            ($env{'user.domain'} eq $reqinfo{'domain'})) {
+        if (($udom eq $reqinfo{'domain'}) &&  ($uname eq $reqinfo{'owner'})) {
             $env{'form.chome'} = $reqinfo{'coursehome'};
             $env{'form.cdescr'} = $reqinfo{'cdescr'};
             $env{'form.crstype'} = $reqinfo{'crstype'}; 
@@ -2345,17 +2601,18 @@ sub retrieve_settings {
                  $env{'form.autoadds'} = $reqinfo{'autoadds'};
                  $env{'form.autdrops'} = $reqinfo{'autodrops'};
                  $env{'form.instcode'} = $reqinfo{'instcode'};
-                 my %crscode = (
-                                 instcode => $reqinfo{'instcode'},
-                               );
-                 &extract_instcode($dom,'instcode',\%crscode);
+                 my $crscode = { 
+                                 $cnum => $reqinfo{'instcode'},
+                               };
+                 &extract_instcode($dom,'instcode',$crscode,$cnum);
             }
             my @currsec;
             if (ref($reqinfo{'sections'}) eq 'HASH') {
                 foreach my $i (sort(keys(%{$reqinfo{'sections'}}))) {
                     if (ref($reqinfo{'sections'}{$i}) eq 'HASH') {
-                        my $sec = $reqinfo{'sections'}{$i}{'inst'};;
+                        my $sec = $reqinfo{'sections'}{$i}{'inst'};
                         $env{'form.secnum_'.$i} = $sec;
+                        $env{'form.sec_'.$i} = '1';
                         if (!grep(/^\Q$sec\E$/,@currsec)) {
                             push(@currsec,$sec);
                         }
@@ -2363,15 +2620,19 @@ sub retrieve_settings {
                     }
                 }
             }
-            if (ref($reqinfo{'crosslistings'}) eq 'HASH') {
-                foreach my $i (sort(keys(%{$reqinfo{'crosslistings'}}))) {
-                    if (ref($reqinfo{'crosslistings'}{$i}) eq 'HASH') {
-                        $env{'form.crosslist_'.$i.'_lcsec'} = $reqinfo{'crosslistings'}{$i}{'loncapa'};
-                        my $xlistsec = $reqinfo{'crosslistings'}{$i}{'instsec'};
-                        my %crscode = (
-                                        $i => $reqinfo{'crosslistings'}{$i}{'instcode'},
-                                      );
-                        &extract_instcode($dom,'crosslist',\%crscode,$1,$xlistsec);
+            if (ref($reqinfo{'crosslists'}) eq 'HASH') {
+                foreach my $i (sort(keys(%{$reqinfo{'crosslists'}}))) {
+                    if (ref($reqinfo{'crosslists'}{$i}) eq 'HASH') {
+                        $env{'form.crosslist_'.$i} = '1';
+                        $env{'form.crosslist_'.$i.'_instsec'} = $reqinfo{'crosslists'}{$i}{'instsec'};
+                        $env{'form.crosslist_'.$i.'_lcsec'} = $reqinfo{'crosslists'}{$i}{'loncapa'};
+                        if ($reqinfo{'crosslists'}{$i}{'instcode'} ne '') {
+                            my $key = $cnum.$i; 
+                            my $crscode = {
+                                              $key => $reqinfo{'crosslists'}{$i}{'instcode'},
+                                          };
+                            &extract_instcode($dom,'crosslist',$crscode,$key,$i);
+                        }
                     }
                 }
             }
@@ -2419,12 +2680,11 @@ sub retrieve_settings {
 }
 
 sub get_request_settings {
-    my ($dom,$cnum) = @_;
+    my ($dom,$cnum,$udom,$uname) = @_;
     my $requestkey = $dom.'_'.$cnum;
     my ($result,%reqinfo);
     if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
-        my %history = &Apache::lonnet::restore($requestkey,'courserequests',
-                                               $env{'user.domain'},$env{'user.name'});
+        my %history = &Apache::lonnet::restore($requestkey,'courserequests',$udom,$uname);
         my $disposition = $history{'disposition'};
         if (($disposition eq 'approval') || ($disposition eq 'pending')) { 
             if (ref($history{'details'}) eq 'HASH') {
@@ -2443,26 +2703,19 @@ sub get_request_settings {
 }
 
 sub extract_instcode {
-    my ($cdom,$element,$crscodehashref,$counter,$xlistsec) = @_;
+    my ($cdom,$element,$crscode,$crskey,$counter) = @_;
     my (%codes,@codetitles,%cat_titles,%cat_order);
-    if (ref($crscodehashref) eq 'HASH') {
-        if (&Apache::lonnet::auto_instcode_format('requests',$cdom,$crscodehashref,
-                       \%codes,\@codetitles,\%cat_titles,\%cat_order) eq 'ok') {
+    if (&Apache::lonnet::auto_instcode_format('requests',$cdom,$crscode,\%codes,
+                                              \@codetitles,\%cat_titles,
+                                              \%cat_order) eq 'ok') {
+        if (ref($codes{$crskey}) eq 'HASH') {
             if (@codetitles > 0) {
                 my $sel = $element;
                 if ($element eq 'crosslist') {
                     $sel .= '_'.$counter;
                 }
-                my $lastitem = pop(@codetitles);
                 foreach my $title (@codetitles) {
-                    if (ref($cat_order{$title}) eq 'ARRAY') {
-                        if (@{$cat_order{$title}} > 0) {
-                            $env{'form.'.$sel.'_'.$title} = $cat_order{$title}[0];
-                        }
-                    }
-                }
-                if ($element eq 'crosslist') { 
-                    $env{'form.'.$sel.'_'.$lastitem} = $xlistsec; 
+                    $env{'form.'.$sel.'_'.$title} = $codes{$crskey}{$title};
                 }
             }
         }