--- loncom/interface/lonrequestcourse.pm	2010/12/05 17:27:00	1.41.2.11
+++ loncom/interface/lonrequestcourse.pm	2020/02/12 22:15:40	1.108
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.41.2.11 2010/12/05 17:27:00 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.108 2020/02/12 22:15:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -94,8 +94,6 @@ described at http://www.lon-capa.org.
 
 =item print_request_outcome()
 
-=item get_processtype()
-
 =item check_autolimit()
 
 =item retrieve_settings()
@@ -121,6 +119,10 @@ use Apache::loncoursequeueadmin;
 use Apache::lonuserutils;
 use LONCAPA qw(:DEFAULT :match);
 
+my $registered_flush;
+my $registered_instcats;
+my $modified_dom;
+
 sub handler {
     my ($r) = @_;
     &Apache::loncommon::content_type($r,'text/html');
@@ -128,46 +130,120 @@ sub handler {
     if ($r->header_only) {
         return OK;
     }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-        ['action','showdom','cnum','state','crstype']);
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    my $action = $env{'form.reqaction'};
-    my $state = $env{'form.state'};
-    my $context;
-    &generate_page($r,$action,$state,$context);
-    return OK;
-}
 
-sub generate_page {
-    my ($r,$action,$state,$context) = @_;
+    $registered_flush = 0;
+    $registered_instcats = 0;
+    $modified_dom = '';
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-        ['action','showdom','cnum','state','crstype']);
+        ['action','showdom','cnum','state','crstype','queue','tabs']);
+    &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 ($jscript,$uname,$udom,$result,$warning,$showcredits,$instcredits,%can_request,
+        %request_domains,@incdoms);
+    my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
+    if ($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'} || $domdefs{'textbookcredits'}) {
+        $showcredits = 1;
+    }
+
+    my $canreq =
+        &Apache::lonnet::check_can_request($dom,\%can_request,\%request_domains);
+
+    foreach my $item (keys(%request_domains)) {
+        if (ref($request_domains{$item}) eq 'ARRAY') {
+            foreach my $possdom (@{$request_domains{$item}}) {
+                unless(grep(/^\Q$possdom\E$/,@incdoms)) {
+                    push(@incdoms,$possdom);
+                }
+            }
+        }
+    }
+
+    if ($canreq) {
+        if (($env{'form.crstype'} eq 'lti') && ($env{'request.lti.login'}) &&
+            ($env{'form.lti.reqrole'} eq 'cc') && ($env{'form.lti.reqcrs'}) &&
+            ($env{'form.lti.sourcecrs'} ne '')) {
+            if ($action eq 'process') {
+                if ($can_request{'lti'}) {
+                    my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
+                    &process_textbook_request($r,$dom,$action,\%domdefs,\%domconfig,\%can_request,'lti');
+                } else {
+                    $r->print(&header('Course Request','','','',{ 'only_body' => 1}).
+                              '<div>'.
+                              '<p class="LC_info">'.&mt('You do not have privileges to request creation of LTI courses.').'</p>'.
+                              '</div>'.
+                              &Apache::loncommon::end_page());
+                }
+            }
+            return OK;
+        }
+        if (($env{'form.crstype'} eq 'textbook') || 
+            (scalar(keys(%can_request)) == 1) && ($can_request{'textbook'})) {
+            my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
+            if ($action eq 'log') {
+                my $usetabs;
+                if ((scalar(keys(%can_request)) == 1) && ($can_request{'textbook'})) {
+                    $usetabs = 1;
+                } elsif ($env{'form.tabs'} eq 'on') {
+                    $usetabs = 1;
+                }
+                &Apache::lonhtmlcommon::add_breadcrumb({text=>'Course Request'});
+                my $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+                &print_request_logs($r,$dom,undef,undef,$crumb,$usetabs);
+            } elsif ($action eq 'process') {
+                if ($can_request{'textbook'}) {
+                    &process_textbook_request($r,$dom,$action,\%domdefs,\%domconfig,\%can_request);
+                } else {
+                    &textbook_request_disabled($r,$dom,$action,\%can_request);
+                }
+            } elsif ($action eq 'display') {
+               my ($uname,$udom,$result,$warning) = &domcoord_display($dom);
+               if ($warning ne '') {
+                   my $args = { only_body => 1 };
+                   $r->print(&header('Course/Community Requests','','' ,'',$args).
+                             '<h3>'.&mt('Course/Community Request Details').'</h3>'.
+                             '<div class="LC_warning">'.$warning.'</div>'.
+                             &close_popup_form());
+                } else {
+                    $states{'display'} = ['details'];
+                    my $loaditems = &onload_action($action,$state);
+                    my $page = 0;
+                    &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
+                                            $loaditems,'','','','','',$showcredits,'','',
+                                            $uname,$udom);
+                }
+            } else {
+                if ($can_request{'textbook'}) {
+                    &print_textbook_form($r,$dom,\@incdoms,\%domdefs,$domconfig{'requestcourses'},
+                                         \%can_request,'textbook');
+                } else {
+                    &textbook_request_disabled($r,$dom,$action,\%can_request);
+                }
+            }
+            return OK;
+        }
+    }
 
     $states{'display'} = ['details'];
     $states{'view'} = ['pick_request','details','cancel','removal'];
-    $states{'log'} = ['filter','display'];
+    $states{'log'} = ['display'];
     $states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
 
-    if ($dom =~ /^\w+citest$/) {
-        $states{'new'} = ['courseinfo','review','process'];
-        if ($env{'form.concepttest'} eq 'editmyown') {
-            push(@{$states{'new'}},'chooseitems','uploadroster','enrolling');
-        } elsif (($env{'form.concepttest'} eq 'defchosen') || 
-                 (($env{'form.concepttest'} eq 'cloning') && (!$env{'form.cloneroster'}))) {
-            push(@{$states{'new'}},'uploadroster','enrolling');
-        } else {
-            push(@{$states{'new'}},'done');
-        }
-    }
     if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
-        unless ($state eq 'crstype') {
+        unless ($env{'form.state'} eq 'crstype') {
             unshift(@{$states{'new'}},'codepick');
         }
     }
 
+    if (($action eq 'new') && (&Apache::loncoursequeueadmin::author_prompt())) {
+        if (ref($states{$action}) eq 'ARRAY') {
+            push(@{$states{$action}},'reqauthor');
+        }
+    }
+
     foreach my $key (keys(%states)) {
         if (ref($states{$key}) eq 'ARRAY') {
             unshift (@{$states{$key}},'crstype');
@@ -176,74 +252,29 @@ sub generate_page {
 
     my @invalidcrosslist;
     my %trail = (
-                 crstype       => 'Request Action',
+                 crstype       => 'Pick Action',
                  codepick      => 'Category',
                  courseinfo    => 'Description',
                  enrollment    => 'Access Dates',
                  personnel     => 'Personnel',
                  review        => 'Review',
-                 process       => 'Request Outcome',
+                 process       => 'Result',
+                 reqauthor     => 'Authoring Space Result',
                  pick_request  => 'Display Summary',
                  details       => 'Request Details',
                  cancel        => 'Cancel Request',
                  removal       => 'Outcome',
-                 chooseitems   => 'Saved Test',
-                 uploadroster  => 'Upload Roster',
-                 enrolling     => 'Completed',
-                 done          => 'Completed',
+                 display       => 'Request Logs',
                 );
-    if ($dom =~ /^\w+citest$/) {
-        $trail{'crstype'} = 'Building a Test';
-        $trail{'courseinfo'} = 'Test Information';
-    }
 
     if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
         $trail{'enrollment'} = 'Enrollment';
     }
 
-    my ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description) = 
+    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 {
-                        if ($env{'form.crstype'} eq 'community') {
-                            $warning = &mt('Invalid username or domain for community requestor');
-                        } else {
-                            $warning = &mt('Invalid username or domain for course requestor');
-                        }
-                    }
-                } else {
-                    if ($env{'form.crstype'} eq 'community') {
-                        $warning = &mt('No information was found for this community request.');
-                    } else {
-                        $warning = &mt('No information was found for this course request.');
-                    }
-                }
-            } else {
-                $warning = &mt('No course request ID provided.');
-            }
-        } else {
-            if ($env{'form.crstype'} eq 'any') {
-               $warning = &mt('You do not have rights to view course or community request information.');
-            } elsif ($env{'form.crstype'} eq 'community') {
-                $warning = &mt('You do not have rights to view community request information.');
-            } else {
-                $warning = &mt('You do not have rights to view course request information.');
-            }
-        }
+        ($uname,$udom,$result,$warning) = &domcoord_display($dom);
     } elsif ((defined($state)) && (defined($action))) {
         if (($action eq 'view') && ($state eq 'details')) {
             if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) {
@@ -290,22 +321,24 @@ sub generate_page {
                 }
             }
         }
-        my %elements =  &form_elements($dom);
+        (my $elements,$instcredits) = &form_elements($dom,$showcredits);
         my $elementsref = {};
-        if (ref($elements{$action}) eq 'HASH') {
-            if (ref($elements{$action}{$state}) eq 'HASH') {
-                $elementsref = $elements{$action}{$state};
+        if ((ref($elements) eq 'HASH') && (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($action);
+            $jscript = &mainmenu_javascript();
         } else {
             $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
             if ($state eq 'courseinfo') {
                 $jscript .= &cloning_javascript();
+            } elsif ($state eq 'process') {
+                $jscript .= &processing_javascript();
             }
         }
     }
@@ -314,25 +347,18 @@ sub generate_page {
         $jscript .= "\n".&Apache::loncommon::userbrowser_javascript();
     }
 
-    my $loaditems = &onload_action($action,$state,$dom);
+    my $loaditems = &onload_action($action,$state);
 
-    my (%can_request,%request_domains);
-    my $canreq = 
-        &Apache::lonnet::check_can_request($dom,\%can_request,\%request_domains);
     if ($action eq 'new') {
         if ($canreq) {
             if ($state eq 'crstype') {
                 &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,
-                                 $crumb,\%request_domains);
+                                 $crumb,\@incdoms);
             } else {
                 &request_administration($r,$action,$state,$page,\%states,$dom,
                                         $jscript,$loaditems,$crumb,$newinstcode,
                                         $codechk,$checkedcode,$description,
-                                        \@invalidcrosslist);
-                if ($state eq 'chooseitems' || $state eq 'uploadroster' || 
-                    $state eq 'enrolling') {
-                    return $canreq;
-                }
+                                        $showcredits,$instcredits,\@invalidcrosslist);
             }
         } else {
             $r->print(&header('Course/Community Requests').$crumb.
@@ -342,32 +368,49 @@ sub generate_page {
         }
     } elsif ($action eq 'view') {
         if ($state eq 'crstype') {
-            &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb,\%request_domains);
+            &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb,\@incdoms);
         } else {
             &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
-                                    $loaditems,$crumb);
+                                    $loaditems,$crumb,'','','','',$showcredits);
         }
     } elsif ($action eq 'display') {
         if ($warning ne '') {
             my $args = { only_body => 1 };
-            $r->print(&header('Course/Community Requests','','',$args).$crumb.
+            $r->print(&header('Course/Community Requests','','' ,'',$args).$crumb.
                       '<h3>'.&mt('Course/Community Request Details').'</h3>'.
                       '<div class="LC_warning">'.$warning.'</div>'.
                       &close_popup_form());
         } else {
             &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
-                                    $loaditems,$crumb,'','','','','',$uname,$udom);
+                                    $loaditems,$crumb,'','','','',$showcredits,'','',
+                                    $uname,$udom);
         }
     } elsif ($action eq 'log') {
-        &print_request_logs($jscript,$loaditems,$crumb);
+        if ($state eq 'crstype') {
+            &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb,\@incdoms);
+        } else {
+            $jscript .= <<ENDJS;
+
+function backPage(formname,prevstate) {
+    formname.state.value = prevstate;
+    formname.submit();
+}
+
+function setPage(formname) {
+    formname.page.value = '1';
+    return;
+}
+
+ENDJS
+            &print_request_logs($r,$dom,$jscript,$loaditems,$crumb,\%can_request);
+        }
     } else {
-        &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb,\%request_domains);
+        &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb,\@incdoms);
     }
