--- loncom/auth/lonroles.pm	2018/05/28 23:26:12	1.338
+++ loncom/auth/lonroles.pm	2020/02/04 01:27:04	1.343
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.338 2018/05/28 23:26:12 raeburn Exp $
+# $Id: lonroles.pm,v 1.343 2020/02/04 01:27:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -272,6 +272,12 @@ sub handler {
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
+        if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq '')) {
+            if ($env{'form.ltitarget'} eq 'iframe') {
+                &Apache::lonnet::appenv({'request.lti.target' => 'iframe'});
+                delete($env{'form.ltitarget'});
+            }
+        }
 
         my $locknum=&Apache::lonnet::get_locks();
         if ($locknum) { return 409; }
@@ -715,9 +721,11 @@ ENDENTERKEY
                                             if (($dest =~ m{^\Q/public/$cdom/$cnum/syllabus\E.*(\?|\&)usehttp=1}) ||
                                                 ($dest =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {
                                                 if ($ENV{'SERVER_PORT'} == 443) {
-                                                    my $hostname = $r->hostname();
-                                                    if ($hostname ne '') {
-                                                        $dest = 'http://'.$hostname.$dest;
+                                                    unless (&Apache::lonnet::uses_sts()) {
+                                                        my $hostname = $r->hostname();
+                                                        if ($hostname ne '') {
+                                                            $dest = 'http://'.$hostname.$dest;
+                                                        }
                                                     }
                                                 }
                                             }
@@ -1100,7 +1108,11 @@ ENDHEADER
 
 # No active roles
     if ($countactive==0) {
-        &requestcourse_advice($r,$cattype,$inrole); 
+        my $elapsed = 0;
+        if ($now && $update) {
+            $elapsed = $now - $update;
+        }
+        &requestcourse_advice($r,$cattype,$inrole,$elapsed); 
 	$r->print('</form>');
         if ($countfuture) {
             $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -1360,8 +1372,8 @@ sub gather_roles {
                     if (!$allowed) {
                         $button=0;
                         unless ($trustchecked{$tdom}) {
-                            if ((&Apache::lonnet::will_trust('othcoau',$tdom,$env{'user.domain'})) &&
-                                (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$tdom))) {
+                            if ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$tdom)) &&
+                                (&Apache::lonnet::will_trust('coaurem',$tdom,$env{'user.domain'}))) {
                                 $willtrust{$tdom} = 1;
                                 $trustchecked{$tdom} = 1;
                             }
@@ -1650,21 +1662,26 @@ sub print_rolerows {
 }
 
 sub findcourse_advice {
-    my ($r,$cattype) = @_;
+    my ($r,$cattype,$elapsed) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
     my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
     if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
-        $r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
+        $r->print('<p>'.&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
 <ul>
  <li>'.&mt('The course has yet to be created.').'</li>
  <li>'.&mt('Automatic enrollment of registered students has not been enabled for the course.').'</li>
  <li>'.&mt('You are in a section of course for which automatic enrollment in the corresponding LON-CAPA course is not active.').'</li>
  <li>'.&mt('The start date for automated enrollment has yet to be reached.').'</li>
  <li>'.&mt('You registered for the course recently and there is a time lag between the time you register, and the time this information becomes available for the update of LON-CAPA course rosters.').'</li>
- <li>'.&mt('Automated enrollment added you to the course in the time since you last logged in.').' '.&mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'</li>   
- </ul>');
+ <li>'.&mt('Automated enrollment added you to the course in the time since you last logged-in.').' '.&mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'</li>   
+ </ul></p>');
     } else {
-        $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
+        $r->print('<p>'.&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'</p>');
+        if ($elapsed > 600) {
+            $r->print('<p>'.&mt('You may also have been assigned to a course in the time since you last logged-in, or checked for changes').
+                      '<br />'.
+                      &mt('If that is the case you can use the "Check for changes" link in the gray Functions bar to update the list of your available course roles.').'</p>');
+        }  
     }
     if (($cattype eq 'std') || ($cattype eq 'domonly')) {
         $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
@@ -1676,7 +1693,7 @@ sub findcourse_advice {
 }
 
 sub requestcourse_advice {
-    my ($r,$cattype,$inrole) = @_;
+    my ($r,$cattype,$inrole,$elapsed) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
     my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
     my (%can_request,%request_doms,$output);
@@ -1737,7 +1754,7 @@ sub requestcourse_advice {
         } else {
             $r->print('<h3>'.&mt('Currently no active roles, courses or communities').'</h3>');
         }
-        &findcourse_advice($r,$cattype);
+        &findcourse_advice($r,$cattype,$elapsed);
     }
     return;
 }