version 1.382, 2017/02/25 19:48:33
|
version 1.388, 2017/08/03 16:22:09
|
Line 92 sub raw_href_to_link {
|
Line 92 sub raw_href_to_link {
|
|
|
sub entity_encode { |
sub entity_encode { |
my ($text)=@_; |
my ($text)=@_; |
return &HTML::Entities::encode($text, '<>&"'); |
return &HTML::Entities::encode($text, '\'<>&"'); |
} |
} |
|
|
sub direct_parm_link { |
sub direct_parm_link { |
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|ext\.tool)($|\?)}) |
)); |
)); |
} |
} |
|
|
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 3497 ENDUTILITY
|
Line 3498 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,$hostname,$idx,$suppurl,$todocs,$suppanchor) = @_; |
$title,$hostname,$idx,$suppurl,$todocs,$suppanchor) = @_; |
my ($jscall,$anchor,$usehttp,$usehttps); |
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; |
|
$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}) { |
} 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); |
Line 3567 sub jump_to_editres {
|
Line 3577 sub jump_to_editres {
|
if ($hostname ne '') { |
if ($hostname ne '') { |
$cfile = 'http://'.$hostname.(($cfile =~ /^\//)? '':'/').$cfile; |
$cfile = 'http://'.$hostname.(($cfile =~ /^\//)? '':'/').$cfile; |
} |
} |
$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1'; |
unless ($is_ext) { |
|
$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1'; |
|
} |
} elsif ($usehttps) { |
} elsif ($usehttps) { |
$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile; |
$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile; |
} |
} |
Line 3596 sub jump_to_editres {
|
Line 3608 sub jump_to_editres {
|
# javascript_valid_email |
# javascript_valid_email |
# |
# |
# Generates javascript to validate an e-mail address. |
# Generates javascript to validate an e-mail address. |
# Returns a javascript function which accetps a form field as argumnent, and |
# Returns a javascript function which accepts a form field as argument, and |
# returns false if field.value does not satisfy two regular expression matches |
# returns false if field.value does not satisfy two regular expression matches |
# for a valid e-mail address. Backwards compatible with old browsers without |
# for a valid e-mail address. Backwards compatible with old browsers without |
# support for javascript RegExp (just checks for @ in field.value in this case). |
# support for javascript RegExp (just checks for @ in field.value in this case). |
|
|
sub javascript_valid_email { |
sub javascript_valid_email { |
my $scripttag .= <<'END'; |
my $scripttag .= <<'END'; |
function validmail(field) { |
function validmail(field,suffix) { |
var str = field.value; |
var str = field.value; |
|
if (suffix != '' && suffix != undefined) { |
|
str += suffix; |
|
} |
if (window.RegExp) { |
if (window.RegExp) { |
var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)"; |
var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)"; |
var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //" |
var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //" |