-    return;
+    return OK;
 }
 
 sub mainmenu_javascript {
-    my ($action) = @_;
     return <<"END";
 function setType(courseForm) {
     for (var i=0; i<courseForm.crstype.length; i++) {
@@ -380,11 +423,11 @@ function setType(courseForm) {
 }
 
 function setAction(courseForm) {
-    for (var i=0; i<courseForm.reqaction.length; i++) {
-        if (courseForm.reqaction.options[i].value == "$action") {
-            courseForm.reqaction.options[i].selected = true;
+    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.reqaction.options[i].selected = false;
+            courseForm.action.options[i].selected = false;
         }
     }
 }
@@ -394,11 +437,11 @@ END
 sub cloning_javascript {
     return <<"END";
 function setCloneDisplay(courseForm) {
-    if (courseForm.cloning.length > 1) {
+    if (courseForm.cloning.length > 1) {    
         for (var i=0; i<courseForm.cloning.length; i++) {
             if (courseForm.cloning[i].checked) {
                 if (courseForm.cloning[i].value == 1) {
-                    document.getElementById('cloneoptions').style.display="block";;
+                    document.getElementById('cloneoptions').style.display="block";
                 }
             }
         }
@@ -407,18 +450,21 @@ function setCloneDisplay(courseForm) {
 END
 }
 
+sub processing_javascript {
+    return <<"END";
+function hideProcessing() {
+    if (document.getElementById('processing')) {
+        document.getElementById('processing').style.display="none";
+    }
+}
+
+END
+}
+
 sub get_breadcrumbs {
     my ($dom,$action,$state,$states,$trail) = @_;
     my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description);
     my $page = 0;
-    my $firstcrumb = 'Pick Action';
-    my $crumbtitle = 'Course/Community Requests';
-    my $crumbhelp = 'Course_Requests';
-    if ($dom =~ /^\w+citest$/) {
-        $firstcrumb = 'Building a Test';
-        $crumbtitle = 'Create Concept Test';
-        $crumbhelp = 'Concept_Test_Creation';
-    }
     if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
         if (defined($action)) {
             my $done = 0;
@@ -456,52 +502,20 @@ sub get_breadcrumbs {
                     }
                 }
             }
-            my %forms = (
-                          chooseitems  => 'requestcrs',
-                          uploadroster => 'studentform',
-                          enrolling    => 'requestcrs',
-                          done         => 'requestcrs',
-                        );
-            my $lastidx;
-            for (my $i=0; $i<@{$states->{$action}}; $i++) {
-                if ($$state eq $states->{$action}[$i]) {
-                    $lastidx = $i;
-                    last;
-                }
-            }
-            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($crumbtitle,$crumbhelp);
-                    last;
-                } else {
-                    if (($$state eq 'process') || ($$state eq 'removal')) {
+            if (ref($states->{$action}) eq 'ARRAY') {
+                for (my $i=0; $i<@{$states->{$action}}; $i++) {
+                    if ($$state eq $states->{$action}[$i]) {
                         &Apache::lonhtmlcommon::add_breadcrumb(
-                            { href => '/adm/requestcourse',
-                              text => "$trail->{$states->{$action}[$i]}",
-                            }
-                        );
+                           {text=>"$trail->{$$state}"});
+                        $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
+                        last;
                     } else {
-                        if (($$state eq 'chooseitems') || ($$state eq 'uploadroster') ||
-                            ($$state eq 'enrolling') || ($$state eq 'done')) {
-                            if (($states->{$action}[$i] ne 'process') &&
-                                ($states->{$action}[$i] ne 'chooseitems') &&
-                                ($states->{$action}[$i] ne 'uploadroster') &&
-                                ($states->{$action}[$i] ne 'enrolling') &&
-                                ($states->{$action}[$i] ne 'done')) {
-                                &Apache::lonhtmlcommon::add_breadcrumb(
-                                   { href => '/adm/requestcourse',
-                                     text => "$trail->{$states->{$action}[$i]}",
-                                   }
-                                );
-                            } else {
-                                my $diff = $i-$lastidx;
-                                &Apache::lonhtmlcommon::add_breadcrumb(
-     { href => "javascript:history.go($diff)",
-       text => "$trail->{$states->{$action}[$i]}", }
-                               );
-                            }
+                        if (($$state eq 'process') || ($$state eq 'removal') || ($$state eq 'reqauthor')) {
+                            &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]')",
@@ -513,13 +527,13 @@ sub get_breadcrumbs {
             }
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb(
-                    {text=>$firstcrumb});
-            $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
+                    {text=>'Pick Action'});
+            $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
         }
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb(
-                {text=>$firstcrumb});
-        $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
+                {text=>'Pick Action'});
+        $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
     }
     return ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description);
 }
@@ -535,20 +549,19 @@ sub header {
         if (ref($args) eq 'HASH') {
             my %loadhash = (
                              'add_entries' => $loaditems,
-                             'function'    => 'norole',
                            );
             my %arghash = (%loadhash,%{$args});
-            $args = \%arghash;
+            $args = \%arghash;                  
         } else {
-            $args = {'add_entries' => $loaditems,
-                     'function'    => 'norole'};
+            $args = {'add_entries' => $loaditems,};
         }
     }
     return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$args);
 }
 
 sub form_elements {
-    my ($dom) = @_;
+    my ($dom,$showcredits) = @_;
+    my $instcredits;
     my %elements =
     (
         new => {
@@ -559,7 +572,7 @@ sub form_elements {
             },
             courseinfo => {
                 cdescr           => 'text',
-                cloning          => 'radio',
+                cloning          => 'radio', 
                 clonecrs         => 'text',
                 clonedom         => 'selectbox',
                 datemode         => 'radio',
@@ -595,28 +608,12 @@ sub form_elements {
          },
     );
     my %servers = &Apache::lonnet::get_servers($dom,'library');
-    if ($dom =~ /^\w+citest$/) {
-        %{$elements{'new'}{'courseinfo'}} = (
-                                              cdescr      => 'text',
-                                              concepttest => 'radio',
-                                            );
-        $elements{'new'}{'enrollment'}{'timezone'} = 'selectbox';
-        if (&show_cloneable()) {
-            $elements{'new'}{'courseinfo'}{'clonecrs'} = 'selectbox';
-            $elements{'new'}{'courseinfo'}{'clonedom'} = 'hidden';
-            $elements{'new'}{'courseinfo'}{'cloneroster'} = 'checkbox';
-        }
-    }
     my $numlib = keys(%servers);
     if ($numlib > 1) {
         $elements{'new'}{'courseinfo'}{'chome'} = 'selectbox';
     } else {
         $elements{'new'}{'courseinfo'}{'chome'} = 'hidden';
     }
-    if ($dom =~ /^\w+citest$/) {
-        my %mergedhash = (%{$elements{'new'}{'courseinfo'}},%{$elements{'new'}{'enrollment'}});
-        %{$elements{'new'}{'courseinfo'}} = %mergedhash;
-    }
     my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
     &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                              \%cat_order,\@code_order);
@@ -632,7 +629,6 @@ sub form_elements {
     }
     if (&Apache::lonnet::auto_run('',$dom)) {
         my %extras = (
-                       sectotal           => 'hidden',
                        enrollstart_month  => 'selectbox',
                        enrollstart_hour   => 'selectbox',
                        enrollend_month    => 'selectbox',
@@ -648,12 +644,39 @@ sub form_elements {
                        addcrosslist       => 'checkbox',
                        autoadds           => 'radio',
                        autodrops          => 'radio',
-                     );
-        if ($env{'form.sectotal'} > 0) {
-            for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
-                $extras{'sec_'.$i} = 'radio';
-                $extras{'secnum_'.$i} = 'text';
-                $extras{'loncapasec_'.$i} = 'text';
+        );
+        my ($instcode,$titlescount) = &get_instcode($dom);
+        if ($instcode) {
+            my @sections = &Apache::lonnet::auto_get_sections(undef,$dom,$instcode);
+            if (@sections) {
+                $extras{'sectotal'} = 'hidden';
+                if ($env{'form.sectotal'} > 0) {
+                    for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+                        $extras{'sec_'.$i} = 'radio';
+                        $extras{'secnum_'.$i} = 'text';
+                        $extras{'loncapasec_'.$i} = 'text';
+                    }
+                }
+            } else {
+                $extras{'addsection'} = 'checkbox';
+                my $sectotal = $env{'form.sectotal'};
+                if ($env{'form.addsection'}) {
+                    $sectotal ++;
+                }
+                for (my $i=0; $i<$sectotal; $i++) {
+                    $extras{'sec_'.$i} = 'checkbox';
+                    $extras{'secnum_'.$i} = 'text',
+                    $extras{'loncapasec_'.$i} = 'text',
+                }
+            }
+            (my $outcome,my $desc,$instcredits) = 
+                &Apache::lonnet::auto_validate_instcode(undef,$dom,$instcode);
+            if ($showcredits && $instcredits eq '') {
+                $extras{'coursecredits'} = 'text';
+            }
+        } elsif (($env{'form.crstype'} eq 'unofficial') || ($env{'form.crstype'} eq 'textbook')) {
+            if ($showcredits) {
+                $extras{'coursecredits'} = 'text';
             }
         }
         my $crosslisttotal = $env{'form.crosslisttotal'};
@@ -663,7 +686,6 @@ sub form_elements {
         if (!$crosslisttotal) {
             $crosslisttotal = 1;
         }
-
         for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
             if ($numtitles) {
                 $extras{'crosslist_'.$i.'_'.$lastitem} = 'text';
@@ -701,7 +723,7 @@ sub form_elements {
     }
     my %personnelhash = (%{$elements{'new'}{'personnel'}},%people);
     %{$elements{'new'}{'personnel'}} = %personnelhash;
-    return %elements;
+    return (\%elements,$instcredits);;
 }
 
 sub onload_action {
@@ -713,18 +735,20 @@ sub onload_action {
         } else {
             $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs);';
         }
+        if ($state eq 'courseinfo') {
+            $loaditems{'onload'} .= 'javascript:setCloneDisplay(document.requestcrs);';
+        }
+        if ($state eq 'process') {
+            $loaditems{'onload'} .= 'javascript:hideProcessing();';
+        }
     }
     return \%loaditems;
 }
 
 sub print_main_menu {
-    my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb,$request_domains) = @_;
+    my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb,$incdoms) = @_;
     my ($types,$typename) = &Apache::loncommon::course_types();
-    my $onchange;
-    unless ($env{'form.interface'} eq 'textual') {
-        $onchange = 'this.form.submit()';
-    }
-
+    my $onchange = 'this.form.submit()';
     my $nextstate_setter = "\n";
     if (ref($states) eq 'HASH') {
         foreach my $key (keys(%{$states})) {
@@ -738,13 +762,11 @@ sub print_main_menu {
         }
     }
 
-    my $js;
-    unless ($dom =~ /^\w+citest$/) {
-        $js = <<"END";
+    my $js = <<"END";
 
 function nextPage(formname) {
     var crschoice = document.mainmenu_coursetype.crstype.value;
-    var actionchoice = document.mainmenu_action.reqaction.value;
+    var actionchoice = document.mainmenu_action.action.value;
     if (check_can_request(crschoice,actionchoice) == true) {
         if ((actionchoice == 'new') && (crschoice == 'official')) {
             nextstate = 'codepick';
@@ -752,7 +774,7 @@ function nextPage(formname) {
 $nextstate_setter 
         }
         formname.crstype.value = crschoice;
-        formname.reqaction.value = actionchoice; 
+        formname.action.value = actionchoice; 
         formname.state.value= nextstate;
         formname.submit();
     }
@@ -762,43 +784,63 @@ $nextstate_setter
 function check_can_request(crschoice,actionchoice) {
     var official = '';
     var unofficial = '';
-    var community = '';    
+    var community = '';
+    var textbook = '';
+    var placement = '';
 END
-        if (ref($can_request) eq 'HASH') {
-            foreach my $item (keys(%{$can_request})) {
-                    $js .= " 
-            $item = 1;
+    if (ref($can_request) eq 'HASH') {
+        foreach my $item (keys(%{$can_request})) {
+                $js .= " 
+        $item = 1;
 ";
-            }
         }
-        my %lt = &Apache::lonlocal::texthash(
-            official => 'You are not permitted to request creation of an official course in this domain.',
-            unofficial => 'You are not permitted to request creation of an unofficial course in this domain.',
-            community => 'You are not permitted to request creation of a community this domain.',
-            all => 'You must choose a specific course type when making a new course request.\\nAll types is not allowed.',
-        ); 
-        $js .= <<END;
+    }
+    my %js_lt = &Apache::lonlocal::texthash(
+        official => 'You are not permitted to request creation of an official course in this domain.',
+        unofficial => 'You are not permitted to request creation of an unofficial course in this domain.',
+        community => 'You are not permitted to request creation of a community in this domain.',
+        textbook => 'You are not permitted to request creation of a textbook course in this domain',
+        placement => 'You are not permitted to request creation of a placement test in this domain',
+        all => 'You must choose a specific course type when making a new course request.',
+        allt => '"All types" is not allowed.',
+    ); 
+    &js_escape(\%js_lt);
+    $js .= <<END;
     if (crschoice == 'official') {
         if (official != 1) {
-            alert("$lt{'official'}");
+            alert("$js_lt{'official'}");
             return false;
         }
     } else {
         if (crschoice == 'unofficial') {
-           if (unofficial != 1) {
-               alert("$lt{'unofficial'}");
-               return false;
+            if (unofficial != 1) {
+                alert("$js_lt{'unofficial'}");
+                return false;
             }
         } else {
             if (crschoice == 'community') {
                 if (community != 1) {
-                    alert("$lt{'community'}");
+                    alert("$js_lt{'community'}");
                     return false;
                 }
             } else {
-                if (actionchoice == 'new') {
-                    alert("$lt{'all'}");
-                    return false;
+                if (crschoice == 'textbook') {
+                    if (textbook != 1) {
+                        alert("$js_lt{'textbook'}");
+                        return false;
+                    }
+                } else {
+                    if (crschoice == 'placement') {
+                        if (placement != 1) {
+                            alert("$js_lt{'placement'}");
+                            return false;
+                        }
+                    } else {
+                        if (actionchoice == 'new') {
+                            alert('$js_lt{'all'}'+'\\n'+'$js_lt{'allt'}');
+                            return false;
+                        }
+                    }
                 }
             }
         }
@@ -806,10 +848,9 @@ END
     return true;
 }
 END
-    }
-    my ($pagetitle,$pageinfo,$domaintitle);
+    my ($pagetitle,$pageinfo,$domaintitle,$earlyout);
     if (ref($can_request) eq 'HASH') {
-        if (($can_request->{'official'}) || ($can_request->{'unofficial'})) {
+        if (($can_request->{'official'}) || ($can_request->{'unofficial'}) || ($can_request->{'textbook'}) || ($can_request->{'placement'})) {
             if ($can_request->{'community'}) {
                 $pagetitle = 'Course/Community Requests';
                 $pageinfo = &mt('Request creation of a new course or community, or review your pending requests.');
@@ -823,72 +864,34 @@ END
             $pagetitle = 'Community Requests';
             $pageinfo = &mt('Request creation of a new course, or review your pending requests.');
             $domaintitle = &mt('Community Domain');
-        } else {
+        } elsif ((ref($incdoms) eq 'ARRAY') && ((@{$incdoms} > 1) ||
+                 ((@{$incdoms} == 1) && ($incdoms->[0] ne $dom)))) {
             $pagetitle = 'Course/Community Requests';
             $pageinfo = &mt('You do not have rights to request creation of courses in this domain; please choose a different domain.');
             $domaintitle = &mt('Course/Community Domain');
+        } else {
+            $pagetitle = 'Course/Community Requests';
+            $pageinfo  = &mt('You do not have rights to request creation of courses or communities.');
+            $earlyout = 1;
         }
     }
-
-    if ($dom =~ /^\w+citest$/) {
-        my $formname = 'requestcrs';
-        my $nexttext = &mt('Continue');
-        $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
-            '<p>'.&mt('Deployment of a Concept Test requires completion of the following three steps:').'<ol>'.
-            '<li>'.&mt('Creation of a course "container" and setting of access dates').'</li>'.
-            '<li>'.&mt('Assembly of a valid test from Concept Inventory questions').'</li>'.
-            '<li>'.&mt('Enrollment of students').'</li>'.
-            '</ol></p><p>'.&mt('When assembling a test you may:').
-            '<br />'.&mt('(a) have a valid test built automatically by the WebCenter, or').'<br />'.&mt('(b) select the questions to include by combining questions chosen from eleven bins with four mandatory questions, or').
-            '<br />'.&mt('(c) copy one of your existing tests (including optional copying of the student roster)').'</p><p>'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'<br />'.&mt("Students' e-mail addresses must be used as their usernames to ensure uniqueness.").'</p><div>'.
-            '<form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
-            '<input type="hidden" name="state" value="courseinfo" />'."\n".
-            '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
-            '<input type="hidden" name="crstype" value="unofficial" />'."\n".
-            '<input type="hidden" name="reqaction" value="new" />'."\n".
-            '<input type="button" name="next" value="'.$nexttext.
-            '" onclick="this.form.submit();" />'."\n".
-            '</form></div>'.
-             &Apache::loncommon::end_page());
-        return;
-    }
-
-    if (!$onchange) {
-        $r->print('&nbsp;<input type="submit" name="godom" value="'.
-                   &mt('Change').'" />');
-    }
-    unless ((ref($can_request) eq 'HASH') && (keys(%{$can_request}) > 0)) {
-        $r->print(&Apache::lonhtmlcommon::row_closure(1)."\n".
-                  &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
-                  &Apache::loncommon::end_page());
+    $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
+             '<p>'.$pageinfo.'</p>');
+    if ($earlyout) {
+        $r->print(&Apache::loncommon::end_page());
         return;
     }
-
-    my @incdoms;
-    if (ref($request_domains) eq 'HASH') {
-        foreach my $item (keys(%{$request_domains})) {
-            if (ref($request_domains->{$item}) eq 'ARRAY') {
-                foreach my $possdom (@{$request_domains->{$item}}) {
-                    unless(grep(/^\Q$possdom\E$/,@incdoms)) {
-                        push(@incdoms,$possdom);
-                    } 
-                } 
-            }
-        }
-    }
-    $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
-             '<p>'.$pageinfo.'</p>'.
-             '<div>'.
+    $r->print('<div>'.
               &Apache::lonhtmlcommon::start_pick_box().
               &Apache::lonhtmlcommon::row_title($domaintitle).
               '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
-              &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange,\@incdoms));
+              &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange,$incdoms));
     if (!$onchange) {
         $r->print('&nbsp;<input type="submit" name="godom" value="'.
                    &mt('Change').'" />');
     }
     unless ((ref($can_request) eq 'HASH') && (keys(%{$can_request}) > 0)) {
-        $r->print(&Apache::lonhtmlcommon::row_closure(1)."\n".
+        $r->print('</form>'.&Apache::lonhtmlcommon::row_closure(1)."\n".
                   &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
                   &Apache::loncommon::end_page());
         return;
@@ -898,12 +901,12 @@ END
     my $nexttext = &mt('Next');
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
 <form name="mainmenu_action" method="post" action=""> 
-<select size="1" name="reqaction" >
+<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></form>'.
-              &Apache::lonhtmlcommon::row_closure(1).
+              &Apache::lonhtmlcommon::row_closure().
               &Apache::lonhtmlcommon::row_title(&mt('Type')).'
 <form name="mainmenu_coursetype" method="post" action="">
 <select size="1" name="crstype">');
@@ -936,7 +939,7 @@ END
               '<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="reqaction" value="" />'."\n".
+              '<input type="hidden" name="action" value="" />'."\n".
               '<input type="button" name="next" value="'.$nexttext.
               '" onclick="javascript:nextPage(document.'.$formname.')" />'."\n".
               '</form></div>');
@@ -946,8 +949,8 @@ END
 
 sub request_administration {
     my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb,
-        $newinstcode,$codechk,$checkedcode,$description,$invalidcrosslist,
-        $uname,$udom) = @_;
+        $newinstcode,$codechk,$checkedcode,$description,$showcredits,
+        $instcredits,$invalidcrosslist,$uname,$udom) = @_;
     my $js;
     if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) {
         $js =  <<END;
@@ -962,13 +965,8 @@ END
     if (($action eq 'new') || ($action eq 'view')) {
         $js .= <<END;   
 
-function backPage(formname,prevstate,currstate) {
+function backPage(formname,prevstate) {
     formname.state.value = prevstate;
-    if (currstate == "enrolling") {
-        if (prevstate == "chooseitems" || prevstate == "uploadroster") {
-            formname.action = "/adm/createuser";
-        }
-    } 
     formname.submit();
 }
 
@@ -976,8 +974,9 @@ END
     }
     if ($action eq 'new') {
         my $jsextra;
-        if ($state eq 'courseinfo') {
-            $jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);
+        if (($state eq 'courseinfo') || ($state eq 'codepick')) {
+            $jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom,'','','','','',
+                                                                         $newinstcode);
         } elsif ($state eq 'enrollment') {
             if (($env{'form.crstype'} eq 'official') && 
                 (&Apache::lonnet::auto_run('',$dom))) {
@@ -985,22 +984,17 @@ END
             }
         } elsif ($state eq 'personnel') {
             $js .= "\n".&section_check_javascript()."\n".&personnel_lcsec_js();
-        } elsif (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) {
-            $js .= "\n".&Apache::londocsgci::builder_javascript($dom)."\n";
         }
         my $title;
         if ($env{'form.crstype'} eq 'community') {
             $title = 'Request a community';
-        } elsif (&Apache::loncommon::needs_gci_custom()) {
-            $title = 'Create a new Concept Test';
         } else {
             $title = 'Request a course';
         }
         $r->print(&header($title,$js.$jscript,$loaditems,$jsextra).$crumb);
-        return if (($state eq 'chooseitems') || ($state eq 'uploadroster') || 
-                   ($state eq 'enrolling'));
         &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
-                            $codechk,$checkedcode,$description,$invalidcrosslist);
+                            $codechk,$checkedcode,$description,$showcredits,
+                            $instcredits,$invalidcrosslist);
     } elsif ($action eq 'view') {
         my $jsextra;
         my $formname = 'requestcrs';
@@ -1031,11 +1025,15 @@ END
                 $title = &mt('Pending requests for official courses');
             } elsif ($env{'form.crstype'} eq 'unofficial') {
                 $title = &mt('Pending requests for unofficial courses');
+            } elsif ($env{'form.crstype'} eq 'textbook') {
+                $title = &mt('Pending requests for textbook courses');
+            } elsif ($env{'form.crstype'} eq 'textbook') {
+                $title = &mt('Pending requests for placement tests'); 
             } else {
                 $title = &mt('Pending course/community requests'); 
             }
             $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
-                      &print_request_status($dom,$action,$state).'</form></div>');
+                      &print_request_status($dom,$action).'</form></div>');
         } elsif ($state eq 'details') {
             my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
             my $origcnum = $env{'form.cnum'};
@@ -1054,9 +1052,10 @@ END
             }
             $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
                       &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
-                                    \@code_order)."\n".
+                                    \@code_order,'','','','',$instcredits)."\n".
                       '<input name="origcnum" value="'.$origcnum.'" type="hidden" />'."\n");
-            my @excluded = &get_excluded_elements($dom,$states,'new','review');
+            my @excluded = &get_excluded_elements($dom,$states,'new','review',
+                                                  $showcredits);
             push(@excluded,'origcnum');
             $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</div>');
             my $other = 'modify';
@@ -1078,7 +1077,8 @@ END
             my ($result,$output) = &print_cancel_request($dom,$env{'form.origcnum'});
             $r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
                       $output);
-            my @excluded = &get_excluded_elements($dom,$states,'view','cancel');
+            my @excluded = &get_excluded_elements($dom,$states,'view','cancel',
+                                                  $showcredits);
             $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</div>');
             my %navtxt = &Apache::lonlocal::texthash (
                                                       prev => 'Back',
@@ -1121,7 +1121,7 @@ END
             }
             $r->print('<h3>'.&mt('Request Cancellation').'</h3><div>'."\n".$form."\n".
                       '<input type="hidden" name="state" value="'.$state.'" />'."\n".
-                      '<input type="hidden" name="reqaction" value="'.$action.'" />'."\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') {
@@ -1155,19 +1155,66 @@ END
         $r->print(&header($title,'','','',{ 'only_body' => 1}).
                   $crumb."\n".'<h3>'.$header.'</h3>'.
                   &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,
-                                \@code_order,$uname,$udom)."\n".'</div>'.
+                                \@code_order,$uname,$udom,'','',$instcredits)."\n".
+                  '</div>'.
                   &close_popup_form());
-    } elsif ($action eq 'log') {
-        $r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb);
     }
     $r->print(&Apache::loncommon::end_page());
     return;
 }
 
+sub domcoord_display {
+    my ($dom) = @_;
+    my ($uname,$udom,$result,$warning);
+    if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
+        if ($env{'form.cnum'} ne '') {
+            my $cnum = $env{'form.cnum'};
+            my $queue = $env{'form.queue'};
+            my $reqkey = $cnum.'_'.$queue;
+            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 {
+                    if ($env{'form.crstype'} eq 'community') {
+                        $warning = &mt('Invalid username or domain for community requestor');
+                    } else {
+                        $warning = &mt('Invalid username or domain for course requestor');
+                    }
+                }
+            } else {
+                if ($env{'form.crstype'} eq 'community') {
+                    $warning = &mt('No information was found for this community request.');
+                } else {
+                    $warning = &mt('No information was found for this course request.');
+                }
+            }
+        } else {
+            $warning = &mt('No course request ID provided.');
+        }
+    } else {
+        if ($env{'form.crstype'} eq 'any') {
+            $warning = &mt('You do not have rights to view course or community request information.');
+        } elsif ($env{'form.crstype'} eq 'community') {
+            $warning = &mt('You do not have rights to view community request information.');
+        } else {
+            $warning = &mt('You do not have rights to view course request information.');
+        }
+    }
+    return ($uname,$udom,$result,$warning);
+}
+
 sub enrollment_lcsec_js {
     my %alerts = &section_check_alerts();
     my $secname = $alerts{'badsec'};
     my $secnone = $alerts{'reserved'};
+    &js_escape(\$secname);
+    &js_escape(\$secnone);
     my $output = '
 function validateEnrollSections(formname,nextstate) {
     var badsectotal = 0;
@@ -1225,8 +1272,10 @@ function validateEnrollSections(formname
 
 sub personnel_lcsec_js {
     my %alerts = &section_check_alerts();
-    my $secname = $alerts{'badsec'}.'\\n'.$alerts{'separate'};
+    my $secname = $alerts{'badsec'}."\n".$alerts{'separate'};
     my $secnone = $alerts{'reserved'};
+    &js_escape(\$secname);
+    &js_escape(\$secnone);
     my $output = '
 function validatePersonnelSections(formname,nextstate) {
     var badsectotal = 0;
@@ -1351,7 +1400,7 @@ sub get_instcode {
 
 sub print_request_form {
     my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode,
-        $description,$invalidcrosslist) = @_;
+        $description,$showcredits,$instcredits,$invalidcrosslist) = @_;
     my $formname = 'requestcrs';
     my ($next,$prev,$message,$output,$codepicker,$crstype);
     $prev = $states->{$action}[$page-1];
@@ -1404,29 +1453,29 @@ sub print_request_form {
                           &Apache::lonhtmlcommon::end_pick_box().'</div>');
             } else {
                 $next = $states->{$action}[$page+2];
-                $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next));
+                $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
             }
         } else {
             if ($crstype eq 'official') {
                 $next = $states->{$action}[$page+2];
             }
-            $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next));
+            $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
         }
     } elsif ($prev eq 'codepick') {
         if ($instcode eq '') {
             $prev = $states->{$action}[$page-2];
         }
-        $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next,$description));
+        $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,$state,$instcode,$dom,\@codetitles,
+        $r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
                                          \%cat_titles,\%cat_order,\@code_order,
-                                         $invalidcrosslist));
+                                         $showcredits,$instcredits,$invalidcrosslist));
     } elsif ($state eq 'personnel') {
-        $r->print(&print_personnel_menu($dom,$formname,$state,$crstype,$invalidcrosslist));
+        $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;
@@ -1450,16 +1499,38 @@ sub print_request_form {
                             }
                             if ($skipuser) {
                                 push(@disallowed,$i);
-                                $disallowmsg{$i} = &mt('[_1] was excluded because new users need be from the course domain','<tt>'.$personname.':'.$persondom.'</tt>');
+                                $disallowmsg{$i} = &mt('[_1] was excluded because new users need to be from the course domain','<tt>'.$personname.':'.$persondom.'</tt>');
                                 next;
                             }
                         }
-                        if (&get_cancreate_status($persondom,$personname,$dom)) {
-                            my ($allowed,$msg) = 
+                        my $usertype = &get_usertype($persondom,$personname,\%curr_rules,\%got_rules);
+                        if (&Apache::lonuserutils::can_create_user($dom,'requestcrs',$usertype)) {
+                            my ($allowed,$msg,$authtype,$authparam) = 
                                 &check_newuser_rules($persondom,$personname,
                                     \%alerts,\%rulematch,\%inst_results,
                                     \%curr_rules,\%got_rules);
                             if ($allowed) {
+                                my %domdefaults = &Apache::lonnet::get_domain_defaults($persondom);
+                                if ($usertype eq 'official') {
+                                    if ($authtype eq '') {
+                                        $authtype = $domdefaults{'auth_def'};
+                                        $authparam = $domdefaults{'auth_arg_def'};
+                                    }
+                                } elsif ($usertype eq 'unofficial') {
+                                    if ($authtype eq '') {
+                                        $authtype = 'internal';
+                                        $authparam = '';
+                                    }
+                                } else {
+                                    $authtype = $domdefaults{'auth_def'};
+                                    $authparam = $domdefaults{'auth_arg_def'};
+                                }
+                                if (($authtype eq '') ||
+                                    (($authtype =~/^krb/) && ($authparam eq ''))) {
+                                    push(@disallowed,$i);
+                                    $disallowmsg{$i} = &mt('[_1] was excluded because institutional information is incomplete for this new user.','<tt>'.$personname.':'.$persondom.'</tt>');
+                                    next;
+                                }
                                 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'};
@@ -1505,7 +1576,11 @@ sub print_request_form {
         if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {
             $cnum = $env{'form.origcnum'};
         } else {
-            $cnum = &Apache::lonnet::generate_coursenum($dom);
+            my $gentype = 'Course';
+            if ($crstype eq 'community') {
+                $gentype = 'Community';
+            }
+            $cnum = &Apache::lonnet::generate_coursenum($dom,$gentype);
         }
         &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                  \%cat_order,\@code_order);
@@ -1514,36 +1589,87 @@ sub print_request_form {
         } else {
             $r->print('<h3>'.&mt('Review course request details before submission').'</h3>');
         }
-        $r->print(&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg).
+        $r->print(&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg,$instcredits).
                   '<input type="hidden" name="cnum" value="'.$cnum.'" />');
+        my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+                                                     $env{'user.domain'});
+        my $postprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'review',$env{'user.name'},
+                                                              $env{'user.domain'},$fullname,$env{'form.cdescr'});
+        if (ref($postprocess) eq 'HASH') {
+            if ($postprocess->{'reviewweb'}) {
+                $r->print($postprocess->{'reviewweb'});
+            }
+        }
         if ($crstype eq 'community') {
             $navtxt{'next'} = &mt('Submit community request');
         } else {
             $navtxt{'next'} = &mt('Submit course request');
         }
