--- loncom/interface/lonrequestcourse.pm	2022/01/01 17:40:20	1.95.2.7.2.1
+++ loncom/interface/lonrequestcourse.pm	2021/03/06 13:44:51	1.110
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.95.2.7.2.1 2022/01/01 17:40:20 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.110 2021/03/06 13:44:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -163,6 +163,23 @@ sub handler {
     }
 
     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);
@@ -200,7 +217,8 @@ sub handler {
                 }
             } else {
                 if ($can_request{'textbook'}) {
-                    &print_textbook_form($r,$dom,\@incdoms,\%domdefs,$domconfig{'requestcourses'},\%can_request);
+                    &print_textbook_form($r,$dom,\@incdoms,\%domdefs,$domconfig{'requestcourses'},
+                                         \%can_request,'textbook');
                 } else {
                     &textbook_request_disabled($r,$dom,$action,\%can_request);
                 }
@@ -769,6 +787,7 @@ function check_can_request(crschoice,act
     var unofficial = '';
     var community = '';
     var textbook = '';
+    var placement = '';
 END
     if (ref($can_request) eq 'HASH') {
         foreach my $item (keys(%{$can_request})) {
@@ -782,6 +801,7 @@ END
         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.',
     ); 
@@ -811,9 +831,16 @@ END
                         return false;
                     }
                 } else {
-                    if (actionchoice == 'new') {
-                        alert('$js_lt{'all'}'+'\\n'+'$js_lt{'allt'}');
-                        return false;
+                    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;
+                        }
                     }
                 }
             }
@@ -824,7 +851,7 @@ END
 END
     my ($pagetitle,$pageinfo,$domaintitle,$earlyout);
     if (ref($can_request) eq 'HASH') {
-        if (($can_request->{'official'}) || ($can_request->{'unofficial'}) || $can_request->{'textbook'}) {
+        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.');
@@ -1001,6 +1028,8 @@ END
                 $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'); 
             }
@@ -2102,7 +2131,8 @@ sub print_personnel_menu {
             official => 'Requestor is automatically assigned Course Coordinator role.',
         );
         $lt{'unofficial'} = $lt{'official'};
-        $lt{'textbook'} = $lt{'textbook'};
+        $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>';
     }
@@ -2118,14 +2148,15 @@ sub print_personnel_menu {
             }
         }
     }
