version 1.95, 2017/03/08 02:51:18
|
version 1.101, 2018/12/30 19:47:06
|
Line 102 sub move {
|
Line 102 sub move {
|
my ($next,$endupmap,$direction) = @_; |
my ($next,$endupmap,$direction) = @_; |
my $safecount=0; |
my $safecount=0; |
my $allowed=0; |
my $allowed=0; |
|
my $deeplinkonly=0; |
|
my $prev=$next; |
|
my ($prevmapid)=split(/\./,$next); |
do { |
do { |
($next,$endupmap)=&get_next_possible_move($next,$endupmap,$direction); |
($next,$endupmap)=&get_next_possible_move($next,$endupmap,$direction); |
|
|
Line 115 sub move {
|
Line 118 sub move {
|
my $priv = &Apache::lonnet::allowed('bre',$url,$symb); |
my $priv = &Apache::lonnet::allowed('bre',$url,$symb); |
$allowed = (($priv eq 'F') || ($priv eq '2')); |
$allowed = (($priv eq 'F') || ($priv eq '2')); |
} |
} |
|
$deeplinkonly = 0; |
|
if ($hash{'deeplinkonly_'.$next}) { |
|
my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$next}); |
|
if ($level eq 'resource') { |
|
$deeplinkonly = 1; |
|
} elsif ($level eq 'map') { |
|
if ($mapid != $prevmapid) { |
|
$deeplinkonly = 1; |
|
} |
|
} |
|
} elsif ($hash{'deeplinkonly_'.$prev}) { |
|
my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$prev}); |
|
if ($level eq 'resource') { |
|
$deeplinkonly = 1; |
|
} elsif ($level eq 'map') { |
|
if ($mapid != $prevmapid) { |
|
$deeplinkonly = 1; |
|
} |
|
} |
|
} |
$safecount++; |
$safecount++; |
} while ( ($next) |
} while ( ($next) |
&& ($next!~/\,/) |
&& ($next!~/\,/) |
&& ( |
&& ( |
(!$hash{'src_'.$next}) |
(!$hash{'src_'.$next}) |
|| ( |
|| ( |
(!$env{'request.role.adv'}) |
(!$env{'request.role.adv'}) |
&& $hash{'randomout_'.$next} |
&& (($hash{'randomout_'.$next}) |
|
|| ($deeplinkonly)) |
) |
) |
|| (!$allowed) |
|| (!$allowed) |
) |
) |
Line 289 sub check_http_req {
|
Line 313 sub check_http_req {
|
if (($$srcref =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) && |
if (($$srcref =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) && |
($ENV{'SERVER_PORT'} == 443) && |
($ENV{'SERVER_PORT'} == 443) && |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
$$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1'; |
unless (&Apache::lonnet::uses_sts()) { |
$usehttp = 1; |
$$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1'; |
|
$usehttp = 1; |
|
} |
} elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) && |
} elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) && |
($ENV{'SERVER_PORT'} == 443)) { |
($ENV{'SERVER_PORT'} == 443)) { |
$usehttp = 1; |
unless (&Apache::lonnet::uses_sts()) { |
|
my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/); |
|
$$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor; |
|
$usehttp = 1; |
|
} |
} |
} |
} |
} |
return $usehttp; |
return $usehttp; |
} |
} |
|
|
|
sub reinited_js { |
|
my ($url,$cid,$timeout) = @_; |
|
if (!$timeout) { |
|
$timeout = 0; |
|
} |
|
return <<"END"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
setTimeout(function() { |
|
var newurl = '$url'; |
|
if (document.getElementById('LC_update_$cid')) { |
|
document.getElementById('LC_update_$cid').style.display = 'none'; |
|
} |
|
if ((newurl !== null) && (newurl !== '') && (newurl !== 'undefined')) { |
|
window.location.href = "$url"; |
|
} |
|
}, $timeout); |
|
// ]]> |
|
</script> |
|
END |
|
} |
|
|
# ================================================================ Main Handler |
# ================================================================ Main Handler |
|
|
sub handler { |
sub handler { |
Line 315 sub handler {
|
Line 367 sub handler {
|
my %cachehash=(); |
my %cachehash=(); |
my $multichoice=0; |
my $multichoice=0; |
my %multichoicehash=(); |
my %multichoicehash=(); |
my ($redirecturl,$redirectsymb,$enc,$anchor); |
my %prog_state=(); |
|
my ($redirecturl,$redirectsymb,$enc,$anchor,$deeplinklevel); |
my $next=''; |
my $next=''; |
my $hostname = $r->hostname(); |
my $hostname = $r->hostname(); |
my @possibilities=(); |
my @possibilities=(); |
Line 372 sub handler {
|
Line 425 sub handler {
|
untie(%hash); |
untie(%hash); |
} |
} |
} |
} |
|
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->send_http_header; |
|
$r->print(&Apache::loncommon::start_page('Content Changed')); |
|
my $preamble = '<div id="LC_update_'.$env{'request.course.id'}.'" class="LC_info">'. |
|
'<br />'. |
|
&mt('Your course session is being updated because of recent changes by course personnel.'). |
|
' '.&mt('Please be patient.').'<br /></div>'. |
|
'<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
|
%prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); |
|
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course')); |
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); |
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); |
|
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished')); |
if ($ferr) { |
if ($ferr) { |
|
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
my $requrl = $r->uri; |
my $requrl = $r->uri; |
$env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; |
$env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; |
$env{'user.reinit'} = 1; |
$env{'user.reinit'} = 1; |
Line 396 sub handler {
|
Line 461 sub handler {
|
} else { |
} else { |
$furl=&Apache::lonnet::absolute_url().$furl; |
$furl=&Apache::lonnet::absolute_url().$furl; |
} |
} |
&Apache::loncommon::content_type($r,'text/html'); |
if ($reinitcheck eq 'update') { |
$r->header_out(Location => $furl); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
return REDIRECT; |
$r->print(&reinited_js($furl,$env{'request.course.id'},100)); |
|
$r->print(&Apache::loncommon::end_page()); |
|
return OK; |
|
} else { |
|
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->header_out(Location => $furl); |
|
return REDIRECT; |
|
} |
} |
} |
if ($direction eq 'return') { |
if ($direction eq 'return') { |
# -------------------------------------------------------- Return to last known |
# -------------------------------------------------------- Return to last known |
my ($newloc,$usehttp); |
my ($newloc,$usehttp); |
if (($last) && (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', |
if (($last) && (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', |
Line 412 sub handler {
|
Line 484 sub handler {
|
$usehttp = &check_http_req(\$newloc); |
$usehttp = &check_http_req(\$newloc); |
if ($hash{'encrypted_'.$id}) { |
if ($hash{'encrypted_'.$id}) { |
$newloc=&Apache::lonenc::encrypted($newloc); |
$newloc=&Apache::lonenc::encrypted($newloc); |
} elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) { |
} |
$newloc = $1.&escape('#').$2; |
if ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|(\#[^\#]+))$}) { |
|
my ($url,$anchor) = ($1,$2); |
|
if ($anchor) { |
|
$newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last).$anchor; |
|
} |
} |
} |
} else { |
} else { |
$newloc='/adm/navmaps'; |
$newloc='/adm/navmaps'; |
Line 427 sub handler {
|
Line 503 sub handler {
|
} else { |
} else { |
$newloc=&Apache::lonnet::absolute_url().$newloc |
$newloc=&Apache::lonnet::absolute_url().$newloc |
} |
} |
&Apache::loncommon::content_type($r,'text/html'); |
if ($reinitcheck eq 'update') { |
$r->header_out(Location => $newloc); |
$r->print(&reinited_js($newloc,$env{'request.course.id'},100)); |
return REDIRECT; |
$r->print(&Apache::loncommon::end_page()); |
|
return OK; |
|
} else { |
|
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->header_out(Location => $newloc); |
|
return REDIRECT; |
|
} |
} |
} |
# |
# |
# Is the current URL on the map? If not, start with last known URL |
# Is the current URL on the map? If not, start with last known URL |
Line 447 sub handler {
|
Line 529 sub handler {
|
if ($last) { |
if ($last) { |
$currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]); |
$currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]); |
} else { |
} else { |
&Apache::loncommon::content_type($r,'text/html'); |
my $newloc = &Apache::lonnet::absolute_url(). |
$r->header_out(Location => |
'/adm/navmaps'; |
&Apache::lonnet::absolute_url(). |
if ($reinitcheck eq 'update') { |
'/adm/navmaps'); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
return REDIRECT; |
$r->print(&reinited_js($newloc,$env{'request.course.id'},100)); |
|
$r->print(&Apache::loncommon::end_page()); |
|
return OK; |
|
} else { |
|
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->header_out(Location => $newloc); |
|
return REDIRECT; |
|
} |
} |
} |
} |
} |
# ------------------------------------------- Do we have any idea where we are? |
# ------------------------------------------- Do we have any idea where we are? |
Line 509 sub handler {
|
Line 598 sub handler {
|
} else { |
} else { |
# -------------------------------------------------------------- No place to go |
# -------------------------------------------------------------- No place to go |
$multichoice=-1; |
$multichoice=-1; |
|
if ($hash{'deeplinkonly_'.$rid}) { |
|
(my $value,$deeplinklevel) = split(/:/,$hash{'deeplinkonly_'.$rid}); |
|
} |
} |
} |
# ----------------- The program must come past this point to untie the big hash |
# ----------------- The program must come past this point to untie the big hash |
untie(%hash); |
untie(%hash); |
Line 530 sub handler {
|
Line 622 sub handler {
|
&Apache::lonnet::linklog($redirecturl,$currenturl); |
&Apache::lonnet::linklog($redirecturl,$currenturl); |
} |
} |
# ------------------------------------- Check for and display critical messages |
# ------------------------------------- Check for and display critical messages |
my ($redirect, $url) = &Apache::loncommon::critical_redirect(300); |
my ($redirect, $url) = &Apache::loncommon::critical_redirect(300,'flip'); |
unless ($redirect) { |
unless ($redirect) { |
my $usehttp = &check_http_req(\$redirecturl); |
my $usehttp = &check_http_req(\$redirecturl); |
if (($usehttp) && ($hostname ne '')) { |
if (($usehttp) && ($hostname ne '')) { |
Line 548 sub handler {
|
Line 640 sub handler {
|
$url .= $anchor; |
$url .= $anchor; |
} |
} |
} |
} |
&Apache::loncommon::content_type($r,'text/html'); |
if ($reinitcheck eq 'update') { |
$r->header_out(Location => $url); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
return REDIRECT; |
$r->print(&reinited_js($url,$env{'request.course.id'},100)); |
|
$r->print(&Apache::loncommon::end_page()); |
|
return OK; |
|
} else { |
|
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->header_out(Location => $url); |
|
return REDIRECT; |
|
} |
} else { |
} else { |
# --------------------------------------------------------- There was a problem |
# --------------------------------------------------------- There was a problem |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
my %lt=&Apache::lonlocal::texthash('title' => 'End of Sequence', |
my %lt=&Apache::lonlocal::texthash('title' => 'End of Sequence', |
|
'deeplink' => 'No link available', |
|
'deeplinkres' => |
|
'Navigation to other content is unavailable when accessing content via deep-linking', |
|
'deeplinkmap' => |
|
'You have reached the end of the sequence of available materials for access via deep-linking', |
'explain' => |
'explain' => |
'You have reached the end of the sequence of materials.', |
'You have reached the end of the sequence of materials.', |
'back' => 'Go Back', |
'back' => 'Go Back', |
Line 623 ENDSTART
|
Line 727 ENDSTART
|
} else { |
} else { |
$r->print(&Apache::lonplacementtest::showresult(1)); |
$r->print(&Apache::lonplacementtest::showresult(1)); |
} |
} |
} else { |
} else { |
$r->print( |
$r->print( |
&Apache::loncommon::start_page('No Resource') |
&Apache::loncommon::start_page('No Resource')); |
.'<h2>'.$lt{'title'}.'</h2>' |
if ($deeplinklevel eq 'resource') { |
.'<p>'.$lt{'explain'}.'</p>'); |
$r->print('<h2>'.$lt{'deeplink'}.'</h2>' |
|
.'<p>'.$lt{'deeplinkres'}.'</p>'); |
|
} elsif ($deeplinklevel eq 'map') { |
|
$r->print('<h2>'.$lt{'title'}.'</h2>' |
|
.'<p>'.$lt{'deeplinkmap'}.'</p>'); |
|
} else { |
|
$r->print('<h2>'.$lt{'title'}.'</h2>' |
|
.'<p>'.$lt{'explain'}.'</p>'); |
|
} |
} |
} |
} |
} |
} |
} |
unless (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') || |
unless (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') || |
($env{'request.role.adv'})) { |
($env{'request.role.adv'})) { |
if ((!@possibilities) && ($reinitcheck)) { |
if ($deeplinklevel) { |
|
$r->print( |
|
&Apache::lonhtmlcommon::actionbox( |
|
['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a>'])); |
|
} elsif ((!@possibilities) && ($reinitcheck)) { |
$r->print( |
$r->print( |
&Apache::lonhtmlcommon::actionbox( |
&Apache::lonhtmlcommon::actionbox( |
['<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>' |
['<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>' |
Line 653 ENDSTART
|
Line 769 ENDSTART
|
} |
} |
} else { |
} else { |
# ------------------------------------------------- Problem, could not tie hash |
# ------------------------------------------------- Problem, could not tie hash |
|
if ($reinitcheck eq 'update') { |
|
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
$r->print(&Apache::loncommon::end_page()); |
|
} |
$env{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing"; |
$env{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing"; |
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} |
} |
} else { |
} else { |
# ---------------------------------------- No, could not determine where we are |
# ---------------------------------------- No, could not determine where we are |
$r->internal_redirect('/adm/ambiguous'); |
my $newloc = '/adm/ambiguous'; |
|
if ($reinitcheck eq 'update') { |
|
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
$r->print(&reinited_js($newloc,$env{'request.course.id'},100)); |
|
$r->print(&Apache::loncommon::end_page()); |
|
} else { |
|
$r->internal_redirect($newloc); |
|
} |
return OK; |
return OK; |
} |
} |
} else { |
} else { |