--- loncom/interface/lonrequestcourse.pm	2009/08/15 01:59:04	1.13
+++ loncom/interface/lonrequestcourse.pm	2009/10/24 03:24:13	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.13 2009/08/15 01:59:04 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.37 2009/10/24 03:24:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,24 +44,28 @@ described at http://www.lon-capa.org.
 
 =item handler()
 
+=item get_breadcrumbs()
+
 =item header()
 
 =item form_elements()
 
 =item onload_action()
 
-=item check_can_request() 
-
-=item course_types()
-
 =item print_main_menu()
 
 =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()
@@ -94,12 +98,14 @@ described at http://www.lon-capa.org.
 
 =item check_autolimit()
 
-=item build_batchcreatehash()
-
 =item retrieve_settings()
 
 =item get_request_settings()
 
+=item extract_instcode() 
+
+=item generate_date_items()
+
 =back
 
 =cut
@@ -112,54 +118,34 @@ use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::loncoursequeueadmin;
+use Apache::lonuserutils;
 use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
     my ($r) = @_;
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
     if ($r->header_only) {
-        &Apache::loncommon::content_type($r,'text/html');
-        $r->send_http_header;
         return OK;
     }
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
 
+    &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 (%states,%stored);
+    my ($jscript,$uname,$udom,$result,$warning);
 
-    my %stored;
-    my $jscript;
-    if ((defined($state)) && (defined($action))) {
-        my %elements =  &form_elements($dom);
-        if (($action eq 'view') && ($state ne 'crstype')) {
-            if (defined($env{'form.request_id'})) {
-                %stored = &retrieve_settings($dom,$env{'form.request_id'});
-            }
-        }
-        my $elementsref = {};
-        if (ref($elements{$action}) eq 'HASH') {
-            if (ref($elements{$action}{$state}) eq 'HASH') {
-                $elementsref = $elements{$action}{$state};
-            }
-        }
-        $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 %states;
-    $states{'view'} = ['pick_request','details','review','process'];
+    $states{'display'} = ['details'];
+    $states{'view'} = ['pick_request','details','cancel','removal'];
     $states{'log'} = ['filter','display'];
     $states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
+
     if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
         unless ($env{'form.state'} eq 'crstype') {
-            unshift (@{$states{'new'}},'codepick');
+            unshift(@{$states{'new'}},'codepick');
         }
     }
 
@@ -169,65 +155,135 @@ sub handler {
         }
     }
 
+    my @invalidcrosslist;
     my %trail = (
                  crstype       => 'Course Request Action',
                  codepick      => 'Category',
                  courseinfo    => 'Description',
-                 enrollment    => 'Enrollment',
+                 enrollment    => 'Access Dates',
                  personnel     => 'Personnel',
                  review        => 'Review',
                  process       => 'Result',
                  pick_request  => 'Display Summary',
+                 details       => 'Request Details',
+                 cancel        => 'Cancel Request',
+                 removal       => 'Outcome',
                 );
 
-    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]}"});
+    if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
+        $trail{'enrollment'} = 'Enrollment';
+    }
+
+    my ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description) = 
+        &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}, my $rest) = 
+                                            &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;
+        }
+        if ($state eq 'crstype') {
+            $jscript = &mainmenu_javascript();
+        } else {
+            $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);
+    my $canreq = &Apache::lonnet::check_can_request($dom,\%can_request);
     if ($action eq 'new') {
         if ($canreq) {
             if ($state eq 'crstype') {
                 &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,$description,
+                                        \@invalidcrosslist);
             }
         } else {
             $r->print(&header('Course Requests').$crumb.
@@ -237,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,$loaditems,$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);
@@ -250,19 +317,124 @@ sub handler {
     return OK;
 }
 
+sub mainmenu_javascript {
+    return <<"END";
+function setType(courseForm) {
+    for (var i=0; i<courseForm.crstype.length; i++) {
+        if (courseForm.crstype.options[i].value == "$env{'form.crstype'}") {
+            courseForm.crstype.options[i].selected = true;
+        } else {
+            courseForm.crstype.options[i].selected = false;
+        }
+    }
+}
+
+function setAction(courseForm) {
+    for (var i=0; i<courseForm.action.length; i++) {
+        if (courseForm.action.options[i].value == "$env{'form.action'}") {
+            courseForm.action.options[i].selected = true;
+        } else {
+            courseForm.action.options[i].selected = false;
+        }
+    }
+}
+END
+}
+
+sub get_breadcrumbs {
+    my ($dom,$action,$state,$states,$trail) = @_;
+    my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description);
+    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,$description) = 
+                                        &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,$description);
+}
+
 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 {
@@ -273,6 +445,7 @@ sub form_elements {
             crstype => {
                 crstype => 'selectbox',
                 action  => 'selectbox',
+                origcnum => 'hidden', 
             },
             courseinfo => {
                 cdescr           => 'text',
@@ -297,7 +470,6 @@ sub form_elements {
                 no_end_date      => 'checkbox',
             },
             personnel => {
-                persontotal => 'hidden',
                 addperson   => 'checkbox', 
             },
             review => {
@@ -346,43 +518,47 @@ sub form_elements {
                        enrollend_year     => 'text',
                        enrollend_minute   => 'text',
                        enrollend_second   => 'text',
-                       crosslisttotal     => 'hidden',
                        addcrosslist       => 'checkbox',
                        autoadds           => 'radio',
                        autodrops          => 'radio',
                      );
         if ($env{'form.sectotal'} > 0) {
             for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
-                $extras{'sec_'.$i} = 'checkbox',
-                $extras{'secnum_'.$i} = 'text',
-                $extras{'loncapasec_'.$i} = 'checkbox',
+                $extras{'sec_'.$i} = 'radio';
+                $extras{'secnum_'.$i} = 'text';
+                $extras{'loncapasec_'.$i} = 'text';
             }
         }
         my $crosslisttotal = $env{'form.crosslisttotal'};
-        if (!defined($crosslisttotal)) {
+        if ($env{'form.addcrosslist'}) {
+            $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;
     }
     my %people;
     my $persontotal = $env{'form.persontotal'};
-    if (!defined($persontotal)) {
+    if ($env{'form.addperson'}) {
+        $persontotal ++;
+    }
+    if ((!defined($persontotal)) || (!$persontotal)) {
         $persontotal = 1;
     }
     for (my $i=0; $i<$persontotal; $i++) {
@@ -395,7 +571,6 @@ sub form_elements {
         $people{'person_'.$i.'_role'}      = 'selectbox',
         $people{'person_'.$i.'_sec'}       = 'selectbox',
         $people{'person_'.$i.'_newsec'}    = 'text',
-        $people{'person_'.$i.'_sections'}  = 'hidden',
     }
     my %personnelhash = (%{$elements{'new'}{'personnel'}},%people);
     %{$elements{'new'}{'personnel'}} = %personnelhash;
@@ -406,55 +581,18 @@ sub onload_action {
     my ($action,$state) = @_;
     my %loaditems;
     if (($action eq 'new') || ($action eq 'view')) {
-        $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)';
-    }
-    return \%loaditems;
-}
-
-sub check_can_request {
-    my ($dom,$can_request) = @_;
-    my $canreq = 0;
-    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')) {
-                $canreq ++;
-                if ($dom eq $env{'user.domain'}) {
-                    $can_request->{$type} = 1;
-                }
-            }
-            if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
-                my @curr = split(',',$env{'environment.reqcrsotherdom.'.$type});
-                if (@curr > 0) {
-                    $canreq ++;
-                    unless ($dom eq $env{'user.domain'}) {
-                        if (grep(/^\Q$dom\E$/,@curr)) {
-                            $can_request->{$type} = 1;
-                        }
-                    }
-                }
-            }
+        if ($state eq 'crstype') {
+            $loaditems{'onload'} = 'javascript:setAction(document.mainmenu_action);javascript:setType(document.mainmenu_coursetype)';
+        } else {
+            $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)';
         }
     }
-    return $canreq;
-}
-
-sub course_types {
-    my @types = ('official','unofficial','community');
-    my %typename = (
-                         official   => 'Official course',
-                         unofficial => 'Unofficial course',
-                         community  => 'Community',
-                    );
-    return (\@types,\%typename);
+    return \%loaditems;
 }
 
-
 sub print_main_menu {
     my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb) = @_;
-    my ($types,$typename) = &course_types();
+    my ($types,$typename) = &Apache::loncommon::course_types();
     my $onchange;
     unless ($env{'form.interface'} eq 'textual') {
         $onchange = 1;
@@ -476,14 +614,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();
     }
@@ -539,31 +679,30 @@ END
 END
 
     $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.
-              '<div>'.
-              '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
+             '<p>'.&mt('Request creation of a new course, or review your pending course requests.').'</p>'.
+             '<div>'.
               &Apache::lonhtmlcommon::start_pick_box().
-              &Apache::lonhtmlcommon::row_title('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')) {
@@ -572,30 +711,43 @@ END
             if ($type eq 'official') {
                 $selected = ' selected="selected"';
             }
-            $r->print('<option value="'.$type.'"'.$selected.'>'.$typename->{$type}.
+            $r->print('<option value="'.$type.'"'.$selected.'>'.&mt($typename->{$type}).
                       '</option>'."\n");
         }
     }
-    $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,$description,$invalidcrosslist,
+        $uname,$udom) = @_;
     my $js;
