Changeset 351

Timestamp:

08/17/09 02:26:01 (15 years ago)

Author:

nanardon

Message:

• fix Mail base parsing

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Mail.pm (modified) (2 diffs)
• Mail/Revaliases.pm (modified) (1 diff)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Mail.pm

@@ -34 +34 @@
             $line =~ s/^\s*#.*//;
             $line or next;
-            my ($name, $forward) = $line =~ /^([^:]+):\s*(.*)$/;
+            my ($name, $forward) = $line =~ /^([^:]+):?\s*(.*)$/;
             $name or do {
                 next;
             };
+            $forward or next;
             $self->{aliases}{$name} = $forward;
         }
@@ -50 +51 @@
         while (my $line = <$handle>) {
             chomp($line);
-            $line =~ s/^#.*//;
-            my ($name, $as) = $line =~ /^([^:]+):(.*)$/;
+            $line =~ s/^\s*#.*//;
+            my ($name, $as) = $line =~ /^(\S+)(?::\s*|\s+)(\S+)$/;
+            $name or next;
+            $as or do { warn $line; next};
             $self->{revaliases}{$name} = $as;
         }

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Mail/Revaliases.pm

@@ -32 +32 @@
 sub get_field {
     my ($self, $field) = @_;
-    $field eq 'as' and return $self->base->{aliases}{$self->id};
+    $field eq 'as' and return $self->base->{revaliases}{$self->id};
     return
 }