--- loncom/interface/lontiny.pm 2022/07/08 16:14:45 1.8.2.3 +++ loncom/interface/lontiny.pm 2022/05/25 18:03:43 1.10 @@ -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.8.2.3 2022/07/08 16:14:45 raeburn Exp $ +# $Id: lontiny.pm,v 1.10 2022/05/25 18:03:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,27 +68,6 @@ sub handler { my $chome = &Apache::lonnet::homeserver($cnum,$cdom); if ($chome ne 'no_host') { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['ttoken']); - my ($linkprot,$linkprotuser,$linkprotexit,$ltoken); - if ($env{'form.ttoken'}) { - my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'}); - if ($link_info{'origurl'} eq $r->uri) { - if ($link_info{'ltoken'}) { - $ltoken = $link_info{'ltoken'}; - my %ltoken_info = &Apache::lonnet::tmpget($link_info{'ltoken'}); - $linkprot = $ltoken_info{'linkprot'}; - $linkprotuser = $ltoken_info{'linkprotuser'}; - $linkprotexit = $ltoken_info{'linkprotexit'}; - } elsif ($link_info{'linkprot'}) { - $linkprot = $link_info{'linkprot'}; - if ($link_info{'linkprotuser'}) { - $linkprotuser = $link_info{'linkprotuser'}; - } - if ($link_info{'linkprotexit'}) { - $linkprotexit = $link_info{'linkprotexit'}; - } - } - } - } if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { # Check for ttoken my $newlauncher = &launch_check($r->uri,$symb); @@ -177,41 +156,50 @@ sub handler { } else { unshift(@possroles,'cc'); } - my %roleshash = - &Apache::lonnet::get_my_roles($env{'user.uname'},$env{'user.domain'}, - 'userroles',['previous','active','future'], - \@possroles,[$cdom],1); - my (%possroles,$hassection,%active,%expired,%future); + my %roleshash = &Apache::lonnet::get_my_roles($env{'user.uname'}, + $env{'user.domain'}, + 'userroles',undef, + \@possroles,[$cdom],1); + my (%possroles,$hassection); if (keys(%roleshash)) { - my $now = time; foreach my $entry (keys(%roleshash)) { if ($entry =~ /^\Q$cnum:$cdom:\E([^:]+):([^:]*)$/) { - my ($role,$sec) = ($1,$2); - $possroles{$role} = $sec; - if ($sec ne '') { + $possroles{$1} = $2; + if ($2 ne '') { $hassection = 1; } - my ($tstart,$tend)=split(/\:/,$roleshash{$entry}); - my $status = 'active'; - if (($tend) && ($tend<=$now)) { - $status = 'previous'; - } - if (($tstart) && ($now<$tstart)) { - $status = 'future'; + } + } + } + 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 ($status eq 'active') { - $active{$role} = $sec; - } elsif ($status eq 'previous') { - $expired{$tend} = $role.':'.$sec; - } elsif ($status eq 'future') { - $future{$tstart} = $role.':'.$sec; + 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; } } } } - my @allposs = keys(%active); if (@allposs == 0) { - &show_roles($r,\%crsenv,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser,$linkprotexit,$ltoken); + &show_roles($r,\%crsenv,\%possroles); } elsif (@allposs == 1) { my $newrole = "$allposs[0]./$cdom/$cnum"; $newrole = "$allposs[0]./$cdom/$cnum"; @@ -219,12 +207,12 @@ sub handler { $newrole .= "/$possroles{$allposs[0]}"; } my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. - '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"'); + '&destinationurl='.&HTML::Entities::encode($r->uri); if ($env{'form.ttoken'}) { $destination .= '&ttoken='.$env{'form.ttoken'}; } - &do_redirect($r,$destination,$linkprot); - } elsif (@allposs > 1) { + &do_redirect($r,$destination); + } elsif (keys(%possroles) > 1) { if (grep(/^(cc|co)$/,@allposs)) { my $newrole; if (exists($possroles{'cc'})) { @@ -234,17 +222,17 @@ sub handler { } $newrole .= "./$cdom/$cnum"; my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'. - '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"'); + '&destinationurl='.&HTML::Entities::encode($r->uri); if ($env{'form.ttoken'}) { $destination .= '&ttoken='.$env{'form.ttoken'}; } - &do_redirect($r,$destination,$linkprot); + &do_redirect($r,$destination); } else { my $hascustom; if (grep(/^cr\//,@allposs)) { $hascustom = 1; } - &show_roles($r,\%crsenv,\%active,$hassection,$hascustom); + &show_roles($r,\%crsenv,\%possroles,$hassection,$hascustom); } } return OK; @@ -263,7 +251,7 @@ sub handler { sub launch_check { my ($linkuri,$symb) = @_; - my ($linkprotector,$linkproturi,$linkprotexit,$linkkey,$newlauncher); + my ($linkprotector,$linkproturi,$linkkey,$newlauncher); if ($env{'form.ttoken'}) { my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'}); &Apache::lonnet::tmpdel($env{'form.ttoken'}); @@ -277,7 +265,8 @@ sub launch_check { $link_info{'linkkey'} = $ltoken_info{'linkkey'}; } } - &Apache::lonnet::tmpdel($link_info{'ltoken'}); + &Apache::lonnet::tmpdel($env{'form.ltoken'}); + delete($env{'form.ltoken'}); } if ($link_info{'linkprot'}) { ($linkprotector,$linkproturi) = split(/:/,$link_info{'linkprot'},2); @@ -301,9 +290,6 @@ sub launch_check { } else { &Apache::lonnet::appenv({'user.linkproturi' => $linkproturi}); } - if ($link_info{'linkprotexit'}) { - $linkprotexit = $link_info{'linkprotexit'}; - } } elsif ($link_info{'linkkey'} ne '') { $linkkey = $link_info{'linkkey'}; my $keyedlinkuri = $linkuri; @@ -343,7 +329,7 @@ sub launch_check { } if ($deeplink ne '') { my $disallow; - my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink); + my ($state,$others,$listed,$scope,$protect,$display,$target) = split(/,/,$deeplink); if (($protect ne 'none') && ($protect ne '')) { my ($acctype,$item) = split(/:/,$protect); if ($acctype =~ /lti(c|d)$/) { @@ -371,12 +357,6 @@ sub launch_check { if ($env{'request.deeplink.target'} ne '') { &Apache::lonnet::delenv('request.deeplink.target'); } - if ($env{'request.linkprot'} ne '') { - &Apache::lonnet::delenv('request.linkprot'); - } - if ($env{'request.linkprotexit'} ne '') { - &Apache::lonnet::delenv('request.linkprotexit'); - } } } else { unless ($currdeeplinklogin eq $linkuri) { @@ -384,17 +364,12 @@ sub launch_check { if ($linkprotector) { &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi}); } elsif ($env{'request.linkprot'}) { - &Apache::lonnet::delenv('request.linkprot'); - } - if ($linkprotexit) { - &Apache::lonnet::appenv({'request.linkprotexit' => $linkprotexit}); - } elsif ($env{'request.linkprotexit'}) { - &Apache::lonnet::delenv('request.linkprotexit'); + &Apache::lonnet::delenv({'request.linkprot'}); } if ($linkkey ne '') { &Apache::lonnet::appenv({'request.linkkey' => $linkkey}); } elsif ($env{'request.linkkey'} ne '') { - &Apache::lonnet::delenv('request.linkkey'); + &Apache::lonnet::delenv({'request.linkkey'}); } $newlauncher = 1; } @@ -410,17 +385,12 @@ sub launch_check { if ($linkprotector) { &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi}); } elsif ($env{'request.linkprot'}) { - &Apache::lonnet::delenv('request.linkprot'); - } - if ($linkprotexit) { - &Apache::lonnet::appenv({'request.linkprotexit' => $linkprotexit}); - } elsif ($env{'request.linkprotexit'}) { - &Apache::lonnet::delenv('request.linkprotexit'); + &Apache::lonnet::delenv({'request.linkprot'}); } if ($linkkey ne '') { &Apache::lonnet::appenv({'request.linkkey' => $linkkey}); } else { - &Apache::lonnet::delenv('request.linkkey'); + &Apache::lonnet::delenv({'request.linkkey'}); } &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri}); if ($env{'request.deeplink.target'} ne '') { @@ -431,32 +401,28 @@ sub launch_check { } sub do_redirect { - my ($r,$destination,$linkprot) = @_; + my ($r,$destination) = @_; my $windowname = 'loncapaclient'; + if ($env{'request.lti.login'}) { + $windowname .= 'lti'; + } my $header = ''; my $args = {'bread_crumbs' => [{'href' => '','text' => 'Role initialization'},],}; - if ($linkprot) { - $args = {'only_body' => 1, - 'redirect' => [0,$destination],}; - } &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - if ($linkprot) { - $r->print(&Apache::loncommon::start_page('Valid link','',$args). - &Apache::loncommon::end_page()); - } else { - $r->print(&Apache::loncommon::start_page('Valid link',$header,$args). - &Apache::lonhtmlcommon::scripttag('self.name="'.$windowname.'";'). - '

