--- loncom/interface/lontiny.pm 2018/04/14 02:29:44 1.2
+++ loncom/interface/lontiny.pm 2018/07/01 00:03:44 1.4
@@ -2,7 +2,7 @@
# Extract domain, courseID, and symb from a shortened URL,
# and switch role to a role in designated course.
#
-# $Id: lontiny.pm,v 1.2 2018/04/14 02:29:44 raeburn Exp $
+# $Id: lontiny.pm,v 1.4 2018/07/01 00:03:44 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -86,8 +86,34 @@ sub handler {
}
}
my @allposs = keys(%possroles);
+ if ($env{'request.lti.login'}) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+ if ($env{'request.lti.target'} eq '') {
+ if ($env{'form.ltitarget'} eq 'iframe') {
+ &Apache::lonnet::appenv({'request.lti.target' => 'iframe'});
+ delete($env{'form.ltitarget'});
+ }
+ }
+ if ($env{'form.selectrole'}) {
+ foreach my $role (@allposs) {
+ my $newrole = "$role./$cdom/$cnum";
+ if ($possroles{$allposs[0]} ne '') {
+ $newrole .= "/$possroles{$role}";
+ }
+ if ($env{"form.$newrole"}) {
+ my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'.
+ '&destinationurl='.&HTML::Entities::encode($r->uri);
+ if ($env{'form.ltitarget'} eq 'iframe') {
+ $destination .= '<itarget=iframe';
+ }
+ &do_redirect($r,$destination);
+ return OK;
+ }
+ }
+ }
+ }
if (@allposs == 0) {
- &show_roles($r,\%crsenv,\%possroles)
+ &show_roles($r,\%crsenv,\%possroles);
} elsif (@allposs == 1) {
my $newrole = "$allposs[0]./$cdom/$cnum";
$newrole = "$allposs[0]./$cdom/$cnum";
@@ -276,13 +302,16 @@ ENDJS
sub generic_error {
my ($r) = @_;
- my $linktext;
- if ($env{'user.adv'}) {
- $linktext = &mt('Continue to your roles page');
- } else {
- $linktext = &mt('Continue to your courses page');
+ my $continuelink;
+ unless ($env{'request.lti.login'}) {
+ my $linktext;
+ if ($env{'user.adv'}) {
+ $linktext = &mt('Continue to your roles page');
+ } else {
+ $linktext = &mt('Continue to your courses page');
+ }
+ $continuelink=''.$linktext.'';
}
- my $continuelink=''.$linktext.'';
my $msg = &mt('The page you requested does not exist.');
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;