Changeset 317 for LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

08/09/09 23:40:07 (15 years ago)

Author:

nanardon

Message:

• don't cache db connection at this level

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Ad/User.pm (modified) (1 diff)
• Objects.pm (modified) (5 diffs)
• Sql/User.pm (modified) (1 diff)

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

@@ -219 +219 @@
     my $newUniPW = $charmap->tou('"'.$clear_pass.'"')->byteswap()->utf16();
     my $mesg = $self->base->ldap->modify(
-        $self->get_c_field('dn'),
+        $self->_get_c_field('dn'),
         changes => [
         #replace => [ userPassword => $clear_pass ],

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

@@ -192 +192 @@
 sub get_c_field {
     my ($self, $cfield) = @_;
+    $self->base->check_acl($self, $cfield, 'r') or return;
+    $self->_get_c_field($cfield);
+}
+
+sub _get_c_field {
+    my ($self, $cfield) = @_;
     my $field = $self->base->get_field_name($self->type, $cfield, 'r') or return;
-    $self->base->check_acl($self, $cfield, 'r') or return;
     $self->get_field($field);
 }
@@ -220 +225 @@
         $self->base->check_acl($self, $cfield, 'w') or return;
     }
+    $self->_set_c_fields(%cdata);
+}
+
+sub _set_c_fields {
+    my ($self, %cdata) = @_;
+    my %data;
     foreach my $cfield (keys %cdata) {
         my $field = $self->base->get_field_name($self->type, $cfield) or next;
@@ -280 +291 @@
             my $value = $field->{val};
             $base->get_field_name($class->type, $field->{attr}, 'r') or next;
-            my $fval = $obj->get_c_field($field->{attr}) || '';
+            my $fval = $obj->_get_c_field($field->{attr}) || '';
             if ($value eq '*') {
                 if ($fval eq '') {
@@ -314 +325 @@
     foreach my $id ($base->list_objects($class->type)) {
         my $obj = $base->get_object($class->type, $id);
-        my $value = $obj->get_c_field($attribute);
+        my $value = $obj->_get_c_field($attribute);
         if ($value) {
             if (ref $value) {
@@ -341 +352 @@
     foreach ($base->list_objects($class->type)) {
         my $obj = $base->get_object($class->type, $_) or next;
-        my $id = $obj->get_c_field($field) or next;
+        my $id = $obj->_get_c_field($field) or next;
         $existsid{$id} = 1;
     }

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

@@ -81 +81 @@
     if ($field eq 'gecos') {
         return to_ascii(
-            join(' ', grep { $_ } ($self->get_c_field('givenName'), ($self->get_c_field('sn'))))
-        ) || to_ascii($self->get_c_field('description'));
+            join(' ', grep { $_ } ($self->_get_c_field('givenName'), ($self->_get_c_field('sn'))))
+        ) || to_ascii($self->_get_c_field('description'));
     } elsif ($field eq 'displayName') {
-        return join(' ', grep { $_ } ($self->get_c_field('givenName'), ($self->get_c_field('sn'))))
+        return join(' ', grep { $_ } ($self->_get_c_field('givenName'), ($self->_get_c_field('sn'))))
             || $self->id;
     } elsif ($field eq 'sAMAccountName') {