--- loncom/interface/lonrequestcourse.pm	2014/01/05 10:55:35	1.75
+++ loncom/interface/lonrequestcourse.pm	2014/05/14 18:20:09	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.75 2014/01/05 10:55:35 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.83 2014/05/14 18:20:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -174,6 +174,22 @@ sub handler {
                 } else {
                     &textbook_request_disabled($r,$dom,\%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);
@@ -232,46 +248,7 @@ sub handler {
     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))) {
-            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.');
-            }
-        }
+        ($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'}))) {
@@ -1129,6 +1106,52 @@ END
     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'};
@@ -1526,7 +1549,8 @@ sub print_request_form {
             &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
                                                      \%cat_order,\@code_order);
         }
-        my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
+        my $lonhost = $r->dir_config('lonHostID');
+        my ($storeresult,$result) = &print_request_outcome($lonhost,$dom,\@codetitles,
                                                            \@code_order,$instcredits);
         $r->print($result);
         if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
@@ -1549,7 +1573,7 @@ sub print_request_form {
             if ($result eq 'created') {
                 my $role = 'au';
                 my $spec = "$role./$env{'form.showdom'}/";
-                push(@links,&mt('Enter your authoring space with role: [_1]',
+                push(@links,&mt('Enter your Authoring Space with role: [_1]',
                                 '<a href="/adm/roles?selectrole=1&amp;'.$spec.'=1">'.
                                 &Apache::lonnet::plaintext($role).'</a>'));
             }
@@ -1624,12 +1648,12 @@ sub print_request_form {
 
 sub print_author_prompt {
     my ($r,$action,$cnum,$showdom,$crstype,$storeresult) = @_;
-    $r->print('<h3>'.&mt('Access to authoring space').'</h3>'.
+    $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?').
+              &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).
@@ -3335,7 +3359,7 @@ sub display_navbuttons {
 }
 
 sub print_request_outcome {
-    my ($dom,$codetitles,$code_order,$instcredits) = @_;
+    my ($lonhost,$dom,$codetitles,$code_order,$instcredits) = @_;
     my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
         %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,
         $uniquecode);
@@ -3580,13 +3604,14 @@ sub print_request_outcome {
                     accessend      => $accessend,
                     personnel      => \%personnel,
                   };
-    my ($result,$output) = &process_request($dom,$cnum,$crstype,$now,$details,$instcode,
+    my ($result,$output) = &process_request($lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,
                                             $req_notifylist,\@instsections,\%domconfig);
     return ($result,$output);
 }
     
 sub process_request {
-    my ($dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,$domconfig) = @_; 
+    my ($lonhost,$dom,$cnum,$crstype,$now,$details,$instcode,$req_notifylist,$instsections,
+        $domconfig) = @_; 
     my (@inststatuses,$storeresult,$creationresult,$output);
     my $val = 
         &Apache::loncoursequeueadmin::get_processtype('course',$env{'user.name'},
@@ -3606,7 +3631,7 @@ sub process_request {
         }
         $storeresult = 'notpermitted'; 
     } else {
-        my ($disposition,$message,$reqstatus);
+        my ($disposition,$message,$reqstatus,$coursedesc);
         my %reqhash = (
                         reqtime   => $now,
                         crstype   => $crstype,
@@ -3614,6 +3639,11 @@ sub process_request {
                       );
         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'};
+        }
         if ($val eq 'autolimit=') {
             $disposition = 'process';
         } elsif ($val =~ /^autolimit=(\d+)$/) {
@@ -3621,7 +3651,7 @@ sub process_request {
             $disposition = &check_autolimit($env{'user.name'},$env{'user.domain'},
                                             $dom,$crstype,$limit,\$message);
         } elsif ($val eq 'validate') {
-            my ($inststatuslist,$validationchk,$validation);
+            my ($inststatuslist,$validationchk,$validation,%custominfo);
             if (@inststatuses > 0) {
                 $inststatuslist = join(',',@inststatuses);
             }
@@ -3631,10 +3661,27 @@ sub process_request {
                     $instseclist = join(',',@{$instsections});
                 }
             }
+            my $preprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'prevalidate',$env{'user.name'},
+                                                                 $env{'user.domain'},$fullname,$coursedesc);
+            if (ref($preprocess) 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})) {
+                                @{$custominfo{$key}} = &Apache::loncommon::get_env_multiple($env{'form.'.$key});
+                            }
+                        } else {
+                            if (exists($env{'form.'.$key})) {
+                                $custominfo{$key} = $env{'form.'.$key};
+                            }
+                        }
+                    }
+                }
+            }
             $validationchk = 
                 &Apache::lonnet::auto_courserequest_validation($dom,
                     $env{'user.name'}.':'.$env{'user.domain'},$crstype,
-                    $inststatuslist,$instcode,$instseclist);
+                    $inststatuslist,$instcode,$instseclist,\%custominfo);
             if ($validationchk =~ /:/) {
                 ($validation,$message) = split(':',$validationchk);
             } else {
@@ -3651,13 +3698,8 @@ sub process_request {
         }
         $reqhash{'disposition'} = $disposition;
         $reqstatus = $disposition;
-        my ($modified,$queued,$coursedesc,%customitems);
+        my ($modified,$queued,$coursedesc,$token,%customitems);
         unless ($disposition eq 'rejected') {
-            if (ref($details) eq 'HASH') {
-                $coursedesc = $details->{'cdescr'};
-            }
-            my $fullname = &Apache::loncommon::plainname($env{'user.name'},
-                                                         $env{'user.domain'});
             my $inprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'process',$env{'user.name'},
                                                                 $env{'user.domain'},$fullname,$coursedesc);
             if (ref($inprocess) eq 'HASH') {
@@ -3720,6 +3762,14 @@ sub process_request {
                 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 .= '<br />'.$role_result.'</p>';
                 $creationresult = 'created';
             } else {
@@ -3742,7 +3792,8 @@ sub process_request {
                                             crstype     => $crstype,
                                             ownername   => $env{'user.name'},
                                             ownerdom    => $env{'user.domain'},
-                                            description => $env{'form.cdescr'}, 
+                                            description => $env{'form.cdescr'},
+                                            lonhost     => $lonhost,
                                           },
                           };
             if ($crstype eq 'official') {
@@ -3760,9 +3811,19 @@ sub process_request {
                 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') {
@@ -3771,9 +3832,11 @@ sub process_request {
                     } else {
                         $output .= &mt('Your course request has been recorded.') 
                     }
-                    $output .= '<br />'.
-                              &notification_information($disposition,$req_notifylist,
-                                                        $dom,$cnum,$now);
+                    unless ($disposition eq 'pending') { 
+                        $output .= '<br />'.
+                                   &notification_information($disposition,$req_notifylist,
+                                                             $dom,$cnum,$now);
+                    }
                 } else {
                     $reqstatus = 'domainerror';
                     $reqhash{'disposition'} = $disposition;
@@ -3785,23 +3848,44 @@ sub process_request {
         ($storeresult,my $updateresult) = 
             &Apache::loncoursequeueadmin::update_coursereq_status(\%reqhash,$dom,
                 $cnum,$reqstatus,'request',$env{'user.domain'},$env{'user.name'});
-        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>';
-            }
-            $output .= &notification_information($disposition,$req_notifylist,$dom,$cnum,$now);
-            if ($disposition eq 'approval') {
+        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'});
-                my $postprocess = 
-                    &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'queued',$env{'user.name'},
+                $postprocess =
+                    &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,$updateaction,$env{'user.name'},
                                                         $env{'user.domain'},$fullname,$env{'form.cdescr'});
+            }
+            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'}))) { 
-                    my $recipient = $env{'user.name'}.':'.$env{'user.domain'};
-                    $output .= &notification_information($disposition,$recipient,$dom,$cnum,$now,undef,$postprocess);
+                    &notification_information($disposition,undef,$dom,$cnum,$now,undef,$postprocess);
+                }
+            } 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);
                 }
             }
         }
