loncom/interface/lonhtmlcommon.pm - diff

Return to lonhtmlcommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.377 and 1.400

version 1.377, 2016/11/09 01:58:43	version 1.400, 2021/10/26 02:31:22
Line 78 sub java_not_enabled {	Line 78 sub java_not_enabled {
sub coursepreflink {	sub coursepreflink {
my ($text,$category)=@_;	my ($text,$category)=@_;
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
return '<a target="_top" href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';	my $target =' target="_top"';
	if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
	$target ='';
	}
	return '<a'.$target.' href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';
} else {	} else {
return '';	return '';
}	}
Line 92 sub raw_href_to_link {	Line 96 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 101 sub direct_parm_link {	Line 105 sub direct_parm_link {
$filter=&entity_encode($filter);	$filter=&entity_encode($filter);
$part=&entity_encode($part);	$part=&entity_encode($part);
if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {	if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
return "<a target='_top' href='/adm/parmset?symb=$symb&filter=$filter&part=$part'><span class='LC_setting'>$linktext</span></a>";	my $target=' target="_top"';
	if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
	$target='';
	}
	return "<a".$target." href=\"/adm/parmset?symb=$symb&filter=$filter&part=$part\"><span class=\"LC_setting\">$linktext</span></a>";
} else {	} else {
return $linktext;	return $linktext;
}	}
}	}
##############################################	##############################################
Line 407 sub textbox {	Line 415 sub textbox {
##############################################	##############################################
##############################################	##############################################
sub checkbox {	sub checkbox {
my ($name,$checked,$value) = @_;	my ($name,$checked,$value,$special) = @_;
my $Str = '<input type="checkbox" name="'.$name.'" ';	my $Str = '<input type="checkbox" name="'.$name.'" ';
if (defined($value)) {	if (defined($value)) {
$Str .= 'value="'.$value.'"';	$Str .= 'value="'.$value.'"';
Line 415 sub checkbox {	Line 423 sub checkbox {
if ($checked) {	if ($checked) {
$Str .= ' checked="checked"';	$Str .= ' checked="checked"';
}	}
$Str .= ' />';	$Str .= $special.' />';
return $Str;	return $Str;
}	}

Line 858 parameter setting wizard.	Line 866 parameter setting wizard.
##############################################	##############################################
sub pjump_javascript_definition {	sub pjump_javascript_definition {
my $Str = <<END;	my $Str = <<END;
function pjump(type,dis,value,marker,ret,call,hour,min,sec) {	function pjump(type,dis,value,marker,ret,call,hour,min,sec,extra) {
openMyModal("/adm/rat/parameter.html?type="+escape(type)	openMyModal("/adm/rat/parameter.html?type="+escape(type)
+"&value="+escape(value)+"&marker="+escape(marker)	+"&value="+escape(value)+"&marker="+escape(marker)
+"&return="+escape(ret)	+"&return="+escape(ret)
+"&call="+escape(call)+"&name="+escape(dis)	+"&call="+escape(call)+"&name="+escape(dis)
+"&defhour="+escape(hour)+"&defmin="+escape(min)	+"&defhour="+escape(hour)+"&defmin="+escape(min)
+"&defsec="+escape(sec)+"&modal=1",350,350,'no');	+"&defsec="+escape(sec)+"&extra="+escape(extra)
	+"&modal=1",350,350,'no');
}	}
END	END
return $Str;	return $Str;
Line 1025 data structure used for bookkeeping.	Line 1034 data structure used for bookkeeping.

=item $number_to_do The total number of items being processed.	=item $number_to_do The total number of items being processed.

	=item $preamble Optional HTML to display before the progress bar.

=back	=back

=back	=back

Returns a hash containing the progress state data structure.	Returns a hash containing the progress state data structure.
	If $number_to_do is zero or null, an indeterminate progress bar will
	be used.

=item &Update_PrgWin()	=item &Update_PrgWin()

Line 1118 Returns: none	Line 1131 Returns: none

# Create progress	# Create progress
sub Create_PrgWin {	sub Create_PrgWin {
my ($r,$number_to_do)=@_;	my ($r,$number_to_do,$preamble)=@_;
my %prog_state;	my %prog_state;
$prog_state{'done'}=0;	$prog_state{'done'}=0;
$prog_state{'firststart'}=&Time::HiRes::time();	$prog_state{'firststart'}=&Time::HiRes::time();
$prog_state{'laststart'}=&Time::HiRes::time();	$prog_state{'laststart'}=&Time::HiRes::time();
$prog_state{'max'}=$number_to_do;	$prog_state{'max'}=$number_to_do;
&Apache::loncommon::LCprogressbar($r);	&Apache::loncommon::LCprogressbar($r,$prog_state{'max'},$preamble);
return %prog_state;	return %prog_state;
}	}

# update progress	# update progress
sub Update_PrgWin {	sub Update_PrgWin {
my ($r,$prog_state,$displayString)=@_;	my ($r,$prog_state,$displayString)=@_;
&Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString);	&Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString,$$prog_state{'max'});
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1181 sub Increment_PrgWin {	Line 1194 sub Increment_PrgWin {
if ($$prog_state{'max'}) {	if ($$prog_state{'max'}) {
$percent=int(100.*$current/$$prog_state{'max'});	$percent=int(100.*$current/$$prog_state{'max'});
}	}
&Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo);	&Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo,$$prog_state{'max'});
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1218 sub crumbs {	Line 1231 sub crumbs {
} else {	} else {
$path.='/';	$path.='/';
}	}
	if ($path eq '/res/') {
	unless (&Apache::lonnet::allowed('bre',$path)) {
	$output.="$dir/";
	next;
	}
	}
my $href_path = &HTML::Entities::encode($path,'<>&"');	my $href_path = &HTML::Entities::encode($path,'<>&"');
&Apache::loncommon::inhibit_menu_check(\$href_path);	&Apache::loncommon::inhibit_menu_check(\$href_path);
if ($form) {	if ($form) {
Line 1295 sub htmlareaheaders {	Line 1314 sub htmlareaheaders {
ENDEDITOR	ENDEDITOR
}	}
$s.=(<<ENDJQUERY);	$s.=(<<ENDJQUERY);
<script type="text/javascript" src="/adm/jQuery/js/jquery-1.11.3.min.js"></script>	<script type="text/javascript" src="/adm/jQuery/js/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.11.4.custom.min.js"></script>	<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.12.1.custom.min.js"></script>
<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.11.4.custom.css" />	<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.12.1.custom.min.css" />
<script type="text/javascript" src="/adm/jpicker/js/jpicker-1.1.6.min.js" >	<script type="text/javascript" src="/adm/jpicker/js/jpicker-1.1.6.min.js" >
</script>	</script>
<link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />	<link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />
Line 1334 $(document).ready(function(){	Line 1353 $(document).ready(function(){
});';	});';
}	}

	sub countdown {

	# Code to put a due date countdown in 'duedatecountdown' span.
	# This is currently located in the breadcrumb headers.
	# note that the dueDateLayout is internatinoalized below.
	# Here document is used to support the substitution into the javascript below.
	# ..which unforunately necessitates escaping the $'s in the javascript.
	# There are several times of importance
	#
	# serverDueDate - The absolute time at which the problem expires.
	# serverTime - The server's time when the problem finished computing.
	# clientTime - The client's time...as close to serverTime as possible.
	# The clientTime will be slightly later due to
	# 1. The latency between problem computation and
	# the first network action.
	# 2. The time required between the page load-start and the actual
	# initial javascript execution that got clientTime.
	# These are used as follows:
	# The difference between clientTime and serverTime are used to
	# correct for differences in clock settings between the browser's system and the
	# server's.
	#
	# The difference between clientTime and the time at which the ready() method
	# starts executing is used to estimate latencies for page load and submission.
	# Since this is an estimate, it is doubled. The latency estimate + one minute
	# is used to determine when the countdown timer turns red to warn the user
	# to think about submitting.


	my $dueDateLayout = &mt('Due in: {dn} {dl} {hnn}{sep}{mnn}{sep}{snn} [_1]',
	"<span id='submitearly'></span>");
	my $early = '- <b>'.&mt('Submit Early').'</b>';
	my $pastdue = '- <b>'.&mt('Past Due').'</b>';
	return <<"JAVASCRIPT";

	var documentReadyTime;

	\$(document).ready(function() {
	if (typeof(dueDate) != "undefined") {
	documentReadyTime = (new Date()).getTime();
	\$("#duedatecountdown").countdown({until: dueDate, compact: true,
	layout: "$dueDateLayout",
	onTick: function (periods) {
	var latencyEstimate = (documentReadyTime - clientTime) * 2;
	if(\$.countdown.periodsToSeconds(periods) < (300 + latencyEstimate)) {
	\$("#submitearly").html("$early");
	if (\$.countdown.periodsToSeconds(periods) < 1) {
	\$("#submitearly").html("$pastdue");
	}
	}
	if(\$.countdown.periodsToSeconds(periods) < (60 + latencyEstimate)) {
	\$(this).css("color", "red"); //Highlight last minute.
	}
	}
	});
	}
	});

	JAVASCRIPT

	}

# ----------------------------------------- Script to activate only some fields	# ----------------------------------------- Script to activate only some fields

sub htmlareaselectactive {	sub htmlareaselectactive {
Line 1557 sub htmlareaselectactive {	Line 1638 sub htmlareaselectactive {

});	});
';	';
$output .= &color_picker;	$output .= &color_picker();

# Code to put a due date countdown in 'duedatecountdown' span.
# This is currently located in the breadcrumb headers.
# note that the dueDateLayout is internatinoalized below.
# Here document is used to support the substitution into the javascript below.
# ..which unforunately necessitates escaping the $'s in the javascript.
# There are several times of importance
#
# serverDueDate - The absolute time at which the problem expires.
# serverTime - The server's time when the problem finished computing.
# clientTime - The client's time...as close to serverTime as possible.
# The clientTime will be slightly later due to
# 1. The latency between problem computation and
# the first network action.
# 2. The time required between the page load-start and the actual
# initial javascript execution that got clientTime.
# These are used as follows:
# The difference between clientTime and serverTime are used to
# correct for differences in clock settings between the browser's system and the
# server's.
#
# The difference between clientTime and the time at which the ready() method
# starts executing is used to estimate latencies for page load and submission.
# Since this is an estimate, it is doubled. The latency estimate + one minute
# is used to determine when the countdown timer turns red to warn the user
# to think about submitting.

my $dueDateLayout = &mt('Due in: {dn} {dl} {hnn}{sep}{mnn}{sep}{snn} [_1]',	$output .= &countdown();
"<span id='submitearly'></span>");
my $early = '- <b>'.&mt('Submit Early').'</b>';
my $pastdue = '- <b>'.&mt('Past Due').'</b>';
$output .= <<JAVASCRIPT;

var documentReadyTime;	$output .= <<"JAVASCRIPT";

\$(document).ready(function() {
if (typeof(dueDate) != "undefined") {
documentReadyTime = (new Date()).getTime();
\$("#duedatecountdown").countdown({until: dueDate, compact: true,
layout: "$dueDateLayout",
onTick: function (periods) {
var latencyEstimate = (documentReadyTime - clientTime) * 2;
if(\$.countdown.periodsToSeconds(periods) < (300 + latencyEstimate)) {
\$("#submitearly").html("$early");
if (\$.countdown.periodsToSeconds(periods) < 1) {
\$("#submitearly").html("$pastdue");
}
}
if(\$.countdown.periodsToSeconds(periods) < (60 + latencyEstimate)) {
\$(this).css("color", "red"); //Highlight last minute.
}
}
});
}
});

/* This code describes the spellcheck options that will be used for	/* This code describes the spellcheck options that will be used for
items with class 'spellchecked'. It is necessary for those objects'	items with class 'spellchecked'. It is necessary for those objects'
Line 1721 sub show_return_link {	Line 1751 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 1886 returns: nothing	Line 1916 returns: nothing
#	#
# The first one should be the course or a menu link	# The first one should be the course or a menu link
if (!defined($menulink)) { $menulink=1; }	if (!defined($menulink)) { $menulink=1; }
if ((($crstype eq 'Placement') \|\| (($env{'request.course.id'}) &&	if ($menulink) {
($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement'))) &&	if ($env{'request.course.id'}) {
(!$env{'request.role.adv'})) {	my ($menucoll,$deeplinkmenu,$menuref) = &Apache::loncommon::menucoll_in_effect();
undef($menulink);	if (($menucoll) && (ref($menuref) eq 'HASH')) {
	if ($menuref->{'main'} eq 'n') {
	undef($menulink);
	}
	}
	}
}	}
if ($menulink) {	if ($menulink) {
my $description = 'Menu';	my $description = 'Menu';
Line 1901 returns: nothing	Line 1936 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 1909 returns: nothing	Line 1944 returns: nothing
}	}
}	}
}	}
	my $target = '_top';
	if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
	$target='';
	}
$menulink = { href =>'/adm/menu',	$menulink = { href =>'/adm/menu',
title =>'Go to main menu',	title =>'Go to main menu',
target =>'_top',	target =>$target,
text =>$description,	text =>$description,
no_mt =>$no_mt_descr, };	no_mt =>$no_mt_descr, };
if($last) {	if($last) {
Line 1930 returns: nothing	Line 1969 returns: nothing
class => 'LC_menubuttons_link',	class => 'LC_menubuttons_link',
};	};
if ($env{'request.noversionuri'} eq '/adm/searchcat') {	if ($env{'request.noversionuri'} eq '/adm/searchcat') {
$hashref->{'target'} = '_top';	$hashref->{'target'} = '_top';
	if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
	$hashref->{'target'} = '';
	}
}	}
$links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',	$links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',
$hashref);	$hashref);
Line 2200 sub docs_breadcrumbs {	Line 2242 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 2629 sub course_custom_roles {	Line 2671 sub course_custom_roles {


sub resource_info_box {	sub resource_info_box {
my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)=@_;	my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres)=@_;
my $return='';	my $return='';
if ($stuvcurrent ne '') {	if (($stuvcurrent ne '') \|\| ($divforres)) {
$return = '<div class="LC_left_float">';	$return = '<div class="LC_left_float">';
}	}
if ($symb) {	if ($symb) {
Line 2660 sub resource_info_box {	Line 2702 sub resource_info_box {
} else {	} else {
$return='<p><span class="LC_error">'.&mt('No context provided.').'</span></p>';	$return='<p><span class="LC_error">'.&mt('No context provided.').'</span></p>';
}	}
if ($stuvcurrent ne '') {	if (($stuvcurrent ne '') \|\| ($divforres)) {
$return .= '</div>';	$return .= '</div>';
}	}
return $return;	return $return;
Line 3391 PARAMSONE	Line 3433 PARAMSONE
if (itemid != null) {	if (itemid != null) {
itemh = itemid.offsetHeight;	itemh = itemid.offsetHeight;
}	}
var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;	var primaryheight = 0;
var secondaryheight;	if (document.getElementById('LC_nav_bar') != null) {
	primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
	}
	var secondaryheight = 0;
if (document.getElementById('LC_secondary_menu') != null) {	if (document.getElementById('LC_secondary_menu') != null) {
secondaryheight = document.getElementById('LC_secondary_menu').offsetHeight;	secondaryheight = document.getElementById('LC_secondary_menu').offsetHeight;
}	}
var crumbsheight = document.getElementById('LC_breadcrumbs').offsetHeight;	var crumbsheight = 0;
	if (document.getElementById('LC_breadcrumbs') != null) {
	crumbsheight = document.getElementById('LC_breadcrumbs').offsetHeight;
	}
var dccidheight = 0;	var dccidheight = 0;
if (document.getElementById('dccid') != null) {	if (document.getElementById('dccid') != null) {
dccidheight = document.getElementById('dccid').offsetHeight;	dccidheight = document.getElementById('dccid').offsetHeight;
Line 3476 function go(url) {	Line 3524 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();
	if (lcHostname!='' && lcHostname!= null) {
	var RegExp = /^https?\:/;
	if (RegExp.test(url)) {
	window.location.href=url;
	} else {
	window.location.href=lcHostname+url;
	}
	} else {
	window.location.href=url;
	}
}	}
}	}

Line 3495 ENDUTILITY	Line 3553 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,$is_ext);
if ($switchserver) {	if ($switchserver) {
if ($home) {	if ($home) {
$cfile = '/adm/switchserver?otherserver='.$home.'&role='.	$cfile = '/adm/switchserver?otherserver='.$home.'&role='.
Line 3516 sub jump_to_editres {	Line 3574 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)) {
	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
	$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) {
	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://}) {
	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
	$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 3544 sub jump_to_editres {	Line 3630 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) {
	if ($hostname ne '') {
	$cfile = 'http://'.$hostname.(($cfile =~ /^\//)? '':'/').$cfile;
	}
	$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';
Line 3570 sub jump_to_editres {	Line 3666 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})(\\]?)$"; //"

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.377
changed lines
	Added in v.1.400