-    if (($action eq 'new') || ($action eq 'view')) {
+    if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) {
         $js =  <<END;
 
 function nextPage(formname,nextstate) {
     formname.state.value= nextstate;
     formname.submit();
 }
+
+END
+    }
+    if (($action eq 'new') || ($action eq 'view')) {
+        $js .= <<END;   
+
 function backPage(formname,prevstate) {
     formname.state.value = prevstate;
     formname.submit();
@@ -605,16 +757,136 @@ END
     }
     if ($action eq 'new') {
         my $jsextra;
-        unless (($state eq 'review') || ($state eq 'process')) {
+        if ($state eq 'courseinfo') {
             $jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);
+        } elsif ($state eq 'enrollment') {
+            if (($env{'form.crstype'} eq 'official') && 
+                (&Apache::lonnet::auto_run('',$dom))) {
+                $js .= "\n".&section_check_javascript()."\n".&enrollment_lcsec_js();
+            }
+        } elsif ($state eq 'personnel') {
+            $js .= "\n".&section_check_javascript()."\n".&personnel_lcsec_js();
         }
         $r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
-        &print_request_form($r,$action,$state,$page,$states,$dom);
+        &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
+                            $codechk,$checkedcode,$description,$invalidcrosslist);
     } elsif ($action eq 'view') {
-        $r->print(&header('Manage course requests',$js.$jscript,$loaditems).$crumb);
+        my $jsextra;
+        my $formname = 'requestcrs';
+        my $prev = $states->{$action}[$page-1];
+        my $next = $states->{$action}[$page+1];
         if ($state eq 'pick_request') {
-            $r->print(&print_request_status($dom));
+            $next = $states->{$action}[$page+1];
+            $jsextra = &viewrequest_javascript($formname,$next);
+        } elsif ($state eq 'details') {
+            $jsextra = &viewdetails_javascript($formname);
+
+        } elsif ($state eq 'cancel') {
+            $jsextra = &viewcancel_javascript($formname);
+        }
+        $r->print(&header('Manage course requests',$js.$jscript.$jsextra,$loaditems).
+                  $crumb);
+        my $form = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />';
+        if ($state eq 'pick_request') {
+            $r->print('<h3>'.&mt('Pending course requests').'</h3><div>'."\n".$form."\n".
+                      &print_request_status($dom).'</form></div>');
+        } elsif ($state eq 'details') {
+            my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
+            my $origcnum = $env{'form.cnum'};
+            if ($origcnum eq '') {
+                $origcnum = $env{'form.origcnum'};   
+            }
+            if ($env{'form.crstype'} eq 'official') {
+                &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+                                                         \%cat_order,\@code_order);
+            }
+            $r->print('<h3>'.&mt('Course Request Details').'</h3><div>'."\n".$form."\n".
+                      &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');
+            push(@excluded,'origcnum');
+            $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</div>');
+            my $other = 'modify';
+            my %navtxt = &Apache::lonlocal::texthash (
+                                                      prev => 'Back',
+                                                      other => 'Modify Request',
+                                                      next => 'Cancel Request',
+                                                     );
+            &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+                                $navtxt{'next'},$state,$other,$navtxt{'other'});
+            $r->print('</form>');
+        } elsif ($state eq 'cancel') {
+            my ($result,$output) = &print_cancel_request($dom,$env{'form.origcnum'});
+            $r->print('<h3>'.&mt('Cancel course request').'</h3><div>'."\n".$form."\n".
+                      $output);
+            my @excluded = &get_excluded_elements($dom,$states,'view','cancel');
+            $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</div>');
+            my %navtxt = &Apache::lonlocal::texthash (
+                                                      prev => 'Back',
+                                                      next => 'Confirm Cancellation',
+                                                     );
+            if ($result eq 'ok') {
+                &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+                                    $navtxt{'next'},$state);
+            } else {
+                &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},undef,
+                                    '',$state);
+            }
+            $r->print('</form>');
+        } elsif ($state eq 'removal') {
+            my $cnum = $env{'form.origcnum'};
+            my $statuskey = 'status:'.$dom.':'.$cnum;
+            my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey],
+                                                   $env{'user.domain'},$env{'user.name'});
+            my $currstatus = $userreqhash{$statuskey};
+            my ($result,$error); 
+            if (($currstatus eq 'approval') || ($currstatus eq 'pending')) { 
+                my %status = (
+                                 $statuskey => 'cancelled',
+                             );
+                my $statusresult = &Apache::lonnet::put('courserequests',\%status);
+                if ($statusresult eq 'ok') {
+                    my $delresult = 
+                        &Apache::lonnet::del_dom('courserequestqueue',
+                                                 [$cnum.'_'.$currstatus],$dom);
+                    if ($delresult eq 'ok') {
+                        $result = 'ok';
+                    } else {
+                        $error = &mt('An error occurred when updating the pending requests queue: [_1]',$delresult);
+                    }
+                } else {
+                    $error = &mt("An error occurred when updating the status of this request in the requestor's records: [_1]",$statusresult);
+                }
+            } else {
+                $error = &mt('The current status of this request could not be verified as pending approval/institutional action.');  
+            }
+            $r->print('<h3>'.&mt('Request Cancellation').'</h3><div>'."\n".$form."\n".
+                      '<input type="hidden" name="state" value="'.$state.'" />'."\n".
+                      '<input type="hidden" name="action" value="'.$action.'" />'."\n".
+                      '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
+                      '<input type="hidden" name="orignum" value="'.$cnum.'" />'."\n");
+            if ($result eq 'ok') {
+                $r->print(&mt('Your course request has been cancelled.'));
+            } else {
+                $r->print('<div class="LC_error">'.
+                          &mt('The request cancellation process was not complete.').
+                          '<br />'.$error.'</div>');
+            }
+            $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);
     }
@@ -622,8 +894,194 @@ END
     return;
 }
 
+sub enrollment_lcsec_js {
+    my %alerts = &section_check_alerts();
+    my $secname = $alerts{'badsec'};
+    my $secnone = $alerts{'reserved'};
+    my $output = '
+function validateEnrollSections(formname,nextstate) {
+    var badsectotal = 0;
+    var reservedtotal = 0;
+    var secTest = "";
+';
+    for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+        $output .= "
+    var selSec = 0;
+    for (var j=0; j<document.requestcrs.sec_".$i.".length; j++) {
+        if (document.requestcrs.sec_".$i."[j].checked) {
+            selSec = document.requestcrs.sec_".$i."[j].value;
+        }
+        if (selSec == 1) {
+            secTest = validsection(document.requestcrs.loncapasec_".$i.");
+            if (secTest == 'badsec') {
+                badsectotal++;
+            }
+            if (secTest == 'reserved') {
+                reservedtotal++;
+            }
+        }
+    }
+";
+    }
+    for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+        $output .= "
+    if (document.requestcrs.crosslist_".$i.".checked) {
+        secTest = validsection(document.requestcrs.crosslist_".$i."_lcsec);
+        if (secTest == 'badsec') {
+            badsectotal++;
+        }
+        if (secTest == 'reserved') {
+            reservedtotal++;
+        }
+    }
+";
+    }
+    $output .= "
+    if (badsectotal>0) {
+        alert('$secname');
+        return false;
+    }
+    if (reservedtotal>0) {
+        alert('$secnone');
+        return false;
+    }
+    formname.state.value= nextstate;
+    formname.submit();
+    return;
+}
+";
+    return $output;
+}
+
+sub personnel_lcsec_js {
+    my %alerts = &section_check_alerts();
+    my $secname = $alerts{'badsec'}.'\\n'.$alerts{'separate'};
+    my $secnone = $alerts{'reserved'};
+    my $output = '
+function validatePersonnelSections(formname,nextstate) {
+    var badsectotal = 0;
+    var reservedtotal = 0;
+    var secTest = "";
+';
+    for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+        $output .= "
+    if (document.requestcrs.person_".$i."_uname.value != '') {
+        secTest = validsection(document.requestcrs.person_".$i."_newsec,'1');
+        if (secTest == 'badsec') {
+            badsectotal++; 
+        }
+        if (secTest == 'reserved') {
+            reservedtotal++;
+        }
+    }
+";
+    }
+    $output .= "
+    if (badsectotal > 0) {
+        alert('$secname');
+        return false;
+    } else {
+        if (reservedtotal > 0) {
+            alert('$secnone');
+            return false;
+        }
+    }
+    formname.state.value = nextstate;
+    formname.submit();
+    return;
+}
+";
+    return $output;
+}
+
+sub section_check_alerts {
+    my %lt = 
+        &Apache::lonlocal::texthash(
+            reserved => "You need to change one or more LON-CAPA section names - none is a reserved word in the system, and may not be used.",
+            badsec => 'You need to change one or more LON-CAPA section names - names may only contain letters or numbers.',
+            separate => 'Separate multiple sections with a comma.'
+        );
+    return %lt;
+}
+
+sub section_check_javascript {
+    return <<"END";
+function validsection(field,mult) {
+    var str = field.value;
+    var badsec=0;
+    var reserved=0;
+    if (window.RegExp) {
+        var badsecnum=0;
+        var reservednum=0;
+        var pattern=/[^a-zA-Z0-9]/; 
+        str = str.replace(/(^\\s*)|(\\s*\$)/gi,"");
+        str = str.replace(/[ ]{2,}/gi," ");
+        if (mult == '1') {
+            var sections = new Array();
+            sections = str.split(/\\s*[\\s,;:]\\s*/);
+            var i;
+            for (i=0; i<sections.length; i++) {
+                if ((sections[i] != '') && (sections[i] != undefined) && (sections[i] != null)) {
+                    if (pattern.test(sections[i])) {
+                        badsecnum++;
+                    } else {
+                        if (sections[i] == 'none') {
+                            reservednum++;
+                        }
+                    }
+                }
+            }
+        } else {
+            if ((str != '') && (str != undefined) && (str != null)) {
+                if (pattern.test(str)) {
+                    badsecnum++;
+                } else {
+                    if (str == 'none') {
+                        reservednum++;
+                    }
+                }
+            }
+        }
+        if (badsecnum > 0) {
+            return 'badsec';
+        }
+        if (reservednum > 0) {
+            return 'reserved';
+        }
+    }
+    return;
+}
+END
+}
+
+sub close_popup_form {
+    my $close= &mt('Close Window');
+    return << "END";
+<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,
+        $description,$invalidcrosslist) = @_;
     my $formname = 'requestcrs';
     my ($next,$prev,$message,$output,$codepicker,$crstype);
     $prev = $states->{$action}[$page-1];
@@ -633,45 +1091,29 @@ sub print_request_form {
                                                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);
+    $r->print('<br /><form name="'.$formname.'" method="post" action="/adm/requestcourse">');
+    my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk,
+        @disallowed);
     if ($crstype eq 'official') {
         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 'ok') {
-                    $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);
@@ -686,39 +1128,219 @@ sub print_request_form {
             $codepicker = &coursecode_form($dom,'instcode',\@codetitles,
                                            \%cat_titles,\%cat_order);
             if ($codepicker) {
-                $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box().$codepicker.
+                $r->print(&mt('Specify the course to be created.').
+                          '<div>'.&Apache::lonhtmlcommon::start_pick_box().
+                          $codepicker.
                           &Apache::lonhtmlcommon::end_pick_box().'</div>');
             } else {
-                $r->print(&courseinfo_form($dom,$formname,$crstype));
+                $next = $states->{$action}[$page+2];
+                $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
             }
         } else {
-            $r->print(&courseinfo_form($dom,$formname,$crstype));
+            if ($crstype eq 'official') {
+                $next = $states->{$action}[$page+2];
+            }
+            $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
         }
     } elsif ($prev eq 'codepick') {
-        $r->print(&courseinfo_form($dom,$formname,$crstype));
+        if ($instcode eq '') {
+            $prev = $states->{$action}[$page-2];
+        }
+        $r->print(&courseinfo_form($dom,$formname,$crstype,$next,$description));
     } 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));
