version 1.527, 2017/02/18 23:39:16
|
version 1.529, 2017/03/08 02:51:08
|
Line 1688 END
|
Line 1688 END
|
# it contains a syllabus which uses an external URL |
# it contains a syllabus which uses an external URL |
# which points at an http site. |
# which points at an http site. |
|
|
my ($is_ssl,$cdom,$cnum); |
my ($is_ssl,$cdom,$cnum,$hostname); |
if ($ENV{'SERVER_PORT'} == 443) { |
if ($ENV{'SERVER_PORT'} == 443) { |
$is_ssl = 1; |
$is_ssl = 1; |
|
$hostname = $r->hostname(); |
} |
} |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
Line 1831 END
|
Line 1832 END
|
($src,$symb,$anchor)=getLinkForResource($stack); |
($src,$symb,$anchor)=getLinkForResource($stack); |
my $srcHasQuestion = $src =~ /\?/; |
my $srcHasQuestion = $src =~ /\?/; |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
if (($src =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) && ($is_ssl) && |
if (($is_ssl) && ($src =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) && |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
|
if ($hostname ne '') { |
|
$src = 'http://'.$hostname.$src; |
|
} |
$src .= ($srcHasQuestion? '&' : '?') . 'usehttp=1'; |
$src .= ($srcHasQuestion? '&' : '?') . 'usehttp=1'; |
$srcHasQuestion = 1; |
$srcHasQuestion = 1; |
|
} elsif (($is_ssl) && ($src =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) { |
|
if ($hostname ne '') { |
|
$src = 'http://'.$hostname.$src; |
|
} |
} |
} |
} |
} |
if (defined($anchor)) { $anchor='#'.$anchor; } |
if (defined($anchor)) { $anchor='#'.$anchor; } |