oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 5.5.6. changes

Browse source
This commit is contained in:
JT Smith 2004-04-11 20:46:37 +00:00
parent dc41a0c9ae
commit a8c39c01c1
10 changed files with 63 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/FormProcessor.pm
View file

@ -67,6 +67,10 @@ These functions are available from this package:
=cut
sub _checkEmailAddy {
return ($_[0] =~ /^([A-Z0-9]+[._-]?){1,}([A-Z0-9]+[_-]?)+\@(([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i);
}
#-------------------------------------------------------------------
=head2 checkbox ( name )
@ -211,7 +215,7 @@ The name of the form variable to retrieve.
=cut
sub email {
if ($session{form}{$_[0]} =~ /^([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\@(([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i) {
if (_checkEmailAddy($session{form}{$_[0]})) {
return $session{form}{$_[0]};
}
return undef;
@ -671,7 +675,7 @@ The name of the form variable to retrieve.
sub url {
if ($session{form}{$_[0]} =~ /mailto:/) {
return $session{form}{$_[0]};
} elsif ($session{form}{$_[0]} =~ /^([A-Z0-9]+[._]?){1,}[A-Z0-9]+\@(([A-Z0-9]+[-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i) {
} elsif (_checkEmailAddy($session{form}{$_[0]})) {
return "mailto:".$session{form}{$_[0]};
} elsif ($session{form}{$_[0]} =~ /:\/\//) {
return $session{form}{$_[0]};