Changeset 493

Timestamp:

10/05/09 07:09:18 (15 years ago)

Author:

nanardon

Message:

• fix forward modification in database (due to swith string => array)

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• Aliases.pm (modified) (2 diffs)
• User.pm (modified) (6 diffs)
• objects.pm (modified) (1 diff)

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

@@ -61 +61 @@
 sub _create {
     my ($class, $base, $id, %data) = @_;
+    $data{'forward'} = [ $data{'forward'} ] unless(ref $data{'forward'});
     my $sth = $base->db->prepare_cached(q{
         select name from aliases where lower(name) = lower(?)
@@ -132 +133 @@
 }
 
+sub set_fields {
+    my ($self, %attrs) = @_;
+    foreach (keys %attrs) {
+        /^forward$/ and do {
+            $attrs{$_} = [ $attrs{$_} ] unless(ref $attrs{$_});
+        };
+    }
+    $self->SUPER::set_fields(%attrs);
+}
+
 1;
 

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

@@ -66 +66 @@
         memberOf        => 'memberOf',
         forward => 'forward',
+        aliases => 'aliases',
         (map { $_ => $_ } $self->_address_fields),
         (map { $_ => $_ } $self->_office_address_fields),
@@ -80 +81 @@
         otheraddress => 'otheraddress',
         mainaddress => 'mainaddress',
-        aliases => 'aliases',
         revaliases => 'revaliases',
+        postalAddress => 'postalAddress',
         facsimileTelephoneNumber => 'facsimileTelephoneNumber',
         ) : ()),
@@ -197 +198 @@
         $sth->finish;
         return $res->{name};
-    } elsif (grep { $field eq $_ } __PACKAGE__->_address_fields(), $self->_office_address_fields) {
+    } elsif (grep { $field eq $_ } __PACKAGE__->_address_fields(),
+        $self->_office_address_fields, 'postalAddress') {
         if (my $fmainaddress = $self->get_c_field('mainaddress')) {
             my $address = $self->base->get_object('address', $fmainaddress);
@@ -210 +212 @@
     } elsif ($field eq 'aliases') {
         my $sth = $self->db->prepare(q{
-            select name from aliases where array[lower($1)] <@
+            select name from aliases where array[lower($1)] =
                 string_to_array(lower(array_to_string("forward", ',')), ',')
         } . ($self->base->{wexported} ? '' : 'and exported = true'));
@@ -296 +298 @@
             next;
         };
+        $attr =~ /^aliases$/ and do {
+            my %aliases = map { $_ => 1 } @{$data{$attr}};
+            foreach ($self->get_attributes('aliases')) {
+                $aliases{$_} ||= 0;
+                $aliases{$_} +=2;
+            }
+            foreach (keys %aliases) {
+                if ($aliases{$_} == 2) {
+                    warn "del $_";
+                } elsif ($aliases{$_} == 1) {
+                    warn "new $_";
+                } # 3 no change
+            }
+            next;
+        };
         grep { $attr eq $_ } (__PACKAGE__->_office_address_fields, __PACKAGE__->_address_fields()) and do {
             my $fmainaddress = $self->_get_c_field('mainaddress');
@@ -311 +328 @@
             }
             if (my $address = $self->base->get_object('address', $fmainaddress)) {
-                $res += $address->set_c_fields($attr => $data{$attr});
+                $res += $address->set_c_fields($attr => $data{$attr}) ||0;
             }
             next;

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

@@ -30 +30 @@
 # This fields are special in sense they may come from site field
 sub _address_fields { qw(co l postalCode streetAddress postOfficeBox st
-    facsimileTelephoneNumber o postalAddress) }
+    facsimileTelephoneNumber o) }
 
 =head1 FUNCTIONS