+                                         \%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 (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg);
+        my $now = time;
+        for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+            my $personname = $env{'form.person_'.$i.'_uname'};
+            my $persondom = $env{'form.person_'.$i.'_dom'};
+            if (($personname =~ /^$match_username$/) && 
+                ($persondom =~ /^$match_domain$/)) {
+                if (&Apache::lonnet::domain($persondom)) {
+                    my $personhome = 
+                        &Apache::lonnet::homeserver($personname,$persondom);
+                    if ($personhome eq 'no_host') {
+                        if ($persondom ne $dom) {
+                            my $skipuser = 1;
+                            if ($env{'user.role.dc./'.$persondom.'/'}) {
+                                my ($start,$end) = split('.',$env{'user.role.dc./'.$persondom.'/'});
+                                if (((!$start) || ($start < $now)) && 
+                                    ((!$end) || ($end > $now))) {
+                                    $skipuser = 0;
+                                }
+                            }
+                            if ($skipuser) {
+                                push(@disallowed,$i);
+                                $disallowmsg{$i} = &mt('[_1] was excluded because new users need be from the course domain','<tt>'.$personname.':'.$persondom.'</tt>');
+                                next;
+                            }
+                        }
+                        if (&get_cancreate_status($persondom,$personname,$dom)) {
+                            my ($allowed,$msg) = 
+                                &check_newuser_rules($persondom,$personname,
+                                    \%alerts,\%rulematch,\%inst_results,
+                                    \%curr_rules,\%got_rules);
+                            if ($allowed) {
+                                if (ref($inst_results{$personname.':'.$persondom}) eq 'HASH') {
+                                    if ($inst_results{$personname.':'.$persondom}{'lastname'} ne '') {
+                                        $env{'form.person_'.$i.'_lastname'} = $inst_results{$personname.':'.$persondom}{'lastname'};
+                                    }
+                                    if ($inst_results{$personname.':'.$persondom}{'firstname'} ne '') {
+                                        $env{'form.person_'.$i.'_firstname'} = $inst_results{$personname.':'.$persondom}{'firstname'};
+                                    }
+                                    if ($inst_results{$personname.':'.$persondom}{'permanentemail'} ne '') {
+                                        $env{'form.person_'.$i.'_emailaddr'} = $inst_results{$personname.':'.$persondom}{'permanentemail'};
+                                    }
+                                }
+                            } else {
+                                push(@disallowed,$i);
+                                $disallowmsg{$i} = &mt('[_1] was excluded because the username violated format rules for the domain','<tt>'.$personname.':'.$persondom.'</tt>');  
+                            }
+                        } else {
+                            push(@disallowed,$i);
+                            $disallowmsg{$i} = &mt('[_1] was excluded because you may not request new users in the domain','<tt>'.$personname.':'.$persondom.'</tt>');
+                        }
+                    } else {
+                        my %userenv = 
+                            &Apache::lonnet::userenvironment($persondom,$personname,'lastname','firstname','permanentemail');
+                        if ($env{'form.person_'.$i.'_lastname'} eq '') {
+                            $env{'form.person_'.$i.'_lastname'} = $userenv{'lastname'};
+                        }
+                        if ($env{'form.person_'.$i.'_firstname'} eq '') {
+                            $env{'form.person_'.$i.'_firstname'} = $userenv{'firstname'};
+                        }
+                        if ($env{'form.person_'.$i.'_emailaddr'} eq '') {
+                            $env{'form.person_'.$i.'_emailaddr'} = $userenv{'permanentemail'};
+                        }
+                    }
+                } elsif ($personname ne '') {
+                    push(@disallowed,$i);
+                    $disallowmsg{$i} = &mt('[_1] was excluded because the domain is invalid','<tt>'.$personname.':'.$persondom.'</tt>');
+                }
+            } elsif ($personname ne '') {
+                push(@disallowed,$i);
+                $disallowmsg{$i} = &mt('[_1] was excluded because the username or domain is invalid.','<tt>'.$personname.':'.$persondom.'</tt>');
+            }
+        }
+        my $cnum;
+        if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {
+            $cnum = $env{'form.origcnum'};
+        } else {
+            $cnum = &Apache::lonnet::generate_coursenum($dom);
+        }
         &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));
+        $r->print('<h3>'.&mt('Review course request details before submission').'</h3>'.
+                  &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg).
+                  '<input type="hidden" name="cnum" value="'.$cnum.'" />');
         $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 ($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 'review') {
+        if (@disallowed > 0) {
+            my @items = qw(uname dom lastname firstname emailaddr hidedom role newsec);
+            my @currsecs = &current_lc_sections();
+            if (@currsecs) {
+                push(@items,'sec');
+            }
+            my $count = 0;
+            for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+                unless ($env{'form.person_'.$i.'_uname'} eq '') {
+                    if (grep(/^$i$/,@disallowed)) {
+                        foreach my $item (@items) {
+                            $env{'form.person_'.$i.'_'.$item} = '';
+                        }
+                    } else { 
+                        foreach my $item (@items) {
+                            $env{'form.person_'.$count.'_'.$item} = $env{'form.person_'.$i.'_'.$item};
+                        }
+                    }
+                }
+                $count ++;
+            }
+            $env{'form.persontotal'} = $count;
+             
+        }
+    }
+    if ($state eq 'enrollment') {
+        push(@excluded,'crosslisttotal');
+    }
+    $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
+    &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+                        $navtxt{'next'},$state);
+    return;
+}
+
+sub get_cancreate_status {
+    my ($persondom,$personname,$dom) = @_;
+    my ($rules,$ruleorder) =
+        &Apache::lonnet::inst_userrules($persondom,'username');
+    my $usertype = &Apache::lonuserutils::check_usertype($persondom,$personname,
+                                                         $rules);
+    return &Apache::lonuserutils::can_create_user($dom,'requestcrs',$usertype);
+}
+
+sub check_newuser_rules {
+    my ($persondom,$personname,$alerts,$rulematch,$inst_results,$curr_rules,
+        $got_rules) = @_;
+    my $allowed = 1;
+    my $newuser = 1;
+    my ($checkhash,$userchkmsg);
+    my $checks = { 'username' => 1 };
+    $checkhash->{$personname.':'.$persondom} = { 'newuser' => $newuser };
+    &Apache::loncommon::user_rule_check($checkhash,$checks,$alerts,$rulematch,
+                                        $inst_results,$curr_rules,$got_rules);
+    if (ref($alerts->{'username'}) eq 'HASH') {
+        if (ref($alerts->{'username'}{$persondom}) eq 'HASH') {
+            my $domdesc =
+                &Apache::lonnet::domain($persondom,'description');
+            if ($alerts->{'username'}{$persondom}{$personname}) {
+                if (ref($curr_rules->{$persondom}) eq 'HASH') {
+                    $userchkmsg =
+                        &Apache::loncommon::instrule_disallow_msg('username',
+                                                                  $domdesc,1).
+                        &Apache::loncommon::user_rule_formats($persondom,
+                            $domdesc,$curr_rules->{$persondom}{'username'},
+                            'username');
+                }
+                $allowed = 0;
+            }
+        }
+    }
+    return ($allowed,$userchkmsg);
+}
+
+sub get_excluded_elements {
+    my ($dom,$states,$action,$state) = @_;
     my @excluded = ('counter');
     my %elements = &form_elements($dom);
     if (ref($states) eq 'HASH') {
@@ -729,7 +1351,7 @@ sub print_request_form {
                 for (my $i=$numitems-1; $i>=0; $i--) {
                     if (ref($elements{$action}) eq 'HASH') {
                         if (ref($elements{$action}{$items[$i]}) eq 'HASH') {
-                            foreach my $key (keys(%{$elements{$action}{$items[$i]}})) { 
+                            foreach my $key (keys(%{$elements{$action}{$items[$i]}})) {
                                 push(@excluded,$key);
                             }
                         }
@@ -742,20 +1364,19 @@ sub print_request_form {
     if (grep(/^instcode_/,@excluded)) {
         push(@excluded,'instcode');
     }
-    $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
-    &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'});
-    return;
+    return @excluded;
 }
 
 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,$hasauto);
     my $starttime = time;
     my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
 
     my %accesstitles = (
                           'start' => 'Default start access',
-                           'end'   => 'Default end accss',
+                           'end'   => 'Default end access',
                        );
     my %enrolltitles = (
                            'start' => 'Start auto-enrollment',
@@ -763,10 +1384,18 @@ 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>'.&Apache::loncommon::help_open_topic('Course_Request_Sections').
+                            '&nbsp;'.&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'}) {
@@ -782,66 +1411,105 @@ 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";
-            }
-            $autoenroll_form = 
-                &Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')).
+                   "'".');" />'.&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;
+            }
+            $hasauto = 1;
+            $autoenroll = 
+                &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autoadd').'&nbsp;'.&mt('Add registered students automatically')).
                 '<span class="LC_nobreak"><label>'.
                 '<input type="radio" name="autoadds" value="1">'.
                 &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
                 '<input type="radio" name="autoadds" value="0" checked="checked">'.
                 &mt('No').'</label></span>'.
-                &Apache::lonhtmlcommon::row_closure().
-                &Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')).
+                &Apache::lonhtmlcommon::row_closure(1).
+                &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autodrop').'&nbsp;'.&mt('Drop unregistered students automatically')).
                 '<span class="LC_nobreak"><label>'.
                 '<input type="radio" name="autodrops" value="1">'.
                 &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
                 '<input type="radio" name="autodrops" value="0" checked="checked">'.
                 &mt('No').'</label></span>'. 
-                &Apache::lonhtmlcommon::row_closure().
-                &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";
+                &Apache::lonhtmlcommon::row_closure(1).
+                &date_setting_table($starttime,$endtime,$formname,'enroll',
+                                    $hasauto,%enrolltitles);
+        }
+    }
+    my $access_dates = 
+        &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
+                            %accesstitles);
+    $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 '<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 />';
         }
     }
-    my $access_dates_form = 
-        &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";
-    }
-    return $sections.$autoenroll.$access_dates;
+    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>'.
+                    '<th>'.&Apache::loncommon::help_open_topic('Course_Request_LCSection').
+                          '&nbsp;'.&mt('LON-CAPA section').'</th>'.
                     &Apache::loncommon::end_data_table_row();
         for (my $i=0; $i<@sections; $i++) {
             my $colflag = $i%2;
+            my $secon = ' checked="checked"';
+            my $secoff = '';
+            if ($env{'form.origcnum'}) {
+                $secoff = $secon;
+                $secon='';
+            }
             $output .= &Apache::loncommon::start_data_table_row().
-                       '<td><input type="checkbox" name="sec_'.$i.
-                       '" checked="checked" /></td>'.
-                       '<td>'.$sections[$i].
+                       '<td><label><input type="radio" name="sec_'.$i.
+                       '"'.$secon.' value="1" />'.&mt('Yes').'</label>'.
+                       ('&nbsp;'x2).'<label><input type="radio" name="sec_'.$i.
+                        '"'.$secoff.' value="0" />'.&mt('No').'</label></td>'.
+                       '<td align="center">'.$sections[$i].
                        '<input type="hidden" name="secnum_'.$i.'" value="'.
                        $sections[$i].'" /></td>'.
                        '<td><input type="text" size="10" name="loncapasec_'.$i.
@@ -855,37 +1523,60 @@ sub inst_section_selector {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime,$formname,$suffix,%datetitles) = @_;
+    my ($starttime,$endtime,$formname,$prefix,$hasauto,%datetitles) = @_;
     my ($perpetual,$table);
-    my $startform = &Apache::lonhtmlcommon::date_setter($formname,'start'.$suffix,
+    my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
                                                         $starttime,'','','',1,'','','',1);
-    my $endform = &Apache::lonhtmlcommon::date_setter($formname,'end'.$suffix,
+    my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
                                                       $endtime,'','','',1,'','','',1);
-    if ($suffix eq 'access') {
+    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';
+    }
+
+    my %help_item = (
+                      access => {
+                                  start => 'Course_Request_Access_Start', 
+                                  end   => 'Course_Request_Access_End',
+                                },
+                      enroll => {
+                                  start => 'Course_Request_Enroll_Start',
+                                  end   => 'Course_Request_Enroll_End',
+                                },
+                     );
+    if ($hasauto) {
+        $help_item{'access'}{'start'} = 'Course_Request_RegAccess_Start';
+        $help_item{'access'}{'end'}   = 'Course_Request_RegAccess_End';
     }
-    $table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}).
-             $startform.
-             &Apache::lonhtmlcommon::row_closure().
-             &Apache::lonhtmlcommon::row_title($datetitles{'end'}).
-             $endform.$perpetual.
-             &Apache::lonhtmlcommon::row_closure(1);
+
+    $table = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'start'}).
+             '&nbsp;'.$datetitles{'start'}).$startform.
+             &Apache::lonhtmlcommon::row_closure(1).
+             &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'end'}).
+             '&nbsp;'.$datetitles{'end'}).$endform.$perpetual.
+             &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)) {
+    if ((!defined($persontotal)) || (!$persontotal)) {
         $persontotal = 1;
     }
     if ($env{'form.addperson'}) {
         $persontotal ++;
     }
-    my $userlinktxt = &mt('Set User');
     my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom');
 
     my $roleoptions;
@@ -895,29 +1586,18 @@ sub print_personnel_menu {
         $type = 'Community';
     }
     foreach my $role (@roles) {
-        my $plrole=&Apache::lonnet::plaintext($role,$type);
+        my $plrole = &Apache::lonnet::plaintext($role,$type);
         $roleoptions .= '  <option value="'.$role.'">'.$plrole.'</option>'."\n";
     }
     my %customroles=&Apache::lonuserutils::my_custom_roles();
     if (keys(%customroles) > 0) {
         foreach my $cust (sort(keys(%customroles))) {
-            my $custrole='cr_cr_'.$env{'user.domain'}.
-                    '_'.$env{'user.name'}.'_'.$cust;
+            my $custrole="cr/$env{'user.domain'}/$env{'user.name'}/$cust";
             $roleoptions .= '  <option value="'.$custrole.'">'.$cust.'</option>'."\n";
         }
     }
 
-    my @currsecs;
-    if ($env{'form.sectotal'}) {
-        for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
-            if (defined($env{'form.loncapasec_'.$i})) {
-                my $lcsec = $env{'form.loncapasec_'.$i};
-                unless (grep(/^\Q$lcsec\E$/,@currsecs)) {
-                    push(@currsecs,$lcsec);
-                }
-            }
-        }
-    }
+    my @currsecs = &current_lc_sections();
 
     my ($existtitle,$existops,$existmult,$newtitle,$seccolspan);
     if (@currsecs) {
@@ -938,19 +1618,24 @@ sub print_personnel_menu {
         $newtitle = &mt('Other').':&nbsp;';
     }
 
+    if ($persontotal) {
+        my %lt = &Apache::lonlocal::texthash(
+            community => 'Requestor is automatically assigned Coordinator role.',
+            official => 'Requestor is automatically assigned Course Coordinator role.',
+        );
+        $lt{'unofficial'} = $lt{'official'};
+        $output .= &Apache::lonhtmlcommon::row_headline().
+                  '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').'&nbsp;'.$lt{$crstype}.' '.&mt('Include other personnel?').'</h3>';
+    }
     for (my $i=0; $i<$persontotal; $i++) { 
         my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
         my $linkargstr = join("','",@linkargs);
-        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','$dom'".');" />';
+        my $uname_form = '<input type="text" name="person_'.$i.'_uname" value="" size="20" />';
         my $onchange = 'javascript:fix_domain('."'$formname','person_".$i."_dom',".
