version 1.379, 2017/01/28 02:31:51
|
version 1.381, 2017/02/20 18:29:22
|
Line 2201 sub docs_breadcrumbs {
|
Line 2201 sub docs_breadcrumbs {
|
my $foldername=shift(@folders); |
my $foldername=shift(@folders); |
if ($folderpath) {$folderpath.='&';} |
if ($folderpath) {$folderpath.='&';} |
$folderpath.=$folder.'&'.$foldername; |
$folderpath.=$folder.'&'.$foldername; |
my $url; |
my $url = $env{'request.use_absolute'}; |
if ($allowed) { |
if ($allowed) { |
$url = '/adm/coursedocs?folderpath='; |
$url .= '/adm/coursedocs?folderpath='; |
} else { |
} else { |
$url = '/adm/supplemental?folderpath='; |
$url .= '/adm/supplemental?folderpath='; |
} |
} |
$url .= &escape($folderpath); |
$url .= &escape($folderpath); |
my $name=&unescape($foldername); |
my $name=&unescape($foldername); |
Line 3496 ENDUTILITY
|
Line 3496 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); |
my ($jscall,$anchor,$usehttp,$usehttps); |
if ($switchserver) { |
if ($switchserver) { |
if ($home) { |
if ($home) { |
$cfile = '/adm/switchserver?otherserver='.$home.'&role='. |
$cfile = '/adm/switchserver?otherserver='.$home.'&role='. |
Line 3520 sub jump_to_editres {
|
Line 3520 sub jump_to_editres {
|
if ($cfile =~ m{^(/adm/wrapper/ext/[^#]+)#([^#]+)$}) { |
if ($cfile =~ m{^(/adm/wrapper/ext/[^#]+)#([^#]+)$}) { |
$cfile = $1; |
$cfile = $1; |
$anchor = $2; |
$anchor = $2; |
|
} elsif ($cfile =~ m{^/public/($match_domain)/($match_courseid)/syllabus}) { |
|
if ($ENV{'SERVER_PORT'} == 443) { |
|
my ($cdom,$cnum) = ($1,$2); |
|
if (($env{'request.course.id'}) && |
|
($env{'course.'.$env{'request.course.id'}.'.num'} eq $cnum) && |
|
($env{'course.'.$env{'request.course.id'}.'.domain'} eq $cdom)) { |
|
if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://}) { |
|
$usehttp = 1; |
|
} |
|
} |
|
} elsif ($env{'request.use_absolute'}) { |
|
if ($env{'request.use_absolute'} =~ m{^https://}) { |
|
$usehttps = 1; |
|
} |
|
} |
} |
} |
if ($symb) { |
if ($symb) { |
if ($anchor ne '') { |
if ($anchor ne '') { |
Line 3545 sub jump_to_editres {
|
Line 3560 sub jump_to_editres {
|
} |
} |
if ($forceedit) { |
if ($forceedit) { |
$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1'; |
$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1'; |
|
if (($usehttps) && ($hostname ne '')) { |
|
$cfile = 'https://'.$hostname.$cfile; |
|
} |
|
} elsif ($usehttp) { |
|
if ($hostname ne '') { |
|
$cfile = 'http://'.$hostname.$cfile; |
|
} |
|
$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1'; |
} |
} |
if ($forcereg) { |
if ($forcereg) { |
$cfile .= (($cfile=~/\?/)?'&':'?').'register=1'; |
$cfile .= (($cfile=~/\?/)?'&':'?').'register=1'; |