--- loncom/interface/lontiny.pm 2019/01/27 15:44:18 1.6
+++ loncom/interface/lontiny.pm 2019/02/07 14:56:05 1.6.2.1
@@ -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.6 2019/01/27 15:44:18 raeburn Exp $
+# $Id: lontiny.pm,v 1.6.2.1 2019/02/07 14:56:05 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -165,32 +165,6 @@ 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);
} elsif (@allposs == 1) {
@@ -239,9 +213,6 @@ sub handler {
sub do_redirect {
my ($r,$destination) = @_;
my $windowname = 'loncapaclient';
- if ($env{'request.lti.login'}) {
- $windowname .= 'lti';
- }
my $header = '';
my $args = {'bread_crumbs' => [{'href' => '','text' => 'Role initialization'},],};
&Apache::loncommon::content_type($r,'text/html');
@@ -383,15 +354,13 @@ ENDJS
sub generic_error {
my ($r) = @_;
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 $linktext;
+ if ($env{'user.adv'}) {
+ $linktext = &mt('Continue to your roles page');
+ } else {
+ $linktext = &mt('Continue to your courses page');
}
+ $continuelink=''.$linktext.'';
my $msg = &mt('The page you requested does not exist.');
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;