-                       "'person_".$i."_hidedom'".');'.
-                       'openuserbrowser('."'$formname','$linkargstr','$dom'".');';
+                       "'person_".$i."_hidedom','person_".$i."_uname'".');';
         my $udom_form = &Apache::loncommon::select_dom_form($dom,'person_'.$i.'_dom','',
                                                             1,$onchange).
-                        '<input type="hidden" name="person_'.$i.'_hidedom" value="'.$dom.'" />';
+                        '<input type="hidden" name="person_'.$i.'_hidedom" value="" />';
         my %form_elems;
         foreach my $item (@items) {
             next if (($item eq 'dom') || ($item eq 'uname') || ($item eq 'hidedom'));
@@ -965,20 +1650,26 @@ sub print_personnel_menu {
                                $existmult.'>'."\n".$existops.'</select>'.('&nbsp;' x3);
         }
         $sectionselector .= $newtitle.
-            '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'.
-            '<input type="hidden" name="person_'.$i.'_sections" value="" />'."\n";
-         
+            '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'."\n";
+        my $usersrchlinktxt = &mt('Search for user');
+        my $usersrchlink =  &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
+                            $usersrchlinktxt);
+        my $userchklinktxt = &mt('Check username');
+        my $userchklink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
+                            $userchklinktxt,'checkusername');
         $output .= 
-            &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel').'<br />'.
-                                              '<span class="LC_nobreak">'.$userlink.
-                                              '</span>').
-            '<table><tr><td align="center" valign="top">'.&mt('Username').'<br />'.$uname_form.'</td>'."\n".
-            '<td align="center" valign="top" colspan="2">'.&mt('Domain').'<br />'.$udom_form.'</td></tr><tr>'."\n".
+            &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel')).
+            '<table><tr><td align="center" valign="middle"><b>'.$usersrchlink.'</b></td>'."\n".
+            '<td align="left" valign="top" colspan="2"><span class="LC_nobreak">'.
+            &mt('Username').':&nbsp;'.$uname_form.'&nbsp;'.$userchklink.'</span><br />'."\n".
+            '<span class="LC_nobreak">'.&mt('Domain').':&nbsp;'.$udom_form.'</span></td>'.
+            '</tr>'."\n".'<tr>'.
             '<td align="center" valign="top">'.&mt('First Name').'<br />'.$form_elems{'firstname'}.'</td>'."\n".
             '<td align="center" valign="top">'.&mt('Last Name').'<br />'.$form_elems{'lastname'}.'</td>'."\n".
             '<td align="center" valign="top">'.&mt('E-mail').'<br />'.$form_elems{'emailaddr'}.'</td></tr>'."\n".
-            '<tr><td align="center" valign="top">'.&mt('Role').'<br />'.$roleselector.'</td>'."\n".
-            '<td'.$seccolspan.' align="center" valign="top">'.&mt('Section(s)').'<br />'.$sectionselector.'</td>'."\n".
+            '<tr><td align="center" valign="top">'.&Apache::loncommon::help_open_topic('Course_Roles').'&nbsp;'.&mt('Role').'<br />'.$roleselector.'</td>'."\n".
+            '<td'.$seccolspan.' align="center" valign="top">'.
+            &Apache::loncommon::help_open_topic('Course_Request_Rolesection').'&nbsp;'.&mt('LON-CAPA Section(s)').'<br />'.$sectionselector.'</td>'."\n".
             '</tr></table>'.&Apache::lonhtmlcommon::row_closure();
     }
     $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another?')).
@@ -986,58 +1677,88 @@ sub print_personnel_menu {
                '<input name="addperson" type="checkbox" value="'.$persontotal.'"'.
                ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
                "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1).
-               &Apache::lonhtmlcommon::end_pick_box().'</div>';
+               &Apache::lonhtmlcommon::end_pick_box().'</div>'.
+               '<p>'.&mt('You may also add users later, once the course has been created, by using the "Manage course users" link, accessible from the "Main Menu".').'</p>';
     return $output;
 }
 
+sub current_lc_sections {
+    my @currsecs;
+    if ($env{'form.sectotal'}) {
+        for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+            if ($env{'form.sec_'.$i}) { 
+                if (defined($env{'form.loncapasec_'.$i})) {
+                    my $lcsec = $env{'form.loncapasec_'.$i};
+                    unless (grep(/^\Q$lcsec\E$/,@currsecs)) {
+                        push(@currsecs,$lcsec);
+                    }
+                }
+            }
+        }
+    }
+    return @currsecs;
+}
+
 sub print_request_status {
     my ($dom) = @_;
-    my %requests = &Apache::lonnet::dumpstore('courserequests',$env{'user.domain'},
-                                              $env{'user.name'});
+    my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
+                                           $env{'user.name'},'^status:'.$dom);
     my ($output,$formname,%queue_by_date);
-    foreach my $key (keys(%requests)) {
-        if (ref($requests{$key}) eq 'HASH') {
-            my ($cdom,$cnum) = split('_',$key);
-            next if ($cdom ne $dom);
-            my $entry;
-            my $timestamp = $requests{$key}{'timestamp'};
-            my $crstype = $requests{$key}{'crstype'};
-            my $status = $requests{$key}{'status'};
-            next unless (($env{'form.crstype'} eq 'all') || 
-                         ($env{'form.crstype'} eq $crstype));
-            next unless (($status eq 'approval') || ($status eq 'pending'));
-            if (ref($requests{$key}{'details'}) eq 'HASH') {
-                $entry = $key.':'.$crstype.':'.$requests{$key}{'details'}{'cdescr'};
-                if ($crstype eq 'official') {
-                    $entry .= ':'.$requests{$key}{'details'}{'instcode'}; 
-                }
-            }
-            if ($entry ne '') {
-                if (exists($queue_by_date{$timestamp})) {
-                    if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
-                        push(@{$queue_by_date{$timestamp}},$entry);
+    my ($types,$typenames) = &Apache::loncommon::course_types();
+    foreach my $key (keys(%statusinfo)) {
+        if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) { 
+            (undef,my($cdom,$cnum)) = split(':',$key);
+            next if ($cdom ne $dom);   
+            my $requestkey = $cdom.'_'.$cnum;
+            if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+                my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+                                                       $env{'user.domain'},$env{'user.name'});
+                my $entry;
+                my $timestamp = $history{'reqtime'};
+                my $crstype = $history{'crstype'};
+                my $disposition = $history{'disposition'};
+                next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
+                next unless (($env{'form.crstype'} eq 'any') || 
+                            ($env{'form.crstype'} eq $crstype));
+                next unless (($disposition eq 'approval') || 
+                             ($disposition eq 'pending'));
+                if (ref($history{'details'}) eq 'HASH') {
+                    $entry = $requestkey.':'.$crstype.':'.
+                             &escape($history{'details'}{'cdescr'});
+                    if ($crstype eq 'official') {
+                        $entry .= ':'.&escape($history{'details'}{'instcode'}); 
+                    }
+                }
+                if ($entry ne '') {
+                    if (exists($queue_by_date{$timestamp})) {
+                        if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
+                            push(@{$queue_by_date{$timestamp}},$entry);
+                        }
+                    } else {
+                        @{$queue_by_date{$timestamp}} = ($entry);
                     }
-                } else {
-                    @{$queue_by_date{$timestamp}} = ($entry);
                 }
             }
         }
     }
     $formname = 'requestcrs';
     my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
-    $output = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />'."\n".
-              '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+    $output = '<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";
+              '<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n".
+              '<input type="hidden" name="showdom" value="" />'."\n".
+              '<input type="hidden" name="cnum" value="" />'."\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') {
+                   '<th>'.&mt('Course Description').'</th>'.
+                   '<th>'.&mt('Domain').'</th>';
+        if ($env{'form.crstype'} eq 'any') {
             $output .= '<th>'.&mt('Type').'</th>';
         }