'.&mt('Welcome').'

'. - '

'.&mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','','').'

'. - ''.&mt('Continue').'

'. - &Apache::loncommon::end_page()); - } + $r->print(&Apache::loncommon::start_page('Valid link',$header,$args). + &Apache::lonhtmlcommon::scripttag('self.name="'.$windowname.'";'). + '

'.&mt('Welcome').'

'. + '

'.&mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','','').'

'. + ''.&mt('Continue').'

'. + &Apache::loncommon::end_page()); return; } sub show_roles { - my ($r,$crsenv,$possroles,$hassection,$hascustom,$futureroles,$expiredroles,$linkprot,$linkprotuser,$linkprotexit,$ltoken) = @_; + my ($r,$crsenv,$possroles,$hassection,$hascustom) = @_; + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; my ($crsdesc,$crstype,$cdom,$cnum,$header,$title,$preamble,$datatable,$js,$args); if (ref($crsenv) eq 'HASH') { $crsdesc = $crsenv->{'description'}; @@ -475,9 +441,6 @@ sub show_roles { if (ref($possroles) eq 'HASH') { if (keys(%{$possroles}) > 0) { $args = {'bread_crumbs' => [{'href' => '','text' => "Choose role in $lc_crstype"},],}; - if ($linkprot) { - $args = {'only_body' => 1}; - } $title = 'Choose a role'; #Do not localize. if ($crstype eq 'Community') { $preamble = &mt('You have the following active roles in this community:'); @@ -487,7 +450,7 @@ sub show_roles { $datatable = '
'. ''."\n". ''."\n". - ''."\n"; + ''."\n"; if ($env{'form.ttoken'}) { $datatable .= ''."\n"; } @@ -569,55 +532,9 @@ function enterrole (thisform,rolecode,bu ENDJS } else { - if ($linkprot) { - $title = 'No access'; - $preamble = '

