--- loncom/auth/lonauth.pm	2018/03/23 01:01:29	1.149
+++ loncom/auth/lonauth.pm	2018/07/01 00:03:42	1.153
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.149 2018/03/23 01:01:29 raeburn Exp $
+# $Id: lonauth.pm,v 1.153 2018/07/01 00:03:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,6 +106,11 @@ sub success {
                 $r->headers_out->add('Set-cookie' => $defaultcookie);
             }
             $r->send_http_header;
+            if (ref($form) eq 'HASH') {
+                $form->{'lti.reqcrs'} = $env{'request.lti.reqcrs'};
+                $form->{'lti.reqrole'} = $env{'request.lti.reqrole'};
+                $form->{'lti.sourcecrs'} = $env{'request.lti.sourcecrs'};
+            }
             &Apache::ltiauth::lti_reqcrs($r,$domain,$form,$username,$domain);
             return;
         }
@@ -160,8 +165,11 @@ sub success {
         $destination .= 'source=login';
     }
 
-    my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";');
-    my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
+    my $windowname = 'loncapaclient';
+    if ($env{'request.lti.login'}) {
+        $windowname .= 'lti';
+    }
+    my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="'.$windowname.'";');
     my $brcrum = [{'href' => '',
                    'text' => 'Successful Login'},];
     my $args = {'bread_crumbs' => $brcrum,};
@@ -198,29 +206,56 @@ sub success {
     }
     $r->send_http_header;
 
-    my $start_page=&Apache::loncommon::start_page('Successful Login',
-                                                  $header,$args);
-    my $end_page  =&Apache::loncommon::end_page();
-
-    my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
-
-    my %lt=&Apache::lonlocal::texthash(
-				       'wel' => 'Welcome',
-				       'pro' => 'Login problems?',
-				       );
-    my $loginhelp = &loginhelpdisplay($domain);
-    if ($loginhelp) {
-        $loginhelp = '<p><a href="'.$loginhelp.'">'.$lt{'pro'}.'</a></p>';
+    my ($start_page,$js,$pagebody,$end_page);
+    if ($env{'request.lti.login'}) {
+        $args = {'only_body' => 1};
+        if ($env{'request.lti.target'} eq '') {
+            my $ltitarget = (($destination =~ /\?/) ? '&' : '?').
+                            'ltitarget=iframe';
+            $js = <<"ENDJS";
+
+<script type="text/javascript">
+// <![CDATA[
+function setLTItarget() {
+    var newloc = '$destination';
+    if (parent !== window) {
+        newloc += '$ltitarget';
     }
-
-    my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>'); 
+    window.location.href=newloc;
+}
+// ]]>
+</script>
+
+ENDJS
+            $args->{'add_entries'} = {'onload' => "javascript:setLTItarget();"};
+            $pagebody =  '<noscript><span class="LC_warning">'
+                        .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
+                        .'</span></noscript>';
+        } else {
+            $args->{'redirect'} = [0,$destination,1];
+        }
+        $start_page=&Apache::loncommon::start_page('',$js,$args);
+    } else {
+        $args->{'redirect'} = [0,$destination];
+        $start_page=&Apache::loncommon::start_page('Successful Login',
+                                                   $js,$args);
+
+        my %lt=&Apache::lonlocal::texthash(
+				           'wel' => 'Welcome',
+				           'pro' => 'Login problems?',
+				          );
+        $pagebody = "<h1>$lt{'wel'}</h1>\n".
+                    &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>');
+        my $loginhelp = &loginhelpdisplay($domain);
+        if ($loginhelp) {
+            $pagebody .= '<p><a href="'.$loginhelp.'">'.$lt{'pro'}.'</a></p>';
+        }
+    }
+    $end_page = &Apache::loncommon::end_page();
     $r->print(<<ENDSUCCESS);
 $start_page
 $windowinfo
-<h1>$lt{'wel'}</h1>
-$welcome
-$loginhelp
-$continuelink
+$pagebody
 $end_page
 ENDSUCCESS
     return;