Changeset 1076 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/OCHelper/User.pm

Timestamp:

07/25/12 09:52:11 (12 years ago)

Author:

nanardon

Message:

Factorize default value computation

This avoid the difference of behavior between OCHelper and direct object
creation.

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/OCHelper/User.pm (modified) (2 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/OCHelper/User.pm

@@ -59 +59 @@
         push(@{$info->{ask}}, 'uidNumber');
         push(@{$info->{ask}}, 'gidNumber');
-        my $mailid = $info->{contents}{givenName} && $info->{contents}{sn}
-            ? sprintf('%s.%s',
-                to_ascii(lc($info->{contents}{givenName})),
-                to_ascii(lc($info->{contents}{sn})),)
-            : undef;
-        $mailid =~ s/ /-/g if ($mailid); # replace space by '-' in mail
-        push(@{$info->{ask}}, 'mail');
-        $info->{contents}{mail} = $mailid && $self->base->{defattr}{'user.maildomain'}
-            ? sprintf('%s@%s', $mailid,
-                $self->base->{defattr}{'user.maildomain'})
-            : undef;
+
+       my %default = $self->base->compute_default(
+            'user', $login || '',
+            %{ $info->{contents} || {} }
+        );
+
+        if ($default{mail}) {
+            push(@{$info->{ask}}, 'mail');
+            $info->{contents}{mail} = $default{mail};
+        }
         if (my $attr = $self->base->attribute('user', 'aliases')) {
             if (!$attr->ro) {
                 push(@{$info->{ask}}, 'aliases');
-                $info->{contents}{aliases} = $mailid
+                $info->{contents}{aliases} = $default{aliases};
             }
         }
@@ -79 +78 @@
             if (!$attr->ro) {
                 push(@{$info->{ask}}, 'revaliases');
-                $info->{contents}{revaliases} = $mailid
+                $info->{contents}{revaliases} = $default{revaliases};
             }
         }