Changeset 462

Timestamp:

09/30/09 23:01:36 (15 years ago)

Author:

nanardon

Message:

• manage several destinations in aliases

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Mail/Aliases.pm (modified) (2 diffs)
• Sql/Aliases.pm (modified) (2 diffs)

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

@@ -32 +32 @@
 sub get_field {
     my ($self, $field) = @_;
-    $field eq 'forward' and return $self->base->{aliases}{$self->id};
+    $field eq 'forward' and return
+        [ split(',', $self->base->{aliases}{$self->id}) ];
     return
 }
@@ -39 +40 @@
     my ($self, %data) = @_;
     if ($data{forward}) {
-        $self->base->{aliases}{$self->id} = $data{forward};
+        $self->base->{aliases}{$self->id} = ref $data{forward}
+            ? join(',', @{$data{forward}}),
+            : $data{forward};
         return 1;
     }

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Aliases.pm

@@ -89 +89 @@
             if (my $res = $sth->fetchrow_hashref) {
                 $next = $res->{forward};
+                $next = ref $next
+                    ? join(',', @$next)
+                    : $next;
                 next;
             } else {
@@ -99 +102 @@
     if ($field =~ /^(parents|anyparents|sameforward|samedestination)$/) {
         my $sth = $self->db->prepare_cached(q{
-            select name from aliases where lower(forward) = lower($1)
+            select name from aliases where array[lower($1)] <@
+                string_to_array(lower(array_to_string("forward", ',')), ',')
             });
         my @tocheck = ($field =~ /^sameforward$/