Changeset 308 for LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad/Group.pm

Timestamp:

08/06/09 17:57:36 (15 years ago)

Author:

nanardon

Message:

• factorize code

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad/Group.pm (modified) (4 diffs)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad/Group.pm

@@ -71 +71 @@
     my %delayed;
     foreach (keys %data) {
-        /^(memberUID|member|sAMAccountName|managedBy)$/ and do {
+        /^(memberUID|member)$/ and do {
             $delayed{$_} = $data{$_};
             next;
         };
-        $class->_populate_entry($entry, $_, $data{$_});
+        $class->_populate_entry($entry, $_, $data{$_}, $base);
     }
     my $msg = $base->ldap->add($entry);
@@ -111 +111 @@
 }
 
+sub _populate_entry {
+    my ($self, $entry, $field, $value, $base) = @_;
+    $base ||= $self->base;
+    for ($field) {
+        /managedBy$/ and do {
+            if ($value && (my $user = $base->get_object('user', $value))) {
+                $value = $user->get_field('dn');
+            } else {
+                $value = undef;
+            }
+            next;
+        };
+        /^sAMAccountName$/ and do {
+            # Hack... to avoid clash with user
+            if ($value !~ /^GR-/) {
+                $value = 'GR-' . $value;
+            }
+            next;
+        };
+    }
+}
+
 sub set_fields {
     my ($self, %data) = @_;
     my %ndata;
     while (my ($f, $val) = each(%data)) {
-        $f eq 'managedBy' and do {
-            if ($val) {
-                my $user = $self->base->get_object('user', $val) or next;
-                $ndata{$f} = $user->get_field('dn');
-            } else {
-                $ndata{$f} = undef;
-            }
-            next;
-        };
         $f eq 'memberUID' and do {
             my %users;
@@ -136 +149 @@
                     $self->{entry}->add(memberUID => $_);
                 } # else {} # can't happen
-                my $mesg = $self->{entry}->update($self->base->ldap);
             }
             next;
@@ -154 +166 @@
             }
             next;
-        };
-        $f eq 'sAMAccountName' and do {
-            # Hack... to avoid clash with user
-            if ($val =~ /^GR-/) {
-                $ndata{$f} = $val;
-            } else {
-                $ndata{$f} = 'GR-' . $val;
-            }
-            next;
         };
         $ndata{$f} = $val;