version 1.92, 2017/02/18 23:39:24
|
version 1.93, 2017/02/20 18:29:33
|
Line 245 sub first_accessible_resource {
|
Line 245 sub first_accessible_resource {
|
my ($newmapid,$newresid)=split(/\./,$newrid); |
my ($newmapid,$newresid)=split(/\./,$newrid); |
my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid}); |
my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid}); |
$furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb }); |
$furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb }); |
&check_for_syllabus(\$furl); |
|
if ($hash{'encrypted_'.$newrid}) { |
if ($hash{'encrypted_'.$newrid}) { |
$furl=&Apache::lonenc::encrypted($furl); |
$furl=&Apache::lonenc::encrypted($furl); |
} |
} |
Line 283 sub first_answerable_ressymb {
|
Line 282 sub first_answerable_ressymb {
|
sub check_for_syllabus { |
sub check_for_syllabus { |
my ($srcref) = @_; |
my ($srcref) = @_; |
return unless (ref($srcref) eq 'SCALAR'); |
return unless (ref($srcref) eq 'SCALAR'); |
|
my $usehttp; |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
Line 290 sub check_for_syllabus {
|
Line 290 sub check_for_syllabus {
|
($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'; |
$$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1'; |
|
$usehttp = 1; |
} |
} |
} |
} |
|
return $usehttp; |
} |
} |
|
|
# ================================================================ Main Handler |
# ================================================================ Main Handler |
Line 331 sub handler {
|
Line 333 sub handler {
|
} |
} |
} elsif ($direction eq 'firstanswerable') { |
} elsif ($direction eq 'firstanswerable') { |
my $furl = &first_answerable_ressymb(); |
my $furl = &first_answerable_ressymb(); |
|
my $usehttp = &check_for_syllabus(\$furl); |
|
if ($usehttp) { |
|
$furl='http://'.$ENV{'SERVER_NAME'}.$furl; |
|
} else { |
|
$furl=&Apache::lonnet::absolute_url().$furl; |
|
} |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->header_out(Location => |
$r->header_out(Location => $furl); |
&Apache::lonnet::absolute_url().$furl); |
|
return REDIRECT; |
return REDIRECT; |
} elsif ($direction eq 'endplacement') { |
} elsif ($direction eq 'endplacement') { |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
Line 379 sub handler {
|
Line 386 sub handler {
|
} |
} |
if ($direction eq 'firstres') { |
if ($direction eq 'firstres') { |
my $furl=&first_accessible_resource(); |
my $furl=&first_accessible_resource(); |
|
my $usehttp = &check_for_syllabus(\$furl); |
|
if ($usehttp) { |
|
$furl='http://'.$ENV{'SERVER_NAME'}.$furl; |
|
} else { |
|
$furl=&Apache::lonnet::absolute_url().$furl; |
|
} |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->header_out(Location => |
$r->header_out(Location => $furl); |
&Apache::lonnet::absolute_url().$furl); |
|
|
|
return REDIRECT; |
return REDIRECT; |
} |
} |
if ($direction eq 'return') { |
if ($direction eq 'return') { |
# -------------------------------------------------------- Return to last known |
# -------------------------------------------------------- Return to last known |
my $newloc; |
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', |
&GDBM_READER(),0640))) { |
&GDBM_READER(),0640))) { |
my ($murl,$id,$fn)=&Apache::lonnet::decode_symb($last); |
my ($murl,$id,$fn)=&Apache::lonnet::decode_symb($last); |
$id=$hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id; |
$id=$hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id; |
$newloc=$hash{'src_'.$id}; |
$newloc=$hash{'src_'.$id}; |
if ($newloc) { |
if ($newloc) { |
&check_for_syllabus(\$newloc); |
$usehttp = &check_for_syllabus(\$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/[^\#]+)\#([^\#]+)$}) { |
} elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) { |
Line 407 sub handler {
|
Line 418 sub handler {
|
} else { |
} else { |
$newloc='/adm/navmaps'; |
$newloc='/adm/navmaps'; |
} |
} |
|
if ($usehttp) { |
|
$newloc='http://'.$ENV{'SERVER_NAME'}.$newloc; |
|
} else { |
|
$newloc=&Apache::lonnet::absolute_url().$newloc |
|
} |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->header_out(Location => |
$r->header_out(Location => $newloc); |
&Apache::lonnet::absolute_url().$newloc); |
|
|
|
return REDIRECT; |
return REDIRECT; |
} |
} |
# |
# |
Line 514 sub handler {
|
Line 528 sub handler {
|
# ------------------------------------- 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); |
unless ($redirect) { |
unless ($redirect) { |
&check_for_syllabus(\$redirecturl); |
my $usehttp = &check_for_syllabus(\$redirecturl); |
$url=&Apache::lonnet::absolute_url().$redirecturl; |
if ($usehttp) { |
|
$url='http://'.$ENV{'SERVER_NAME'}.$redirecturl; |
|
} else { |
|
$url=&Apache::lonnet::absolute_url().$redirecturl; |
|
} |
my $addanchor; |
my $addanchor; |
if (($anchor ne '') && (!$enc || $env{'request.role.adv'})) { |
if (($anchor ne '') && (!$enc || $env{'request.role.adv'})) { |
$addanchor = 1; |
$addanchor = 1; |
Line 565 $lt{'pick'}:
|
Line 583 $lt{'pick'}:
|
ENDSTART |
ENDSTART |
foreach my $id (@possibilities) { |
foreach my $id (@possibilities) { |
my $src = $multichoicehash{'src_'.$id}; |
my $src = $multichoicehash{'src_'.$id}; |
&check_for_syllabus(\$src); |
my $usehttp = &check_for_syllabus(\$src); |
|
if ($usehttp) { |
|
$src = 'http://'.$ENV{'SERVER_NAME'}.$src; |
|
} |
$r->print( |
$r->print( |
'<tr><td><a href="'. |
'<tr><td><a href="'. |
&add_get_param($src, |
&add_get_param($src, |