-        if (($env{'form.crstype'} eq 'all') || ($env{'form.crstype'} eq 'official')) {
+        if (($env{'form.crstype'} eq 'any') || ($env{'form.crstype'} eq 'official')) {
             $output .= '<th>'.&mt('Institutional Code').'</th>';
         }
         $output .= '<th>'.&mt('Date requested').'</th>'.
@@ -1050,14 +1771,28 @@ sub print_request_status {
                     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>';
+     '<td><input type="button" value="'.&mt('Select').'" onclick="javascript:chooseRequest('."'$cdom','$cnum'".')" /></td>'.
+     '<td>'.&unescape($desc).'</td>'.
+     '<td>'.$cdom.'</td>';
+                    if ($env{'form.crstype'} eq 'any') {
+                        my $typename;
+                        if (ref($typenames) eq 'HASH') {
+                            $typename = &mt($typenames->{$type});
+                        }
+                        if ($typename eq '') {
+                            $typename = &mt('Unknown type');
+                        }
+                        $output .= '<td>'.$typename.'</td>';
                     }
-                    if (($env{'form.crstype'} eq 'all') || 
+                    if (($env{'form.crstype'} eq 'any') || 
                         ($env{'form.crstype'} eq 'official')) {
-                        $output .= '<td>'.$instcode.'</td>';
+                        my $showinstcode;
+                        if ($type eq 'official') {
+                            $showinstcode = &unescape($instcode);
+                        } else {
+                            $showinstcode = &mt('Not applicable');
+                        }
+                        $output .= '<td>'.$showinstcode.'</td>';
                     }
                     $output .= '<td>'.$showtime.'</td>'.
                                &Apache::loncommon::end_data_table_row();
@@ -1069,24 +1804,123 @@ sub print_request_status {
         $output .= '<div>'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
     }
     $output .= '
-<input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
-</form>';
+<br /><input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />';
     return $output;
 }
 
+sub print_cancel_request {
+    my ($dom,$cnum) = @_;
+    my $requestkey = $dom.'_'.$cnum;
+    my ($result,$output);
+    if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+        my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+                                               $env{'user.domain'},$env{'user.name'});
+        my $timestamp = $history{'reqtime'};
+        my $crstype = $history{'crstype'};
+        my $status = $history{'status'};
+        if (($status eq 'cancelled') || ($status eq 'created')) { 
+            if ($status eq 'cancelled') {
+                $output = &mt('This request has already been cancelled.');
+            } elsif ($status eq 'created') {
+                $output = &mt('This request has already been processed, and a course created.');
+            }
+            $output = &mt('No further action will be taken');
+        } elsif (ref($history{'details'}) eq 'HASH') {
+            my ($types,$typename) = &Apache::loncommon::course_types();
+            my $showtype = $crstype;
+            if (defined($typename->{$crstype})) {
+                $showtype = $typename->{$crstype}; 
+            }
+            $output = '<p>'.&Apache::loncommon::start_data_table().
+                      &Apache::loncommon::start_data_table_header_row().
+                      '<th>'.&mt('Description').'</th><th>'.&mt('Requested').'</th>'.
+                      '<th>'.&mt('Type').'</th>'.
+                      &Apache::loncommon::end_data_table_header_row().
+                      &Apache::loncommon::start_data_table_row().
+                      '<td>'.$history{details}{'cdescr'}.'</td><td>'.
+                      &Apache::lonlocal::locallocaltime($timestamp).'</td>'.
+                      '<td>'.$showtype.'</td>'.
+                      &Apache::loncommon::end_data_table_row().
+                      &Apache::loncommon::end_data_table().
+                      '<br /><div class="LC_warning">'.
+                      &mt('Cancelling the request will remove it from the queue of pending course requests').'</div>';
+            $result = 'ok';
+        } else {
+            $output = '<div class="LC_error">'.&mt('No record exists for the course ID').'</div>';
+        }
+    } else {
+        $output = '<div class="LC_error">'.&mt('Invalid course ID').'</div>';
+    }
+    return ($result,$output);
+}
+
+sub viewrequest_javascript {
+    my ($formname,$next) = @_;
+    return <<"ENDJS";
+
+function chooseRequest(cdom,cnum) {
+    document.$formname.showdom.value = cdom;
+    document.$formname.cnum.value = cnum;
+    nextPage(document.$formname,'$next');
+}
+
+ENDJS
+}
+
+sub viewdetails_javascript {
+    my ($formname) = @_;
+    return << "ENDJS";
+
+function nextPage(formname,nextstate) {
+    if (nextstate == "modify") { 
+        formname.state.value = "personnel";
+        formname.action.value = "new";
+    } else {
+        formname.state.value = nextstate;
+    }
+    formname.submit();
+}
+
+function backPage(formname,prevstate) {
+    formname.state.value = prevstate;
+    formname.submit();
+}
+
+ENDJS
+}
+
+sub viewcancel_javascript {
+    my $alert = &mt('Are you sure you want to cancel this request?\\n'.
+                    'Your request will be removed.');
+    return << "ENDJS";
+function nextPage(formname,nextstate) {
+    if (confirm('$alert')) {
+        formname.state.value = nextstate;
+        formname.submit();
+    }
+    return;
+}
+
+ENDJS
+}
+
 sub print_request_logs {
     my ($jscript,$loaditems,$crumb) = @_;
     return;
 }
 
 sub print_review {
-    my ($formname,$dom,$codetitles,$cat_titles,$cat_order,$code_order) = @_;
-    my ($types,$typename) = &course_types();
+    my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom,
+        $disallowed,$disallowmsg) = @_;
+    my ($types,$typename) = &Apache::loncommon::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 '');
@@ -1097,13 +1931,19 @@ sub print_review {
     $crstypename = $env{'form.crstype'};
     if (ref($typename) eq 'HASH') {
         unless ($typename->{$env{'form.crstype'}} eq '') {
-            $crstypename = $typename->{$env{'form.crstype'}};
+            $crstypename = &mt($typename->{$env{'form.crstype'}});
         }
     }
+    my $category = 'Course';
+    if ($env{'form.crstype'} eq 'community') {
+        $category = 'Community';
+    }
 
     $inst_headers = '<th>'.&mt('Description').'</th><th>'.&mt('Type').'</th>';
     $inst_values = '<td>'.$env{'form.cdescr'}.'</td><td>'.$crstypename.'</td>';
 
+    my $enrollrow_title = &mt('Default Access Dates').'<br />'.
+                          '('.&Apache::lonnet::plaintext('st',$category).')';
     if ($env{'form.crstype'} eq 'official') {
         if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH')) {
             foreach my $title (@{$codetitles}) {
@@ -1120,6 +1960,7 @@ sub print_review {
             }
         }
         if (&Apache::lonnet::auto_run('',$dom)) {
+            $enrollrow_title = &mt('Enrollment');
             $enroll_headers = '<th>'.&mt('Automatic Adds').'</th>'.
                               '<th>'.&mt('Automatic Drops').'</th>'.
                               '<th>'.&mt('Enrollment Starts').'</th>'.
@@ -1158,65 +1999,70 @@ 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();
     $inst_headers .= '<th>'.&mt('Clone From').'</th>';
     if (($env{'form.clonecrs'} =~ /^$match_name$/) && 
         ($env{'form.clonedom'} =~ /^$match_domain$/)) {
-        my %coursehash = 
-            &Apache::lonnet::courseiddump($env{'form.clonedom'},'.',1,'.','.',
-                                          $env{'form.clonecrs'},undef,undef,'.');
-        my $cloneid = $env{'form.clonedom'}.'_'.$env{'form.clonecrs'};
-        if (ref($coursehash{$cloneid}) eq 'HASH') {
-            $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
-            my $clonedesc = $coursehash{$cloneid}{'description'};
-            my $cloneinst = $coursehash{$cloneid}{'inst_code'};
-
-            $inst_values .= '<td>'.$clonedesc.'&nbsp;';
-            if ($cloneinst ne '') {
-                $inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedom'}); 
-            } else {
-                $inst_values .= &mt('(from [_1])',$env{'form.clonedom'});
-            }
-            $inst_values .= '</td><td>';
-            if ($env{'form.datemode'} eq 'preserve') {
-                $inst_values .= $ctxt{'pcd'}; 
-            } elsif ($env{'form.datemode'} eq 'shift') {
-                $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
-            } else {
-                $inst_values .= $ctxt{'ncd'};
-            }
-            $inst_values .= '</td>';
-        } else {
-            $inst_values .= '<td>'.&mt('Unknown').'</td>';
-        }
+        my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+                           $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
+        if ($canclone) {
+            my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
+                              $env{'form.clonecrs'},('description','internal.coursecode'));
+            if (keys(%courseenv) > 0) {
+                $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
+                $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
+                my $cloneinst = $courseenv{'internal.coursecode'};
+                if ($cloneinst ne '') {
+                    $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
+                } else {
+                    $inst_values .= &mt('from').' '.$env{'form.clonedom'};
+                }
+                $inst_values .= '</td><td>';
+                if ($env{'form.datemode'} eq 'preserve') {
+                    $inst_values .= $ctxt{'prd'}; 
+                } elsif ($env{'form.datemode'} eq 'shift') {
+                    $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
+                } else {
+                    $inst_values .= $ctxt{'ncd'};
+                }
+                $inst_values .= '</td>';
+             } else {
+                 $inst_values .= '<td>'.&mt('Unknown').'</td>';
+             }
+         } else {
+             $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
+         }
     } else {
         $inst_values .= '<td>'.&mt('None').'</td>';
     }
@@ -1243,18 +2089,65 @@ sub print_review {
                          '<td>'.&mt('None').'</td></tr>';
     for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
         if ($env{'form.person_'.$i.'_uname'} ne '') {
+            if (ref($disallowed) eq 'ARRAY') {
+                next if (grep(/^$i$/,@{$disallowed}));
+            } 
+            my @officialsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+            my @allsecs;
+            foreach my $sec (@officialsecs) {
+                next unless ($sec =~ /\w/);
+                next if ($sec =~ /\W/);
+                next if ($sec eq 'none');
+                push(@allsecs,$sec);
+            }
+            my $newsec = $env{'form.person_'.$i.'_newsec'};
+            $newsec =~ s/^\s+//;
+            $newsec =~s/\s+$//;
+            my @newsecs = split(/\s*[\s,;:]\s*/,$newsec);
+            foreach my $sec (@newsecs) {
+                next unless ($sec =~ /\w/); 
+                next if ($sec =~ /\W/);
+                next if ($sec eq 'none');
+                if ($sec ne '') {
+                    unless (grep(/^\Q$sec\E$/,@allsecs)) {
+                        push(@allsecs,$sec); 
+                    }
+                }
+            }
+            my $showsec;
+            if (@allsecs) {
+                $showsec = join(', ',@allsecs);
+            }
+            if ($showsec eq '') {
+                $showsec = &mt('None');
+            }
+            if ($env{'form.person_'.$i.'_role'} eq 'cc') {
+                $showsec = &mt('None');
+            }
+            my $role = $env{'form.person_'.$i.'_role'}; 
             $personnel_values .= 
                 '<tr><td>'.$env{'form.person_'.$i.'_firstname'}.' '.
                 $env{'form.person_'.$i.'_lastname'}.'</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>';
+                '<td>'.&Apache::lonnet::plaintext($role,$container).'</td>'.
+                '<td>'.$showsec.'</td></tr>';
+        }
+    }
+    my $output;
+    if (ref($disallowed) eq 'ARRAY') {
+        if (@{$disallowed} > 0) {
+            if (ref($disallowmsg) eq 'HASH') {
+                $output = '<p class="LC_warning">'.
+                          &mt('Not all requested personnel could be included.').'<ul>'; 
+                foreach my $item (@{$disallowed}) {
+                    $output .= '<li>'.$disallowmsg->{$item}.'</li>';
+                }
+                $output .= '</ul></p>';
+            }
         }
     }
-    my $output =  '<p>'.&mt('Review the details of the course request before submission.').'</p>'.  
-                  '<div>'.&Apache::lonhtmlcommon::start_pick_box().
+    $output .=    '<div>'.&Apache::lonhtmlcommon::start_pick_box().
                   &Apache::lonhtmlcommon::row_title(&mt('Owner')).
                   '<table class="LC_innerpickbox"><tr>'.
                   '<th>'.&mt('Name').'</th>'.
@@ -1269,7 +2162,7 @@ sub print_review {
                   '<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')).
+                  &Apache::lonhtmlcommon::row_title($enrollrow_title).
                   '<table class="LC_innerpickbox"><tr>'.$enroll_headers.'</tr>'."\n".
                   '<tr>'.$enroll_values.'</tr></table>'."\n".
                   &Apache::lonhtmlcommon::row_closure();
@@ -1283,9 +2176,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();
-    my $cnum = &Apache::lonnet::generate_coursenum($dom);
-    $output .= '<input type="hidden" name="cnum" value="'.$cnum.'" />';
+               &Apache::lonhtmlcommon::end_pick_box().'</div>';
     return $output;
 }
 
