version 1.101, 2018/12/30 19:47:06
|
version 1.103, 2021/04/29 17:45:25
|
Line 304 sub first_answerable_ressymb {
|
Line 304 sub first_answerable_ressymb {
|
} |
} |
|
|
sub check_http_req { |
sub check_http_req { |
my ($srcref) = @_; |
my ($srcref,$hostname) = @_; |
return unless (ref($srcref) eq 'SCALAR'); |
return unless (ref($srcref) eq 'SCALAR'); |
my $usehttp; |
my $usehttp; |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
Line 313 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://})) { |
unless (&Apache::lonnet::uses_sts()) { |
unless ((&Apache::lonnet::uses_sts()) || |
|
(&Apache::lonnet::waf_allssl($hostname))) { |
$$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1'; |
$$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1'; |
$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)) { |
unless (&Apache::lonnet::uses_sts()) { |
unless ((&Apache::lonnet::uses_sts()) || |
|
(&Apache::lonnet::waf_allssl($hostname))) { |
my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/); |
my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/); |
$$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor; |
$$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor; |
$usehttp = 1; |
$usehttp = 1; |
Line 390 sub handler {
|
Line 392 sub handler {
|
} |
} |
} elsif ($direction eq 'firstanswerable') { |
} elsif ($direction eq 'firstanswerable') { |
my $furl = &first_answerable_ressymb(); |
my $furl = &first_answerable_ressymb(); |
my $usehttp = &check_http_req(\$furl); |
my $usehttp = &check_http_req(\$furl,$hostname); |
if (($usehttp) && ($hostname ne '')) { |
if (($usehttp) && ($hostname ne '')) { |
$furl='http://'.$hostname.$furl; |
$furl='http://'.$hostname.$furl; |
} else { |
} else { |
Line 431 sub handler {
|
Line 433 sub handler {
|
my $preamble = '<div id="LC_update_'.$env{'request.course.id'}.'" class="LC_info">'. |
my $preamble = '<div id="LC_update_'.$env{'request.course.id'}.'" class="LC_info">'. |
'<br />'. |
'<br />'. |
&mt('Your course session is being updated because of recent changes by course personnel.'). |
&mt('Your course session is being updated because of recent changes by course personnel.'). |
' '.&mt('Please be patient.').'<br /></div>'. |
' '.&mt('Please be patient').'.<br /></div>'. |
'<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
'<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
%prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); |
%prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course')); |
&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')); |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!')); |
if ($ferr) { |
if ($ferr) { |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
my $requrl = $r->uri; |
my $requrl = $r->uri; |
Line 455 sub handler {
|
Line 457 sub handler {
|
} |
} |
if ($direction eq 'firstres') { |
if ($direction eq 'firstres') { |
my $furl=&first_accessible_resource(); |
my $furl=&first_accessible_resource(); |
my $usehttp = &check_http_req(\$furl); |
my $usehttp = &check_http_req(\$furl,$hostname); |
if (($usehttp) && ($hostname ne '')) { |
if (($usehttp) && ($hostname ne '')) { |
$furl='http://'.$hostname.$furl; |
$furl='http://'.$hostname.$furl; |
} else { |
} else { |
Line 481 sub handler {
|
Line 483 sub handler {
|
$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) { |
$usehttp = &check_http_req(\$newloc); |
$usehttp = &check_http_req(\$newloc,$hostname); |
if ($hash{'encrypted_'.$id}) { |
if ($hash{'encrypted_'.$id}) { |
$newloc=&Apache::lonenc::encrypted($newloc); |
$newloc=&Apache::lonenc::encrypted($newloc); |
} |
} |
Line 525 sub handler {
|
Line 527 sub handler {
|
$last=$hash{'last_known'}; |
$last=$hash{'last_known'}; |
untie(%hash); |
untie(%hash); |
} |
} |
my $newloc; |
|
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 { |
Line 624 sub handler {
|
Line 625 sub handler {
|
# ------------------------------------- Check for and display critical messages |
# ------------------------------------- Check for and display critical messages |
my ($redirect, $url) = &Apache::loncommon::critical_redirect(300,'flip'); |
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,$hostname); |
if (($usehttp) && ($hostname ne '')) { |
if (($usehttp) && ($hostname ne '')) { |
$url='http://'.$hostname.$redirecturl; |
$url='http://'.$hostname.$redirecturl; |
} else { |
} else { |
Line 691 $lt{'pick'}:
|
Line 692 $lt{'pick'}:
|
ENDSTART |
ENDSTART |
foreach my $id (@possibilities) { |
foreach my $id (@possibilities) { |
my $src = $multichoicehash{'src_'.$id}; |
my $src = $multichoicehash{'src_'.$id}; |
my $usehttp = &check_http_req(\$src); |
my $usehttp = &check_http_req(\$src,$hostname); |
if (($usehttp) && ($hostname ne '')) { |
if (($usehttp) && ($hostname ne '')) { |
$src = 'http://'.$hostname.$src; |
$src = 'http://'.$hostname.$src; |
} |
} |