-    } elsif ($state eq 'process') {
+    }  elsif ($state eq 'process') {
         if ($crstype eq 'official') {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                      \%cat_order,\@code_order);
         }
-        my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles,
-                                                           \@code_order,$formname);
+        my $lonhost = $r->dir_config('lonHostID');
+        my ($storeresult,$result,$customized) = &print_request_outcome($r,$lonhost,$dom,\@codetitles,
+                                                                      \@code_order,$instcredits);
         $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('<p><a href="/adm/requestcourse?action=view&state=details&showdom='.$dom.'&cnum='. $env{'form.cnum'}.'">'.
+                          &mt('Modify this request').'</a>'.('&nbsp;'x4).
+                          '<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
             }
-            unless ($env{'form.concepttest'}) {
-                $r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
+            if (&Apache::loncoursequeueadmin::author_prompt()) {
+                unless ($customized) {
+                    &print_author_prompt($r,$env{'form.action'},$env{'form.cnum'},$env{'form.showdom'},
+                                         $env{'form.crstype'},$storeresult);
+                }
+            } elsif ($storeresult eq 'created') {
+                unless ($customized) {
+                    $r->print('<p><a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
+                }
+            }
+        }
+    } elsif ($state eq 'reqauthor') {
+        my ($result,@links); 
+        if ($env{'form.requestauthor'}) {
+            $r->print(&Apache::loncoursequeueadmin::process_reqauthor(\$result));
+            if ($result eq 'created') {
+                my $role = 'au';
+                my $spec = "$role./$env{'form.showdom'}/";
+                push(@links,&mt('Enter your Authoring Space with role: [_1]',
+                                '<a href="/adm/roles?selectrole=1&amp;'.$spec.'=1">'.
+                                &Apache::lonnet::plaintext($role).'</a>'));
             }
-            return;
         }
-    } elsif ($state eq 'uploadroster') {
-         &roster_upload_form($r,$output,$formname);
+        if (($env{'form.disposition'} eq 'created') &&
+            ($env{'form.cnum'} =~ /^$match_courseid$/) &&
+            ($env{'form.showdom'} =~ /^$match_domain$/)) {
+            my ($spec,$area,$role,$type);
+            my $role = 'cc';
+            my $spec = "$role./$env{'form.showdom'}/$env{'form.cnum'}";
+            my $type = 'Course';
+            if ($env{'form.crstype'} eq 'community') {
+                $type = 'Community';
+            }
+            my $showrole = &Apache::lonnet::plaintext($role,$type);
+            unshift(@links,&mt('Enter new course with role: [_1]',
+                               '<a href="/adm/roles?selectrole=1&amp;'.$spec.'=1">'.$showrole.'</a>'));
+        }
+        if (@links > 1) {
+            $r->print(&mt('New roles will be listed on your [_1]Roles[_2] page.',
+                          '<a href="/adm/roles">','</a>').'&nbsp'.&mt('Choose a role:').
+                       '<ul>');
+            foreach my $link (@links) {
+                $r->print('<li>'.$link.'</li>');
+            }
+            $r->print('</ul>');
+        } elsif (@links == 1) {
+            $r->print('<p>'.$links[0].'</p>');
+        }
     }
-    my @excluded = &get_excluded_elements($dom,$states,$action,$state);
+    my @excluded = &get_excluded_elements($dom,$states,$action,$state,$showcredits);
     if ($state eq 'personnel') {
         push(@excluded,'persontotal');
     }
@@ -1570,52 +1696,51 @@ sub print_request_form {
                 $count ++;
             }
             $env{'form.persontotal'} = $count;
-             
         }
     }
     if ($state eq 'enrollment') {
-        push(@excluded,'crosslisttotal');
+        push(@excluded,('sectotal','crosslisttotal'));
     }
-    if ($state eq 'done') {
-        $r->print(&done_display());
+    if (($state eq 'process') || ($state eq 'reqauthor')) {
+        $r->print('</form>');
     } else {
-        $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded));
+        $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
         &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
                             $navtxt{'next'},$state);
     }
-    $r->print('</form>');
     return;
 }
 
-sub done_display {
-    return '<h3>'.&mt('Concept Test creation is complete').'</h3>'.
-           '<p>'.&mt('The following management tools are available via the "[_1]Manage Tests[_2]" tab, or from the toolbar on the [_3]Concept Test Contents[_4] page.[_5]',
-           '<a href="/adm/menu">','</a>','<a href="/adm/navmaps">','</a>','<br />').
-           '<dl class="LC_GCI_Menu">'.
-           '<dt>'.&mt('Concept Test Contents').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/nav.png\');">'.&mt('Display the Table of Contents for your Concept Test.').'</dd>'.
-           '<dt>'.&mt('Assemble Concept Test').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/docs.png\');">'.&mt('If no students have attempted the Concept Test you will be able to modify it. You can also change the start and end date of the test itself.').'</dd></dl>'.
-           '<dl class="LC_GCI_Menu">'.
-           '<dt>'.&mt('Enrollment and Student Activity').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/cprv.png\');">'.&mt('Display or download a course roster, and view information about completion status and last login. You can also add new students, or change access dates for existing students.').'</dd>'.
-           '<dt>'.&mt("What's New?").'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/new.png\');">'.&mt('View information about changes in your Concept Test course.').'</dd></dl>'.
-           '<dl class="LC_GCI_Menu">'.
-           '<dt>'.&mt('Prepare Printable Concept Test').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/prnt.png\');">'.&mt('Create a PDF which you can send to a printer to create a hardcopy of the Concept Test.').'</dd>'.
-           '<dt>'.&mt('Concept Test Statistics').'</dt>'.
-           '<dd style="background-image:url(\'/res/adm/pages/chrt.png\');">'.&mt('After the closing date of the Concept Test you can view and download statistics for the test, as well as anonymized submission data.').'</dd>'.
-           '</dl></p>';
-}
+sub print_author_prompt {
+    my ($r,$action,$cnum,$showdom,$crstype,$storeresult) = @_;
+    $r->print('<h3>'.&mt('Access to Authoring Space').'</h3>'.
+              '<p>'.
+              &mt('Although assessment items can be created directly inside a course, such items only use part of the assessment capabilities of LON-CAPA.').
+              '<br />'.
+              &mt('By contrast, items created in Authoring Space, then imported into a course, can use all of the features of the assessment engine.').'</p>'.
+              '<p>'.&mt('Request Authoring Space access now?').
+              '<span class="LC_nobreak">&nbsp;'.
+              '<label><input type="radio" name="requestauthor" value="1" />'.&mt('Yes').'</label>'.
+              ('&nbsp;'x2).
+              '<label><input type="radio" name="requestauthor" value="0" checked="checked"/>'.&mt('No').'</label>'.
+              '</span></p>'.
+              '<input type="submit" name="newauthor" value="'.&mt('Submit authoring request').'" />'.
+              '<input type="hidden" name="state" value="reqauthor" />'.
+              '<input type="hidden" name="action" value="'.$action.'" />'.
+              '<input type="hidden" name="cnum" value="'.$cnum.'" />'.
+              '<input type="hidden" name="showdom" value="'.$showdom.'" />'.
+              '<input type="hidden" name="crstype" value="'.$crstype.'" />'.
+              '<input type="hidden" name="disposition" value="'.$storeresult.'" />'.
+              '<br />');
+}    
 
-sub get_cancreate_status {
-    my ($persondom,$personname,$dom) = @_;
+sub get_usertype {
+    my ($persondom,$personname,$curr_rules,$got_rules) = @_;
     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);
+                                                         $rules,$curr_rules,$got_rules);
+    return $usertype;
 }
 
 sub check_newuser_rules {
@@ -1623,7 +1748,7 @@ sub check_newuser_rules {
         $got_rules) = @_;
     my $allowed = 1;
     my $newuser = 1;
-    my ($checkhash,$userchkmsg);
+    my ($checkhash,$userchkmsg,$authtype,$authparam);
     my $checks = { 'username' => 1 };
     $checkhash->{$personname.':'.$persondom} = { 'newuser' => $newuser };
     &Apache::loncommon::user_rule_check($checkhash,$checks,$alerts,$rulematch,
@@ -1645,22 +1770,38 @@ sub check_newuser_rules {
             }
         }
     }
-    return ($allowed,$userchkmsg);
+    if ($allowed) {
+        if (ref($rulematch) eq 'HASH') {
+            if (ref($rulematch->{$personname.':'.$persondom}) eq 'HASH') {
+                my $matchedrule = $rulematch->{$personname.':'.$persondom}{'username'};
+                my ($rules,$ruleorder) =
+                    &Apache::lonnet::inst_userrules($persondom,'username');
+                if (ref($rules) eq 'HASH') {
+                    if (ref($rules->{$matchedrule}) eq 'HASH') {
+                        $authtype = $rules->{$matchedrule}{'authtype'};
+                        $authparam = $rules->{$matchedrule}{'authparm'};
+                    }
+                }
+            }
+        }
+    }
+    return ($allowed,$userchkmsg,$authtype,$authparam);
 }
 
 sub get_excluded_elements {
-    my ($dom,$states,$action,$state) = @_;
+    my ($dom,$states,$action,$state,$showcredits) = @_;
     my @excluded = ('counter');
-    my %elements = &form_elements($dom);
+    my ($elements,$instcredits) = &form_elements($dom,$showcredits);
     if (ref($states) eq 'HASH') {
         if (ref($states->{$action}) eq 'ARRAY') {
             my @items = @{$states->{$action}};
             my $numitems = scalar(@items);
             if ($numitems) {
                 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]}})) {
+                    if ((ref($elements) eq 'HASH') && 
+                        (ref($elements->{$action}) eq 'HASH')) {
+                        if (ref($elements->{$action}{$items[$i]}) eq 'HASH') {
+                            foreach my $key (keys(%{$elements->{$action}{$items[$i]}})) {
                                 push(@excluded,$key);
                             }
                         }
@@ -1673,25 +1814,17 @@ sub get_excluded_elements {
     if (grep(/^instcode_/,@excluded)) {
         push(@excluded,'instcode');
     }
-    if ($env{'form.initmap'}) {
-        push(@excluded,'initmap');
-    }
-    if ($env{'form.output'}) {
-        push(@excluded,'output');
-    }
     return @excluded;
 }
 
 sub print_enrollment_menu {
-    my ($formname,$state,$instcode,$dom,$codetitles,$cat_titles,$cat_order,
-        $code_order,$invalidcrosslist) =@_;
-    my ($sections,$autoenroll,$access_dates,$output,$hasauto);
+    my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
+        $showcredits,$instcredits,$invalidcrosslist) =@_;
+    my ($sections,$autoenroll,$access_dates,$output,$hasauto,$hascredits,
+        $creditsrow,$domdefcredits);
     my $starttime = time;
-    my $diff = 6*30*24*60*60; # 6 months from now, approx
-    if (&Apache::loncommon::needs_gci_custom()) {
-        $diff = 7*24*60*60; # 7 days from now, approx
-    }
-    my $endtime = $starttime+$diff;
+    my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
+
     my %accesstitles = (
                           'start' => 'Default start access',
                            'end'   => 'Default end access',
@@ -1700,11 +1833,39 @@ sub print_enrollment_menu {
                            'start' => 'Start auto-enrollment',
                            'end'   => 'End auto-enrollment',
                        );
+    if ($showcredits) {
+        unless ($env{'form.crstype'} eq 'community') {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
+            $domdefcredits = $domdefs{$env{'form.crstype'}.'credits'};
+        }
+    }
     if ($env{'form.crstype'} eq 'official') {
         if (&Apache::lonnet::auto_run('',$dom)) {
             $output = &show_invalid_crosslists($invalidcrosslist);
             my ($section_form,$crosslist_form);
-            $section_form = &inst_section_selector($dom,$instcode);
+            if ($instcode ne '') {
+                $section_form = &inst_section_selector($dom,$instcode);
+                if ($section_form eq '') {
+                    my $sectotal = $env{'form.sectotal'};
+                    if (!$sectotal) {
+                        $sectotal = 1;
+                    }
+                    if ($env{'form.addsection'}) {
+                        $sectotal ++;
+                    }
+                    for (my $i=0; $i<$sectotal; $i++) {
+                        $section_form .= &sections_form($dom,$instcode,$i);
+                    }
+                    if ($section_form) {
+                        $section_form .=
+                    &Apache::lonhtmlcommon::row_title(&mt('Add another')).
+                    '<input name="sectotal" type="hidden" value="'.$sectotal.'" />'.
+                    '<input name="addsection" type="checkbox" value="'.$sectotal.'"'.
+                    ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
+                   "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
+                    }
+                }
+            }
             if ($section_form) {
                 $sections = &Apache::lonhtmlcommon::row_headline().
                             '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Sections').
@@ -1728,10 +1889,10 @@ sub print_enrollment_menu {
                     &Apache::lonhtmlcommon::row_title(&mt('Add another')).
                     '<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.
                     '<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.
-                    ' onclick="javascript:nextPage(document.'.$formname.",'".$state.
+                    ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
                    "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
                 $sections .=  &Apache::lonhtmlcommon::row_headline.
-                              '<h3>'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
+                              '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Crosslist').'&nbsp;'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
                               &Apache::lonhtmlcommon::row_closure(1).
                               $crosslist_form;
             }
@@ -1739,25 +1900,43 @@ sub print_enrollment_menu {
             $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" />'.
+                '<input type="radio" name="autoadds" value="1">'.
                 &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
-                '<input type="radio" name="autoadds" value="0" checked="checked" />'.
+                '<input type="radio" name="autoadds" value="0" checked="checked">'.
                 &mt('No').'</label></span>'.
                 &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" />'.
+                '<input type="radio" name="autodrops" value="1">'.
                 &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
-                '<input type="radio" name="autodrops" value="0" checked="checked" />'.
+                '<input type="radio" name="autodrops" value="0" checked="checked">'.
                 &mt('No').'</label></span>'. 
                 &Apache::lonhtmlcommon::row_closure(1).
                 &date_setting_table($starttime,$endtime,$formname,'enroll',
-                                    $hasauto,$dom,%enrolltitles);
+                                    $hasauto,undef,%enrolltitles);
+            if ($showcredits) {
+                if ($instcredits) {
+                    $creditsrow = &mt('[quant,_1,credit]',$instcredits);
+                } else {
+                    $creditsrow = '<span class="LC_nobreak">'.
+                                  '<input type="text" size="3" name="coursecredits"'.
+                                  ' value="'.$domdefcredits.'" />';
+                }
+                $hascredits = 1;
+            }
+        }
+    } elsif (($env{'form.crstype'} eq 'unofficial') || ($env{'form.crstype'} eq 'textbook')) {
+        if ($showcredits) {
+            $creditsrow = '<span class="LC_nobreak">'.
+                          '<input type="text" size="3" name="coursecredits"'.
+                          ' value="'.$domdefcredits.'"/>';
+            $hascredits = 1;
         }
     }
     my $access_dates = 
         &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
-                            $dom,%accesstitles);
+                            $hascredits,%accesstitles);
+    $output .= &Apache::lonhtmlcommon::start_pick_box();
     if ($sections) {
         $output .=  $sections;
     }
@@ -1774,23 +1953,19 @@ sub print_enrollment_menu {
         }
         $output .= &Apache::lonhtmlcommon::row_headline('Access').
                    '<h3>'.$header.'</h3>'.
-                   &Apache::lonhtmlcommon::row_closure(1);
-        if ($dom =~ /^\w+citest$/) {
-            my $includeempty = 1;
-            my $timezone = &Apache::lonlocal::gettimezone();
-            $output .= &Apache::lonhtmlcommon::row_title('Time zone').
-                       &Apache::loncommon::select_timezone('timezone',$timezone,
-                                                           undef,$includeempty).
-                       &Apache::lonhtmlcommon::row_closure(1);
-        }
-        $output .= $access_dates;
+                   &Apache::lonhtmlcommon::row_closure(1).
+                   $access_dates;
     }
-    if ($dom =~ /^\w+citest$/) {
-        return $output;
-    } else {
-        return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
-               &Apache::lonhtmlcommon::end_pick_box().'</div>';
+    if ($creditsrow) {
+        $output .= &Apache::lonhtmlcommon::row_headline('Credits').
+                   '<h3>'.&mt('Credits earned by students').'</h3>'.
+                   &Apache::lonhtmlcommon::row_closure(1).
+                   &Apache::lonhtmlcommon::row_title(&mt('Default credits')).
+                   $creditsrow.
+                   &Apache::lonhtmlcommon::row_closure(1);
     }
+    return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+           &Apache::lonhtmlcommon::end_pick_box().'</div>';
 }
 
 sub show_invalid_crosslists {
@@ -1852,30 +2027,20 @@ sub inst_section_selector {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime,$formname,$prefix,$hasauto,$dom,%datetitles) = @_;
+    my ($starttime,$endtime,$formname,$prefix,$hasauto,$hascredits,%datetitles)=@_;
     my ($perpetual,$table);
-    my $no_hh_mm_ss = 1;
-    my $hide_timezone;
-    if (&Apache::loncommon::needs_gci_custom()) {
-        $no_hh_mm_ss = '';
-        if ($dom =~ /^\w+citest$/) {
-            if ($prefix eq 'access') {
-                $hide_timezone = 1;
-            }
-        }
-    }
     my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
-                                                        $starttime,'','','',$no_hh_mm_ss,'','','',1,$hide_timezone);
+                                                        $starttime,'','','',1,'','','',1);
     my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
-                                                      $endtime,'','','',$no_hh_mm_ss,'','','',1,$hide_timezone);
+                                                      $endtime,'','','',1,'','','',1);
     my $closure = '';
     if ($prefix eq 'access') {
-        unless (&Apache::loncommon::needs_gci_custom()) {
-            $perpetual = ' <span class="LC_nobreak"><label>'.
-                         '<input type="checkbox" name="no_end_date" />'.
-                         &mt('No end date').'</label></span>';
+        $perpetual = ' <span class="LC_nobreak"><label>'.
+                     '<input type="checkbox" name="no_end_date" />'.
+                     &mt('No end date').'</label></span>';
+        unless ($hascredits) {
+            $closure = '1';
         }
-        $closure = '1';
     }
 
     my %help_item = (
@@ -1894,16 +2059,16 @@ sub date_setting_table {
     }
 
     $table = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'start'}).
-             '&nbsp;'.$datetitles{'start'}).$startform.
+             '&nbsp;'.&mt($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.
+             '&nbsp;'.&mt($datetitles{'end'})).$endform.$perpetual.
              &Apache::lonhtmlcommon::row_closure($closure);
     return $table;
 }
 
 sub print_personnel_menu {
-    my ($dom,$formname,$state,$crstype,$invalidcrosslist) = @_;
+    my ($dom,$formname,$crstype,$invalidcrosslist) = @_;
     my $output;
     if ($crstype eq 'official') {
         if (&Apache::lonnet::auto_run('',$dom)) {
@@ -1965,17 +2130,32 @@ sub print_personnel_menu {
             official => 'Requestor is automatically assigned Course Coordinator role.',
         );
         $lt{'unofficial'} = $lt{'official'};
+        $lt{'textbook'} = $lt{'official'};
+        $lt{'placement'} = $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 $cansearch = 1;
+    my @alldoms = &Apache::lonnet::all_domains();
+    if (@alldoms == 1) {
+        my %domsrch = &Apache::lonnet::get_dom('configuration',
+                                               ['directorysrch'],$alldoms[0]);
+        if (ref($domsrch{'directorysrch'}) eq 'HASH') {
+            if ((!$domsrch{'directorysrch'}{'available'}) &&
+                ($domsrch{'directorysrch'}{'lcavailable'} eq '0')) {
+                $cansearch = 0;
+            }
+        }
+    }
+    my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$dom);
+    for (my $i=0; $i<$persontotal; $i++) {
         my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
         my $linkargstr = join("','",@linkargs);
         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','person_".$i."_uname'".');';
         my $udom_form = &Apache::loncommon::select_dom_form($dom,'person_'.$i.'_dom','',
-                                                            1,$onchange).
+                                                            1,$onchange,undef,$trusted,$untrusted).
                         '<input type="hidden" name="person_'.$i.'_hidedom" value="" />';
         my %form_elems;
         foreach my $item (@items) {
@@ -1992,9 +2172,14 @@ sub print_personnel_menu {
         }
         $sectionselector .= $newtitle.
             '<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 $usersrchlink;
+        if ($cansearch) {
+            my $usersrchlinktxt = &mt('Search for user');
+            $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
+                                                                $usersrchlinktxt);
+        } else {
+            $usersrchlink = '&nbsp;';
+        }
         my $userchklinktxt = &mt('Check username');
         my $userchklink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
                             $userchklinktxt,'checkusername');