'.&mt('Access unavailable for this LON-CAPA content.').'

'; - $args->{'only_body'} = 1; - } else { - $title = 'No active role'; - $preamble = '

'.&mt("You have no active roles in this $lc_crstype so the page is currently unavailable to you.").'

'; - $args = {'bread_crumbs' => [{'href' => '','text' => 'Role status'},],}; - } - $header = &mt('No access for: [_1]',''.&Apache::loncommon::plainname($env{'user.name'}, - $env{'user.domain'}).''); - if ((ref($futureroles) eq 'HASH') && (keys(%{$futureroles}) > 0)) { - my @future = sort { $a <=> $b } (keys(%{$futureroles})); - $preamble .= '

'.&mt('Access will begin: [_1].',&Apache::lonlocal::locallocaltime($future[0])). - ' '.&mt('Please try again then.').'

'; - } elsif ((ref($expiredroles) eq 'HASH') && (keys(%{$expiredroles}) > 0)) { - my @expired = sort { $b <=> $a } (keys(%{$expiredroles})); - $preamble .= '

'.&mt('Access ended: [_1].',&Apache::lonlocal::locallocaltime($expired[0])).'

'; - } elsif ($linkprot) { - if ($linkprotuser) { - my ($uname,$udom) = split(/:/,$linkprotuser,2); - $preamble .= '

'.&mt('As you followed a link from another system, while logged into that other system with the username: [_1], it is recommended that you contact your instructor.',''.$uname.'').'

'; - } else { - my $relogin; - my %data = ( - origurl => $r->uri, - linkprot => $linkprot, - linkprotexit => $linkprotexit, - ); - my $token = - &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'retry'); - unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) || - ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { - $relogin = '/adm/relaunch?rtoken='.$token; - } - $preamble .= '

'.&mt('You might try logging in with a different username and/or domain.').' '. - &mt('You are currently logged in as: [_1] in domain: [_2]', - ''.$env{'user.name'}.'',''.$env{'user.domain'}.'').'

'; - if ($relogin) { - $preamble .= '

'.&mt('[_1]Log-in again[_2]','','').'

'; - } - } - } - if ($env{'form.ttoken'}) { - &Apache::lonnet::tmpdel($env{'form.ttoken'}); - } - if ($ltoken) { - &Apache::lonnet::tmpdel($ltoken); - } + $title = 'No active role'; + $preamble = &mt("You have no active roles in this $lc_crstype so the page is currently unavailable to you."); + $args = {'bread_crumbs' => [{'href' => '','text' => 'Role status'},],}; } } &Apache::loncommon::content_type($r,'text/html'); @@ -633,13 +550,15 @@ ENDJS sub generic_error { my ($r) = @_; my $continuelink; - my $linktext; - if ($env{'user.adv'}) { - $linktext = &mt('Continue to your roles page'); - } else { - $linktext = &mt('Continue to your courses page'); + 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.''; } - $continuelink=''.$linktext.''; my $msg = &mt('The page you requested does not exist.'); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header;