@@ -1302,22 +2193,51 @@ sub dates_from_form {
 }
 
 sub courseinfo_form {
-    my ($dom,$formname,$crstype) = @_;
-    my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
-                 &Apache::lonhtmlcommon::row_title('Course Description').
-                 '<input type="text" size="40" name="cdescr" />';
+    my ($dom,$formname,$crstype,$next,$description) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                official => 'You must provide a (brief) course description.',
+                community => 'You must provide a (brief) community description.'
+             );
+    $lt{'unofficial'} = $lt{'official'};
+    my $js_validate = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA['
+
+function validateForm() {
+    if ((document.$formname.cdescr.value == "")  || (document.$formname.cdescr.value == "undefined")) {
+        alert('$lt{$crstype}');
+        return;
+    }
+    nextPage(document.$formname,'$next');
+}
+// ]]
+</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_headline().
+                  '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Description').'&nbsp;'.$title.'</h3>'.
+                  &Apache::lonhtmlcommon::row_closure(1).
+                  &Apache::lonhtmlcommon::row_title(&mt('Description')).
+                 '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
                                                   'default','hide');
     if ($numlib > 1) {
         $output .= &Apache::lonhtmlcommon::row_closure().
-                   &Apache::lonhtmlcommon::row_title(
-                       &mt('Home Server for Course'));
+                   &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
     }
     $output .= $home_server_pick.
+               &Apache::lonhtmlcommon::row_closure().
+               &Apache::lonhtmlcommon::row_headline().
+               '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.&mt('Clone content and settings from an existing course?').'</h3>'. 
                &Apache::lonhtmlcommon::row_closure(1).
-               &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;
 }
 
@@ -1327,17 +2247,15 @@ sub clone_form {
     if ($crstype eq 'community') {
         $type = 'Community';
     }
-    my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').
+    my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').'&nbsp;'.
                     &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
     my %lt = &clone_text();
     my $output .= 
-        &Apache::lonhtmlcommon::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().
+        '<input type="text" size="25" name="clonecrs" value=""  />'.
+        '</label>'.&Apache::lonhtmlcommon::row_closure(1).
+        &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'<label>'.
+        $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
         '<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
         '</label><br /><label>'.
@@ -1346,12 +2264,11 @@ 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;
 }
 
