version 1.655, 2018/05/29 19:33:48
|
version 1.657, 2018/12/27 20:10:31
|
Line 4171 END
|
Line 4171 END
|
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
if (($ENV{'SERVER_PORT'} == 443) && |
if (($ENV{'SERVER_PORT'} == 443) && |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
$url .= '?usehttp=1'; |
unless (&Apache::lonnet::uses_sts()) { |
|
$url .= '?usehttp=1'; |
|
} |
$nomodal = 1; |
$nomodal = 1; |
} |
} |
} |
} |
Line 4237 END
|
Line 4239 END
|
$url = $1; |
$url = $1; |
$anchor = $2; |
$anchor = $2; |
if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) { |
if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) { |
if ($hostname ne '') { |
unless (&Apache::lonnet::uses_sts()) { |
$url = 'http://'.$hostname.$url; |
if ($hostname ne '') { |
|
$url = 'http://'.$hostname.$url; |
|
} |
|
$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1'; |
} |
} |
$nomodal = 1; |
$nomodal = 1; |
} |
} |
Line 4246 END
|
Line 4251 END
|
} elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
} elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
if (($ENV{'SERVER_PORT'} == 443) && |
if (($ENV{'SERVER_PORT'} == 443) && |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
if ($hostname ne '') { |
unless (&Apache::lonnet::uses_sts()) { |
$url = 'http://'.$hostname.$url; |
if ($hostname ne '') { |
|
$url = 'http://'.$hostname.$url; |
|
} |
|
$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1'; |
} |
} |
$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1'; |
|
$nomodal = 1; |
$nomodal = 1; |
} |
} |
} |
} |
Line 7272 sub editing_js {
|
Line 7279 sub editing_js {
|
if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
if (($ENV{'SERVER_PORT'} == 443) && |
if (($ENV{'SERVER_PORT'} == 443) && |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
if ($hostname ne '') { |
unless (&Apache::lonnet::uses_sts()) { |
$backtourl = 'http://'.$hostname.$backtourl; |
if ($hostname ne '') { |
|
$backtourl = 'http://'.$hostname.$backtourl; |
|
} |
|
$backtourl .= (($backtourl =~ /\?/) ? '&':'?').'usehttp=1'; |
} |
} |
$backtourl .= (($backtourl =~ /\?/) ? '&':'?').'usehttp=1'; |
|
} |
} |
} elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) { |
} elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) { |
if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) { |
if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) { |
$backtourl = 'http://'.$hostname.$backtourl; |
unless (&Apache::lonnet::uses_sts()) { |
|
$backtourl = 'http://'.$hostname.$backtourl; |
|
} |
} |
} |
} |
} |
if ($anchor ne '') { |
if ($anchor ne '') { |
Line 8116 function showPage(current, pageId, nav,
|
Line 8127 function showPage(current, pageId, nav,
|
current.className = 'right'; |
current.className = 'right'; |
} |
} |
activeTab = ''; |
activeTab = ''; |
|
toggleExternal(); |
toggleUpload(); |
toggleUpload(); |
toggleMap(); |
toggleMap(); |
toggleCrsRes(); |
toggleCrsRes(); |
Line 8128 function showPage(current, pageId, nav,
|
Line 8140 function showPage(current, pageId, nav,
|
currentData = document.getElementById(pageId); |
currentData = document.getElementById(pageId); |
currentData.style.display = 'block'; |
currentData.style.display = 'block'; |
activeTab = pageId; |
activeTab = pageId; |
|
toggleExternal(); |
toggleUpload(); |
toggleUpload(); |
toggleMap(); |
toggleMap(); |
toggleCrsRes(); |
toggleCrsRes(); |