-    for (my $i=0; $i<$persontotal; $i++) { 
+    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) {
@@ -2530,7 +2561,7 @@ sub print_request_logs {
         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);
+                    my @types = qw(official unofficial community textbook placement);
                     foreach my $type (@types) {
                         if ($domconfig{'requestcourses'}{'uniquecode'}{$type}) {
                             $showuniquecode = 1;
@@ -2698,7 +2729,7 @@ sub reqstatus_names {
                         rejected  => 'Request rejected',
                         cancelled => 'Request cancelled',
             );
-    if (($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook')) {
+    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');
@@ -3111,6 +3142,7 @@ sub courseinfo_form {
     &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['
@@ -3190,6 +3222,8 @@ sub clone_form {
     my $type = 'Course';
     if ($crstype eq 'community') {
         $type = 'Community';
+    } elsif ($crstype eq 'placement') {
+        $type = 'Placement'; 
     }
     my %lt = &clone_text($crstype);
     my $output .= 
@@ -3208,7 +3242,7 @@ sub clone_form {
         '</label><br /><label>'.
         '<input type="radio" name="datemode" value="shift" checked="checked" /> '.
         $lt{'shd'}.'</label>'.
-        '<input type="text" size="5" name="dateshift" value="364" />'.
+        '<input type="text" size="5" name="dateshift" value="365" />'.
         &Apache::lonhtmlcommon::row_closure(1).
         &Apache::lonhtmlcommon::row_title($lt{'dpl'}).'<label>'.
         '<input type="radio" name="tinyurls" value="delete" /> '.$lt{'nsl'}.
@@ -3373,18 +3407,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);
+                            }
                         }
                     }
                 }
@@ -3698,7 +3737,7 @@ sub print_request_outcome {
                                                         $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) = @_; 
@@ -3716,6 +3755,8 @@ sub process_request {
             $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);
         }
@@ -4025,7 +4066,7 @@ sub process_request {
             } elsif ($disposition eq 'pending') {
                 my $pendingform;
                 if ($crstype ne 'official') {
-                    $pendingform = &pending_validation_form($r,$dom,$cnum,$crstype,$now,$token,
+                    $pendingform = &pending_validation_form($dom,$cnum,$crstype,$now,$token,
                                                             $lonhost,$env{'form.cdescr'});
                 }
                 if ($pendingform) {
@@ -4343,7 +4384,7 @@ sub notification_information {
 }
 
 sub pending_validation_form {
-    my ($r,$cdom,$cnum,$crstype,$now,$token,$lonhost,$cdesc) = @_;
+    my ($cdom,$cnum,$crstype,$now,$token,$lonhost,$cdesc) = @_;
     my $output;
     my %postvalues = (
                       'owner'      => $env{'user.name'}.':'.$env{'user.domain'},
@@ -4379,8 +4420,6 @@ sub pending_validation_form {
                 my $hostname = &Apache::lonnet::hostname($lonhost);
                 my $protocol = $Apache::lonnet::protocol{$lonhost};
                 $protocol = 'http' if ($protocol ne 'https');
-                my $alias = &Apache::lonnet::use_proxy_alias($r,$lonhost);
-                $hostname = $alias if ($alias ne '');
                 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".
@@ -4406,7 +4445,7 @@ sub check_autolimit {
             if (($crstype eq 'community') && 
                 (exists($crsroles{$cnum.':'.$cdom.':co'}))) {
                 $count ++;
-            } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook')) &&
+            } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'textbook') || ($crstype eq 'placement')) &&
                      (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {
                 $count ++;
             }
@@ -4609,9 +4648,11 @@ sub generate_date_items {
 }
 
 sub print_textbook_form {
-    my ($r,$dom,$incdoms,$domdefs,$settings,$can_request) = @_;
+    my ($r,$dom,$incdoms,$domdefs,$settings,$can_request,$crstype,$formhash) = @_;
     my (%prefab,%ordered,%numprefab);
-    my $crstype = 'textbook';
+    if ($crstype eq '') {
+        $crstype = 'textbook';
+    }
 #
 #  Retrieve list of prefabricated courses (textbook courses and templates) cloneable by user
 #
@@ -4671,7 +4712,7 @@ sub print_textbook_form {
                                                owner => $courseinfo{'internal.courseowner'},
                                                releaserequired => $courseinfo{'internal.releaserequired'},
                                                type  => $courseinfo{'type'},
-                                           };
+                                          };
         }
     }
 
@@ -4728,31 +4769,37 @@ sub print_textbook_form {
 
     my $jscript = &textbook_request_javascript(\%numprefab,$numcurrent,$numdomcourses,$customvalidationjs);
     $jscript .= $customjs;
-    my %loaditems;
+    my (%loaditems,$args);
     $loaditems{'onload'} = 'javascript:uncheckAllRadio();'.$customonload;
-    $r->print(&header('Course Request',$jscript,\%loaditems));
+    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'})) {
+        unless (((scalar(keys(%{$can_request})) == 1) && ($can_request->{'textbook'})) ||
+                ($crstype eq 'lti')) {
             &Apache::lonhtmlcommon::add_breadcrumb(
                 { href => '/adm/requestcourse',
                   text => 'Pick action',
                 });
         }
     }
-    &Apache::lonhtmlcommon::add_breadcrumb({text=>'Course Request'});
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'));
+    unless ($crstype eq 'lti') {
+        &Apache::lonhtmlcommon::add_breadcrumb({text=>'Course Request'});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'));
 
-    &startContentScreen($r,'textbookrequests');
+        &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>');
+        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>');
+        }
     }
 
 #
@@ -4871,7 +4918,7 @@ sub print_textbook_form {
                   '</label><br /><label>'.
                   '<input type="radio" name="owndatemode" value="shift" checked="checked" /> '.
                   $lt{'shd'}.'</label>'.
-                  '<input type="text" size="5" name="owndateshift" value="364" />'.
+                  '<input type="text" size="5" name="owndateshift" value="365" />'.
                   '</fieldset><fieldset style="display:inline-block">'.
                   '<legend>'.$lt{'dpl'}.'</legend><label>'.
                   '<input type="radio" name="owntinyurls" value="delete" />'.$lt{'nsl'}.
@@ -4895,7 +4942,7 @@ sub print_textbook_form {
                   '</label><br /><label>'.
                   '<input type="radio" name="colldatemode" value="shift" checked="checked" /> '.
                   $lt{'shd'}.'</label>'.
-                  '<input type="text" size="5" name="colldateshift" value="364" />'.
+                  '<input type="text" size="5" name="colldateshift" value="365" />'.
                   '</fieldset><fieldset style="display:inline-block">'.
                   '<legend>'.$lt{'dpl'}.'</legend><label>'.
                   '<input type="radio" name="colltinyurls" value="delete" />'.$lt{'nsl'}.
@@ -4948,15 +4995,24 @@ sub print_textbook_form {
 #
 # Submit button
 #
-    $r->print('<input type="hidden" name="crstype" value="textbook" />'.
+    $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>');
-    &endContentScreen($r).
+    unless ($crstype eq 'lti') {
+        &endContentScreen($r);
+    }
     $r->print(&Apache::loncommon::end_page());
     return;
 }
@@ -5043,9 +5099,11 @@ sub clone_selection_table {
 }
 
 sub process_textbook_request {
-    my ($r,$dom,$action,$domdefs,$domconfig,$can_request) = @_;
+    my ($r,$dom,$action,$domdefs,$domconfig,$can_request,$crstype) = @_;
     my ($uniquecode,$req_notifylist);
-    my $crstype = 'textbook';
+    if ($crstype eq '') {
+        $crstype = 'textbook';
+    }
     if (ref($domconfig) eq 'HASH') {
         if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
             if (ref($domconfig->{'requestcourses'}{'notify'}) eq 'HASH') {
@@ -5087,27 +5145,33 @@ sub process_textbook_request {
         }
     }
     my $js = &processing_javascript();
-    my $loaditems = { 
-                      onload => 'javascript:hideProcessing();',
-                    };
-    $r->print(&header('Course Creation',$js,$loaditems));
-
-    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',
-                });
+    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');
     }
-    &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'},
@@ -5159,7 +5223,12 @@ sub process_textbook_request {
     my ($result,$output,$customized) = &process_request($r,$lonhost,$dom,$cnum,$crstype,$now,$details,
                                                         '',$req_notifylist,[],$domconfig);
     $r->print($output);
-    if (&Apache::loncoursequeueadmin::author_prompt()) {
+    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);
         }
@@ -5168,7 +5237,9 @@ sub process_textbook_request {
             $r->print('<p><a href="/adm/requestcourse">'.&mt('Create another course').'</a></p>');
         }
     }
-    &endContentScreen($r);
+    unless ($crstype eq 'lti') {
+        &endContentScreen($r);
+    }
     $r->print(&Apache::loncommon::end_page());
 }