-sub clone_text { 
+sub clone_text {
     return &Apache::lonlocal::texthash(
                'cid'  => 'Course ID',
                'dmn'  => 'Domain',
@@ -1369,6 +2286,10 @@ sub coursecode_form {
                     instcode  => 'Course Category',
                     crosslist => 'Cross Listed Course',
                    );
+    my %helpitem = ( 
+                     instcode => 'Course_Request_Category',
+                     crosslist => 'Course_Request_Crosslist',
+                   );
     if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH') && 
         (ref($cat_order))) {
         my ($sel,$instsec,$lcsec);
@@ -1384,7 +2305,7 @@ sub coursecode_form {
             my $lastitem = pop(@{$codetitles});
             my $lastinput = '<input type="text" size="5" name="'.$sel.'_'.                                            $lastitem.'" />';
             if (@{$codetitles} > 0) {
-                $output = &Apache::lonhtmlcommon::row_title($rowtitle{$context}).
+                $output = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($helpitem{$context}).'&nbsp;'.$rowtitle{$context}).
                           '<table><tr>';
                 if ($context eq 'crosslist') {
                     $output .= '<td>'.&mt('Include?').'<br />'.
@@ -1451,38 +2372,91 @@ sub coursecode_form {
 
 sub get_course_dom {
     my $codedom = &Apache::lonnet::default_login_domain();
+    if ($env{'form.showdom'} ne '') {
+        if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
+            return $env{'form.showdom'};
+        }
+    }
     if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
+        my ($types,$typename) = &Apache::loncommon::course_types();
+        if (ref($types) eq 'ARRAY') {
+            foreach my $type (@{$types}) {
+                if (&Apache::lonnet::usertools_access($env{'user.name'},
+                                                      $env{'user.domain'},$type,
+                                                      undef,'requestcourses')) {
+                    return $env{'user.domain'};
+                }
+            }
+            my @possible_doms;
+            foreach my $type (@{$types}) {
+                my $dom_str = $env{'environment.reqcrsotherdom.'.$type};
+                if ($dom_str ne '') {
+                    my @domains = split(',',$dom_str);
+                    foreach my $entry (@domains) {
+                        my ($extdom,$extopt) = split(':',$entry);
+                        if ($extdom eq $env{'request.role.domain'}) {
+                            return $extdom;
+                        } 
+                        unless(grep(/^\Q$extdom\E$/,@possible_doms)) {
+                            push(@possible_doms,$extdom);
+                        }
+                    }
+                }
+            }
+            if (@possible_doms) {
+                @possible_doms = sort(@possible_doms);
+                return $possible_doms[0];
+            }
+        }
         $codedom = $env{'user.domain'};
         if ($env{'request.role.domain'} ne '') {
             $codedom = $env{'request.role.domain'};
         }
     }
-    if ($env{'form.showdom'} ne '') {
-        if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
-            $codedom = $env{'form.showdom'};
-        }
-    }
     return $codedom;
 }
 
 sub display_navbuttons {
-    my ($r,$formname,$prev,$prevtext,$next,$nexttext) = @_;
+    my ($r,$dom,$formname,$prev,$prevtext,$next,$nexttext,$state,$other,$othertext) = @_;
     $r->print('<div class="LC_navbuttons">');
     if ($prev) {
-        $r->print('
-      <input type="button" name="previous" value = "'.$prevtext.'"
-    onclick="javascript:backPage(document.'.$formname.','."'".$prev."'".')"/>
-   &nbsp;&nbsp;&nbsp;');
+        $r->print('<input type="button" name="previous" value = "'.$prevtext.'" '.
+                  'onclick="javascript:backPage('."document.$formname,'$prev'".')"/>'.
+                  ('&nbsp;'x3));
     } elsif ($prevtext) {
-        $r->print('
-      <input type="button" name="previous" value = "'.$prevtext.'"
-    onclick="javascript:history.back()"/>
-   &nbsp;&nbsp;&nbsp;');
-    }
-    if ($next) {
-        $r->print('
-      <input type="button" name="next" value="'.$nexttext.'"
- onclick="javascript:nextPage(document.'.$formname.','."'".$next."'".')" />');
+        $r->print('<input type="button" name="previous" value = "'.$prevtext.'" '.
+                  'onclick="javascript:history.back()"/>'.('&nbsp;'x3));
+    }
+    if ($state eq 'details') {
+        $r->print(' <input type="button" name="other" value="'.$othertext.'" '.
+                  'onclick="javascript:nextPage('."document.$formname,'$other'".
+                  ')" />');
+    }
+    my $gotnext;
+    if ($state eq 'courseinfo') {
+        $r->print('<input type="button" name="next" value="'.$nexttext.'" '.
+                  'onclick="javascript:validateForm();" />');
+        $gotnext = 1;
+    } elsif ($state eq 'enrollment') {
+        if (($env{'form.crstype'} eq 'official') && 
+            (&Apache::lonnet::auto_run('',$dom))) {
+            $r->print('<input type="button" name="next" value="'.$nexttext.'" '.
+                      'onclick="javascript:validateEnrollSections('."document.$formname,'$next'".');" />');
+                $gotnext = 1;
+        }
+    } elsif ($state eq 'personnel') {
+        if ($env{'form.persontotal'} > 0) { 
+            $r->print('<input type="button" name="next" value="'.$nexttext.'" '.
+                      'onclick="javascript:validatePersonnelSections('."document.$formname,'$next'".');" />');
+            $gotnext = 1;
+        }
+    }
+    unless ($gotnext) {
+        if ($next) {
+            $r->print('
+                      <input type="button" name="next" value="'.$nexttext.'" '.
+      'onclick="javascript:nextPage('."document.$formname,'$next'".')" />');
+        }
     }
     $r->print('</div>');
 }
@@ -1491,6 +2465,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"; 
@@ -1505,6 +2481,7 @@ sub print_request_outcome {
     }
     $now = time;
     $crstype = $env{'form.crstype'};
+    my @instsections;
     if ($crstype eq 'official') {
         if (&Apache::lonnet::auto_run('',$dom)) {
             ($enrollstart,$enrollend)=&dates_from_form('enrollstart','enrollend');
@@ -1512,7 +2489,11 @@ sub print_request_outcome {
         for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
             if ($env{'form.sec_'.$i}) {
                 if ($env{'form.secnum_'.$i} ne '') {
-                    $sections{$i}{'inst'} = $env{'form.secnum_'.$i};
+                    my $sec = $env{'form.secnum_'.$i};
+                    $sections{$i}{'inst'} = $sec;
+                    if (($sec ne '') && (!grep(/^\Q$sec\E$/,@instsections))) {
+                        push(@instsections,$sec);
+                    }
                     $sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i};
                 }
             }
@@ -1527,16 +2508,21 @@ 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'};
             }
         }
+    } else {
+        $enrollstart = '';
+        $enrollend = '';
     }
-
     for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
         my $uname = $env{'form.person_'.$i.'_uname'};
-        my $udom = $env{'form.person_'.$i.'_uname'};
+        my $udom = $env{'form.person_'.$i.'_dom'};
         if (($uname =~ /^$match_username$/) && ($udom =~ /^$match_domain$/)) {
             if (&Apache::lonnet::domain($udom) ne '') {
                 unless (ref($personnel{$uname.':'.$udom}) eq 'HASH') {
@@ -1548,7 +2534,7 @@ sub print_request_outcome {
                 }
                 my $role = $env{'form.person_'.$i.'_role'};
                 unless ($role eq '') {
-                    if (ref(@{$personnel{$uname.':'.$udom}{'roles'}}) eq 'ARRAY') {
+                    if (ref($personnel{$uname.':'.$udom}{'roles'}) eq 'ARRAY') {
                         my @curr_roles = @{$personnel{$uname.':'.$udom}{'roles'}};
                         unless (grep(/^\Q$role\E$/,@curr_roles)) {
                             push(@{$personnel{$uname.':'.$udom}{'roles'}},$role);
@@ -1559,19 +2545,28 @@ sub print_request_outcome {
                     if ($role eq 'cc') {
                         @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = ();
                     } else {
-                        my @currsec;
-                        if ($env{'form.person_'.$i.'_sections'} ne '') {
-                            my @sections = split(',',$env{'form.person_'.$i.'_sections'});
-                            foreach my $sec (@sections) {
-                                next if ($sec eq '');
-                                if (@currsec > 0) {
-                                    unless(grep(/^\Q$sec\E$/,@currsec)) {
-                                        push(@currsec,$sec);
-                                    }
+                        my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+                        my @allsecs;
+                        foreach my $sec (@currsec) {
+                            next unless ($sec =~ /\w/);
+                            next if ($sec =~ /\W/);
+                            next if ($sec eq 'none');
+                            push(@allsecs,$sec);
+                        }
+                        my $newsec = $env{'form.person_'.$i.'_newsec'};
+                        $newsec =~ s/^\s+//;
+                        $newsec =~s/\s+$//;
+                        my @newsecs = split(/[\s,;]+/,$newsec);
+                        foreach my $sec (@newsecs) {
+                            next if ($sec =~ /\W/);
+                            next if ($sec eq 'none');
+                            if ($sec ne '') {
+                                unless (grep(/^\Q$sec\E$/,@allsecs)) {
+                                    push(@allsecs,$sec);
                                 }
                             }
                         }
-                        @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @currsec;
+                        @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @allsecs;
                     }
                 }
             } else {
@@ -1582,6 +2577,37 @@ sub print_request_outcome {
         }
     }
     my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+    my $autodrops = 0;
+    if ($env{'form.autodrops'}) {
+        $autodrops = $env{'form.autodrops'}; 
+    }
+    my $autoadds = 0;
+    if ($env{'form.autoadds'}) {
+        $autodrops = $env{'form.autoadds'};
+    }
+    if ($env{'form.autoadds'}) {
+        $autodrops = $env{'form.autoadds'};
+    }
+    my $instcode = '';
+    if (exists($env{'form.instcode'})) {
+        $instcode = $env{'form.instcode'};
+    }
+    my $clonecrs = '';
+    my $clonedom = '';
+    if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) && 
+        ($env{'form.clonedom'} =~ /^($match_domain)$/)) {
+        my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
+                                                    $env{'form.clonedom'});
+        if ($clonehome ne 'no_host') {  
+            my $canclone =  
+                &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+                        $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
+            if ($canclone) {
+                $clonecrs = $env{'form.clonecrs'};
+                $clonedom = $env{'form.clonedom'};
+            }
+        }
+    }
     my $details = {
                     owner          => $env{'user.name'},
                     domain         => $env{'user.domain'}, 
@@ -1590,43 +2616,45 @@ sub print_request_outcome {
                     coursehome     => $env{'form.chome'},
                     cdescr         => $env{'form.cdescr'},
                     crstype        => $env{'form.crstype'},
-                    instcode       => $env{'form.instcode'},
-                    clonedom       => $env{'form.clonedom'},
-                    clonecrs       => $env{'form.clonecrs'},
+                    instcode       => $instcode,
+                    clonedom       => $clonedom,
+                    clonecrs       => $clonecrs,
                     datemode       => $env{'form.datemode'},
-                    dateshift      => $env{'form.datshift'},
-                    sectotal       => $env{'form.sectotal'},
+                    dateshift      => $env{'form.dateshift'},
+                    sectotal       => $sectotal,
                     sections       => \%sections,
-                    crosslisttotal => $env{'form.crosslisttotal'},
+                    crosslisttotal => $crosslisttotal,
                     crosslists     => \%crosslistings,
-                    autoadds       => $env{'form.autoadds'},
-                    autodrops      => $env{'form.autodrops'},
+                    autoadds       => $autoadds,
+                    autodrops      => $autodrops,
                     enrollstart    => $enrollstart,
                     enrollend      => $enrollend,
                     accessstart    => $accessstart,
                     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') {
-            $output = &mt('You are not permitted to request creation of official courses');
+            $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');
+            $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);
         }
+        $storeresult = 'notpermitted'; 
     } else {
-        my ($disposition,$message);
+        my ($disposition,$message,$reqstatus);
         my %reqhash = (
-                        timestamp => $now,
+                        reqtime   => $now,
                         crstype   => $crstype,
                         details   => $details,
                       );
         my $requestkey = $dom.'_'.$cnum;
+        my $validationerror;
         if ($val eq 'autolimit=') {
             $disposition = 'process';
         } elsif ($val =~ /^autolimit=(\d+)$/) {
@@ -1634,43 +2662,70 @@ sub print_request_outcome {
             $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);
+            my ($inststatuslist,$validationchk,$validation);
+            if (@inststatuses > 0) {
+                $inststatuslist = join(',',@inststatuses);
+            }
+            my $instseclist;
+            if (@instsections > 0) {
+                $instseclist = join(',',@instsections);
+            }
+            $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 = $validation;
+            }
         } else {
             $disposition = 'approval';
         }
-        $reqhash{'status'} = $disposition;
+        $reqhash{'disposition'} = $disposition;
+        $reqstatus = $disposition;
+        my ($modified,$queued);
         if ($disposition eq 'rejected') {
             $output = &mt('Your course request was rejected.');
             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);
+            my @roles = &Apache::lonuserutils::roles_by_context('course');
             my $type = 'Course';
             if ($crstype eq 'community') {
                 $type = 'Community';
             }
-            my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
-            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
-            my @roles = &Apache::lonuserutils::roles_by_context('course');
             foreach my $role (@roles) {
                 $longroles{$role}=&Apache::lonnet::plaintext($role,$type);
             }
-            my $owneremail;
-            my %emails = &Apache::loncommon::getemails();
-            foreach my $email ('permanentemail','critnotification','notification') {
-                $owneremail = $emails{$email};
-                last if ($owneremail ne '');
-            }
-            my %reqdetails = &build_batchcreatehash($dom,$details,$owneremail,\%domdefs);
-            my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',\%reqdetails,\%longroles,\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$output,\$keysmsg,$env{'user.domain'},$env{'user.name'},$cnum,$crstype);
-            $disposition = 'created';
-            if ($cid eq "/$dom/$cnum") {
+            my $result = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
+                                   'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
+                                   \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles);
+            if ($result eq 'created') {
                 $disposition = 'created';
-                $output = &mt('Your course request has been processed and the course has been created.').'<br />'.&mt('You will need to logout and log-in again to be able to select a role in the course.');
+                $reqstatus = 'created';
+                my $role_result = &update_requestors_roles($dom,$cnum,$crstype,$details,
+                                                           \%longroles);
+                $output = '<p>'.&mt('Your course request has been processed and the course has been created.').
+                          '<br />'.$role_result.'</p>';
+                $creationresult = 'created';
             } else {
-                $output = &mt('An error occurred when processing your course request.').'<br />'.&mt('You may want to review the request details and submit the request again.');
+                $output = '<span class="LC_error">'.
+                          &mt('An error occurred when processing your course request.').
+                          '<br />'.
+                          &mt('You may want to review the request details and submit the request again.').
+                          '</span>';
+                $creationresult = 'error';
             }
         } else {
             my $requestid = $cnum.'_'.$disposition;
@@ -1683,57 +2738,216 @@ sub print_request_outcome {
                                             description => $env{'form.cdescr'}, 
                                           },
                           };
-            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);
-                    }
+            my $statuskey = 'status:'.$dom.':'.$cnum;
+            my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey],
+                                                   $env{'user.domain'},$env{'user.name'});
+            if ($userreqhash{$statuskey} ne '') {
+                $modified = 1;
+                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;
+                }
+            }
+            unless ($queued) {
+                my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
+                                                            $dom);
+                if ($putresult eq 'ok') {
+                    $output = &mt('Your course request has been recorded.').'<br />'.
+                              &notification_information($disposition,$req_notifylist,
+                                                        $cnum,$now);
                 } 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>';
+                    $reqstatus = 'domainerror';
+                    $reqhash{'disposition'} = $disposition;
+                    my $warning = &mt('An error occurred saving your request in the pending requests queue.');
+                    $output = '<span class"LC_warning">'.$warning.'</span><br />';
                 }
-            } 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;
+        my ($statusresult);
         if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
             $storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
                                                            'courserequests');
+            if ($storeresult eq 'ok') {
+                my %status = (
+                                 'status:'.$dom.':'.$cnum => $reqstatus,
+                             );
+                $statusresult = &Apache::lonnet::put('courserequests',\%status);
+            }
         } else {
             $storeresult = 'error: invalid requestkey format'; 
         }
         if ($storeresult ne 'ok') {
             $output .=  '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).'</span><br />';
             &Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
+        } elsif ($statusresult ne 'ok') {
+            $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'</span><br />';
+            &Apache::lonnet::logthis("Error saving course request status for  $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
+        }
+        if ($modified && $queued && $storeresult eq 'ok') {
+            $output .= '<p>'.&mt('Your course request has been updated').'</p>'.
+                       &notification_information($disposition,$req_notifylist,$cnum,$now);
+        }
+        if ($validationerror ne '') {
+            $output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
         }
     }
+    if ($creationresult ne '') {
+        return ($creationresult,$output);
+    } else {
+        return ($storeresult,$output);
+    }
+}
+
+sub update_requestors_roles {
+    my ($dom,$cnum,$crstype,$details,$longroles) = @_;
+    my $now = time;
+    my ($active,$future,$numactive,$numfuture,$output);
+    my $owner = $env{'user.name'}.':'.$env{'user.domain'};
+    if (ref($details) eq 'HASH') {
+        if (ref($details->{'personnel'}) eq 'HASH') {
+            unless (ref($details->{'personnel'}{$owner}) eq 'HASH') {
+                $details->{'personnel'}{$owner} = {
+                                                    'roles' => ['cc'],
+                                                    'cc'    => { 'usec' => [] },
+                                                  };
+            }
+            my @roles;
+            if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
+                @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
+                unless (grep(/^cc$/,@roles)) {
+                    push(@roles,'cc');
+                }
+            } else {
+                @roles = ('cc');
+            }
+            foreach my $role (@roles) {
+                my $start = $now;
+                my $end = '0';
+                if ($role eq 'st') {
+                    if ($details->{'accessstart'} ne '') {
+                        $start = $details->{'accessstart'};
+                    }
+                    if ($details->{'accessend'} ne '') {
+                        $end = $details->{'accessend'};
+                    }
+                }
+                my @usecs;
+                if ($role ne 'cc') {
+                    if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
+                        @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
+                    }
+                } 
+                if ($role eq 'st') {
+                    if (@usecs > 1) {
+                        my $firstsec = $usecs[0];
+                        @usecs = ($firstsec);
+                    }
+                }
+                if (@usecs == 0) {
+                    push(@usecs,'');
+                }
+                foreach my $usec (@usecs) {
+                    my (%userroles,%newrole,%newgroups,$spec,$area);
+                    my $area = '/'.$dom.'/'.$cnum;
+                    my $spec = $role.'.'.$area;
+                    if ($usec ne '') {
+                       $spec .= '/'.$usec;
+                       $area .= '/'.$usec;
+                    }
+                    if ($role =~ /^cr\//) {
+                        &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
+                                                          $cnum,$spec,$area);
+                    } else {
+                        &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
+                                                            $spec,$cnum,$area);
+                    }
+                    &Apache::lonnet::set_userprivs(\%userroles,\%newrole,
+                                                   \%newgroups);
+                    $userroles{'user.role.'.$spec} = $start.'.'.$end;
+                    &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
+                    if (($end == 0) || ($end > $now)) {
+                        my $showrole = $role;
+                        if ($role =~ /^cr\//) {
+                            $showrole = &Apache::lonnet::plaintext($role,$crstype);
+                        } elsif (ref($longroles) eq 'HASH') {
+                            if ($longroles->{$role} ne '') {
+                                $showrole = $longroles->{$role};
+                            }
+                        }
+                        if ($start <= $now) {
+                            $active .= '<li><a href="/adm/roles?selectrole=1&'.
+                                       $spec.'=1">'.$showrole;
+                            if ($usec ne '') {
+                                $active .= ' - '.&mt('section:').' '.$usec; 
+                            }
+                            $active .= '</a></li>';
+                            $numactive ++;
+                        } else { 
+                            $future .= '<li>'.$showrole;
+                            if ($usec ne '') {
+                                $future .= ' - '.&mt('section:').' '.$usec;
+                            }
+                            $future .= '</li>';
+                            $numfuture ++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if ($active) {
+        if ($numactive == 1) {
+            $output = &mt('Use the following link to enter the course:'); 
+        } else {
+            $output = &mt('Use the following links to your new roles to enter the course:');
+        }
+        $output .= ' <ul>'.$active.'</ul><br />';
+    }
+    if ($future) {
+        $output .= &mt('The following course [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'<a href="/adm/roles">','</a>',&Apache::lonlocal::locallocaltime($details->{'accessstart'})).
+                   ' <ul>'.$future.'</ul>';
+    }
+    return $output;
+}
+
+sub notification_information {
+    my ($disposition,$req_notifylist,$cnum,$now) = @_;
+    my %emails = &Apache::loncommon::getemails();
+    my $address;
+    if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
+        $address = $emails{'permanentemail'};
+        if ($address eq '') {
+            $address = $emails{'notification'};
+        }
+    }
+    my $output;
+    if ($disposition eq 'approval') {
+        $output .= &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').'<br />'.
+                   &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';
+        if ($address ne '') {
+            $output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).'<br />';
+        }
+        if ($req_notifylist) {
+            my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+                                                                     $env{'user.domain'});
+            my $sender = $env{'user.name'}.':'.$env{'user.domain'};
+            &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,"$fullname ($env{'user.name'}:$env{'user.domain'})",$cnum,$env{'form.cdescr'},$now,'coursereq',$sender);
+        }
+    } elsif ($disposition eq 'pending') {
+        $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 {
+        $output .= '<div class="LC_warning">'.
+                   &mt('Your request status is: [_1].',$disposition). 
+                   '</div>'
+    }
     return $output;
 }
 