@@ -2016,7 +2201,7 @@ sub print_personnel_menu {
     $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another')).
                '<input name="persontotal" type="hidden" value="'.$persontotal.'" />'.
                '<input name="addperson" type="checkbox" value="'.$persontotal.'"'.
-               ' onclick="javascript:nextPage(document.'.$formname.",'".$state.
+               ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
                "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1).
                &Apache::lonhtmlcommon::end_pick_box().'</div>';
     if ($crstype eq 'community') {
@@ -2044,53 +2229,96 @@ sub current_lc_sections {
     return @currsecs;
 }
 
-sub print_request_status {
-    my ($dom,$action,$state) = @_;
+sub sorted_request_history {
+    my ($dom,$action,$curr_req) = @_;
+    my ($after,$before,$statusfilter,$crstypefilter);
+    if ($env{'form.status'} ne '') {
+        $statusfilter = $env{'form.status'};
+    }
+    if ($env{'form.crstype'} ne '') {
+        $crstypefilter = $env{'form.crstype'};
+    }
+    if (ref($curr_req) eq 'HASH') {
+        $after = $curr_req->{'requested_after_date'},
+        $before = $curr_req->{'requested_before_date'};
+        $statusfilter = $curr_req->{'status'};
+        $crstypefilter = $curr_req->{'crstype'};
+    }
     my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
                                            $env{'user.name'},'^status:'.$dom);
-    my ($output,$formname,%queue_by_date);
+    my %queue_by_date;
     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'};
+        if ($action eq 'view') {
+            next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending'));
+        } else {
+            next unless (($statusfilter eq 'any') ||
+                          ($statusfilter eq $statusinfo{$key}));
+        }
+        (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 $reqtime = $history{'reqtime'};
+            my $lastupdate = $history{'timestamp'};
+            my $crstype = $history{'crstype'};
+            my $disposition = $history{'disposition'};
+            my $status = $history{'status'};
+            my $uniquecode = $history{'code'}; 
+            if ($action eq 'view') {
                 next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
-                next unless (($env{'form.crstype'} eq 'any') || 
-                            ($env{'form.crstype'} eq $crstype));
+            } else {
+                next if (($reqtime < $after) || ($reqtime > $before));
+            }
+            next unless (($crstypefilter eq 'any') || 
+                         ($crstypefilter eq $crstype));
+            if ($action eq 'view') {
                 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 (ref($history{'details'}) eq 'HASH') {
+                $entry = $requestkey.':'.$crstype.':'.
+                         &escape($history{'details'}{'cdescr'});
+                if ($action eq 'log') {
+                    $entry .= ':'.$uniquecode.':'.$lastupdate.':';
+                    if ($statusinfo{$key} ne '') {
+                        $entry .= $statusinfo{$key};
+                    } elsif ($status ne '') {
+                        $entry .= $status;
+                    } else {
+                        $entry .= $disposition;
                     }
                 }
-                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);
+                if ($crstype eq 'official') {
+                    $entry .= ':'.&escape($history{'details'}{'instcode'}); 
+                }
+            }
+            if ($entry ne '') {
+                if (exists($queue_by_date{$reqtime})) {
+                    if (ref($queue_by_date{$reqtime}) eq 'ARRAY') {
+                        push(@{$queue_by_date{$reqtime}},$entry);
                     }
+                } else {
+                    @{$queue_by_date{$reqtime}} = ($entry);
                 }
             }
         }
     }
-    $formname = 'requestcrs';
+    return %queue_by_date;
+}
+
+sub print_request_status {
+    my ($dom,$action) = @_;
+    my %queue_by_date = &sorted_request_history($dom,$action);
     my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
-    $output = '<input type="hidden" name="reqaction" value="'.$action.'" />'."\n".
+    my $formname = 'requestcrs';
+    my ($types,$typenames) = &Apache::loncommon::course_types();
+    my $output = '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
 
-              '<input type="hidden" name="state" value="'.$state.'" />'."\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="showdom" value="" />'."\n".
               '<input type="hidden" name="cnum" value="" />'."\n";
@@ -2237,7 +2465,7 @@ sub viewdetails_javascript {
 function nextPage(formname,nextstate) {
     if (nextstate == "modify") { 
         formname.state.value = "personnel";
-        formname.reqaction.value = "new";
+        formname.action.value = "new";
     } else {
         formname.state.value = nextstate;
     }
@@ -2253,8 +2481,9 @@ ENDJS
 }
 
 sub viewcancel_javascript {
-    my $alert = &mt('Are you sure you want to cancel this request?\\n'.
-                    'Your request will be removed.');
+    my $alert = &mt('Are you sure you want to cancel this request?')."\n".
+                &mt('Your request will be removed.');
+    &js_escape(\$alert);
     return << "ENDJS";
 function nextPage(formname,nextstate) {
     if (confirm('$alert')) {
@@ -2268,13 +2497,332 @@ ENDJS
 }
 
 sub print_request_logs {
-    my ($jscript,$loaditems,$crumb) = @_;
+    my ($r,$dom,$jscript,$loaditems,$crumb,$usetabs) = @_;
+    my $title;
+    if ($env{'form.crstype'} eq 'community') {
+        $title = 'Community Request Logs';
+    } elsif ($env{'form.crstype'} eq 'any') {
+        $title = 'Course/Community Request Logs';
+    } else {
+        $title = 'Course Request Logs';
+    }
+    $r->print(&header($title,$jscript,$loaditems).$crumb);
+    if ($usetabs) {
+        &startContentScreen($r,'textbooklogs');
+    }
+    my $formname = 'requestcrs';
+    $r->print('<form action="/adm/requestcourse" method="post" name="'.$formname.'" onsubmit="javascript:setPage(this);">'."\n".
+              '<input type="hidden" name="action" value="log" />'."\n".
+              '<input type="hidden" name="state" value="display" />'."\n");
+    # set defaults
+    my $now = time();
+    my $defstart = $now - (7*24*3600); #7 days ago
+    my %defaults = (
+                     page                => '1',
+                     show                => '10',
+                     crstype             => 'any',
+                     status              => 'any',
+                     requested_before_date => $now,
+                     requested_after_date  => $defstart,
+                   );
+    my ($types,$typenames) = &Apache::loncommon::course_types();
+    my $more_records = 0;
+    my %curr;
+    foreach my $item ('show','page','crstype','status') {
+        $curr{$item} = $env{'form.'.$item};
+    }
+    $curr{'requested_after_date'} = &Apache::lonhtmlcommon::get_date_from_form('requested_after_date');
+    $curr{'requested_before_date'} = &Apache::lonhtmlcommon::get_date_from_form('requested_before_date');
+    foreach my $key (keys(%defaults)) {
+        if ($curr{$key} eq '') {
+            $curr{$key} = $defaults{$key};
+        }
+    }
+    my ($statuses,$statusnames) = &reqstatus_names($curr{'crstype'});
+    $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
+              &requestlog_display_filter($formname,\%curr));
+    my %queue_by_date = &sorted_request_history($dom,$env{'form.action'},\%curr);
+    my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
+    my $showntablehdr = 0;
+    my $tablehdr = &Apache::loncommon::start_data_table().
+                   &Apache::loncommon::start_data_table_header_row().
+                   '<th>&nbsp;</th><th>'.&mt('Request Date').'</th>'.
+                   '<th>'.&mt('Description').'</th>';
+    if ($curr{'crstype'} eq 'any') {
+        $tablehdr .= '<th>'.&mt('Course Type').'</th>';
+    }
+    if (($curr{'crstype'} eq 'official') || ($curr{'crstype'} eq 'any')) {
+        $tablehdr .= '<th>'.&mt('Institutional Code').'</th>';
+    }
+    my $showuniquecode;
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
+    if (($curr{'status'} eq 'any') || ($curr{'status'} eq 'created')) {
+        if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+            if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {
+                if ($curr{'crstype'} eq 'any') {
+                    my @types = qw(official unofficial community textbook placement);
+                    foreach my $type (@types) {
+                        if ($domconfig{'requestcourses'}{'uniquecode'}{$type}) {
+                            $showuniquecode = 1;
+                            last;
+                        }
+                    }
+                } elsif ($domconfig{'requestcourses'}{'uniquecode'}{$curr{'crstype'}}) {
+                    $showuniquecode = 1;
+                }
+            }
+        }
+    }
+    if ($showuniquecode) {
+        $tablehdr .= '<th>'.&mt('Unique Code').'</th>';    
+    }
+    if ($curr{'status'} eq 'any') {
+        $tablehdr .= '<th>'.&mt('Status').'</th>';
+    } elsif ($curr{'status'} eq 'created') {
+        $tablehdr .= '<th>'.&mt('Creation Date').'</th>';
+    } elsif ($curr{'status'} eq 'cancelled') {
+        $tablehdr .= '<th>'.&mt('Cancellation Date').'</th>';
+    } elsif ($curr{'status'} eq 'rejected') {
+        $tablehdr .= '<th>'.&mt('Rejection Date').'</th>';
+    }
+    $tablehdr .= &Apache::loncommon::end_data_table_header_row();
+    my ($minshown,$maxshown);
+    $minshown = 1;
+    my $count = 0;
+    if ($curr{'show'} ne &mt('all')) {
+        $maxshown = $curr{'page'} * $curr{'show'};
+        if ($curr{'page'} > 1) {
+            $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
+        }
+    }
+    my $norecords;
+    if (@sortedtimes > 0) {
+        foreach my $item (@sortedtimes) {
+            if ($curr{'show'} ne &mt('all')) {
+                if ($count >= $curr{'page'} * $curr{'show'}) {
+                    $more_records = 1;
+                    last;
+                }
+            }
+            $count ++;
+            next if ($count < $minshown);
+            if (!$showntablehdr) {
+                $r->print($tablehdr);
+                $showntablehdr = 1;
+            }
+            my $showtime = &Apache::lonlocal::locallocaltime($item);
+            if (ref($queue_by_date{$item}) eq 'ARRAY') {
+                foreach my $request (sort(@{$queue_by_date{$item}})) {
+                    my ($key,$crstype,$desc,$uniquecode,$timestamp,$status,$instcode) = split(':',$request);
+                    my ($cdom,$cnum) = split('_',$key);
+                    my $output = &Apache::loncommon::start_data_table_row().
+     '<td>'.$count.'</td>'.
+     '<td>'.$showtime.'</td>'.
+     '<td>'.&unescape($desc).'</td>';
+                    if ($curr{'crstype'} eq 'any') {
+                        my $typename;
+                        if (ref($typenames) eq 'HASH') {
+                            $typename = &mt($typenames->{$crstype});
+                        }
+                        if ($typename eq '') {
+                            $typename = &mt('Unknown type');
+                        }
+                        $output .= '<td>'.$typename.'</td>';
+                    }
+                    if (($curr{'crstype'} eq 'any') ||
+                        ($curr{'crstype'} eq 'official')) {
+                        my $showinstcode;
+                        if ($crstype eq 'official') {
+                            $showinstcode = &unescape($instcode);
+                        } else {
+                            $showinstcode = &mt('Not applicable');
+                        }
+                        $output .= '<td>'.$showinstcode.'</td>';
+                    }
+                    if ($showuniquecode) {
+                        if ($status eq 'created') {
+                            $output .= '<td>'.$uniquecode.'</td>';
+                        } else {
+                            $output .= '<td>'.&mt('Not applicable').'</td>';
+                        }    
+                    }
+                    if ($curr{'status'} eq 'any') {
+                        my $statusname = &mt('Unknown status');
+                        if (ref($statusnames) eq 'HASH') {
+                            if ($statusnames->{$status} ne '') {
+                                $statusname = $statusnames->{$status};
+                            }
+                        }
+                        if (($status eq 'created') || ($status eq 'cancelled') ||
+                            ($status eq 'rejected')) {
+                            $statusname .= ' '.&Apache::lonlocal::locallocaltime($timestamp);
+                        }
+                        $output .= '<td>'.$statusname.'</td>';
+                    } elsif (($status eq 'created') || ($status eq 'cancelled') ||
+                             ($status eq 'rejected')) {
+                         $output .= '<td>'.&Apache::lonlocal::locallocaltime($timestamp).'</td>';
+                    }
+                    $output .= &Apache::loncommon::end_data_table_row();
+                    $r->print($output);
+                }
+            }
+        }
+        if ($showntablehdr) {  
+            $r->print(&Apache::loncommon::end_data_table());
+            if (($curr{'page'} > 1) || ($more_records)) {
+                $r->print('<table><tr>');
+                if ($curr{'page'} > 1) {
+                    $r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>');
+                }
+                if ($more_records) {
+                    $r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>');
+                }
+                $r->print('</tr></table>');
+                $r->print(<<"ENDSCRIPT");
+<script type="text/javascript">
+// <![CDATA[
+function chgPage(caller) {
+    if (caller == 'previous') {
+        document.$formname.page.value --;
+    }
+    if (caller == 'next') {
+        document.$formname.page.value ++;
+    }
+    document.$formname.submit();
     return;
 }
+// ]]>
+</script>
+ENDSCRIPT
+            }
+        } else {
+            $norecords = 1;
+        }
+    } else {
+        $norecords = 1;
+    }
+    if ($norecords) {
+        $r->print('<p class="LC_info">'.
+                  &mt('There are no records to display').
+                  '</p>');
+    }
+    if ($usetabs) {
+        $r->print('<input type="hidden" name="tabs" value="on" />');
+    }
+    $r->print('</form>');
+    if ($usetabs) {
+        &endContentScreen($r);
+    }
+    $r->print(&Apache::loncommon::end_page());
+    return;
+}
+
+sub reqstatus_names {
+    my ($crstype) = @_;
+    my @statuses = qw(created approval pending rejected cancelled);
+    my %statusnames =
+            &Apache::lonlocal::texthash (
+                        created   => 'Created',
+                        approval  => 'Queued pending approval',
+                        pending   => 'Queued pending validation',
+                        rejected  => 'Request rejected',
+                        cancelled => 'Request cancelled',
+            );
+    if (($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook') || ($crstype eq 'placement')) {
+        $statusnames{'created'} = &mt('Course created');
+    } elsif ($crstype eq 'community') {
+        $statusnames{'created'} = &mt('Community created');
+    }
+    return (\@statuses,\%statusnames);
+}
+
+sub requestlog_display_filter {
+    my ($formname,$curr) = @_;
+    my $nolink = 1;
+    my $output = '<table><tr><td valign="top">'.
+                 '<span class="LC_nobreak"><b>'.&mt('Records/page:').'</b></span><br />'.
+                 &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+                                              (&mt('all'),5,10,20,50,100,1000,10000)).
+                 '</td><td>&nbsp;&nbsp;</td>';
+    my $startform =
+        &Apache::lonhtmlcommon::date_setter($formname,'requested_after_date',
+                                            $curr->{'requested_after_date'},undef,
+                                            undef,undef,undef,undef,undef,undef,$nolink);
+    my $endform =
+        &Apache::lonhtmlcommon::date_setter($formname,'requested_before_date',
+                                            $curr->{'requested_before_date'},undef,
+                                            undef,undef,undef,undef,undef,undef,$nolink);
+    $output .= '<td valign="top"><b>'.&mt('Window during which course/community was requested:').'</b><br />'.
+               '<table><tr><td>'.&mt('After:').
+               '</td><td>'.$startform.'</td></tr>'.
+               '<tr><td>'.&mt('Before:').'</td>'.
+               '<td>'.$endform.'</td></tr></table>'.
+               '</td>'.
+               '<td>&nbsp;&nbsp;</td>';
+    my ($types,$typenames) = &Apache::loncommon::course_types();
+    if (ref($types) eq 'ARRAY') {
+        if (@{$types} > 1) {
+            $output .= '<td valign="top"><b>'.
+                       &mt('Course Type:').'</b><br /><select name="crstype">';
+            my $selstr = '';
+            if ($curr->{'crstype'} eq 'any') {
+                $selstr = ' selected="selected"';
+            }
+            $output .= '<option value="any"'.$selstr.'>'.&mt('All types').'</option>'."\n";
+            foreach my $crstype (@{$types}) {
+                my $selstr = '';
+                if ($curr->{'crstype'} eq $crstype) {
+                    $selstr = ' selected="selected"';
+                }
+                my $typename = $crstype;
+                if (ref($typenames) eq 'HASH') {
+                    if ($typenames->{$crstype} ne '') {
+                        $typename = $typenames->{$crstype};
+                    }
+                }
+                $output .= '<option value="'.$crstype.'"'.$selstr.'>'.$typename.'</option>'."\n";
+            }
+            $output .= '</select></td>';
+        }
+    }
+    my ($statuses,$statusnames) = &reqstatus_names($curr->{'crstype'});
+    if (ref($statuses) eq 'ARRAY') {
+        if (@{$statuses} > 1) {
+            $output .= '<td valign="top"><b>'.
+                       &mt('Request Status:').'</b><br /><select name="status">';
+            my $selstr = '';
+            if ($curr->{'status'} eq 'any') {
+                $selstr = ' selected="selected"';
+            }
+            $output .= '<option value="any"'.$selstr.'>'.&mt('Any status').'</option>'."\n";
+            foreach my $status (@{$statuses}) {
+                my $selstr = '';
+                if ($curr->{'status'} eq $status) {
+                    $selstr = ' selected="selected"';
+                }
+                my $statusname = $status;
+                if (ref($statusnames) eq 'HASH') {
+                    if ($statusnames->{$status} ne '') {
+                        $statusname = $statusnames->{$status};
+                    }
+                }
+                $output .= '<option value="'.$status.'"'.$selstr.'>'.$statusname.'</option>'."\n";
+            }
+            $output .= '</select></td>';
+        }
+    }
+    $output .= '</tr></table>';
+
+    # Update Display button
+    $output .= '<p>'.
+               '<input type="submit" value="'.&mt('Update Display').'" />'.
+               '</p><hr />';
+    return $output;
+}
 
 sub print_review {
     my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom,
-        $disallowed,$disallowmsg) = @_;
+        $disallowed,$disallowmsg,$instcredits) = @_;
     my ($types,$typename) = &Apache::loncommon::course_types();
     my ($owner,$ownername,$owneremail);
     if ($uname eq '' || $udom eq '') {
@@ -2307,6 +2855,7 @@ sub print_review {
 
     my $enrollrow_title = &mt('Default Access Dates').'<br />'.
                           '('.&Apache::lonnet::plaintext('st',$category).')';
+    my $instcode;
     if ($env{'form.crstype'} eq 'official') {
         if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH')) {
             foreach my $title (@{$codetitles}) {
@@ -2322,6 +2871,17 @@ sub print_review {
                 }
             }
         }
+        if (ref($code_order) eq 'ARRAY') {
+            foreach my $item (@{$code_order}) {
+                $instcode .= $env{'form.instcode_'.$item};
+            }
+        }
+        $inst_headers .= '<th>'.&mt('Credits').'</th>';
+        if ($instcredits) {
+            $inst_values .= '<td>'.$instcredits.'</td>';
+        } else {
+            $inst_values .= '<td>'.$env{'form.coursecredits'}.'</td>';
+        }
         if (&Apache::lonnet::auto_run('',$dom)) {
             $enrollrow_title = &mt('Enrollment');
             $enroll_headers = '<th>'.&mt('Automatic Adds').'</th>'.
@@ -2391,95 +2951,57 @@ sub print_review {
             $section_values .= $xlistinfo;
         }
         $section_values .= '</table></td>';
+    } elsif (($env{'form.crstype'} eq 'unofficial') || ($env{'form.crstype'} eq 'textbook')) {
+        $inst_headers .= '<th>'.&mt('Credits').'</th>';
+        $inst_values .= '<td>'.$env{'form.coursecredits'}.'</td>';
     }
 
     my %ctxt = &clone_text();
-    if ($dom =~ /^\w+citest$/) {
-        $inst_headers .= '<th>'.&mt('Test Questions').'</th>';
-        my $concepttest;
-        if ($env{'form.concepttest'} eq 'defchosen') {
-            $concepttest = 'Auto-generated';
-        } elsif ($env{'form.concepttest'} eq 'editmyown') {
-            $concepttest = 'Manually selected';
-        } elsif ($env{'form.concepttest'} eq 'cloning') {
-            $concepttest = 'Copied from existing test';
-        }
-        $inst_values .= '<td>'.$concepttest.('&nbsp;'x2).'</td>';
-    }
-    if (&show_cloneable()) {
-        $inst_headers .= '<th>'.&mt('Copy From').'</th>';
-        if ((($env{'form.cloning'}) || 
-             (($dom =~ /^\w+citest$/) && ($env{'form.concepttest'} eq 'cloning'))) &&
-            ($env{'form.clonecrs'} =~ /^$match_name$/) && 
-            ($env{'form.clonedom'} =~ /^$match_domain$/)) {
-            my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
-                           $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
-                           $env{'form.crstype'});
-            if ($canclone) {
-                my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
+    $inst_headers .= '<th>'.&mt('Clone From').'</th>';
+    if (($env{'form.cloning'}) &&
+        ($env{'form.clonecrs'} =~ /^$match_name$/) && 
+        ($env{'form.clonedom'} =~ /^$match_domain$/)) {
+        my $canclone = &Apache::loncoursequeueadmin::can_clone_course($uname,
+                           $udom,$env{'form.clonecrs'},$env{'form.clonedom'},
+                           $env{'form.crstype'},$dom,$instcode);
+        if ($canclone) {
+            my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
                               $env{'form.clonecrs'},('description','internal.coursecode'));
-                if (keys(%courseenv) > 0) {
-                    if ($dom =~ /^\w+citest$/) {
-                        $inst_headers .= '<th>'.$ctxt{'ros'}.'</th>';
-                    } else {
-                        $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 {
-                        unless ($dom =~ /^\w+citest$/) {
-                            $inst_values .= &mt('from').' '.$env{'form.clonedom'};
-                        }
-                    }
-                    $inst_values .= ('&nbsp;'x2).'</td><td>';
-                    if ($dom =~ /^\w+citest$/) {
-                        if ($env{'form.cloneroster'}) {
-                            $inst_values .= &mt('Yes');
-                        } else {
-                            $inst_values .= &mt('No');
-                        }
-                    } else {
-                        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>';
-                 }
+            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('Not permitted'),'</td>';
+                 $inst_values .= '<td>'.&mt('Unknown').'</td>';
              }
-        } else {
-            $inst_values .= '<td>'.&mt('None').'</td>';
-        }
-    }
-    my $tz;
-    if ($dom =~ /^\w+citest$/) {
-        if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
-            $tz = $env{'form.timezone'};
-        } else {
-            $tz = &Apache::lonlocal::gettimezone();
-        }
-        $enroll_headers .= '<th>'.&mt('Time Zone').'</th>';
+         } else {
+             $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
+         }
+    } else {
+        $inst_values .= '<td>'.&mt('None').'</td>';
     }
     $enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
                        '<th>'.&mt('Access Ends').'</th>';
-    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$tz);
-    if ($dom =~ /^\w+citest$/) {
-        $enroll_values .= '<td>'.$tz.'</td>'; 
-    }
-    $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart,$tz).'</td>';
+    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+    $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart).'</td>';
     if ($accessend == 0) {
         $enroll_values .= '<td>'.&mt('No end date').'</td>';
     } else {
-        $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend,$tz).'</td>';
+        $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend).'</td>';
     }
 
     my $container = 'Course';
