--- loncom/interface/lontiny.pm 2021/08/10 15:28:14 1.7
+++ loncom/interface/lontiny.pm 2023/06/02 01:20:26 1.19
@@ -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.7 2021/08/10 15:28:14 raeburn Exp $
+# $Id: lontiny.pm,v 1.19 2023/06/02 01:20:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -67,9 +67,39 @@ sub handler {
if ($cnum =~ /^$match_courseid$/) {
my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
if ($chome ne 'no_host') {
- # Check for ltoken or linkkey
- my $newlauncher = &launch_check($r->uri,$symb,$cnum,$cdom);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['ttoken']);
+ my ($linkprot,$linkprotuser,$linkprotexit,$ltoken,$linkprotpbid,$linkprotpburl);
+ 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'};
+ $linkprotpbid = $ltoken_info{'linkprotpbid'};
+ $linkprotpbid = $ltoken_info{'linkprotpburl'};
+ } 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 ($link_info{'linkprotpbid'}) {
+ $linkprotpbid = $link_info{'linkprotpbid'};
+ }
+ if ($link_info{'linkprotpburl'}) {
+ $linkprotpburl = $link_info{'linkprotpburl'};
+ }
+ }
+ }
+ }
if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
+ # Check for ttoken
+ my $newlauncher = &launch_check($r->uri,$symb);
my ($map,$resid,$url) = &Apache::lonnet::decode_symb($symb);
if (&Apache::lonnet::is_on_map($url)) {
my $realuri;
@@ -96,14 +126,14 @@ sub handler {
$realuri .= '?symb='.$symb;
}
}
- my $update;
+ my ($update,$reinitresult);
# Check if course needs to be re-initialized
if ($newlauncher) {
$update = 1;
} else {
my $loncaparev = $r->dir_config('lonVersion');
- my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
- if ($result eq 'update') {
+ ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+ if (($reinitresult eq 'main') || ($reinitresult eq 'both')) {
$update = 1;
} elsif (!-e $env{'request.course.fn'}.'.db') {
$update = 1;
@@ -133,6 +163,16 @@ sub handler {
return HTTP_NOT_ACCEPTABLE;
}
}
+ if (($reinitresult eq 'both') || ($reinitresult eq 'supp')) {
+ my $possdel;
+ if ($reinitresult eq 'supp') {
+ $possdel = 1;
+ }
+ my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
+ unless ($refs_updated) {
+ &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
+ }
+ }
my $host = $r->headers_in->get('Host');
if (!$host) {
$r->internal_redirect($realuri);
@@ -155,22 +195,39 @@ sub handler {
} else {
unshift(@possroles,'cc');
}
- my %roleshash = &Apache::lonnet::get_my_roles($env{'user.uname'},
- $env{'user.domain'},
- 'userroles',undef,
- \@possroles,[$cdom],1);
- my (%possroles,$hassection);
+ 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);
if (keys(%roleshash)) {
+ my $now = time;
foreach my $entry (keys(%roleshash)) {
if ($entry =~ /^\Q$cnum:$cdom:\E([^:]+):([^:]*)$/) {
- $possroles{$1} = $2;
- if ($2 ne '') {
+ my ($role,$sec) = ($1,$2);
+ $possroles{$role} = $sec;
+ if ($sec ne '') {
$hassection = 1;
}
+ my ($tstart,$tend)=split(/\:/,$roleshash{$entry});
+ my $status = 'active';
+ if (($tend) && ($tend<=$now)) {
+ $status = 'previous';
+ }
+ if (($tstart) && ($now<$tstart)) {
+ $status = 'future';
+ }
+ if ($status eq 'active') {
+ $active{$role} = $sec;
+ } elsif ($status eq 'previous') {
+ $expired{$tend} = $role.':'.$sec;
+ } elsif ($status eq 'future') {
+ $future{$tstart} = $role.':'.$sec;
+ }
}
}
}
- my @allposs = keys(%possroles);
+ my @allposs = keys(%active);
if ($env{'request.lti.login'}) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
if ($env{'request.lti.target'} eq '') {
@@ -187,7 +244,7 @@ sub handler {
}
if ($env{"form.$newrole"}) {
my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'.
- '&destinationurl='.&HTML::Entities::encode($r->uri);
+ '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"');
if ($env{'form.ltitarget'} eq 'iframe') {
$destination .= '<itarget=iframe';
}
@@ -198,17 +255,21 @@ sub handler {
}
}
if (@allposs == 0) {
- &show_roles($r,\%crsenv,\%possroles);
+ &show_roles($r,\%crsenv,\%active,'','',\%future,\%expired,$linkprot,$linkprotuser,
+ $linkprotexit,$linkprotpbid,$linkprotpburl,$ltoken);
} elsif (@allposs == 1) {
my $newrole = "$allposs[0]./$cdom/$cnum";
$newrole = "$allposs[0]./$cdom/$cnum";
if ($possroles{$allposs[0]} ne '') {
- $newrole .= "/$possroles{$allposs[0]}";
+ $newrole .= "/$possroles{$allposs[0]}";
}
my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'.
- '&destinationurl='.&HTML::Entities::encode($r->uri);
- &do_redirect($r,$destination);
- } elsif (keys(%possroles) > 1) {
+ '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"');
+ if ($env{'form.ttoken'}) {
+ $destination .= '&ttoken='.$env{'form.ttoken'};
+ }
+ &do_redirect($r,$destination,$linkprot);
+ } elsif (@allposs > 1) {
if (grep(/^(cc|co)$/,@allposs)) {
my $newrole;
if (exists($possroles{'cc'})) {
@@ -218,14 +279,17 @@ sub handler {
}
$newrole .= "./$cdom/$cnum";
my $destination .= '/adm/roles?selectrole=1&'.$newrole.'=1'.
- '&destinationurl='.&HTML::Entities::encode($r->uri);
- &do_redirect($r,$destination);
+ '&destinationurl='.&HTML::Entities::encode($r->uri,'&<>"');
+ if ($env{'form.ttoken'}) {
+ $destination .= '&ttoken='.$env{'form.ttoken'};
+ }
+ &do_redirect($r,$destination,$linkprot);
} else {
my $hascustom;
if (grep(/^cr\//,@allposs)) {
$hascustom = 1;
}
- &show_roles($r,\%crsenv,\%possroles,$hassection,$hascustom);
+ &show_roles($r,\%crsenv,\%active,$hassection,$hascustom);
}
}
return OK;
@@ -243,13 +307,23 @@ sub handler {
}
sub launch_check {
- my ($linkuri,$symb,$cnum,$cdom) = @_;
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['ltoken','linkkey']);
- my ($linkprotector,$linkproturi,$linkkey,$newlauncher);
- if ($env{'form.ltoken'}) {
- my %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'});
- &Apache::lonnet::tmpdel($env{'form.ltoken'});
- delete($env{'form.ltoken'});
+ my ($linkuri,$symb) = @_;
+ my ($linkprotector,$linkproturi,$linkprotexit,$linkprotpbid,$linkprotpburl,$linkkey,$newlauncher);
+ if ($env{'form.ttoken'}) {
+ my %link_info = &Apache::lonnet::tmpget($env{'form.ttoken'});
+ &Apache::lonnet::tmpdel($env{'form.ttoken'});
+ delete($env{'form.ttoken'});
+ if ($link_info{'ltoken'}) {
+ unless (($link_info{'linkprot'}) || ($link_info{'linkkey'} ne '')) {
+ my %ltoken_info = &Apache::lonnet::tmpget($link_info{'ltoken'});
+ if ($ltoken_info{'linkprot'}) {
+ $link_info{'linkprot'} = $ltoken_info{'linkprot'};
+ } elsif ($ltoken_info{'linkkey'} ne '') {
+ $link_info{'linkkey'} = $ltoken_info{'linkkey'};
+ }
+ }
+ &Apache::lonnet::tmpdel($link_info{'ltoken'});
+ }
if ($link_info{'linkprot'}) {
($linkprotector,$linkproturi) = split(/:/,$link_info{'linkprot'},2);
if ($env{'user.linkprotector'}) {
@@ -272,111 +346,198 @@ sub launch_check {
} else {
&Apache::lonnet::appenv({'user.linkproturi' => $linkproturi});
}
- }
- } elsif ($env{'form.linkkey'}) {
- $linkkey = $env{'form.linkkey'};
- my $keyedlinkuri = $linkuri;
- if ($env{'user.deeplinkkey'}) {
- my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
- unless (grep(/^\Q$linkkey\E$/,@linkkeys)) {
- push(@linkkeys,$linkkey);
- &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
+ if ($link_info{'linkprotexit'}) {
+ $linkprotexit = $link_info{'linkprotexit'};
}
- } else {
- &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
- }
- if ($env{'user.keyedlinkuri'}) {
- my @keyeduris = split(/,/,$env{'user.keyedlinkuri'});
- unless (grep(/^\Q$keyedlinkuri\E$/,@keyeduris)) {
- push(@keyeduris,$keyedlinkuri);
- &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))});
+ if ($link_info{'linkprotpbid'}) {
+ $linkprotpbid = $link_info{'linkprotpbid'};
}
- } else {
- &Apache::lonnet::appenv({'user.keyedlinkuri' => $keyedlinkuri});
- }
- delete($env{'form.linkkey'});
- }
- if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
- my $currdeeplinklogin = $env{'request.deeplink.login'};
- if ($linkprotector || $linkkey) {
- my $deeplink;
- if ($symb =~ /\.(page|sequence)$/) {
- my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($symb))[2]);
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (ref($navmap)) {
- $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink');
+ if ($link_info{'linkprotpburl'}) {
+ $linkprotpburl = $link_info{'linkprotpburl'};
+ }
+ } elsif ($link_info{'linkkey'} ne '') {
+ $linkkey = $link_info{'linkkey'};
+ my $keyedlinkuri = $linkuri;
+ if ($env{'user.deeplinkkey'} ne '') {
+ my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
+ unless (grep(/^\Q$linkkey\E$/,@linkkeys)) {
+ push(@linkkeys,$linkkey);
+ &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
}
} else {
- $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$symb);
+ &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
}
- if ($deeplink ne '') {
- my $disallow;
- my ($state,$others,$listed,$scope,$protect) = split(/,/,$deeplink);
- if (($protect ne 'none') && ($protect ne '')) {
- my ($acctype,$item) = split(/:/,$protect);
- if ($acctype =~ /lti(c|d)$/) {
- unless ($linkprotector.':'.$linkproturi eq $item.$1.':'.$linkuri) {
- $disallow = 1;
- }
- } elsif ($acctype eq 'key') {
- unless ($linkkey eq $item) {
- $disallow = 1;
- }
- }
+ if ($env{'user.keyedlinkuri'}) {
+ my @keyeduris = split(/,/,$env{'user.keyedlinkuri'});
+ unless (grep(/^\Q$keyedlinkuri\E$/,@keyeduris)) {
+ push(@keyeduris,$keyedlinkuri);
+ &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))});
}
- if ($disallow) {
- if ($currdeeplinklogin eq $linkuri) {
- &Apache::lonnet::delenv('request.deeplink.login');
+ } else {
+ &Apache::lonnet::appenv({'user.keyedlinkuri' => $keyedlinkuri});
+ }
+ }
+ if ($link_info{'checklaunch'}) {
+ $newlauncher = 1;
+ }
+ }
+ my $currdeeplinklogin = $env{'request.deeplink.login'};
+ my $deeplink;
+ if ($symb =~ /\.(page|sequence)$/) {
+ my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($symb))[2]);
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ if (ref($navmap)) {
+ $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink');
+ }
+ } else {
+ $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$symb);
+ }
+ if ($deeplink ne '') {
+ my $disallow;
+ my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink);
+ if (($protect ne 'none') && ($protect ne '')) {
+ my ($acctype,$item) = split(/:/,$protect);
+ if ($acctype =~ /lti(c|d)$/) {
+ my $ltitype = $1;
+ if ($linkprotector) {
+ unless ($linkprotector.':'.$linkproturi eq $item.$ltitype.':'.$linkuri) {
+ $disallow = 1;
}
} else {
- unless ($currdeeplinklogin eq $linkuri) {
- if ($linkprotector) {
- &Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
- } elsif ($linkkey) {
- &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
- }
- $newlauncher = 1;
+ $disallow = 1;
+ }
+ } elsif ($acctype eq 'key') {
+ if ($linkkey ne '') {
+ unless ($linkkey eq $item) {
+ $disallow = 1;
}
- &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri});
+ } else {
+ $disallow = 1;
+ }
+ }
+ }
+ if ($disallow) {
+ if ($currdeeplinklogin eq $linkuri) {
+ &Apache::lonnet::delenv('request.deeplink.login');
+ 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');
+ }
+ if ($env{'request.linkprotpbid'} ne '') {
+ &Apache::lonnet::delenv('request.linkprotpbid');
+ }
+ if ($env{'request.linkprotpburl'} ne '') {
+ &Apache::lonnet::delenv('request.linkprotpburl');
}
}
} else {
+ unless ($currdeeplinklogin eq $linkuri) {
+ if (($linkprotector) || ($linkkey ne '')) {
+ 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');
+ }
+ if ($linkprotpbid) {
+ &Apache::lonnet::appenv({'request.linkprotpbid' => $linkprotpbid});
+ } elsif ($env{'request.linkprotpbid'}) {
+ &Apache::lonnet::delenv('request.linkprotpbid');
+ }
+ if ($linkprotpburl) {
+ &Apache::lonnet::appenv({'request.linkprotpburl' => $linkprotpburl});
+ } elsif ($env{'request.linkprotpburl'}) {
+ &Apache::lonnet::delenv('request.linkprotpburl');
+ }
+ if ($linkkey ne '') {
+ &Apache::lonnet::appenv({'request.linkkey' => $linkkey});
+ } elsif ($env{'request.linkkey'} ne '') {
+ &Apache::lonnet::delenv('request.linkkey');
+ }
+ $newlauncher = 1;
+ }
+ }
&Apache::lonnet::appenv({'request.deeplink.login' => $linkuri});
+ if ($target ne '') {
+ &Apache::lonnet::appenv({'request.deeplink.target' => $target});
+ } elsif ($env{'request.deeplink.target'} ne '') {
+ &Apache::lonnet::delenv('request.deeplink.target');
+ }
}
} else {
- &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri});
if ($linkprotector) {
&Apache::lonnet::appenv({'request.linkprot' => $linkprotector.':'.$linkproturi});
- } elsif ($linkkey) {
+ } 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');
+ }
+ if ($linkprotpbid) {
+ &Apache::lonnet::appenv({'request.linkprotpbid' => $linkprotpbid});
+ } elsif ($env{'request.linkprotpbid'}) {
+ &Apache::lonnet::delenv('request.linkprotpbid');
+ }
+ if ($linkprotpburl) {
+ &Apache::lonnet::appenv({'request.linkprotpburl' => $linkprotpburl});
+ } elsif ($env{'request.linkprotpburl'}) {
+ &Apache::lonnet::delenv('request.linkprotpburl');
+ }
+ if ($linkkey ne '') {
&Apache::lonnet::appenv({'request.linkkey' => $linkkey});
+ } else {
+ &Apache::lonnet::delenv('request.linkkey');
+ }
+ &Apache::lonnet::appenv({'request.deeplink.login' => $linkuri});
+ if ($env{'request.deeplink.target'} ne '') {
+ &Apache::lonnet::delenv('request.deeplink.target');
}
}
return $newlauncher;
}
sub do_redirect {
- my ($r,$destination) = @_;
+ my ($r,$destination,$linkprot) = @_;
my $windowname = 'loncapaclient';
if ($env{'request.lti.login'}) {
$windowname .= 'lti';
}
my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
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;
- $r->print(&Apache::loncommon::start_page('Valid link',$header,$args).
- &Apache::lonhtmlcommon::scripttag('self.name="'.$windowname.'";').
- '<h1>'.&mt('Welcome').'</h1>'.
- '<p>'.&mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>').'</p><p>'.
- '<a href="'.$destination.'">'.&mt('Continue').'</a></p>'.
- &Apache::loncommon::end_page());
+ 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.'";').
+ '<h1>'.&mt('Welcome').'</h1>'.
+ '<p>'.&mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>').'</p><p>'.
+ '<a href="'.$destination.'">'.&mt('Continue').'</a></p>'.
+ &Apache::loncommon::end_page());
+ }
return;
}
sub show_roles {
- my ($r,$crsenv,$possroles,$hassection,$hascustom) = @_;
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
+ my ($r,$crsenv,$possroles,$hassection,$hascustom,$futureroles,$expiredroles,
+ $linkprot,$linkprotuser,$linkprotexit,$linkprotpbid,$linkprotpburl,$ltoken) = @_;
my ($crsdesc,$crstype,$cdom,$cnum,$header,$title,$preamble,$datatable,$js,$args);
if (ref($crsenv) eq 'HASH') {
$crsdesc = $crsenv->{'description'};
@@ -395,6 +556,9 @@ 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:');
@@ -402,12 +566,15 @@ sub show_roles {
$preamble = &mt('You have the following active roles in this course:');
}
$datatable = '<form name="" action="/adm/roles">'.
- '<input type="hidden" name="newrole" value="" />'.
- '<input type="hidden" name="selectrole" value="1" />'.
- '<input type="hidden" name="destinationurl" value="'.$r->uri.'" />'.
- &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- '<th></th><th>'.&mt('User role').'</th>';
+ '<input type="hidden" name="newrole" value="" />'."\n".
+ '<input type="hidden" name="selectrole" value="1" />'."\n".
+ '<input type="hidden" name="destinationurl" value="'.&HTML::Entities::encode($r->uri,'&<>"').'" />'."\n";
+ if ($env{'form.ttoken'}) {
+ $datatable .= '<input type="hidden" name="ttoken" value="'.$env{'form.ttoken'}.'" />'."\n";
+ }
+ $datatable .= &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th></th><th>'.&mt('User role').'</th>';
if ($hassection) {
$datatable .= '<th>'.&mt('Section').'</th>';
}
@@ -483,9 +650,57 @@ function enterrole (thisform,rolecode,bu
</script>
ENDJS
} 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'},],};
+ if ($linkprot) {
+ $title = 'No access';
+ $preamble = '<p>'.&mt('Access unavailable for this LON-CAPA content.').'</p>';
+ $args->{'only_body'} = 1;
+ } else {
+ $title = 'No active role';
+ $preamble = '<p>'.&mt("You have no active roles in this $lc_crstype so the page is currently unavailable to you.").'</p>';
+ $args = {'bread_crumbs' => [{'href' => '','text' => 'Role status'},],};
+ }
+ $header = &mt('No access for: [_1]','<b>'.&Apache::loncommon::plainname($env{'user.name'},
+ $env{'user.domain'}).'</b>');
+ if ((ref($futureroles) eq 'HASH') && (keys(%{$futureroles}) > 0)) {
+ my @future = sort { $a <=> $b } (keys(%{$futureroles}));
+ $preamble .= '<p>'.&mt('Access will begin: [_1].',&Apache::lonlocal::locallocaltime($future[0])).
+ ' '.&mt('Please try again then.').'</p>';
+ } elsif ((ref($expiredroles) eq 'HASH') && (keys(%{$expiredroles}) > 0)) {
+ my @expired = sort { $b <=> $a } (keys(%{$expiredroles}));
+ $preamble .= '<p>'.&mt('Access ended: [_1].',&Apache::lonlocal::locallocaltime($expired[0])).'</p>';
+ } elsif ($linkprot) {
+ if ($linkprotuser) {
+ my ($uname,$udom) = split(/:/,$linkprotuser,2);
+ $preamble .= '<p>'.&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.','<i>'.$uname.'</i>').'</p>';
+ } else {
+ my $relogin;
+ my %data = (
+ origurl => $r->uri,
+ linkprot => $linkprot,
+ linkprotexit => $linkprotexit,
+ linkprotpbid => $linkprotpbid,
+ linkprotpburl => $linkprotpburl,
+ );
+ 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 .= '<p>'.&mt('You might try logging in with a different username and/or domain.').' '.
+ &mt('You are currently logged in as: [_1] in domain: [_2]',
+ '<i>'.$env{'user.name'}.'</i>','<i>'.$env{'user.domain'}.'</i>').'</p>';
+ if ($relogin) {
+ $preamble .= '<p>'.&mt('[_1]Log-in again[_2]','<a href="'.$relogin.'" target="_self">','</a>').'</p>';
+ }
+ }
+ }
+ if ($env{'form.ttoken'}) {
+ &Apache::lonnet::tmpdel($env{'form.ttoken'});
+ }
+ if ($ltoken) {
+ &Apache::lonnet::tmpdel($ltoken);
+ }
}
}
&Apache::loncommon::content_type($r,'text/html');