@@ -1741,7 +2955,7 @@ 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');
+    my @options = ('autolimit','validate','approval');
     if ($dom eq $env{'user.domain'}) {
         %userenv = 
             &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
@@ -1754,7 +2968,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 {
@@ -1807,11 +3021,17 @@ sub get_processtype {
     } 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;
+        if ($userenv{'reqcrsotherdom.'.$crstype}) {
+            my @doms = split(',',$userenv{'reqcrsotherdom.'.$crstype});
+            my $optregex = join('|',@options);
+            foreach my $item (@doms) {
+                my ($extdom,$extopt) = split(':',$item);
+                if ($extdom eq $dom) {  
+                    if ($extopt =~ /^($optregex)(=?\d*)$/) {
+                        $val = $1.$2;
+                    }
+                    last;
+                }
             }
             @{$inststatuses} = ('_external_');
         }
@@ -1823,7 +3043,7 @@ 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 ($types,$typename) = &Apache::loncommon::course_types();
     my %requests = &Apache::lonnet::dumpstore('courserequests',$udom,$uname);
     my %count;
     if (ref($types) eq 'ARRAY') {
@@ -1853,61 +3073,169 @@ sub check_autolimit {
     return;
 }
 
-sub build_batchcreatehash {
-    my ($dom,$details,$owneremail,$domdefs) = @_;
-    my %batchhash;
-    my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users};
-    if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {
-        my $emailenc = &Apache::lonnet::escape($owneremail);
-        my $owner = $details->{'owner'}.':'.$details->{'domain'};
-        foreach my $item (@items) {
-            $batchhash{$item} = $details->{$item};
+sub retrieve_settings {
+    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 (($udom eq $reqinfo{'domain'}) &&  ($uname eq $reqinfo{'owner'})) {
+            $env{'form.chome'} = $reqinfo{'coursehome'};
+            $env{'form.cdescr'} = $reqinfo{'cdescr'};
+            $env{'form.crstype'} = $reqinfo{'crstype'}; 
+            &generate_date_items($reqinfo{'accessstart'},'accessstart');
+            &generate_date_items($reqinfo{'accessend'},'accessend');
+            if ($reqinfo{'accessend'} == 0) {
+                $env{'form.no_end_date'} = 1;
+            }
+            if (($reqinfo{'crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
+                &generate_date_items($reqinfo{'enrollstart'},'enrollstart');
+                &generate_date_items($reqinfo{'enrollend'},'enrollend');
+            }
+            $env{'form.clonecrs'} = $reqinfo{'clonecrs'};
+            $env{'form.clonedom'} = $reqinfo{'clonedom'};
+            $env{'form.datemode'} = $reqinfo{'datemode'};
+            $env{'form.dateshift'} = $reqinfo{'dateshift'};
+            if (($reqinfo{'crstype'} eq 'official') && ($reqinfo{'instcode'} ne '')) { 
+                 $env{'form.sectotal'} = $reqinfo{'sectotal'};
+                 $env{'form.crosslisttotal'} = $reqinfo{'crosslisttotal'};
+                 $env{'form.autoadds'} = $reqinfo{'autoadds'};
+                 $env{'form.autdrops'} = $reqinfo{'autodrops'};
+                 $env{'form.instcode'} = $reqinfo{'instcode'};
+                 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'};
+                        $env{'form.secnum_'.$i} = $sec;
+                        $env{'form.sec_'.$i} = '1';
+                        if (!grep(/^\Q$sec\E$/,@currsec)) {
+                            push(@currsec,$sec);
+                        }
+                        $env{'form.loncapasec_'.$i} = $reqinfo{'sections'}{$i}{'loncapa'};
+                    }
+                }
+            }
+            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);
+                        }
+                    }
+                }
+            }
+            if (ref($reqinfo{'personnel'}) eq 'HASH') {
+                my $i = 0;
+                foreach my $user (sort(keys(%{$reqinfo{'personnel'}}))) {
+                    my ($uname,$udom) = split(':',$user);
+                    if (ref($reqinfo{'personnel'}{$user}) eq 'HASH') {
+                        if (ref($reqinfo{'personnel'}{$user}{'roles'}) eq 'ARRAY') {
+                            foreach my $role (sort(@{$reqinfo{'personnel'}{$user}{'roles'}})) {
+                                $env{'form.person_'.$i.'_role'} = $role;
+                                $env{'form.person_'.$i.'_firstname'} = $reqinfo{'personnel'}{$user}{'firstname'};
+                                $env{'form.person_'.$i.'_lastname'} = $reqinfo{'personnel'}{$user}{'lastname'}; ;
+                                $env{'form.person_'.$i.'_emailaddr'} = $reqinfo{'personnel'}{$user}{'emailaddr'};
+                                $env{'form.person_'.$i.'_uname'} = $uname;
+                                $env{'form.person_'.$i.'_dom'} = $udom;
+                                if (ref($reqinfo{'personnel'}{$user}{$role}) eq 'HASH') {
+                                    if (ref($reqinfo{'personnel'}{$user}{$role}{'usec'}) eq 'ARRAY') {
+                                        my @usecs = @{$reqinfo{'personnel'}{$user}{$role}{'usec'}};
+                                        my @newsecs;
+                                        if (@usecs > 0) {
+                                            foreach my $sec (@usecs) {
+                                                if (grep(/^\Q$sec\E/,@currsec)) {
+                                                    $env{'form.person_'.$i.'_sec'} = $sec;
+                                                } else {
+                                                    push(@newsecs,$sec);
+                                                }
+                                            }
+                                        }
+                                        if (@newsecs > 0) {
+                                            $env{'form.person_'.$i.'_newsec'} = join(',',@newsecs); 
+                                        }
+                                    }
+                                }
+                                $i ++;
+                            }
+                        }
+                    }
+                }
+                $env{'form.persontotal'} = $i;
+            }
         }
-        $batchhash{'title'} = $details->{'cdescr'};
-        $batchhash{'coursecode'} = $details->{'instcode'};
-        $batchhash{'emailenc'} = $emailenc;
-        $batchhash{'adds'} = $details->{'autoadds'};
-        $batchhash{'drops'} = $details->{'autodrops'};
-        $batchhash{'authtype'} = $domdefs->{'auth_def'};
-        $batchhash{'authparam'} = $domdefs->{'auth_arg_def'};
-        if ($details->{'crstype'} eq 'community') {
-            $batchhash{'crstype'} = 'Community';
-        } else {
-            $batchhash{'crstype'} = 'Course'; 
-        }
-        $batchhash{'users'}{$details->{$owner}} = {
-                                 firstname => $env{'environment.first'},
-                                 lastname  => $env{'environment.last'},
-                                 emailenc  => $emailenc,
-                                 email     => $owneremail,
-                             };
     }
-    return %batchhash;
+    return $result;
 }
 
-sub retrieve_settings {
-    my ($dom,$request_id) = @_;
-    my %reqinfo = &get_request_settings($request_id,$dom);
-    my %stored;
-    $stored{'cdescr'} = &unescape($reqinfo{'description'});
-    $stored{'accessstart'} = $reqinfo{'accessstart'};
-    $stored{'accessend'} = $reqinfo{'accessend'};
-    if ($stored{'accessend'} == 0) {
-        $stored{'no_end_date'} = 1;
-    }
-    $stored{'enrollstart'} = $reqinfo{'enrollstart'};
-    $stored{'enrollend'} = $reqinfo{'enrollend'};
-    $stored{'crosslist'} = $reqinfo{'crosslist'};
-    $stored{'clonecrs'} = $reqinfo{'clonecrs'};
-    $stored{'clonedom'} = $reqinfo{'clonedom'};
-    $stored{'sections'} = $reqinfo{'sections'};
-    $stored{'personnel'} = $reqinfo{'personnel'};
+sub get_request_settings {
+    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',$udom,$uname);
+        my $disposition = $history{'disposition'};
+        if (($disposition eq 'approval') || ($disposition eq 'pending')) { 
+            if (ref($history{'details'}) eq 'HASH') {
+                %reqinfo = %{$history{'details'}};
+                $result = 'ok';
+            } else {
+                $result = 'nothash';
+            }
+        } else {
+            $result = 'notqueued';
+        }
+    } else {
+        $result = 'invalid';
+    }
+    return ($result,%reqinfo);
+}
 
-    return %stored;
+sub extract_instcode {
+    my ($cdom,$element,$crscode,$crskey,$counter) = @_;
+    my (%codes,@codetitles,%cat_titles,%cat_order);
+    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;
+                }
+                foreach my $title (@codetitles) {
+                    $env{'form.'.$sel.'_'.$title} = $codes{$crskey}{$title};
+                }
+            }
+        }
+    }
+    return;
 }
 
-sub get_request_settings {
-    my ($request_id,$dom);
+sub generate_date_items {
+    my ($currentval,$item) = @_;
+    if ($currentval =~ /\d+/) {
+        my ($tzname,$sec,$min,$hour,$mday,$month,$year) = 
+            &Apache::lonhtmlcommon::get_timedates($currentval);
+        $env{'form.'.$item.'_day'} = $mday;
+        $env{'form.'.$item.'_month'} = $month+1;
+        $env{'form.'.$item.'_year'} = $year;
+    }
+    return;
 }
 
 1;