@@ -2590,9 +3112,9 @@ sub print_review {
 }
 
 sub dates_from_form {
-    my ($startname,$endname,$timezone) = @_;
-    my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname,$timezone);
-    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form($endname,$timezone);
+    my ($startname,$endname) = @_;
+    my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname);
+    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form($endname);
     if ($endname eq 'accessend') {
         if (exists($env{'form.no_end_date'}) ) {
             $enddate = 0;
@@ -2602,19 +3124,22 @@ sub dates_from_form {
 }
 
 sub courseinfo_form {
-    my ($dom,$formname,$state,$crstype,$next,$description) = @_;
-    my %lt = &Apache::lonlocal::texthash(
+    my ($dom,$formname,$crstype,$next,$description) = @_;
+    my %js_lt = &Apache::lonlocal::texthash(
                 official => 'You must provide a (brief) course description.',
                 community => 'You must provide a (brief) community description.'
              );
-    $lt{'unofficial'} = $lt{'official'};
+    &js_escape(\%js_lt);
+    $js_lt{'unofficial'} = $js_lt{'official'};
+    $js_lt{'textbook'} = $js_lt{'official'};
+    $js_lt{'placement'} = $js_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}');
+        alert('$js_lt{$crstype}');
         return;
     }
     nextPage(document.$formname,'$next');
@@ -2642,32 +3167,17 @@ function toggleCloning() {
 
 ENDJS
     my $title = &mt('Brief Course Description');
-    my $desctitle = &mt('Description');
-    if ($dom =~ /^\w+citest$/) {
-        $title = &mt('Concept Test Course Information');
-        $desctitle = &mt('Concept Test Title');
-    }
-    my $clonetitle = &mt('Copy content and settings from an existing course?');
+    my $clonetitle = &mt('Clone content and settings from an existing course?');
     if ($crstype eq 'community') {
         $title = &mt('Brief Community Description');
-        $clonetitle = &mt('Copy content and settings from an existing community?');
+        $clonetitle = &mt('Clone content and settings from an existing community?');
     }
     my $output .= $js_validate."\n".&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($desctitle).
-                  '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
-    my $showclone;
-    if ($dom =~ /^\w+citest$/) {
-        $showclone = &show_cloneable();
-    } else {
-        $showclone = 1;
-    }
-    if ($dom =~ /^\w+citest$/) {
-        $output .= &Apache::lonhtmlcommon::row_closure(1).
-                   &concepttest_form($showclone,$dom);
-    }
+                  &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');
@@ -2676,82 +3186,24 @@ ENDJS
                    &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
     }
     $output .= $home_server_pick.
-               &Apache::lonhtmlcommon::row_closure();
-    if ($showclone && $dom !~ /^\w+citest$/) {
-        $output .= &Apache::lonhtmlcommon::row_headline().
-                   '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.$clonetitle.
-                   '<label><input type="radio" name="cloning" value="1" '.
-                   'onclick="javascript:toggleCloning()" />'.
-                   &mt('Yes').('&nbsp;'x2).'</label><label>'.
-                   '<input type="radio" name="cloning" value="0" checked="checked"'.
-                   'onclick="javascript:toggleCloning()" />'.&mt('No').'</label>'.
-                   '</h3>'.
-                   &Apache::lonhtmlcommon::row_closure(1).
-                   &Apache::lonhtmlcommon::row_headline().
-                   '<div id="cloneoptions" style="display: none" >'.
-                   &Apache::lonhtmlcommon::start_pick_box().
-                   &clone_form($dom,$formname,$crstype).
-                   &Apache::lonhtmlcommon::end_pick_box().'</div>';
-    }
-    if ($dom =~ /^\w+citest$/) {
-        my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order);
-        my $invalidcrosslist = [];
-        $output .= &print_enrollment_menu($formname,$state,$instcode,$dom,
-                       \@codetitles,\%cat_titles,\%cat_order,
-                       \@code_order,$invalidcrosslist);
-    }
-    $output .= &Apache::lonhtmlcommon::end_pick_box()."\n";
-    return $output;
-}
-
-sub concepttest_form {
-    my ($showclone,$dom) = @_;
-    my $output = &Apache::lonhtmlcommon::row_title(&mt('Questions included in Concept Test')).
-                 '<label>'.
-                 '<input type="radio" name="concepttest" value="editmyown" checked="checked" /> '.
-                 &mt('Chosen by you from Concept Inventory').
-                 '</label><br />'.
-                 '<label>'.
-                 '<input type="radio" name="concepttest" value="defchosen" /> '.
-                 &mt('Automatically selected by WebCenter').
-                 '</label>';
-    if ($showclone) {
-        $output .=  '<br /><span class="LC_nobreak"><label>'.
-                    '<input type="radio" name="concepttest" value="cloning" /> '.
-                    &mt('Copied from existing Test: ').
-                    '</label>'.&select_oldtest().('&nbsp;' x2).
-                    '<input type="hidden" name="clonedom" value="'.$dom.'" />'.
-                    '<label><input type="checkbox" value="1" name="cloneroster" />'.
-                    &mt('Copy roster').'</label>';
-    }
-    return $output;
-}
-
-sub select_oldtest {
-    my $output = '<select name="clonecrs"><option value="" selected="selected">'.
-                 '</option>';
-    my %courses = &Apache::loncommon::existing_gcitest_courses('cc');
-    my %Sortby;
-    foreach my $course (sort(keys(%courses))) {
-        next unless (ref($courses{$course}) eq 'HASH');
-        my $clean_title = $courses{$course}{'description'};
-        $clean_title =~ s/\W+//g;
-        if ($clean_title eq '') {
-            $clean_title = $courses{$course}{'description'};
-        }
-        push(@{$Sortby{$clean_title}},$course);
-    }
-    my @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby));
-    foreach my $item (@sorted_courses) {
-        foreach my $course (@{$Sortby{$item}}) {
-            my ($cdom,$cnum) = split('_',$course);
-            if (($cdom =~ /^\w+citest$/) && (ref($courses{$course}) eq 'HASH')) {
-                my $cdesc = $courses{$course}{'description'};
-                $output .= '<option value="'.$cnum.'">'.$cdesc.'</option>';
-            }
-        }
-    }
-    $output .= '</select>';
+               &Apache::lonhtmlcommon::row_closure().
+               &Apache::lonhtmlcommon::row_headline().
+               '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.$clonetitle.
+               &Apache::lonhtmlcommon::row_closure(1).
+               &Apache::lonhtmlcommon::row_title(&mt('Clone?')).
+               '<label><input type="radio" name="cloning" value="1" '.
+               'onclick="javascript:toggleCloning()" />'.
+               &mt('Yes').('&nbsp;'x2).'</label><label>'.
+               '<input type="radio" name="cloning" value="0" checked="checked" '.
+               'onclick="javascript:toggleCloning()" />'.&mt('No').'</label>'.
+               '</h3>'.
+               &Apache::lonhtmlcommon::row_closure(1).
+               &Apache::lonhtmlcommon::row_headline().
+               '<div id="cloneoptions" style="display: none" >'.
+               &Apache::lonhtmlcommon::start_pick_box().
+               &clone_form($dom,$formname,$crstype).
+               &Apache::lonhtmlcommon::end_pick_box().'</div>'.
+               &Apache::lonhtmlcommon::end_pick_box()."\n";
     return $output;
 }
 
@@ -2760,16 +3212,19 @@ sub clone_form {
     my $type = 'Course';
     if ($crstype eq 'community') {
         $type = 'Community';
+    } elsif ($crstype eq 'placement') {
+        $type = 'Placement'; 
     }
-    my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').'&nbsp;'.
-                    &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
     my %lt = &clone_text();
     my $output .= 
-        &Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
-        '<input type="text" size="25" name="clonecrs" value=""  />'.
-        '</label>'.&Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'<label>'.
-        $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure(1).
+        &Apache::loncommon::select_dom_form($dom,'clonedom').'</label>'.
+        &Apache::lonhtmlcommon::row_closure(1).
+        &Apache::lonhtmlcommon::row_title($lt{'cid'}).'<label>'.
+        '<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();opencrsbrowser('."'$formname','clonecrs','clonedom','','','','$type'".')" />'.
+        '</label>&nbsp;'.
+        &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type).
+        &Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
         '<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
         '</label><br /><label>'.
@@ -2788,22 +3243,20 @@ sub clone_text {
                'dmn'  => 'Domain',
                'dsh'  => 'Date Shift',
                'ncd'  => 'Do not clone date parameters',
-               'prd'  => 'Copy date parameters as-is',
+               'prd'  => 'Clone date parameters as-is',
                'shd'  => 'Shift date parameters by number of days',
-               'ros'  => 'Copy Roster',
         );
 }
 
 sub coursecode_form {
     my ($dom,$context,$codetitles,$cat_titles,$cat_order,$num) = @_;
     my $output;
-    my %rowtitle = (
+    my %rowtitle = &Apache::lonlocal::texthash (
                     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))) {
@@ -2818,9 +3271,13 @@ sub coursecode_form {
         }
         if (@{$codetitles} > 0) {
             my $lastitem = pop(@{$codetitles});
-            my $lastinput = '<input type="text" size="5" name="'.$sel.'_'.                                            $lastitem.'" />';
+            my $lastinput = '<input type="text" size="5" name="'.$sel.'_'.$lastitem.'" />';
             if (@{$codetitles} > 0) {
-                $output = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($helpitem{$context}).'&nbsp;'.$rowtitle{$context}).
+                my $helplink;
+                if (defined($helpitem{$context})) {
+                    $helplink = &Apache::loncommon::help_open_topic($helpitem{$context}).'&nbsp;';
+                }
+                $output = &Apache::lonhtmlcommon::row_title($helplink.$rowtitle{$context}).
                           '<table><tr>';
                 if ($context eq 'crosslist') {
                     $output .= '<td>'.&mt('Include?').'<br />'.
@@ -2885,6 +3342,26 @@ sub coursecode_form {
     return $output;
 }
 
+sub sections_form {
+    my ($dom,$instcode,$num) = @_;
+    my $rowtitle;
+    if ($instcode eq '') {
+        $rowtitle = &mt('Sections');
+    } else {
+        $rowtitle = &mt('Sections of [_1]',$instcode);
+    }
+    return &Apache::lonhtmlcommon::row_title($rowtitle).
+           '<table><tr><td align="center">'.
+           '<span class="LC_nobreak">'.&mt('Include?').
+           '<input type="checkbox" name="sec_'.$num.'" value="1" /></span>'.
+           '</td><td align="center">'.&mt('Institutional section').'<br />'.
+           '<input type="text" size="10" name="secnum_'.$num.'" />'.
+           '</td><td align="center">'.&mt('LON-CAPA section').'<br />'.
+           '<input type="text" size="10" name="loncapasec_'.$num.'" />'.
+           '</td></tr></table>'.
+           &Apache::lonhtmlcommon::row_closure(1);
+}
+
 sub get_course_dom {
     my $codedom = &Apache::lonnet::default_login_domain();
     if ($env{'form.showdom'} ne '') {
@@ -2902,18 +3379,23 @@ sub get_course_dom {
                     return $env{'user.domain'};
                 }
             }
-            my @possible_doms;
+            my (@possible_doms,%willtrust);
             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);
+                        unless (exists($willtrust{$extdom})) {
+                            $willtrust{$extdom} = &Apache::lonnet::will_trust('reqcrs',$env{'user.domain'},$extdom);
+                        }
+                        if ($willtrust{$extdom}) {
+                            if ($extdom eq $env{'request.role.domain'}) {
+                                return $extdom;
+                            }
+                            unless(grep(/^\Q$extdom\E$/,@possible_doms)) {
+                                push(@possible_doms,$extdom);
+                            }
                         }
                     }
                 }
@@ -2977,9 +3459,10 @@ sub display_navbuttons {
 }
 
 sub print_request_outcome {
-    my ($r,$dom,$codetitles,$code_order,$formname) = @_;
+    my ($r,$lonhost,$dom,$codetitles,$code_order,$instcredits) = @_;
     my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
-        %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
+        %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,
+        $uniquecode);
     my $sectotal = $env{'form.sectotal'};
     my $crosslisttotal = 0;
     $cnum = $env{'form.cnum'};
@@ -2987,15 +3470,17 @@ sub print_request_outcome {
         $output = &mt('Invalid LON-CAPA course number for the new course')."\n"; 
         return $output;
     }
-
-    %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
+    $crstype = $env{'form.crstype'};
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
     if (ref($domconfig{'requestcourses'}) eq 'HASH') {
         if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
             $req_notifylist = $domconfig{'requestcourses'}{'notify'}{'approval'};
         }
+        if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {
+            $uniquecode = $domconfig{'requestcourses'}{'uniquecode'}{$crstype};
+        }
     }
     $now = time;
-    $crstype = $env{'form.crstype'};
     my $ccrole = 'cc';
     if ($crstype eq 'community') {
         $ccrole = 'co';
@@ -3043,6 +3528,7 @@ sub print_request_outcome {
         $enrollstart = '';
         $enrollend = '';
     }
+    my (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg,%skipped);
     for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
         my $uname = $env{'form.person_'.$i.'_uname'};
         my $udom = $env{'form.person_'.$i.'_dom'};
@@ -3054,6 +3540,56 @@ sub print_request_outcome {
                              lastname     => $env{'form.person_'.$i.'_lastname'},
                              emailaddr    => $env{'form.person_'.$i.'_emailaddr'},
                                                    };
+                    if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                        my $usertype = &get_usertype($udom,$uname,\%curr_rules,\%got_rules);
+                        if (&Apache::lonuserutils::can_create_user($udom,'requestcrs',$usertype)) {
+                            my ($allowed,$msg,$authtype,$authparam) =
+                                &check_newuser_rules($udom,$uname,\%alerts,\%rulematch,
+                                                     \%inst_results,\%curr_rules,\%got_rules);
+                            if ($allowed) {
+                                my %domdefaults = &Apache::lonnet::get_domain_defaults($udom);
+                                if ($usertype eq 'official') {
+                                    if ($authtype eq '') {
+                                        $authtype = $domdefaults{'auth_def'};
+                                        $authparam = $domdefaults{'auth_arg_def'};
+                                    } else {
+                                        if ($authtype eq 'loc') {
+                                            $authtype = 'localauth';
+                                        } elsif ($authtype eq 'int') {
+                                            $authtype = 'internal';
+                                        }
+                                        if ($authtype !~ /^(krb4|krb5|internal|localauth)$/) {
+                                            $authtype = $domdefaults{'auth_def'};
+                                            $authparam = $domdefaults{'auth_arg_def'};
+                                        }
+                                    }
+                                } elsif ($usertype eq 'unofficial') {
+                                    if ($authtype eq '') {
+                                        $authtype = 'internal';
+                                        $authparam = '';
+                                    }
+                                } else {
+                                    $authtype = $domdefaults{'auth_def'};
+                                    $authparam = $domdefaults{'auth_arg_def'};
+                                }
+                                if (($authtype eq '') ||
+                                    (($authtype =~/^krb(4|5)$/) && ($authparam eq '')) ||
+                                    ($authtype !~ /^(krb4|krb5|internal|localauth)$/)) {
+                                    $skipped{$uname.':'.$udom} = 1;
+                                    next;
+                                } else {
+                                    $personnel{$uname.':'.$udom}{'authtype'} = $authtype;
+                                    $personnel{$uname.':'.$udom}{'autharg'} = $authparam;
+                                }
+                            } else {
+                                $skipped{$uname.':'.$udom} = 1;
+                                next;
+                            }
+                        } else {
+                            $skipped{$uname.':'.$udom} = 1;
+                            next;
+                        }
+                    }
                 }
                 my $role = $env{'form.person_'.$i.'_role'};
                 unless ($role eq '') {
@@ -3099,38 +3635,42 @@ sub print_request_outcome {
             push(@baduname,$uname.':'.$udom);
         }
     }
-    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$env{'form.timezone'});
+    if (keys(%skipped)) {
+        foreach my $key (keys(%skipped)) {
+            delete($personnel{$key}); 
+        }
+    }
+    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'};
+        $autoadds = $env{'form.autoadds'};
     }
     my $instcode = '';
     if (exists($env{'form.instcode'})) {
         $instcode = $env{'form.instcode'};
     }
+    my $credits;
+    if ($instcredits) {
+        $credits = $instcredits;
+    } elsif (exists($env{'form.coursecredits'})) {
+        $credits = $env{'form.coursecredits'};
+    }
     my $clonecrs = '';
     my $clonedom = '';
