version 1.380, 2017/02/18 23:39:16
|
version 1.381, 2017/02/20 18:29:22
|
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,$usehttp); |
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 3530 sub jump_to_editres {
|
Line 3530 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 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) { |
} elsif ($usehttp) { |
|
if ($hostname ne '') { |
|
$cfile = 'http://'.$hostname.$cfile; |
|
} |
$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1'; |
$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1'; |
} |
} |
if ($forcereg) { |
if ($forcereg) { |