@@ -3994,7 +4078,7 @@ sub notification_information {
                     if (scalar(@{$addmsg}) > 0) {
                         &Apache::loncoursequeueadmin::send_selfserve_notification($recipient,$addmsg,undef,
                                                                                   $env{'form.cdescr'},$now,
-                                                                                  'queuedreq',$sender);
+                                                                                  'queuedcrsreq',$sender);
                     }
                 }
             }
@@ -4003,11 +4087,20 @@ sub notification_information {
             }
         }
     } 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'})))) {
@@ -4043,7 +4136,7 @@ sub notification_information {
                 }
             }
             if (scalar(@{$addmsg}) > 0) {
-                my $type = 'createdreq';
+                my $type = 'createdcrsreq';
                 if ($code) {
                     $type = 'uniquecode';
                 }
@@ -4059,6 +4152,53 @@ sub notification_information {
     return $output;
 }
 
+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";
+                    }
+                }
+                if ($buttontext eq '') {
+                    if ($crstype eq 'community') {
+                        $buttontext = &mt('Create community');
+                    } else {
+                        $buttontext = &mt('Create course');
+                    }
+                }
+                my $protocol = $Apache::lonnet::protocol{$lonhost};
+                $protocol = 'http' if ($protocol ne 'https');
+                my $crscreator = $protocol.'://'.&Apache::lonnet::hostname($lonhost).'/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";
+            }
+        }
+    }
+    return $output;
+}
+
 sub check_autolimit {
     my ($uname,$udom,$dom,$crstype,$limit,$message) = @_;
     my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},
