version 1.380, 2017/02/18 23:39:16
|
version 1.385, 2017/05/07 13:57:58
|
Line 1727 sub show_return_link {
|
Line 1727 sub show_return_link {
|
(($env{'request.noversionuri'}=~/^\/adm\//) && |
(($env{'request.noversionuri'}=~/^\/adm\//) && |
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && |
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && |
($env{'request.noversionuri'}!~ |
($env{'request.noversionuri'}!~ |
m{^/adm/.*/(smppg|bulletinboard|exttools?)($|\?)}) |
m{^/adm/.*/(smppg|bulletinboard|exttool)($|\?)}) |
)); |
)); |
} |
} |
|
|
Line 1902 returns: nothing
|
Line 1902 returns: nothing
|
$env{'course.'.$env{'request.course.id'}.'.description'}; |
$env{'course.'.$env{'request.course.id'}.'.description'}; |
$no_mt_descr = 1; |
$no_mt_descr = 1; |
if ($env{'request.noversionuri'} =~ |
if ($env{'request.noversionuri'} =~ |
m{^/public/($match_domain)/($match_courseid)/syllabus$}) { |
m{^/?public/($match_domain)/($match_courseid)/syllabus$}) { |
unless (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $1) && |
unless (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $1) && |
($env{'course.'.$env{'request.course.id'}.'.num'} eq $2)) { |
($env{'course.'.$env{'request.course.id'}.'.num'} eq $2)) { |
$description = 'Menu'; |
$description = 'Menu'; |
Line 3477 function go(url) {
|
Line 3477 function go(url) {
|
if (url!='' && url!= null) { |
if (url!='' && url!= null) { |
currentURL = null; |
currentURL = null; |
currentSymb= null; |
currentSymb= null; |
window.location.href=url; |
var lcHostname = setLCHost(); |
|
window.location.href=lcHostname+url; |
} |
} |
} |
} |
|
|
Line 3496 ENDUTILITY
|
Line 3497 ENDUTILITY
|
|
|
sub jump_to_editres { |
sub jump_to_editres { |
my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath, |
my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath, |
$title,$idx,$suppurl,$todocs,$suppanchor) = @_; |
$title,$hostname,$idx,$suppurl,$todocs,$suppanchor) = @_; |
my ($jscall,$anchor,$usehttp); |
my ($jscall,$anchor,$usehttp,$usehttps,$is_ext); |
if ($switchserver) { |
if ($switchserver) { |
if ($home) { |
if ($home) { |
$cfile = '/adm/switchserver?otherserver='.$home.'&role='. |
$cfile = '/adm/switchserver?otherserver='.$home.'&role='. |
Line 3517 sub jump_to_editres {
|
Line 3518 sub jump_to_editres {
|
} |
} |
} else { |
} else { |
unless ($cfile =~ m{^/priv/}) { |
unless ($cfile =~ m{^/priv/}) { |
if ($cfile =~ m{^(/adm/wrapper/ext/[^#]+)#([^#]+)$}) { |
if ($cfile =~ m{^(/adm/wrapper/ext/([^#]+))#([^#]+)$}) { |
$cfile = $1; |
$cfile = $1; |
$anchor = $2; |
my $extlink = $2; |
} elsif ($cfile =~ m{^/public/($match_domain)/($match_courseid)/syllabus}) { |
$anchor = $3; |
|
$is_ext = 1; |
|
if (($extlink !~ /^https:/) && ($ENV{'SERVER_PORT'} == 443)) { |
|
$usehttp = 1; |
|
} elsif ($env{'request.use_absolute'}) { |
|
if ($env{'request.use_absolute'} =~ m{^https://}) { |
|
$usehttps = 1; |
|
} |
|
} |
|
} elsif ($cfile =~ m{^/?public/($match_domain)/($match_courseid)/syllabus}) { |
if ($ENV{'SERVER_PORT'} == 443) { |
if ($ENV{'SERVER_PORT'} == 443) { |
my ($cdom,$cnum) = ($1,$2); |
my ($cdom,$cnum) = ($1,$2); |
if (($env{'request.course.id'}) && |
if (($env{'request.course.id'}) && |
Line 3530 sub jump_to_editres {
|
Line 3540 sub jump_to_editres {
|
$usehttp = 1; |
$usehttp = 1; |
} |
} |
} |
} |
|
} elsif ($env{'request.use_absolute'}) { |
|
if ($env{'request.use_absolute'} =~ m{^https://}) { |
|
$usehttps = 1; |
|
} |
} |
} |
} |
} |
if ($symb) { |
if ($symb) { |
Line 3556 sub jump_to_editres {
|
Line 3570 sub jump_to_editres {
|
} |
} |
if ($forceedit) { |
if ($forceedit) { |
$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1'; |
$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1'; |
|
if ($usehttps) { |
|
$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile; |
|
} |
} elsif ($usehttp) { |
} elsif ($usehttp) { |
$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1'; |
if ($hostname ne '') { |
|
$cfile = 'http://'.$hostname.(($cfile =~ /^\//)? '':'/').$cfile; |
|
} |
|
unless ($is_ext) { |
|
$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1'; |
|
} |
|
} elsif ($usehttps) { |
|
$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile; |
} |
} |
if ($forcereg) { |
if ($forcereg) { |
$cfile .= (($cfile=~/\?/)?'&':'?').'register=1'; |
$cfile .= (($cfile=~/\?/)?'&':'?').'register=1'; |