-    if ((($env{'form.cloning'}) || 
-         (($dom =~ /^\w+citest$/) && ($env{'form.concepttest'} eq 'cloning'))) && 
+    if (($env{'form.cloning'}) &&
         ($env{'form.clonecrs'} =~ /^($match_courseid)$/) && 
         ($env{'form.clonedom'} =~ /^($match_domain)$/)) {
-        if ($dom =~ /^\w+citest$/) {
-            $env{'form.clonedom'} = $dom;
-        }
         my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
                                                     $env{'form.clonedom'});
-        if ($clonehome ne 'no_host') {
+        if ($clonehome ne 'no_host') {  
             my $canclone =  
                 &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
                         $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
-                        $crstype);
+                        $crstype,$dom,$instcode);
             if ($canclone) {
                 $clonecrs = $env{'form.clonecrs'};
                 $clonedom = $env{'form.clonedom'};
@@ -3146,6 +3686,8 @@ sub print_request_outcome {
                     cdescr         => $env{'form.cdescr'},
                     crstype        => $env{'form.crstype'},
                     instcode       => $instcode,
+                    defaultcredits => $credits, 
+                    uniquecode     => $uniquecode,
                     clonedom       => $clonedom,
                     clonecrs       => $clonecrs,
                     datemode       => $env{'form.datemode'},
@@ -3162,28 +3704,19 @@ sub print_request_outcome {
                     accessend      => $accessend,
                     personnel      => \%personnel,
                   };
-    if ($dom =~ /^\w+citest$/) {
-        my $template = &get_template($dom);
-        if ($env{'form.concepttest'} eq 'editmyown') {
-            $details->{'firstres'} = 'nav'; 
-        } else {
-            $details->{'firstres'} = 'blank';
-        }
-        if ($env{'form.concepttest'} eq 'cloning') {
-            if (($clonecrs) && ($clonedom =~ /^\w+citest$/)) {
-                $details->{'cloneroster'} = $env{'form.cloneroster'};
-            } elsif ($template) {
-                $details->{'clonedom'} = $dom;
-                $details->{'clonecrs'} = $template;
-            }
-        } else {
-            $details->{'clonedom'} =  $dom,
-            $details->{'clonecrs'} =  $template,
-        }
-        $details->{'datemode'} = 'delete';
-    }
-    my (@inststatuses,$storeresult,$creationresult,$donedisplay);
-    my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
+    my ($result,$output,$customized) = &process_request($r,$lonhost,$dom,$cnum,$crstype,$now,$details,
+                                                        $instcode,$req_notifylist,\@instsections,\%domconfig);
+    return ($result,$output,$customized);
+}
+
+sub process_request {
+    my ($r,$lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,
+        $domconfig) = @_; 
+    my (@inststatuses,$storeresult,$creationresult,$output,$customized);
+    my $val = 
+        &Apache::loncoursequeueadmin::get_processtype('course',$env{'user.name'},
+                                                      $env{'user.domain'},$env{'user.adv'},
+                                                      $dom,$crstype,\@inststatuses,$domconfig);
     if ($val eq '') {
         if ($crstype eq 'official') {
             $output = &mt('You are not permitted to request creation of official courses.');
@@ -3191,12 +3724,16 @@ sub print_request_outcome {
             $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');
+        } elsif ($crstype eq 'textbook') {
+            $output = &mt('You are not permitted to request creation of textbook courses');
+        } elsif ($crstype eq 'placement') {
+            $output = &mt('You are not permitted to request creation of placement tests');
         } else {
             $output = &mt('Unrecognized course type: [_1]',$crstype);
         }
         $storeresult = 'notpermitted'; 
     } else {
-        my ($disposition,$message,$reqstatus);
+        my ($disposition,$message,$reqstatus,$coursedesc,$accessstart,$accessend,%customvalidation);
         my %reqhash = (
                         reqtime   => $now,
                         crstype   => $crstype,
@@ -3204,6 +3741,13 @@ sub print_request_outcome {
                       );
         my $requestkey = $dom.'_'.$cnum;
         my $validationerror;
+        my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+                                                     $env{'user.domain'});
+        if (ref($details) eq 'HASH') {
+            $coursedesc = $details->{'cdescr'};
+            $accessstart = $details->{'accessstart'};
+            $accessend = $details->{'accessend'};
+        }
         if ($val eq 'autolimit=') {
             $disposition = 'process';
         } elsif ($val =~ /^autolimit=(\d+)$/) {
@@ -3212,17 +3756,32 @@ sub print_request_outcome {
                                             $dom,$crstype,$limit,\$message);
         } elsif ($val eq 'validate') {
             my ($inststatuslist,$validationchk,$validation);
+            if (ref($details) eq 'HASH') {
+                if ($details->{'clonecrs'}) {
+                    $customvalidation{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'};
+                }
+            }
             if (@inststatuses > 0) {
                 $inststatuslist = join(',',@inststatuses);
             }
             my $instseclist;
-            if (@instsections > 0) {
-                $instseclist = join(',',@instsections);
+            if (ref($instsections) eq 'ARRAY') {
+                if (@{$instsections} > 0) {
+                    $instseclist = join(',',@{$instsections});
+                }
+            }
+#
+# Retrieve any custom form information used for validation 
+#
+            my $preprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'prevalidate',$env{'user.name'},
+                                                                 $env{'user.domain'},$fullname,$coursedesc);
+            if (ref($preprocess) eq 'HASH') {
+                &custom_formitems($preprocess,\%customvalidation);
             }
             $validationchk = 
                 &Apache::lonnet::auto_courserequest_validation($dom,
                     $env{'user.name'}.':'.$env{'user.domain'},$crstype,
-                    $inststatuslist,$instcode,$instseclist);
+                    $inststatuslist,$instcode,$instseclist,\%customvalidation);
             if ($validationchk =~ /:/) {
                 ($validation,$message) = split(':',$validationchk);
             } else {
@@ -3239,7 +3798,21 @@ sub print_request_outcome {
         }
         $reqhash{'disposition'} = $disposition;
         $reqstatus = $disposition;
-        my ($modified,$queued);
+        my ($modified,$queued,$token,%customitems);
+        unless ($disposition eq 'rejected') {
+            my $inprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'process',$env{'user.name'},
+                                                                $env{'user.domain'},$fullname,$coursedesc,undef,
+                                                                undef,undef,\%customvalidation);
+#
+# Retrieve any custom form information submitted with review page and include in request details.
+#
+            if (ref($inprocess) eq 'HASH') {
+                &custom_formitems($inprocess,\%customitems);
+                foreach my $key (keys(%customitems)) {
+                    $reqhash{'custom'}{$key} = $customitems{$key};
+                }
+            }
+        }
         if ($disposition eq 'rejected') {
             if ($crstype eq 'community') {
                 $output = &mt('Your community request was rejected.');
@@ -3252,7 +3825,7 @@ sub print_request_outcome {
             $storeresult = 'rejected';
         } elsif ($disposition eq 'process') {
             my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
-            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
+            my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles,$code);
             my $type = 'Course';
             if ($crstype eq 'community') {
                 $type = 'Community';
@@ -3261,9 +3834,36 @@ sub print_request_outcome {
             foreach my $role (@roles) {
                 $longroles{$role}=&Apache::lonnet::plaintext($role,$type);
             }
-            my $result = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
-                                   'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
-                                   \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles);
+            $r->print('<div id="processing" style="display:block;">'."\n".
+                      &mt('Your request is being processed; this page will update when processing is complete.').
+                      '</div>');
+            $r->rflush();
+            if (ref($details) eq 'HASH') {
+                if ($details->{'clonecrs'}) {
+                    $customitems{'_LC_clonefrom'} = $details->{'clonedom'}.'_'.$details->{'clonecrs'};
+                }
+            }
+            $customitems{'_LC_ownerfullname'} = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'},'first');
+            my $owneremail;
+            my %emails = &Apache::loncommon::getemails();
+            foreach my $email ('permanentemail','critnotification','notification') {
+                $owneremail = $emails{$email};
+                last if ($owneremail ne '');
+            }
+            if ($owneremail ne '') {
+                $customitems{'_LC_owneremail'} = $owneremail;
+            }
+            $customitems{'_LC_coursedomainname'} = &Apache::lonnet::domain($dom,'description');
+            $customitems{'_LC_coursedescription'} = $coursedesc;
+            $customitems{'_LC_coursestartdate'} = $accessstart;
+            $customitems{'_LC_courseenddate'} = $accessend;
+            my ($result,$postprocess) = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
+                                          'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
+                                          \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,
+                                          \$code,\%customitems);
+            if (ref($postprocess) eq 'HASH') {
+                $customized = $postprocess->{'createdcustomized'};
+            }
             if ($result eq 'created') {
                 $disposition = 'created';
                 $reqstatus = 'created';
@@ -3274,79 +3874,45 @@ sub print_request_outcome {
                 } else {
                     $output = '<p>'.&mt('Your course request has been processed and the course has been created.');
                 }
-                if ($dom =~ /^\w+citest$/) {
-                    my $caller = 'requestcrs';
-                    my $timezone;
-                    if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
-                        $timezone = $env{'form.timezone'};
-                    } else {
-                        $timezone = Apache::lonlocal::gettimezone();
-                    }
-                    &acquire_cc_role($dom,$cnum,'cc./'.$dom.'/'.$cnum);
-                    my %parmresult =
-                        &store_crsparms($dom,$cnum,$now,$accessstart,$accessend);
-                    &Apache::londocsgci::setdefaults($dom);
-                    my %crsenvhash = (
-                                       suppress_tries => 'yes',
-                                       timezone       => $timezone,
-                                     );
-                    my $putresult =  &Apache::lonnet::put('environment',\%crsenvhash,$dom,$cnum);
-                    if ($env{'form.concepttest'} eq 'cloning') {
-                        &Apache::lonuserstate::readmap($dom.'/'.$cnum);
-                        if (($clonecrs) && ($clonedom =~ /^\w+citest$/)) {
-                            my $cloneid = $clonedom.'/'.$clonecrs; 
-                            my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
-                            my $oldcdesc = $clonedesc{'description'};
-                            $output .= '<br />'.&mt('A concept test has been copied from your existing test: [_1].','<b>'.$oldcdesc.'</b>').'</p>';
-                            if ($env{'form.cloneroster'}) {
-                                $output .= '<br />'.&mt('You requested copying of the old student roster to the new course.');
-                                if ($logmsg =~ /\Q\0\E/) {
-                                    my @logging = split("\0",$logmsg);
-                                    if (@logging) {
-                                        $output .= '<p>'.$logging[-1].'</p>';
-                                    }
-                                }
-                                $output .= '<ul>'.
-                                           '<li>'.&mt('Access starts:').' '.
-                                                  &Apache::lonlocal::locallocaltime($accessstart,$timezone).'</li>'.
-                                           '<li>'.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend,$timezone).'</li>'.
-                                           '</ul><br />';
-                                $r->print($output);
-                                $output = '';
-                                $donedisplay = 1;
-                            } else {
-                                &roster_upload_form($r,$output,$formname);
-                                $output = '';
-                            }
-                        } else {
-                            $output .= '</p>';
-                            &roster_upload_form($r,$output,$formname);
-                            $output = '';
-                        }
-                    } elsif ($env{'form.concepttest'} eq 'defchosen') {
-                        $output .= '<br />';
-                        my $error = &Apache::londocsgci::store($caller,$dom,$cnum);
-                        if ($error) {
-                            $output .= '<span class="LC_error">'.
-                                       &mt('An error occurred saving an auto-generated concept test: [_1].',$error).
-                                       '</span>';
-                        } else {
-                            &Apache::lonuserstate::readmap($dom.'/'.$cnum);
-                            $output .= &mt('A concept test has also been generated.');
+                if (($code) || ((ref($postprocess) eq 'HASH') && 
+                                (($postprocess->{'createdweb'}) || ($postprocess->{'createdmsg'})))) {
+                    $output .= &notification_information($disposition,$env{'user.name'}.':'.$env{'user.domain'},
+                                                         $dom,$cnum,$now,$code,$postprocess);
+                }
+                if ($code) {
+                    $reqhash{'code'} = $code;
+                }
+                if (ref($postprocess) eq 'HASH') {
+                    if (ref($postprocess->{'createdactions'}) eq 'HASH') {
+                        if (ref($postprocess->{'createdactions'}{'environment'}) eq 'HASH') {
+                            &Apache::loncoursequeueadmin::postprocess_crsenv($dom,$cnum,
+                                                                             $postprocess->{'createdactions'}{'environment'});
                         }
-                        $output .= '</p>';
-                        &roster_upload_form($r,$output,$formname);
-                        $output = '';
-                    } else {
-                        $output .= '</p></form><br />'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'<br /></p>';
-                        $r->print($output);
-                        &Apache::londocsgci::editor($r,'requestcrs',$dom,$cnum);
-                        $output = '';
                     }
-                } else {
-                    $output .= '<br />'.$role_result.'</p>';
                 }
+                unless ($customized) { 
+                    $output .= '<br />'.$role_result;
+                }
+                $output .= '</p>';
                 $creationresult = 'created';
+                # Flush the course logs so reverse user roles immediately updated
+                unless ($registered_flush) {
+                    my $handlers = $r->get_handlers('PerlCleanupHandler');
+                    $r->set_handlers('PerlCleanupHandler' => [\&Apache::lonnet::flushcourselogs,@{$handlers}]);
+                    $registered_flush=1;
+                }
+                if ($instcode ne '') {
+                    &Apache::lonnet::devalidate_cache_new('instcats',$dom);
+                    # Update cache of self-cataloging courses on institution's server(s).
+                    if (&Apache::lonnet::shared_institution($dom)) {
+                        unless ($registered_instcats) {
+                            my $handlers = $r->get_handlers('PerlCleanupHandler');
+                            $r->set_handlers('PerlCleanupHandler' => [\&devalidate_remote_instcats,@{$handlers}]);
+                            $registered_instcats=1;
+                            $modified_dom = $dom;
+                        }
+                    }
+                }
             } else {
                 $output = '<span class="LC_error">';
                 if ($crstype eq 'community') {
@@ -3361,15 +3927,19 @@ sub print_request_outcome {
             }
         } else {
             my $requestid = $cnum.'_'.$disposition;
-            my $request = { 
+            my $request = {
                             $requestid => {
                                             timestamp   => $now,
                                             crstype     => $crstype,
                                             ownername   => $env{'user.name'},
                                             ownerdom    => $env{'user.domain'},
-                                            description => $env{'form.cdescr'}, 
+                                            description => $env{'form.cdescr'},
+                                            lonhost     => $lonhost,
                                           },
                           };
+            if ($crstype eq 'official') {
+                $request->{$requestid}->{'instcode'} = $instcode;
+            }
             my $statuskey = 'status:'.$dom.':'.$cnum;
             my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey],
                                                    $env{'user.domain'},$env{'user.name'});
@@ -3382,9 +3952,19 @@ sub print_request_outcome {
                 if (($queuehash{$cnum.'_approval'} ne '') || 
                     ($queuehash{$cnum.'_pending'} ne '')) {
                     $queued = 1;
+                    if (ref($queuehash{$cnum.'_pending'}) eq 'HASH') {
+                        $token = $queuehash{$cnum.'_pending'}{'token'};
+                    } 
                 }
             }
             unless ($queued) {
+                if (($disposition eq 'pending') && ($crstype ne 'official')) {
+                    my %reqinfo = (
+                                    $cnum.':'.$dom => $now.':'.$env{'user.name'}.':'.$env{'user.domain'},
+                                  );
+                     $token = &Apache::lonnet::tmpput(\%reqinfo,$lonhost);
+                     $request->{$requestid}->{'token'} = $token;
+                }
                 my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
                                                             $dom);
                 if ($putresult eq 'ok') {
@@ -3393,9 +3973,11 @@ sub print_request_outcome {
                     } else {
                         $output .= &mt('Your course request has been recorded.') 
                     }
-                    $output .= '<br />'.
-                              &notification_information($disposition,$req_notifylist,
-                                                        $cnum,$now);
+                    unless ($disposition eq 'pending') { 
+                        $output .= '<br />'.
+                                   &notification_information($disposition,$req_notifylist,
+                                                             $dom,$cnum,$now);
+                    }
                 } else {
                     $reqstatus = 'domainerror';
                     $reqhash{'disposition'} = $disposition;
@@ -3404,45 +3986,106 @@ sub print_request_outcome {
                 }
             }
         }
-        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);
+        ($storeresult,my $updateresult) = 
+            &Apache::loncoursequeueadmin::update_coursereq_status(\%reqhash,$dom,
+                $cnum,$reqstatus,'request',$env{'user.domain'},$env{'user.name'});
+        if ($storeresult eq 'ok') {
+            my $postprocess;
+            if (($disposition eq 'approval') || ($disposition eq 'pending')) {
+                my $updateaction = $disposition;
+                if ($disposition eq 'approval') {
+                    $updateaction = 'queued';
+                }
+                my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+                                                             $env{'user.domain'});
+                $postprocess =
+                    &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,$updateaction,$env{'user.name'},
+                                                        $env{'user.domain'},$fullname,$env{'form.cdescr'});
             }
-        } 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') {
-            if ($crstype eq 'community') {
-                $output .= '<p>'.&mt('Your community request has been updated').'</p>';
-            } else {
-                $output .= '<p>'.&mt('Your course request has been updated').'</p>';
+            if ($modified && $queued) {
+                if ($crstype eq 'community') {
+                    $output .= '<p>'.&mt('Your community request has been updated').'</p>';
+                } else {
+                    $output .= '<p>'.&mt('Your course request has been updated').'</p>';
+                }
+                if ($disposition eq 'approval') {
+                    $output .= &notification_information($disposition,$req_notifylist,$dom,$cnum,$now);
+                }
+            }
+            if ($disposition eq 'approval') {
+                if ((ref($postprocess) eq 'HASH') && 
+                    ((ref($postprocess->{'queuedmsg'}) eq 'HASH') || ($postprocess->{'queuedweb'}))) { 
+                    &notification_information($disposition,undef,$dom,$cnum,$now,undef,$postprocess);
+                    $customized = $postprocess->{'createdcustomized'};
+                }
+            } elsif ($disposition eq 'pending') {
+                my $pendingform;
+                if ($crstype ne 'official') {
+                    $pendingform = &pending_validation_form($dom,$cnum,$crstype,$now,$token,
+                                                            $lonhost,$env{'form.cdescr'});
+                }
+                if ($pendingform) {
+                    $output .= $pendingform;
+                } else { 
+                    $output .= &notification_information($disposition,undef,$dom,$cnum,$now,undef,$postprocess);
+                }
+                if (ref($postprocess) eq 'HASH') {
+                    $customized = $postprocess->{'createdcustomized'};
+                }
             }
-            $output .= &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>';
+            $output .= '<p class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
+        }
+        if ($updateresult) {
+            $output .= $updateresult;
         }
     }
     if ($creationresult ne '') {
-        if ($donedisplay) {
-            $r->print('<br />'.&done_display());
-        }
-        return ($creationresult,$output);
+        return ($creationresult,$output,$customized);
     } else {
-        return ($storeresult,$output);
+        return ($storeresult,$output,$customized);
+    }
+}
+
+sub devalidate_remote_instcats {
+    if ($modified_dom ne '') {
+        my %servers = &Apache::lonnet::internet_dom_servers($modified_dom);
+        my %thismachine;
+        map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
+        if (keys(%servers)) {
+            foreach my $server (keys(%servers)) {
+                next if ($thismachine{$server});
+                &Apache::lonnet::remote_devalidate_cache($server,['instcats:'.$modified_dom]);
+            }
+        }
+        $modified_dom = '';
+    }
+    return;
+}
+
+sub custom_formitems {
+    my ($preprocess,$customhash) = @_;
+    return unless ((ref($preprocess) eq 'HASH') && (ref($customhash) eq 'HASH'));  
+    if (ref($preprocess->{'formitems'}) eq 'HASH') {
+        foreach my $key (keys(%{$preprocess->{'formitems'}})) {
+            if ($preprocess->{'formitems'}->{$key} eq 'multiple') {
+                if (exists($env{'form.'.$key})) {
+                    my @items = &Apache::loncommon::get_env_multiple($env{'form.'.$key});
+                    foreach my $item (@items) {
+                        $item =~ s/(`)/'/g;
+                        $item =~ s/\$/\(\$\)/g;
+                        push(@{$customhash->{$key}},$item);
+                    }
+                }
+            } else {
+                if (exists($env{'form.'.$key})) {
+                    $customhash->{$key} = $env{'form.'.$key};
+                    $customhash->{$key} =~ s/(`)/'/g;
+                    $customhash->{$key} =~ s/\$/\(\$\)/g;
+                }
+            }
+        }
     }
 }
 
@@ -3581,140 +4224,8 @@ sub update_requestors_roles {
     return $output;
 }
 
-sub acquire_cc_role {
-    my ($cdom,$cnum,$trolecode,$csec) = @_;
-    my %coursegroups = &Apache::lonnet::get_active_groups(
-                        $env{'user.domain'},$env{'user.name'},$cdom, $cnum);
-    my $cgrps = join(':',keys(%coursegroups));
-    if ($env{'environment.recentroles'}) {
-        my %frozen_roles =
-            &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
-        &Apache::lonhtmlcommon::store_recent('roles',$trolecode,' ',
-                                            $frozen_roles{$trolecode});
-    }
-
-    &Apache::lonnet::appenv({"request.course.id"   => '',
-                             "request.course.fn"   => '',
-                             "request.course.uri"  => '',
-                             "request.course.sec"  => '',
-                             "request.role"        => 'cm',
-                             "request.role.adv"    => $env{'user.adv'},
-                             "request.role.domain" => $env{'user.domain'}});
-
-    &Apache::lonnet::log($env{'user.domain'},
-                         $env{'user.name'},
-                         $env{'user.home'},
-                         "Role ".$trolecode);
-
-    &Apache::lonnet::appenv(
-                            {'request.role'        => $trolecode,
-                             'request.role.domain' => $cdom,
-                             'request.course.sec'  => $csec,
-                             'request.course.groups' => $cgrps});
-    my ($furl,$ferr) = &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
-    my $tadv;
-    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
-    return;
-}
-
-sub store_crsparms {
-    my ($cdom,$cnum,$now,$accessstart,$accessend) = @_;
-    my $topsymb = '___0___uploaded/'.$cdom.'/'.$cnum.'/default.sequence';
-    my %crsparms = (
-                      buttonshide => {
-                                       value => 'yes',
-                                       type  => 'string_yesno',
-                                     },
-                      opendate    => {
-                                       value => $accessstart,
-                                       type  => 'date_start',
-                                     },
-                      duedate     => {
-                                       value => $accessend,
-                                       type  => 'date_end',
-                                     },
-                      problemstatus => {
-                                           value => 'no',
-                                           type  => 'string_problemstatus',
-                                       },
-                      maxtries      => {
-                                           value => '1',
-                                           type  => 'intpos',
-                                       },
-                      discussend    => {
-                                           value => $now,
-                                           type  => 'date_end',
-                                       },
-                      discusshide   => { 
-                                           value => 'yes',
-                                           type  => 'string_yesno',
-                                       }
-    );
-    my %parmresult;
-    foreach my $item (keys(%crsparms)) {
-        $parmresult{$item} =
-            &Apache::lonparmset::storeparm_by_symb($topsymb,
-                                   '0_'.$item,14,$crsparms{$item}{'value'},
-                                   $crsparms{$item}{'type'},undef,$cdom);
-    }
-    return %parmresult;
-}
-
-sub roster_upload_form {
-    my ($r,$output,$formname,$titletext) = @_;
-    my $title = &mt('Request Processed');
-    if ($titletext ne '') {
-        $title = $titletext;
-    }
-    $r->print(<<"ENDJS");
-<script type="text/javascript">
-// <![CDATA['
-
-function toggleRosterUpload() {
-    var willupload;
-    if (document.$formname.roster.length > 1) {
-        for (var i=0; i<document.$formname.roster.length; i++) {
-            if (document.$formname.roster[i].checked) {
-                willupload = document.$formname.roster[i].value;
-            }
-        }
-    }
-    if (willupload == 1) {
-        document.getElementById('rosterupload').style.display="block";
-        document.getElementById('norosterupload').style.display="none";
-    } else {
-        document.getElementById('rosterupload').style.display="none";
-        document.getElementById('norosterupload').style.display="block";
-    }
-    return;
-}
-// ]]
-</script>
-
-ENDJS
-    $r->print('<h3>'.$title.'</h3>'.$output.
-              '<h4>'.&mt('Course roster file upload').'</h4>');
-    $r->print('<p>'.&mt('If you have a text file available containing student e-mail addresses and initial passwords, you may upload it now.').'<br />'.
-    &mt('You may also enroll students later with the [_1]"Enrollment/Activity"[_2] utility in the management toolbar.','<i>','</i>').'</p>'.
-    &mt('Upload roster file now?').'&nbsp;'.
-    '<label><input type="radio" name="roster" value="1" '.
-    'onclick="javascript:toggleRosterUpload()" />'.
-    &mt('Yes').('&nbsp;'x2).'</label><label>'.
-    '<input type="radio" name="roster" value="0" checked="checked"'.
-    'onclick="javascript:toggleRosterUpload()" />'.&mt('No').'</label><br />'.
-    '<div id="norosterupload"><input type="submit" value="'.&mt('Next').'" name="norostersub" />'.
-    '<input type="hidden" name="reqaction" value="new" />'.
-    '<input type="hidden" name="state" value="done" /></div></form>'.
-    '<div id="rosterupload" style="display: none"><form name="studentform" method="post" enctype="multipart/form-data" '.
-    ' action="/adm/createuser">'."\n");
-    &Apache::lonuserutils::print_first_users_upload_form($r,'course','noheader','requestcrs');
-    $r->print('<input type="hidden" name="concepttest" value="'.$env{'form.concepttest'}.'" />'.
-              '</div></form>');
-}
-
 sub notification_information {
-    my ($disposition,$req_notifylist,$cnum,$now) = @_;
+    my ($disposition,$req_notifylist,$dom,$cnum,$now,$code,$postprocess) = @_;
     my %emails = &Apache::loncommon::getemails();
     my $address;
     if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
@@ -3732,110 +4243,147 @@ sub notification_information {
         }
         if ($req_notifylist) {
             my $fullname = &Apache::loncommon::plainname($env{'user.name'},
-                                                                     $env{'user.domain'});
+                                                         $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);
+            &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,"$fullname ($env{'user.name'}:$env{'user.domain'})",
+                                                                      'undef',$env{'form.cdescr'},$now,'coursereq',$sender);
+        }
+        if (ref($postprocess) eq 'HASH') {
+            if (ref($postprocess->{'queuedmsg'}) eq 'ARRAY') {
+                if (scalar(@{$postprocess->{'queuedmsg'}}) > 0) {
+                    my $recipient = $env{'user.name'}.':'.$env{'user.domain'};
+                    my $sender = $recipient;
+                    my $addmsg = [];
+                    foreach my $item (@{$postprocess->{'queuedmsg'}}) {
+                        if (ref($item) eq 'HASH') {
+                            if ($item->{'mt'} ne '') {
+                                push(@{$addmsg},$item);
+                            }
+                        }
+                    }
+                    if (scalar(@{$addmsg}) > 0) {
+                        &Apache::loncoursequeueadmin::send_selfserve_notification($recipient,$addmsg,undef,
+                                                                                  $env{'form.cdescr'},$now,
+                                                                                  'queuedcrsreq',$sender);
+                    }
+                }
+            }
+            if ($postprocess->{'queuedweb'}) {
+                $output .= $postprocess->{'queuedweb'};
+            }
         }
     } elsif ($disposition eq 'pending') {
-        $output .= '<div class="LC_info">'.
+        my $pending_default = '<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>';
+                       '</div>';
+        if (ref($postprocess) eq 'HASH') {
+            if ($postprocess->{'pendingweb'}) {
+                $output .= $postprocess->{'pendingweb'};
+            } else {
+                $output .= $pending_default;
+            }
+        } else {
+            $output .= $pending_default;
+        }
+    } elsif ($disposition eq 'created') {
+        if (($code) || ((ref($postprocess) eq 'HASH') && 
+            ((ref($postprocess->{'createdmsg'}) eq 'ARRAY') || ($postprocess->{'createdweb'})))) {
+            my $addmsg = [];
+            my $recipient = $env{'user.name'}.':'.$env{'user.domain'};
+            my $sender = $recipient;
+            if ($code) {
+                push(@{$addmsg},{
+                                  mt   => 'Students can automatically select your course: "[_1]" by entering this code: [_2]',
+                                  args => [$env{'form.cdescr'},$code],
+                                });
+                $output .= '<p>'.
+                           &mt('Students can automatically select your course by entering this code: [_1].','<b>'.$code.'</b>').
+                           '<br />'.
+                           &mt('A message has been sent to your LON-CAPA account with this information.');
+                if ($address ne '') {
+                    $output.= '<br />'.&mt('An e-mail has also been sent to: [_1] with this code.',$address);
+                }
+                $output .= '</p>';
+            }
+            if (ref($postprocess) eq 'HASH') {
+                if (ref($postprocess->{'createdmsg'}) eq 'ARRAY') {
+                    foreach my $item (@{$postprocess->{'createdmsg'}}) {
+                        if (ref($item) eq 'HASH') {
+                            if ($item->{'mt'} ne '') {  
+                                push(@{$addmsg},$item);
+                            }
+                        }
+                    }
+                }
+                if ($postprocess->{'createdweb'}) {
+                    $output .= $postprocess->{'createdweb'}
+                }
+            }
+            if (scalar(@{$addmsg}) > 0) {
+                my $type = 'createdcrsreq';
+                if ($code) {
+                    $type = 'uniquecode';
+                }
+                &Apache::loncoursequeueadmin::send_selfserve_notification($recipient,$addmsg,$dom.'_'.$cnum,$env{'form.cdescr'},
+                                                                          $now,$type,$sender);
+            }
+        }
     } else {
         $output .= '<div class="LC_warning">'.
-                   &mt('Your request status is: [_1].',$disposition). 
-                   '</div>'
+                   &mt('Your request status is: [_1].',$disposition).
+                   '</div>';
     }
     return $output;
 }
 
-sub get_processtype {
-    my ($dom,$crstype,$inststatuses,$domconfig) = @_;
-    return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH'));
-    my (%userenv,%settings,$val);
-    my @options = ('autolimit','validate','approval');
-    if ($dom eq $env{'user.domain'}) {
-        %userenv = 
-            &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
-                'requestcourses.'.$crstype,'inststatus');
-        if ($userenv{'requestcourses.'.$crstype}) {
-            $val = $userenv{'requestcourses.'.$crstype};
-            @{$inststatuses} = ('_custom_');
-        } else {
-            my ($task,%alltasks);
-            if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
-                %settings = %{$domconfig->{'requestcourses'}};
-                if (ref($settings{$crstype}) eq 'HASH') {
-                    if (($env{'user.adv'}) && ($settings{$crstype}{'_LC_adv'} ne '')) {
-                        $val = $settings{$crstype}{'_LC_adv'};
-                        @{$inststatuses} = ('_LC_adv_');
-                    } else {
-                        if ($userenv{'inststatus'} ne '') {
-                            @{$inststatuses} = split(',',$userenv{'inststatus'});
-                        } else {
-                            @{$inststatuses} = ('default');
-                        }
-                        foreach my $status (@{$inststatuses}) {
-                            if (exists($settings{$crstype}{$status})) {
-                                my $value = $settings{$crstype}{$status};
-                                next unless ($value); 
-                                unless (exists($alltasks{$value})) {
-                                    if (ref($alltasks{$value}) eq 'ARRAY') {
-                                        unless(grep(/^\Q$status\E$/,@{$alltasks{$value}})) {
-                                            push(@{$alltasks{$value}},$status); 
-                                        }
-                                    } else {
-                                        @{$alltasks{$value}} = ($status);
-                                    }
-                                }
-                            }
-                        }
-                        my $maxlimit = 0;
-                        
-                        foreach my $key (sort(keys(%alltasks))) {
-                            if ($key =~ /^autolimit=(\d*)$/) {
-                                if ($1 eq '') {
-                                    $val ='autolimit=';
-                                    last;
-                                } elsif ($1 > $maxlimit) {
-                                    $maxlimit = $1; 
-                                }
-                            }
-                        }
-                        if ($maxlimit) {
-                            $val = 'autolimit='.$maxlimit;
-                        } else {
-                            foreach my $option (@options) {
-                                if ($alltasks{$option}) {
-                                    $val = $option;
-                                    last;  
-                                }
-                            }
-                        }
+sub pending_validation_form {
+    my ($cdom,$cnum,$crstype,$now,$token,$lonhost,$cdesc) = @_;
+    my $output;
+    my %postvalues = (
+                      'owner'      => $env{'user.name'}.':'.$env{'user.domain'},
+                      'course'     => $cdom.'_'.$cnum,
+                      'coursetype' => $crstype,
+                     );
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$cdom);
+
+    if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+        my ($url,$buttontext,$code,@fields);
+        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+            $postvalues{'description'} = $cdesc;
+            $url = $domconfig{'requestcourses'}{'validation'}{'url'};
+            if (ref($domconfig{'requestcourses'}{'validation'}{'fields'}) eq 'ARRAY') {
+                @fields = @{$domconfig{'requestcourses'}{'validation'}{'fields'}};
+            }
+            $buttontext = $domconfig{'requestcourses'}{'validation'}{'button'};
+            $output .= $domconfig{'requestcourses'}{'validation'}{'markup'};
+            if (($url =~ m{^(https?\://|/)}) && (@fields > 0)) {
+                $output .= '<form name="crsreqvalidation" action="'.$url.'" method="post">'."\n";
+                foreach my $field (@fields) {
+                    if ($postvalues{$field}) {
+                        $output .= '<input type="hidden" name="'.$field.'" value="'.$postvalues{$field}.'" />'."\n";
                     }
                 }
-            }
-        }
-    } else {
-        %userenv = &Apache::lonnet::userenvironment($env{'user.domain'},
-                      $env{'user.name'},'reqcrsotherdom.'.$env{'form.crstype'});
-        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;
+                if ($buttontext eq '') {
+                    if ($crstype eq 'community') {
+                        $buttontext = &mt('Create community');
+                    } else {
+                        $buttontext = &mt('Create course');
                     }
-                    last;
                 }
+                my $hostname = &Apache::lonnet::hostname($lonhost);
+                my $protocol = $Apache::lonnet::protocol{$lonhost};
+                $protocol = 'http' if ($protocol ne 'https');
+                my $crscreator = $protocol.'://'.$hostname.'/cgi-bin/createpending.pl';
+                $output .= '<input type="hidden" name="crscreator" value="'.$crscreator.'" />'."\n".
+                           '<input type="hidden" name="token" value="'.$token.'" />'."\n".
+                           '<input type="submit" name="validate" value="'.$buttontext.'" />'."\n".
+                           '</form>'."\n";
             }
-            @{$inststatuses} = ('_external_');
         }
     }
-    return $val;
+    return $output;
 }
 
 sub check_autolimit {
@@ -3852,7 +4400,7 @@ sub check_autolimit {
             if (($crstype eq 'community') && 
                 (exists($crsroles{$cnum.':'.$cdom.':co'}))) {
                 $count ++;
-            } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial')) &&
+            } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook') || ($crstype eq 'placement')) &&
                      (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {
                 $count ++;
             }
@@ -3898,18 +4446,31 @@ sub retrieve_settings {
             }
             $env{'form.clonecrs'} = $reqinfo{'clonecrs'};
             $env{'form.clonedom'} = $reqinfo{'clonedom'};
+            if (($reqinfo{'clonecrs'} ne '') && ($reqinfo{'clonedom'} ne '')) {
+                $env{'form.cloning'} = 1;
+            }
             $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);
+            if ($reqinfo{'crstype'} eq 'official') {
+                $env{'form.autoadds'} = $reqinfo{'autoadds'};
+                $env{'form.autodrops'} = $reqinfo{'autodrops'};
+                if ($reqinfo{'instcode'} ne '') { 
+                    $env{'form.sectotal'} = $reqinfo{'sectotal'};
+                    $env{'form.crosslisttotal'} = $reqinfo{'crosslisttotal'};
+                    $env{'form.instcode'} = $reqinfo{'instcode'};
+                    my $crscode = { 
+                                    $cnum => $reqinfo{'instcode'},
+                                  };
+                    &extract_instcode($dom,'instcode',$crscode,$cnum);
+                    (undef,undef,my $instcredits) =
+                        &Apache::lonnet::auto_validate_instcode(undef,$dom,
+                                                                $reqinfo{'instcode'});
+                    if ($instcredits ne $reqinfo{'defaultcredits'}) {
+                        $env{'form.coursecredits'} = $reqinfo{'defaultcredits'};
+                    }
+                }
+            } elsif (($reqinfo{'crstype'} eq 'unofficial') || ($reqinfo{'crstype'} eq 'textbook')) {
+                $env{'form.coursecredits'} = $reqinfo{'defaultcredits'};
             }
             my @currsec;
             if (ref($reqinfo{'sections'}) eq 'HASH') {
@@ -4040,25 +4601,796 @@ sub generate_date_items {
     return;
 }
 
-sub show_cloneable {
-    my $showclone;
-    if (&Apache::loncommon::needs_gci_custom()) {
-        my %courses = &Apache::loncommon::existing_gcitest_courses('cc');
-        my $numcourses = scalar(keys(%courses));
-        return $numcourses;
-    } else {
-        return 1;
+sub print_textbook_form {
+    my ($r,$dom,$incdoms,$domdefs,$settings,$can_request,$crstype,$formhash) = @_;
+    my (%prefab,%ordered,%numprefab);
+    if ($crstype eq '') {
+        $crstype = 'textbook';
+    }
+#
+#  Retrieve list of prefabricated courses (textbook courses and templates) cloneable by user
+#
+    foreach my $type ('textbooks','templates') {
+        $numprefab{$type} = 0;
+        if (ref($settings) eq 'HASH') {
+            $prefab{$type} = $settings->{$type};
+            if (ref($prefab{$type}) eq 'HASH') {
+                foreach my $item (keys(%{$prefab{$type}})) {
+                    my ($clonedom,$clonecrs) = split(/_/,$item);
+                    if (ref($prefab{$type}{$item}) eq 'HASH') {
+                        if (&Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+                                          $env{'user.domain'},$clonecrs,$clonedom,$crstype,$dom)) {
+
+                            my $num = $prefab{$type}{$item}{'order'};
+                            $ordered{$type}{$num} = $item;
+                            $numprefab{$type} ++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+#
+# Check if domain has multiple library servers
+#
+    my ($home_server_pick,$numlib) =
+        &Apache::loncommon::home_server_form_item($dom,'chome',
+                                                  'default','hide');
+    if ($numlib > 1) {
+        $home_server_pick = &mt('Home Server for Course').': '.$home_server_pick.'<br />';
     }
+
+#
+# Retrieve information about courses owned by user, or in which user has an active
+# Course Coordinator role
+#
+    my $numcurrent;
+    my %cloneable = &Apache::lonnet::courseiddump($dom,'.',1,'.',$env{'user.name'}.':'.$env{'user.domain'},
+                                                  '.',undef,undef,'Course');
+    my %ccroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
+                                                ['active'],['cc']);
+
+    my $cc_clone = '';
+    foreach my $role (keys(%ccroles)) {
+        my ($cnum,$cdom,$rest) = split(/:/,$role,3);
+        $cc_clone .= $cdom.':'.$cnum.'&';
+        unless (exists($cloneable{$cdom.'_'.$cnum})) {
+            my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum,{'one_time' => 1});
+            $cloneable{$cdom.'_'.$cnum} = {
+                                               context => $courseinfo{'internal.creationcontext'},
+                                               created => $courseinfo{'internal.created'},
+                                               creator => $courseinfo{'internal.creator'},
+                                               description => $courseinfo{'description'},
+                                               inst_code => $courseinfo{'coursecode'},
+                                               owner => $courseinfo{'internal.courseowner'},
+                                               releaserequired => $courseinfo{'internal.releaserequired'},
+                                               type  => $courseinfo{'type'},
+                                          };
+        }
+    }
+
+    my $numcurrent = scalar(keys(%cloneable));
+
+#
+# Retrieve information about courses from user's domain which user can clone, but which not owned
+# or cloneable based on Course Coordinator role.
+#
+    my ($numdomcourses,%domcloneable);
+    my %allcloneable = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',undef,undef,'Course',
+                                                     undef,undef,undef,undef,undef,
+                                                     $env{'user.name'}.':'.$env{'user.domain'},
+                                                     $cc_clone,1);
+    foreach my $cid (keys(%allcloneable)) {
+        unless (exists($cloneable{$cid})) {
+            $domcloneable{$cid} = $allcloneable{$cid};
+        }
+    }
+    $numdomcourses = scalar(keys(%domcloneable));
+
+    my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+                                                 $env{'user.domain'});
+
+#
+# Retrieve any custom form information prior to rendering page
+#
+
+    my $initprocess = &Apache::lonnet::auto_crsreq_update($dom,undef,$crstype,'initializereview',$env{'user.name'},
+                                                         $env{'user.domain'},$fullname);
+    my %custominit;
+    if (ref($initprocess) eq 'HASH') {
+        &custom_formitems($initprocess,\%custominit);
+    }
+
+#
+# Retrieve any custom onload actions or javascript used for page before rendering
+#
+
+    my ($customonload,$customjs,$customvalidationjs);
+    my $inprocess = &Apache::lonnet::auto_crsreq_update($dom,undef,$crstype,'prereview',$env{'user.name'},
+                                                        $env{'user.domain'},$fullname,undef,undef,
+                                                        undef,undef,\%custominit);
+    if (ref($inprocess) eq 'HASH') {
+        $customonload = $inprocess->{'onload'};
+        $customjs = $inprocess->{'javascript'};
+        $customvalidationjs = $inprocess->{'validationjs'};
+    }
+
+    my $postprocess = &Apache::lonnet::auto_crsreq_update($dom,undef,$crstype,'review',
+                                                          $env{'user.name'},
+                                                          $env{'user.domain'},$fullname,undef,undef,
+                                                          undef,undef,\%custominit);
+
+    my $jscript = &textbook_request_javascript(\%numprefab,$numcurrent,$numdomcourses,$customvalidationjs);
+    $jscript .= $customjs;
+    my (%loaditems,$args);
+    $loaditems{'onload'} = 'javascript:uncheckAllRadio();'.$customonload;
+    if ($crstype eq 'lti') {
+       $args = { 'only_body' => 1};
+    }
+    $r->print(&header('Course Request',$jscript,\%loaditems,undef,$args));
+
+    if (ref($can_request) eq 'HASH') {
+        unless (((scalar(keys(%{$can_request})) == 1) && ($can_request->{'textbook'})) ||
+                ($crstype eq 'lti')) {
+            &Apache::lonhtmlcommon::add_breadcrumb(
+                { href => '/adm/requestcourse',
+                  text => 'Pick action',
+                });
+        }
+    }
+    unless ($crstype eq 'lti') {
+        &Apache::lonhtmlcommon::add_breadcrumb({text=>'Course Request'});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'));
+
+        &startContentScreen($r,'textbookrequests');
+#
+# Show domain selector form, if required.
+#
+        if (@{$incdoms} > 1) {
+            my $onchange = 'this.form.submit()';
+            $r->print('<form name="domforcourse" method="post" action="/adm/requestcourse">'.
+                      '<div><fieldset><legend>'.&mt('Domain').'</legend>'.
+                      &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange,$incdoms).
+                      '</fieldset></form>');
+        }
+    }
+
+#
+# Course request form
+#
+
+#
+# Course Title
+#
+    $r->print('<form name="requestcourse" method="post" action="/adm/requestcourse" onsubmit="return validTextbookReq();">'.
+              '<div>'.
+              '<fieldset>'.
+              '<legend>'.&mt('Course Information').'</legend>'.
+              '<span class="LC_nobreak">'.&mt('Title').':&nbsp'.
+              '<input type="text" size="60" name="cdescr" value="" /></span><br />'.
+              $home_server_pick.'<br /></fieldset>'.
+              '</div>');
+
+#
+# Content source selection, if more than one available
+#
+    if (keys(%cloneable) || keys(%ordered) || keys(%domcloneable)) {
+        $r->print('<div>'. 
+                  '<fieldset><legend>'.&mt('Course Content').'</legend>');
+        if (keys(%ordered)) {
+            if (ref($ordered{'textbooks'}) eq 'HASH') {
+                $r->print('<span class="LC_nobreak"><label>'.
+                          '<input type="radio" name="cloning" value="textbook" onclick="javascript:cloneChoice();" />'.
+                          &mt('Load textbook content').'</span>'.('&nbsp;'x2).' ');
+            }
+            if (ref($ordered{'templates'}) eq 'HASH') {
+                $r->print('<span class="LC_nobreak"><label>'.
+                          '<input type="radio" name="cloning" value="template" onclick="javascript:cloneChoice();" />'.
+                          &mt('Load pre-existing template').'</span>'.('&nbsp;'x2).' ');
+            }
+        }
+        if (keys(%cloneable)) {
+            $r->print('<span class="LC_nobreak"><label>'.
+                      '<input type="radio" name="cloning" value="existing" onclick="javascript:cloneChoice();" />'.
+                      &mt('Copy one of your courses').'</label></span>'.('&nbsp;'x2).' ');
+        }
+        if (keys(%domcloneable)) {
+            $r->print('<span class="LC_nobreak"><label>'.
+                      '<input type="radio" name="cloning" value="colleague" onclick="javascript:cloneChoice();" />'.
+                      &mt("Copy a colleague's course").'</label></span>'.('&nbsp;'x2).' ');
+        }
+        $r->print('<span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="cloning" value="none" checked="checked" onclick="javascript:cloneChoice();" />'.
+                  &mt('Empty course shell').'</label></span>');
+    } else {
+        $r->print('<input type="hidden" name="cloning" value="none" />');
+    }
+
+#
+# Table of cloneable textbook courses
+#
+    if (keys(%ordered)) {
+        foreach my $type ('textbooks','templates') {
+            my $divid = 'showtextbook';
+            my $radioid = 'book';
+            if ($type eq 'templates') {
+                $divid = 'showtemplate'; 
+                $radioid = 'template';
+            }
+            if (ref($ordered{$type}) eq 'HASH') {
+                $r->print('<div id="'.$divid.'" style="display:none">'.
+                          &Apache::loncommon::start_data_table().
+                          &Apache::loncommon::start_data_table_header_row().
+                          '<th>'.&mt('Title').'</th>');
+                if ($type eq 'textbooks') {
+                    $r->print('<th>'.&mt('Author(s)').'</th>');
+                }
+                $r->print('<th>'.&mt('Subject').'</th>');
+                if ($type eq 'textbooks') {
+                    $r->print('<th>'.&mt('Publisher').'</th>'.
+                              '<th>'.&mt('Book').'</th>');
+                }
+                $r->print(&Apache::loncommon::end_data_table_header_row());
+                my @items = sort { $a <=> $b } keys(%{$ordered{$type}});
+                foreach my $num (@items) {
+                    my $item = $ordered{$type}{$num};
+                    my $cleantitle=&HTML::Entities::encode($prefab{$type}{$item}{'title'},'<>&"');
+                    $cleantitle=~s/'/\\'/g;
+                    $cleantitle =~ s/^\s+//;
+                    $r->print(&Apache::loncommon::start_data_table_row().
+                              '<td><label><input type="radio" name="'.$radioid.'" value="'.$item.'" />'.
+                              $cleantitle.'</label></td>');
+                    if ($type eq 'textbooks') {
+                         $r->print('<td>'.$prefab{$type}{$item}{'author'}.'</td>');
+                    }
+                    $r->print('<td>'.$prefab{$type}{$item}{'subject'}.'</td>');
+                    if ($type eq 'textbooks') {
+                        $r->print('<td>'.$prefab{$type}{$item}{'publisher'}.'</td>'.
+                                  '<td><img border="0" src="'.$prefab{$type}{$item}{'image'}.
+                                  '" alt="'.$cleantitle.'" /></td>');
+                    }
+                    $r->print(&Apache::loncommon::end_data_table_row());
+                }
+                $r->print(&Apache::loncommon::end_data_table().
+                          '</div>');
+            }
+        }
+    }
+
+#
+# Table of user's current courses (owner and/or course coordinator)
+#
+    my %lt = &clone_text();
+    if (keys(%cloneable)) {
+        $r->print('<div id="showexisting" style="display:none">'.
+                  &clone_selection_table($dom,'owned',\%cloneable).
+                  '<p><input type="radio" name="owndatemode" value="delete" /> '.$lt{'ncd'}.
+                  '</label><br /><label>'.
+                  '<input type="radio" name="owndatemode" value="preserve" /> '.$lt{'prd'}.
+                  '</label><br /><label>'.
+                  '<input type="radio" name="owndatemode" value="shift" checked="checked" /> '.
+                  $lt{'shd'}.'</label>'.
+                  '<input type="text" size="5" name="owndateshift" value="365" />'.
+                  '</div>');
+    }
+#
+# Table of other cloneable courses from user's domain (exclude own courses)
+#
+    if (keys(%domcloneable)) {
+        $r->print('<div id="showcolleague" style="display:none">'.
+                  &clone_selection_table($dom,'colleague',\%domcloneable).
+                  '<p><input type="radio" name="colldatemode" value="delete" /> '.$lt{'ncd'}.
+                  '</label><br /><label>'.
+                  '<input type="radio" name="colldatemode" value="preserve" /> '.$lt{'prd'}.
+                  '</label><br /><label>'.
+                  '<input type="radio" name="colldatemode" value="shift" checked="checked" /> '.
+                  $lt{'shd'}.'</label>'.
+                  '<input type="text" size="5" name="colldateshift" value="365" />'.
+                  '</div>');
+    }
+
+#
+# End of content selector
+#
+    if (keys(%cloneable) || keys(%domcloneable) || keys(%ordered)) {
+        $r->print('</fieldset></div>');
+    }
+
+    my %accesstitles = (
+                          'start' => 'Default start access',
+                           'end'   => 'Default end access',
+                       );
+    my %help_item = (
+                       start => 'Course_Request_Access_Start',
+                       end   => 'Course_Request_Access_End',
+                    );
+    my $starttime = time;
+    my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
+    my $startform = &Apache::lonhtmlcommon::date_setter('requestcourse','accessstart',
+                                                        $starttime,'','','',1,'','','',1);
+    my $endform = &Apache::lonhtmlcommon::date_setter('requestcourse','accessend',
+                                                      $endtime,'','','',1,'','','',1);
+#
+# Set default start and end dates for student access
+# 
+    $r->print('<div>'.
+              '<fieldset><legend>'.&mt('Student Access Dates').'</legend>'.
+              &Apache::loncommon::help_open_topic($help_item{'start'}).
+              '&nbsp;'.&mt($accesstitles{'start'}).$startform.'<br />'.
+              &Apache::loncommon::help_open_topic($help_item{'end'}).
+              '&nbsp;'.&mt($accesstitles{'end'}).$endform.'<br /></div>');
+
+#
+# Display any custom fields for this course type
+#
+    if (ref($postprocess) eq 'HASH') {
+        if ($postprocess->{'reviewweb'}) {
+            $r->print($postprocess->{'reviewweb'});
+        }
+    }
+
+#
+# Submit button
+#
+    $r->print('<input type="hidden" name="crstype" value="'.$crstype.'" />'.
+              '<input type="hidden" name="action" value="process" />'.
+              '<input type="submit" value="'.&mt('Create course').'" />');
+
+#
+# End request form
+#
+
+    if (($crstype eq 'lti') && (ref($formhash) eq 'HASH')) {
+        foreach my $item (keys(%{$formhash})) {
+            $r->print('<input type="hidden" name="'.$item.'" value="'.$formhash->{$item}.'" />'."\n");
+        }
+    }
+
+    $r->print('</form>');
+    unless ($crstype eq 'lti') {
+        &endContentScreen($r);
+    }
+    $r->print(&Apache::loncommon::end_page());
+    return;
 }
 
-sub get_template {
-    my ($cdom) = @_;
-    my %template = (
-                     gcitest  => '8v226795a882b4bcagcil1',
-                     slcitest => '8v226795a882b4bcagcil1',
-                   );
-    return $template{$cdom};
+sub clone_selection_table {
+    my ($dom,$name,$cloneableref) = @_;
+    return unless ((ref($cloneableref) eq 'HASH') && (($name eq 'owned') || ($name eq 'colleague')));
+    my %allownernames;
+    my %sortbytitle;
+    my $output;
+    foreach my $cid (sort(keys(%{$cloneableref}))) {
+        if (ref($cloneableref->{$cid}) eq 'HASH') {
+            my $cdesc = $cloneableref->{$cid}{'description'};
+            $cdesc =~ s/`/'/g;
+            if ($cdesc ne '') {
+                push(@{$sortbytitle{$cdesc}},$cid);
+            }
+        }
+    }
+    foreach my $title (sort(keys(%sortbytitle))) {
+         if (ref($sortbytitle{$title}) eq 'ARRAY') {
+            foreach my $cid (sort(@{$sortbytitle{$title}})) {
+                my $cleantitle=&HTML::Entities::encode($title,'<>&"');
+                $cleantitle=~s/'/\\'/g;
+                $cleantitle =~ s/^\s+//;
+                my ($namestr,@owners,%ownernames);
+                if ($cloneableref->{$cid}{'owner'} ne '') {
+                    push(@owners,$cloneableref->{$cid}{'owner'});
+                }
+                if ($cloneableref->{$cid}{'co-owners'} ne '') {
+                    foreach my $item (split(/,/,$cloneableref->{$cid}{'co-owners'})) {
+                        if (($item ne '') && (!grep(/^\Q$item\E$/,@owners))) {
+                            push(@owners,$item);
+                        }
+                    }
+                }
+                foreach my $owner (@owners) {
+                    my ($ownername,$ownerdom);
+                    if ($owner =~ /:/) {
+                        ($ownername,$ownerdom) = split(/:/,$owner);
+                    } else {
+                        $ownername = $owner;
+                        if ($owner ne '') {
+                            $ownerdom = $dom;
+                        }
+                    }
+                    if ($ownername ne '' && $ownerdom ne '') {
+                        if (exists($allownernames{$ownername.':'.$ownerdom})) {
+                            $ownernames{$ownername.':'.$ownerdom} = $allownernames{$ownername.':'.$ownerdom};
+                        } else {
+                            my %namehash=&Apache::loncommon::getnames($ownername,$ownerdom);
+                            $ownernames{$ownername.':'.$ownerdom} = \%namehash;
+                            $allownernames{$ownername.':'.$ownerdom} = $ownernames{$ownername.':'.$ownerdom};
+                        }
+                    }
+                }
+                my @lastnames;
+                foreach my $owner (keys(%ownernames)) {
+                    if (ref($ownernames{$owner}) eq 'HASH') {
+                        push(@lastnames,$ownernames{$owner}{'lastname'});
+                    }
+                }
+                if (@lastnames) {
+                    $namestr = join(', ',sort(@lastnames));
+                }
+                $output .= &Apache::loncommon::start_data_table_row().
+                           '<td><label><input type="radio" name="'.$name.'" value="'.$cid.'" />'.
+                           '&nbsp;'.$cleantitle.'</label></td>'.
+                           '<td>'.$namestr.'</td>'.
+                           &Apache::loncommon::end_data_table_row();
+            }
+        }
+    }
+    if ($output) {
+        return &Apache::loncommon::start_data_table().
+               &Apache::loncommon::start_data_table_header_row().
+               '<th>'.&mt('Title').'</th>'.
+               '<th>'.&mt('Owner/co-owner(s)').'</th>'.
+               &Apache::loncommon::end_data_table_header_row().
+               $output.
+               &Apache::loncommon::end_data_table();
+    }
+    return;
 }
 
+sub process_textbook_request {
+    my ($r,$dom,$action,$domdefs,$domconfig,$can_request,$crstype) = @_;
+    my ($uniquecode,$req_notifylist);
+    if ($crstype eq '') {
+        $crstype = 'textbook';
+    }
+    if (ref($domconfig) eq 'HASH') {
+        if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
+            if (ref($domconfig->{'requestcourses'}{'notify'}) eq 'HASH') {
+                $req_notifylist = $domconfig->{'requestcourses'}{'notify'}{'approval'};
+            }
+            if (ref($domconfig->{'requestcourses'}{'uniquecode'}) eq 'HASH') {
+                $uniquecode = $domconfig->{'requestcourses'}{'uniquecode'}{$crstype};
+            }
+        }
+    }
+    my $now = time;
+    my $reqtype = $env{'form.cloning'};
+    my (@inststatuses,$storeresult,$creationresult);
+    my $cnum = &Apache::lonnet::generate_coursenum($dom,'Course');
+    my ($clonefrom,$clonedom,$clonecrs);
+    if ($reqtype eq 'textbook') {
+        $clonefrom = $env{'form.book'};
+    } elsif ($reqtype eq 'template') {
+        $clonefrom = $env{'form.template'};
+    } elsif ($reqtype eq 'existing') {
+        $clonefrom = $env{'form.owned'};
+    } elsif ($reqtype eq 'colleague') {
+        $clonefrom = $env{'form.colleague'};
+    }
+    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+    if ($clonefrom) {
+        ($clonedom,$clonecrs) = split(/_/,$clonefrom);
+        if (&Apache::lonnet::homeserver($clonecrs,$clonedom) ne 'no_host') {
+            my $canclone =
+                &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+                            $env{'user.domain'},$clonecrs,$clonedom,$crstype,$dom);
+            unless ($canclone) {
+                undef($clonecrs);
+                undef($clonedom);
+            }
+        } else {
+            undef($clonecrs);
+            undef($clonedom);
+        }
+    }
+    my $js = &processing_javascript();
+    my ($loaditems,$args);
+    $loaditems = {
+                   onload => 'javascript:hideProcessing();',
+                 };
+    if ($crstype eq 'lti') {
+       $args = { 'only_body' => 1};
+    }
+    $r->print(&header('Course Creation',$js,$loaditems,undef,$args));
+
+    unless ($crstype eq 'lti') {
+        if (ref($can_request) eq 'HASH') {
+            unless ((scalar(keys(%{$can_request})) == 1) && ($can_request->{'textbook'})) {
+                &Apache::lonhtmlcommon::add_breadcrumb(
+                    { href => '/adm/requestcourse',
+                      text => 'Pick action',
+                    });
+            }
+        }
+        &Apache::lonhtmlcommon::add_breadcrumb(
+                                               { href => '/adm/requestcourse',
+                                                 text => "Create Course",
+                                               }
+                                              );
+        &Apache::lonhtmlcommon::add_breadcrumb({text=>'Request Processed'});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'));
+        &startContentScreen($r,'textbookrequests');
+    }
+
+    my $details = {
+                    owner          => $env{'user.name'},
+                    domain         => $env{'user.domain'},
+                    cdom           => $dom,
+                    cnum           => $cnum,
+                    coursehome     => $env{'form.chome'},
+                    cdescr         => $env{'form.cdescr'},
+                    crstype        => $crstype,
+                    uniquecode     => $uniquecode,
+                    clonedom       => $clonedom,
+                    clonecrs       => $clonecrs,
+                    accessstart    => $accessstart,
+                    accessend      => $accessend,
+                    personnel      => {},
+                  };
+    if (($clonecrs ne '') && ($clonedom ne '')) {
+        if ($reqtype eq 'existing') {
+            $details->{datemode} = $env{'form.owndatemode'};
+            if ($details->{datemode} eq 'shift') {
+                $details->{dateshift} = $env{'form.owndateshift'};
+            } else {
+                $details->{dateshift} = '';
+            }
+        } elsif ($reqtype eq 'colleague') {
+            $details->{datemode} = $env{'form.colldatemode'};
+            if ($details->{datemode} eq 'shift') {
+                $details->{dateshift} = $env{'form.colldateshift'};
+            } else {
+                $details->{dateshift} = '';
+            }
+        } elsif (($reqtype eq 'textbook') || ($reqtype eq 'template')) {
+            $details->{datemode} = 'delete';
+            $details->{dateshift} = '';
+        }
+        if ($details->{dateshift} ne '') {
+            $details->{dateshift} =~ s/[^\d\.]+//g;
+        }
+    } else {
+        $details->{datemode} = '';
+        $details->{dateshift} = '';
+    }
+    my $lonhost = $r->dir_config('lonHostID');
+    $r->rflush();
+    my ($result,$output,$customized) = &process_request($r,$lonhost,$dom,$cnum,$crstype,$now,$details,
+                                                        '',$req_notifylist,[],$domconfig);
+    $r->print($output);
+    if ($crstype eq 'lti') {
+        my %consumers = &Apache::lonnet::get_dom('lticonsumers',[$env{'form.sourcecrs'}],$dom);
+        if (($env{'form.lti.sourcecrs'} ne '')  && ($consumers{$env{'form.lti.sourcecrs'}} eq '') && ($cnum ne '')) {
+            &Apache::lonnet::put_dom('lticonsumers',{ $env{'form.lti.sourcecrs'} => $cnum },$dom);
+        }
+    } elsif (&Apache::loncoursequeueadmin::author_prompt()) {
+        unless ($customized) {
+            &print_author_prompt($r,$action,$cnum,$dom,$crstype,$result);
+        }
+    } elsif ($result eq 'created') {
+        unless ($customized) {
+            $r->print('<p><a href="/adm/requestcourse">'.&mt('Create another course').'</a></p>');
+        }
+    }
+    unless ($crstype eq 'lti') {
+        &endContentScreen($r);
+    }
+    $r->print(&Apache::loncommon::end_page());
+}
+
+sub textbook_request_javascript {
+    my ($numprefab,$numcurrent,$numcolleague,$customvalidationjs) = @_;
+    return unless (ref($numprefab) eq 'HASH');
+    return if (!$numprefab->{'textbooks'} && !$numprefab->{'templates'} && !$numcurrent && !$numcolleague);
+    my %js_lt = &Apache::lonlocal::texthash(
+                 choose    => 'Please select a content option.',
+                 textbook  => 'Please select a textbook, or choose a different option.',
+                 template  => 'Please select a template, or choose a different option.',        
+                 existing  => 'Please select one of your existing courses to copy, or choose a different option.',
+                 colleague => "Please select a colleague's course to copy, or choose a different option.", 
+                 title     => 'Please enter a course title.',
+             );
+    &js_escape(\%js_lt);
+    return <<"ENDSCRIPT";
+function cloneChoice() {
+    if (document.requestcourse.cloning) {
+        var radioLength = document.requestcourse.cloning.length;
+        if (radioLength == undefined) {
+            var val = document.requestcourse.cloning.value;
+            if ((val == 'textbook') || (val == 'template') || (val == 'existing') || (val == 'colleague')) {
+                var elem = document.getElementById('show'+val);
+                if (document.requestcourse.cloning.checked) {
+                    elem.style.display = 'block';
+                } else {
+                    uncheckRadio(val);
+                    elem.style.display = 'none';
+                }
+            }
+        } else {
+            for (var i=0; i<radioLength; i++) {
+                var val = document.requestcourse.cloning[i].value;
+                if ((val == 'textbook') || (val == 'template') || (val == 'existing') || (val == 'colleague')) {
+                    var elem = document.getElementById('show'+val);
+                    if (document.requestcourse.cloning[i].checked) {
+                        elem.style.display = 'block';
+                    }  else {
+                        if (val == 'textbook') {
+                            uncheckRadio('book');
+                        }
+                        if (val == 'template') {
+                            uncheckRadio('template');
+                        }
+                        if (val == 'existing') {
+                            uncheckRadio('owned');
+                        }
+                        if (val == 'colleague') {
+                            uncheckRadio('colleague');
+                        }
+                        elem.style.display = 'none';
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function uncheckRadio(radioGroupName) {
+    var group = document.getElementsByName(radioGroupName);
+    var radioLength = group.length;
+    if (radioLength == undefined) {
+        group.checked = false;
+    } else {
+        for (var i=0; i<radioLength; i++) {
+            group[i].checked = false;
+        }
+    }
+    return;
+}
+
+function uncheckAllRadio() {
+    uncheckRadio('cloning');
+    var numbook = $numprefab->{'textbooks'};
+    var numtemplate = $numprefab->{'templates'};
+    var numcurrent = $numcurrent;
+    var numcolleague = $numcolleague;
+    if (numbook > 0) {
+        uncheckRadio('textbook'); 
+    }
+    if (numtemplate > 0) {
+        uncheckRadio('template');
+    }
+    if (numcurrent > 0) {
+        uncheckRadio('existing');
+    }
+    if (numcolleague > 0) {
+        uncheckRadio('colleague');
+    }
+    return;
+}
+
+function validTextbookReq() {
+    if (document.requestcourse.cloning) {
+        var cloneChoice = 0;
+        var radioLength = document.requestcourse.cloning.length;
+        if (radioLength == undefined) {
+            if (document.requestcourse.cloning.checked == false) {
+                alert("$js_lt{'choose'}");
+                return false;
+            } else {
+                cloneChoice = document.requestcourse.cloning.value;
+            }
+        } else {
+            for (var i=0; i<radioLength; i++) {
+                if (document.requestcourse.cloning[i].checked) {
+                    cloneChoice = document.requestcourse.cloning[i].value;
+                    break;
+                }
+            }
+            if (cloneChoice == 0) {
+                alert("$js_lt{'choose'}");
+                return false;
+            }
+        }
+        var group;
+        if ((cloneChoice == 'textbook') || (cloneChoice == 'template') || (cloneChoice == 'existing') || (cloneChoice == 'colleague')) {
+            var group;
+            if (cloneChoice == 'textbook') {
+                group = document.getElementsByName('book');
+            } else {
+                if (cloneChoice == 'template') {
+                    group = document.getElementsByName('template');
+                } else {
+                    if (cloneChoice == 'existing') {
+                        group = document.getElementsByName('owned');
+                    } else {
+                        group = document.getElementsByName('colleague');
+                    }
+                }
+            }
+            var groupLength = group.length;
+            var chosen = 0;
+            if (groupLength == undefined) {
+                if (group.checked) {
+                    chosen = 1;
+                }
+            } else {
+                for (var j=0; j<groupLength; j++) {
+                    if (group[j].checked) {
+                        chosen = 1;
+                        break;
+                    }
+                }
+           }
+           if (chosen == 0) {
+               if (cloneChoice == 'textbook') {
+                   alert("$js_lt{'textbook'}");
+               } else {
+                   if (cloneChoice == 'template') {
+                       alert("$js_lt{'template'}");
+                   } else {
+                       if (cloneChoice == 'existing') {
+                           alert("$js_lt{'existing'}");
+                       } else {
+                           alert("$js_lt{'colleague'}");
+                       }
+                   }
+               }
+               return false;
+            }
+        }
+    }
+    if (document.requestcourse.cdescr.value == '') {
+        alert("$js_lt{'title'}");
+        return false;
+    }
+    $customvalidationjs
+    return true;
+}
+ 
+ENDSCRIPT
+
+}
+
+sub textbook_request_disabled {
+    my ($r,$dom,$action,$can_request) = @_;
+    if (ref($can_request) eq 'HASH') {
+        if ($action eq 'process') {
+            unless ((scalar(keys(%{$can_request})) == 1)) {
+                &Apache::lonhtmlcommon::add_breadcrumb(
+                   { href => '/adm/requestcourse',
+                     text => 'Pick action',
+                   });
+            }
+        }
+    }
+    $r->print(&header('Course Request'));
+    &Apache::lonhtmlcommon::add_breadcrumb({text=>'Course Request'});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests').
+              '<div>'.
+              '<p class="LC_info">'.&mt('You do not have privileges to request creation of textbook courses.').'</p>');
+    if (ref($can_request) eq 'HASH') {
+        if (scalar(keys(%{$can_request})) > 1) {
+            $r->print('<a href="/adm/requestcourse">'.&mt('Go back').'</a>');
+         }
+    }
+    $r->print('</div>'.
+              &Apache::loncommon::end_page());
+    return;
+}
+
+sub startContentScreen {
+    my ($r,$mode)=@_;
+    $r->print("\n".'<ul class="LC_TabContentBigger" id="textbookreq">'."\n");
+    $r->print('<li'.(($mode eq 'textbookrequests')?' class="active"':'').'><a href="/adm/requestcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Request a Course').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
+    $r->print('<li'.(($mode eq 'textbooklogs')?' class="active"':'').'><a href="/adm/requestcourse?action=log&amp;crstype=textbook&amp;tabs=on"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Course Request History').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
+    $r->print("\n".'</ul>'."\n");
+    $r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="mainbox" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="maincontentbox" style="display: block;">');
+}
+
+sub endContentScreen {
+   my ($r)=@_;
+   $r->print('</div></div></div>');
+}
+   
 1;