@@ -4276,25 +4416,26 @@ sub generate_date_items {
 
 sub print_textbook_form {
     my ($r,$dom,$incdoms,$domdefs,$settings,$can_request) = @_;
-    my ($bookshash,%ordered);
+    my (%prefab,%ordered,%numprefab);
     my $crstype = 'textbook';
 #
-#  Retrieve list of textbook courses cloneable by user
+#  Retrieve list of prefabricated courses (textbook courses and templates) cloneable by user
 #
-    my $numbook;
-    if (ref($settings) eq 'HASH') {
-        $bookshash = $settings->{'textbooks'};
-        if (ref($bookshash) eq 'HASH') {
-            foreach my $item (keys(%{$bookshash})) {
-                my ($clonedom,$clonecrs) = split(/_/,$item);
-                if (ref($bookshash->{$item}) eq 'HASH') {
+    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 (&Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
-                                        $env{'user.domain'},$clonecrs,$clonedom,$crstype)) {
-
-                        my $num = $bookshash->{$item}{'order'};
-                        $ordered{$num} = $item;
-                        $numbook ++;
+                    if (ref($prefab{$type}{$item}) eq 'HASH') {
+                        if (&Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+                                          $env{'user.domain'},$clonecrs,$clonedom,$crstype)) {
+
+                            my $num = $prefab{$type}{$item}{'order'};
+                            $ordered{$type}{$num} = $item;
+                            $numprefab{$type} ++;
+                        }
                     }
                 }
             }
@@ -4330,7 +4471,7 @@ sub print_textbook_form {
 
     my $numcurrent = scalar(keys(%cloneable));
 
-    my $jscript = &textbook_request_javascript($numbook,$numcurrent);
+    my $jscript = &textbook_request_javascript(\%numprefab,$numcurrent);
     my %loaditems;
     $loaditems{'onload'} = 'javascript:uncheckAllRadio();';
     $r->print(&header('Course Request',$jscript,\%loaditems));
@@ -4381,9 +4522,16 @@ sub print_textbook_form {
         $r->print('<div>'. 
                   '<fieldset><legend>'.&mt('Course Content').'</legend>');
         if (keys(%ordered)) {
-            $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{'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>'.
@@ -4401,31 +4549,51 @@ sub print_textbook_form {
 # Table of cloneable textbook courses
 #
     if (keys(%ordered)) {
-        $r->print('<div id="showtextbook" style="display:none">'.
-                  &Apache::loncommon::start_data_table().
-                  &Apache::loncommon::start_data_table_header_row().
-                  '<th>'.&mt('Title').'</th>'.
-                  '<th>'.&mt('Author(s)').'</th>'.
-                  '<th>'.&mt('Subject').'</th>'.
-                  '<th>'.&mt('Book').'</th>'.
-                  &Apache::loncommon::end_data_table_header_row());
-        my @items = sort { $a <=> $b } keys(%ordered);
-        foreach my $num (@items) {
-            my $item = $ordered{$num};
-            my $cleantitle=&HTML::Entities::encode($bookshash->{$item}->{'title'},'<>&"');
-            $cleantitle=~s/'/\\'/g;
-            $cleantitle =~ s/^\s+//;
-            $r->print(&Apache::loncommon::start_data_table_row().
-                      '<td><label><input type="radio" name="book" value="'.$item.'" />'.
-                      $cleantitle.'</label></td>'.
-                      '<td>'.$bookshash->{$item}->{'author'}.'</td>'.
-                      '<td>'.$bookshash->{$item}->{'subject'}.'</td>'.
-                      '<td><img border="0" src="'.$bookshash->{$item}->{'image'}.
-                      '" alt="'.$cleantitle.'" /></td>'. 
-                      &Apache::loncommon::end_data_table_row());
+        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>');
+            }
         }
-        $r->print(&Apache::loncommon::end_data_table().
-                  '</div>');
     }
 
 #
@@ -4586,7 +4754,6 @@ sub process_textbook_request {
             }
         }
     }
-    my $crstype = 'textbook';
     my $now = time;
     my $reqtype = $env{'form.cloning'};
     my (@inststatuses,$storeresult,$creationresult);
@@ -4594,6 +4761,8 @@ sub process_textbook_request {
     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'};
     }
@@ -4651,7 +4820,9 @@ sub process_textbook_request {
         $details->{datemode} = $env{'form.datemode'};
         $details->{dateshift} = $env{'form.dateshift'};
     }
-    my ($result,$output) = &process_request($dom,$cnum,$crstype,$now,$details,'',$req_notifylist,[],$domconfig);
+    my $lonhost = $r->dir_config('lonHostID');
+    my ($result,$output) = &process_request($lonhost,$dom,$cnum,$crstype,$now,$details,'',
+                                            $req_notifylist,[],$domconfig);
     $r->print($output);
     if (&Apache::loncoursequeueadmin::author_prompt()) {
         &print_author_prompt($r,$action,$cnum,$dom,$crstype,$result);
@@ -4663,21 +4834,23 @@ sub process_textbook_request {
 }
 
 sub textbook_request_javascript {
-    my ($numbook,$numcurrent) = @_;
+    my ($numprefab,$numcurrent) = @_;
+    return unless (ref($numprefab) eq 'HASH');
+    return if (!$numprefab->{'textbooks'} && !$numprefab->{'templates'} && !$numcurrent);
     my %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.',
                  title    => 'Please enter a course title.',
              );
-    return if (!$numbook && !$numcurrent);
     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 == 'existing')) {
+            if ((val == 'textbook') || (val == 'template') || (val == 'existing')) {
                 var elem = document.getElementById('show'+val);
                 if (document.requestcourse.cloning.checked) {
                     elem.style.display = 'block';
@@ -4689,7 +4862,7 @@ function cloneChoice() {
         } else {
             for (var i=0; i<radioLength; i++) {
                 var val = document.requestcourse.cloning[i].value;
-                if ((val == 'textbook') || (val == 'existing')) {
+                if ((val == 'textbook') || (val == 'template') || (val == 'existing')) {
                     var elem = document.getElementById('show'+val);
                     if (document.requestcourse.cloning[i].checked) {
                         elem.style.display = 'block';
@@ -4697,6 +4870,9 @@ function cloneChoice() {
                         if (val == 'textbook') {
                             uncheckRadio('book');
                         }
+                        if (val == 'template') {
+                            uncheckRadio('template');
+                        }
                         if (val == 'existing') {
                             uncheckRadio('owned');
                         }
@@ -4724,11 +4900,15 @@ function uncheckRadio(radioGroupName) {
 
 function uncheckAllRadio() {
     uncheckRadio('cloning');
-    var numbook = $numbook;
+    var numbook = $numprefab->{'textbooks'};
+    var numtemplate = $numprefab->{'templates'};
     var numcurrent = $numcurrent;
     if (numbook > 0) {
         uncheckRadio('textbook'); 
     }
+    if (nutemplate > 0) {
+        uncheckRadio('template');
+    }m
     if (numcurrent > 0) {
         uncheckRadio('existing');
     }
@@ -4759,12 +4939,16 @@ function validTextbookReq() {
             }
         }
         var group;
-        if ((cloneChoice == 'textbook') || (cloneChoice == 'existing')) {
+        if ((cloneChoice == 'textbook') || (cloneChoice == 'template') || (cloneChoice == 'existing')) {
             var group;
             if (cloneChoice == 'textbook') {
                 group = document.getElementsByName('book');
             } else {
-                group = document.getElementsByName('owned');
+                if (cloneChoice == 'template') {
+                    group = document.getElementsByName('template');
+                } else {
+                    group = document.getElementsByName('owned');
+                }
             }
             var groupLength = group.length;
             var chosen = 0;
@@ -4784,7 +4968,11 @@ function validTextbookReq() {
                if (cloneChoice == 'textbook') {
                    alert("$lt{'textbook'}");
                } else {
-                   alert("$lt{'existing'}");
+                   if (cloneChoice == 'template') {
+                       alert("$lt{'template'}");
+                   } else {
+                       alert("$lt{'existing'}");
+                   }
                }
                return false;
             }