if is_email and is_URL are called without a parameter, now $_ will be evaluated

[selfforum.git] / selfforum-cgi / shared / CheckRFC.pm

diff --git a/selfforum-cgi/shared/CheckRFC.pm b/selfforum-cgi/shared/CheckRFC.pm
index d1731d207bf34bd8468b20358d85f0d293dc51f7..b000dcff7f737918538be98882ee8daac16e0bef 100644 (file)
--- a/selfforum-cgi/shared/CheckRFC.pm
+++ b/selfforum-cgi/shared/CheckRFC.pm
@@ -56,8 +56,9 @@ require Exporter;
 #
 # Return: Status code (Bool)
 #
 #
 # Return: Status code (Bool)
 #

-sub is_URL ($@) {
+sub is_URL (;$@) {

   my ($string, @schemes) = @_;
   my ($string, @schemes) = @_;

+  $string = $_ unless defined $string;

   my $scheme;
 
   return unless (defined ($string) and length ($string));
   my $scheme;
 
   return unless (defined ($string) and length ($string));


@@ -96,8 +97,11 @@ sub is_URL ($@) {
 #
 # Return: Status code (Bool)
 #
 #
 # Return: Status code (Bool)
 #

-sub is_email ($;$) {
+sub is_email (;$$) {

   my $string = shift;
   my $string = shift;

+  $string = $_ unless defined $string;
+  return unless defined $string;
+

   my $strict = shift;
 
   # false if any non-ascii chars
   my $strict = shift;
 
   # false if any non-ascii chars


@@ -106,8 +110,6 @@ sub is_email ($;$) {
 
   # remove nested comments
   1 while ($string =~ s/\([^()]*\)//g);
 
   # remove nested comments
   1 while ($string =~ s/\([^()]*\)//g);

-  #$string =~ s/^\s+//;
-  #$string =~ s/\s+$//;

 
   return ($string =~ /^$email[0]$/) unless $strict;
 
 
   return ($string =~ /^$email[0]$/) unless $strict;