[vhffs-dev] [1393] again ;)

[subversion@xxxxxxxxxxxxx]

Revision: 1393
Author:   gradator
Date:     2009-04-12 18:42:39 +0200 (Sun, 12 Apr 2009)

Log Message:
-----------
again ;)

Modified Paths:
--------------
    trunk/vhffs-listengine/src/listengine.pl


Modified: trunk/vhffs-listengine/src/listengine.pl
===================================================================
--- trunk/vhffs-listengine/src/listengine.pl	2009-04-12 13:35:37 UTC (rev 1392)
+++ trunk/vhffs-listengine/src/listengine.pl	2009-04-12 16:42:39 UTC (rev 1393)
@@ -198,7 +198,7 @@
     my $header;
     my $email;
     my ( $message_id  ) =  ($mail->get( 'Message-Id' ) =~ /<(.+)>/);
-    my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?\s*$/ );
+    my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?[^\@]*$/ );
     $from = lc $from;
     my $directory = get_moderation_dir( $list );
     my $subject = $mail->get('Subject');
@@ -674,7 +674,7 @@
 
 	exit -1 if( ! defined $list );
     
-	my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?\s*$/ );
+	my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?[^\@]*$/ );
         $from = lc $from;
 	my $subject = $mail->get('Subject');
 	my $subs = $list->get_members;
@@ -815,7 +815,7 @@
     my $mail = shift;
     my $list = shift;
 
-    my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?\s*$/ );
+    my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?[^\@]*$/ );
     $from = lc $from;
     my $subject = $mail->get('Subject');
     my $action;
@@ -1106,7 +1106,7 @@
 sub get_lang
 {
     my $mail = shift;
-    my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?\s*$/ );
+    my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?[^\@]*$/ );
     $from = lc $from;
 
     my $lang = Vhffs::Services::MailingList::get_language_for_sub( $vhffs , $from );
@@ -1129,7 +1129,7 @@
 	my $list = shift;
 	my $mail = shift;
 
-	my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?\s*$/ );
+	my ( $from ) = ( $mail->get('From') =~ /([^\s\@<"]+\@[^">\@\s]+)>?[^\@]*$/ );
 	exit( 0 ) unless defined $from;
 	exit( 0 ) if( $from eq '' );