Changeset 1315 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Timestamp:

04/07/15 16:42:39 (9 years ago)

Author:

nanardon

Message:

merge changes

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Attributes.pm (modified) (2 diffs)
• Objects.pm (modified) (1 diff)
• Sql/Accreq.pm (modified) (1 diff)
• Sql/Address.pm (modified) (2 diffs)
• Sql/Aliases.pm (modified) (4 diffs)
• Sql/Group.pm (modified) (6 diffs)
• Sql/Nethost.pm (modified) (4 diffs)
• Sql/Netzone.pm (modified) (3 diffs)
• Sql/Service.pm (modified) (1 diff)
• Sql/Site.pm (modified) (1 diff)
• Sql/User.pm (modified) (12 diffs)
• Sql/objects.pm (modified) (5 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Attributes.pm

@@ -192 +192 @@
 }
 
+=head2 checkinput ($value)
+
+Check input value, return false on error
+
+=cut
+
+sub checkinput {
+    my ($self, $values) = @_;
+
+    if ($self->mandatory &&
+        (!(defined($values)) || $values eq '')) {
+        $self->base->log(LA_ERR,
+            "%s attribute cannot be empty for object %s/%s",
+            $self->name,
+            $self->object->type,
+            $self->object->id,
+        );
+        return;
+    }
+
+    if ($self->has_values_list && $values) {
+        my @possible = $self->can_values;
+        foreach my $value (ref $values ? @{ $values } : $values) {
+            if (! grep { $value eq $_ } @possible) {
+                $self->base->log(LA_ERR,
+                    "%s attribute cannot have `%s' as value for object %s/%s",
+                    $self->name,
+                    $value,
+                    $self->object->type,
+                    $self->object->id,
+                );
+                return;
+            }
+        }
+    }
+
+    if (ref $values eq 'ARRAY' && ! $self->multiple) {
+        $self->base->log(LA_WARN, 'Attribute %s is not multi valuesd', $self->name);
+        # TODO: really return an error
+        # return;
+    }
+
+    if ($self->{checkinput}) {
+        if (!$self->{checkinput}->($values)) {
+            return;
+        }
+    }
+
+    return 1;
+}
+
 =head2 readable
 
@@ -370 +421 @@
     my ($self, $values) = @_;
 
-    if (ref $self->{set} eq 'CODE') {
-        return $self->{set}->($self,
-            ref $values
-            ? [ map { $self->input($_) } @$values ]
-            : $values ? $self->input($values) : undef);
-    } else {
-        return $self->object->set_fields(
-            $self->iname,
-            ref $values
-                ? [ map { $self->input($_) } @$values ]
-                : $values ? $self->input($values) : undef);
-    }
+    my $inputv = ref $values
+        ? [ map { $self->input($_) } @$values ]
+        : $values ? $self->input($values) : undef;
+
+    my $res = ref $self->{set} eq 'CODE'
+        ? $self->{set}->($self, $inputv)
+        : $self->object->set_fields($self->iname, $inputv);
+
+    # If the attribute has a post code, call it
+    if ($res && $self->{post}) {
+        $self->{post}->($self, $inputv);
+    }
+
+    $res
 }
 

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

@@ -370 +370 @@
             return;
         };
-        $attribute->mandatory &&
-            (!(defined($cdata{$cfield})) || $cdata{$cfield} eq '') and do {
+
+        if (!$attribute->checkinput($cdata{$cfield})) {
             $self->base->log(LA_ERR,
-                "%s attribute cannot be empty, ignoring for object %s/%s",
-                $cfield,
-                        $self->type,
-                        $self->id,
+                "Value for attribute %s to %s (%s) does not match requirements",
+                $cfield, $self->id, $self->type
             );
-            return 0;
+            return;
         };
     }

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Accreq.pm

@@ -92 +92 @@
                 },
             },
+            comment => { },
+            description => { },
+            notifyMail => { },
         }
     )

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Address.pm

@@ -40 +40 @@
                 reference => 'site',
             },
-            sn =>           { ro => 1, },
-            mail =>         { ro => 1, },
-            givenName =>    { ro => 1, },
-            postalAddress => { ro => 1, },
-            displayName =>  { ro => 1, },
-            co =>           {
-                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
-            },
-            l =>            {
-                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+            sn =>           {
+                managed => 1,
+                ro => 1,
+                get => sub {
+                    my ($attr) = @_;
+                    my $self = $attr->object;
+                    my $user = $self->base->get_object('user', $self->_get_c_field('user'))
+                        or return;
+                    return $user->_get_c_field($attr->name);
+                },
+            },
+            mail =>         {
+                managed => 1,
+                ro => 1,
+                get => sub {
+                    my ($attr) = @_;
+                    my $self = $attr->object;
+                    my $user = $self->base->get_object('user', $self->_get_c_field('user'))
+                        or return;
+                    return $user->_get_c_field($attr->name);
+                },
+            },
+            givenName => {
+                managed => 1,
+                ro => 1,
+                get => sub {
+                    my ($attr) = @_;
+                    my $self = $attr->object;
+                    my $user = $self->base->get_object('user', $self->_get_c_field('user'))
+                        or return;
+                    return $user->_get_c_field($attr->name);
+                },
+            },
+            postalAddress => {
+                managed => 1,
+                ro => 1,
+                get => sub {
+                    my ($attr) = @_;
+                    my $self = $attr->object;
+                    my $bp = $self->_get_c_field('postOfficeBox');
+                    return join("\n", grep { $_ } (
+                            $self->_get_c_field('o'),
+                            $self->_get_c_field('streetAddress'),
+                            ($bp ? 'BP ' . $bp : ''),
+                            join(' ', grep { $_ } (
+                                    $self->_get_c_field('postalCode'),
+                                    $self->_get_c_field('l'),)),
+                            join(' ', grep { $_ } (
+                                    $self->_get_c_field('st'),
+                                    $self->_get_c_field('co'),),
+                            )
+                        )
+                    );
+                },
+            },
+            displayName =>  {
+                managed => 1,
+                ro => 1,
+                get => sub {
+                    my $self = $_[0]->object;
+                    return join(' ', grep { $_ } (
+                            $self->_get_c_field('givenName'),
+                            $self->_get_c_field('sn'),
+                        )
+                    );
+                },
+            },
+            co => {
+                managed => 1,
+                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                get => sub {
+                    my ($self) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        if (my $osite = $self->base->get_object('site', $site)) {
+                            return $osite->get_attributes($self->name);
+                        }
+                    }
+                    return $self->object->get_field($self->name);
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        return 1;
+                    } else {
+                        return $self->object->set_fields($self->name, $data)
+                    }
+                },
+            },
+            l => {
+                managed => 1,
+                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                get => sub {
+                    my ($self) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        if (my $osite = $self->base->get_object('site', $site)) {
+                            return $osite->get_attributes($self->name);
+                        }
+                    }
+                    return $self->object->get_field($self->name);
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        return 1;
+                    } else {
+                        return $self->object->set_fields($self->name, $data)
+                    }
+                },
             },
             postalCode =>   {
-                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                managed => 1,
+                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                get => sub {
+                    my ($self) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        if (my $osite = $self->base->get_object('site', $site)) {
+                            return $osite->get_attributes($self->name);
+                        }
+                    }
+                    return $self->object->get_field($self->name);
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        return 1;
+                    } else {
+                        return $self->object->set_fields($self->name, $data)
+                    }
+                },
             },
             streetAddress => {
+                managed => 1,
                 formtype => 'TEXTAREA',
                 ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                get => sub {
+                    my ($self) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        if (my $osite = $self->base->get_object('site', $site)) {
+                            return $osite->get_attributes($self->name);
+                        }
+                    }
+                    return $self->object->get_field($self->name);
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        return 1;
+                    } else {
+                        return $self->object->set_fields($self->name, $data)
+                    }
+                },
             },
             postOfficeBox => {
-                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
-            },
-            st =>           {
-                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                managed => 1,
+                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                get => sub {
+                    my ($self) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        if (my $osite = $self->base->get_object('site', $site)) {
+                            return $osite->get_attributes($self->name);
+                        }
+                    }
+                    return $self->object->get_field($self->name);
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        return 1;
+                    } else {
+                        return $self->object->set_fields($self->name, $data)
+                    }
+                },
+            },
+            st => {
+                managed => 1,
+                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                get => sub {
+                    my ($self) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        if (my $osite = $self->base->get_object('site', $site)) {
+                            return $osite->get_attributes($self->name);
+                        }
+                    }
+                    return $self->object->get_field($self->name);
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        return 1;
+                    } else {
+                        return $self->object->set_fields($self->name, $data)
+                    }
+                },
             },
             facsimileTelephoneNumber => {
-                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                managed => 1,
+                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                get => sub {
+                    my ($self) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        if (my $osite = $self->base->get_object('site', $site)) {
+                            return $osite->get_attributes($self->name);
+                        }
+                    }
+                    return $self->object->get_field($self->name);
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        return 1;
+                    } else {
+                        return $self->object->set_fields($self->name, $data)
+                    }
+                },
             },
             o =>            {
-                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                managed => 1,
+                ro => sub { $_[0] && $_[0]->get_attributes('site') ? 1 : 0 },
+                get => sub {
+                    my ($self) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        if (my $osite = $self->base->get_object('site', $site)) {
+                            return $osite->get_attributes($self->name);
+                        }
+                    }
+                    return $self->object->get_field($self->name);
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    if (my $site = $self->object->get_attributes('site')) {
+                        return 1;
+                    } else {
+                        return $self->object->set_fields($self->name, $data)
+                    }
+                },
             },
             isMainAddress => { formtype => 'CHECKBOX', },
             active => { ro => 1 },
+            telephoneNumber => { },
+            physicalDeliveryOfficeName => { },
+            otherTelephone => { },
+            ipPhone => { },
+            homePhone => { },
+            description => { },
         }
     );
@@ -87 +299 @@
 }
 
-sub get_field {
-    my ($self, $field) = @_;
-    if ((grep { $field eq $_ } (qw(
-            co l
-            postalCode streetAddress
-            postOfficeBox st
-            facsimileTelephoneNumber o
-            ))) && (my $fsite = $self->get_c_field('site'))) {
-        my $site = $self->base->get_object('site', $fsite);
-        if ($site) {
-            return $site->get_field($field);
-        }
-    } elsif ($field =~ /^(sn|givenName|mail)$/) {
-        my $user = $self->base->get_object('user', $self->_get_c_field('user'))
-            or return;
-        return $user->_get_c_field($field);
-    } elsif ($field eq 'postalAddress' ) {
-        my $bp = $self->_get_c_field('postOfficeBox');
-        return join("\n", grep { $_ } (
-            $self->_get_c_field('o'),
-            $self->_get_c_field('streetAddress'),
-            ($bp ? 'BP ' . $bp : ''),
-            join(' ', grep { $_ } (
-                    $self->_get_c_field('postalCode'),
-                    $self->_get_c_field('l'),)),
-            join(' ', grep { $_ } (
-                    $self->_get_c_field('st'),
-                    $self->_get_c_field('co'),),
-            )
-        ));
-    } elsif ($field eq 'displayName') {
-        return join(' ', grep { $_ } (
-            $self->_get_c_field('givenName'),
-            $self->_get_c_field('sn'),
-        ));
-    } else {
-        return $self->SUPER::get_field($field);
-    }
-}
-
-sub _set_c_fields {
-    my ($self, %cdata) = @_;
-    if ($cdata{site} &&
-        $self->base->get_object('site', $cdata{site})) {
-        foreach (qw(co l postalCode streetAddress postOfficeBox st
-                    facsimileTelephoneNumber o)) {
-            delete($cdata{$_});
-        }
-    }
-
-    $self->SUPER::_set_c_fields(%cdata);
-}
-
-sub set_fields {
-    my ($self, %data) = @_;
-    my %fdata;
-    my $res = 0;
-    foreach my $attr (keys %data) {
-        $attr =~ /^site$/ and do {
-            my $site =
-            $self->base->get_object('site',
-                $data{$attr});
-            if ($site) {
-                foreach (qw(co l postalCode streetAddress postOfficeBox st
-                        facsimileTelephoneNumber o)) {
-                    $fdata{$_} = undef;
-                    $data{$_} = undef;
-                }
-            }
-            $fdata{$attr} = $data{$attr} || undef;
-            next;
-        };
-        $fdata{$attr} = $data{$attr} || undef;
-    }
-    if  (keys %fdata) {
-        $res += $self->SUPER::set_fields(%fdata);
-    }
-
-    $res;
-}
-
 1;
 

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

@@ -25 +25 @@
     my ($class, $base) = @_;
 
+    
+    my $recurs = sub {
+        my ($attr) = @_;
+        my ($self) = $attr->object;
+        my $field = $attr->name; 
+
+        my $sth = $self->db->prepare_cached(q{
+            select name from aliases where array[lower($1)] <@
+            string_to_array(lower(array_to_string("forward", ',')), ',')
+            });
+        my @tocheck = ($field =~ /^sameforward$/
+            ? $self->get_field('forward')
+            : ($field =~ /^samedestination$/ 
+                ? $self->get_field('finalpoint')
+                : $self->id));
+        my @results;
+        my @already;
+        while (my $next = shift(@tocheck)) {
+            # endless loop detection
+            grep { $next eq $_ } @already and do {
+                push(@results, 'LOOP');
+                next;
+            };
+            push(@already, $next);
+            $sth->execute($next);
+            while (my $res = $sth->fetchrow_hashref) {
+                push(@tocheck, $res->{name});
+                $res->{name} eq $self->id and next;
+                push(@results, $res->{name});
+            }
+            $field =~ /^(parents|sameforward)$/ and last; # No recursive search
+        }
+        return scalar(@results) <= 1 ? $results[0] : \@results;
+    };
+
     $class->SUPER::_get_attr_schema($base,
         {
@@ -34 +69 @@
                 multiple => 1,
                 monitored => 1,
+                set => sub {
+                    my ($self, $data) = @_;
+                    return $self->object->set_fields($self->iname, 
+                        $data
+                        ? ref $data ? $data : [ $data ]
+                        : undef
+                    );
+                },
             },
-            finalpoint      => { ro => 1, multiple => 1 },
-            parents         => { ro => 1, },
-            anyparents      => { ro => 1, },
-            sameforward     => { ro => 1, multiple => 1 },
-            samedestination => { ro => 1, multiple => 1 },
+            finalpoint      => {
+                ro => 1,
+                multiple => 1,
+                get => sub {
+                    my ($self) = @_;
+                    my $sth = $self->base->db->prepare_cached(q{
+                        select forward from aliases where lower(name) = lower(?)
+                        limit 1
+                        });
+                    my @res = ();
+                    my @next = @{ $self->object->get_field('forward') || [] };
+                    while (my $next = shift(@next)) {
+                        $sth->execute($next);
+                        if (my $res = $sth->fetchrow_hashref) {
+                            push(@next, @{ $res->{forward} });
+                        } else {
+                            push(@res, $next);
+                        }
+                    }
+                    $sth->finish;
+                    return @res ? \@res : undef;
+                },
+            },
+            parents         => {
+                ro => 1,
+                get => $recurs,
+            },
+            anyparents      => {
+                ro => 1,
+                get => $recurs,
+            },
+            sameforward     => {
+                ro => 1,
+                multiple => 1,
+                get => $recurs,
+            },
+            samedestination => {
+                ro => 1,
+                multiple => 1,
+                get => $recurs,
+            },
             user            => {
                 ro => 1,
@@ -48 +127 @@
                 formtype => 'DATE',
             },
+            comment => { },
         }
     )
@@ -86 +166 @@
 }
 
-sub get_field {
-    my ($self, $field) = @_; 
-    if ($field eq 'finalpoint') {
-        my $sth = $self->db->prepare_cached(q{
-        select forward from aliases where lower(name) = lower(?)
-        limit 1
-        });
-        my @res = ();
-        my @next = @{ $self->get_field('forward') || [] };
-        while (my $next = shift(@next)) {
-            $sth->execute($next);
-            if (my $res = $sth->fetchrow_hashref) {
-                push(@next, @{ $res->{forward} });
-            } else {
-                push(@res, $next);
-            }
-        }
-        $sth->finish;
-        return @res ? \@res : undef;
-    }
-    if ($field =~ /^(parents|anyparents|sameforward|samedestination)$/) {
-        my $sth = $self->db->prepare_cached(q{
-            select name from aliases where array[lower($1)] <@
-                string_to_array(lower(array_to_string("forward", ',')), ',')
-            });
-        my @tocheck = ($field =~ /^sameforward$/
-            ? $self->get_field('forward')
-            : ($field =~ /^samedestination$/ 
-                ? $self->get_field('finalpoint')
-                : $self->id));
-        my @results;
-        my @already;
-        while (my $next = shift(@tocheck)) {
-            # endless loop detection
-            grep { $next eq $_ } @already and do {
-                push(@results, 'LOOP');
-                next;
-            };
-            push(@already, $next);
-            $sth->execute($next);
-            while (my $res = $sth->fetchrow_hashref) {
-                push(@tocheck, $res->{name});
-                $res->{name} eq $self->id and next;
-                push(@results, $res->{name});
-            }
-            $field =~ /^(parents|sameforward)$/ and last; # No recursive search
-        }
-        return scalar(@results) <= 1 ? $results[0] : \@results;
-    }
-    $self->SUPER::get_field($field);
-}
-
-sub set_fields {
-    my ($self, %attrs) = @_;
-    foreach (keys %attrs) {
-        /^forward$/ and do {
-            $attrs{$_} = [ $attrs{$_} ] unless(ref $attrs{$_});
-        };
-    }
-    $self->SUPER::set_fields(%attrs);
-}
 
 1;

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Group.pm

@@ -27 +27 @@
     $class->SUPER::_get_attr_schema($base,
         {
-            gidNumber  => { inline => 1, uniq => 1, iname => 'gidnumber',
-                mandatory => 1, },
+            gidNumber  => {
+                inline => 1,
+                uniq => 1,
+                iname => 'gidnumber',
+                mandatory => 1, 
+            },
             gidnumber  => { inline => 1, uniq => 1, hide => 1, },
-            exported   => { inline => 1, },
-            name       => { inline => 1, ro => 1 },
             cn         => { inline => 1, ro => 1, iname => 'name', },
-            create     => { inline => 1, ro => 1 },
-            date       => { inline => 1, ro => 1 },
             memberUID  => {
                 monitored => 1,
@@ -46 +46 @@
                      || $_[0]->_get_c_field('autoMemberFilter'))
                     ? 1 : 0 
+                },
+                get => sub {
+                    my ($self) = @_; 
+                    my $sth = $self->base->db->prepare_cached(
+                        q{
+                        select value from group_attributes
+                        join "group" on "group".ikey = group_attributes.okey
+                        join "user" on "user".name = group_attributes.value
+                        where "group".name = ? and attr = ?
+                        } .
+                        ($self->base->{wexported} ? '' : 'and "user".exported = true')
+                    );
+                    $sth->execute($self->object->id, 'memberUID');
+                    my @res;
+                    while (my $res = $sth->fetchrow_hashref) {
+                        push(@res, $res->{value});
+                    }
+                    return \@res;
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    $self->object->_set_group_members($data);
                 },
             },
@@ -60 +82 @@
                     ? 1 : 0 
                 },
+                get => sub {
+                    my ($self) = @_;
+                    $self->object->_get_c_field('memberUID');
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    $self->object->_set_group_members($data);
+                },
             },
             sAMAccountName => { iname => 'name', ro => 1 },
@@ -91 +121 @@
             autoMemberFilter => {
                 multiple => 1,
-            }
+                set => sub {
+                    my ($self, $data) = @_;
+                    $self->object->set_fields($self->name, $data) or return;
+                    $self->object->populate_dyn_group;
+                    return 1;
+                }
+            },
+            label => { },
+            expire => { },
+            description => { },
+            comment => { },
         }
     )
-}
-
-sub get_field {
-    my ($self, $field) = @_;
-    for ($field) {
-        /^(member|memberUID)$/ and do {
-            my $sth = $self->db->prepare_cached(
-                q{
-                select value from group_attributes
-                join "group" on "group".ikey = group_attributes.okey
-                join "user" on "user".name = group_attributes.value
-                where "group".name = ? and attr = ?
-                } .
-                ($self->base->{wexported} ? '' : 'and "user".exported = true')
-            );
-            $sth->execute($self->id, 'memberUID');
-            my @res;
-            while (my $res = $sth->fetchrow_hashref) {
-                push(@res, $res->{value});
-            }
-            return \@res;
-        };
-    }
-    $self->SUPER::get_field($field);
 }
 
@@ -124 +140 @@
     my %member;
     my $res = 0;
-    foreach (@{ $self->get_field('memberUID') }) {
+    foreach (@{ $self->_get_c_field('memberUID') }) {
         $member{$_}{c} = 1;
     }
@@ -158 +174 @@
 }
 
-sub set_fields {
-    my ($self, %data) = @_;
-    my %fdata;
-    my $res = 0;
-    foreach my $attr (keys %data) {
-        $attr =~ /^memberUID|member$/ and do {
-            if (($self->_get_c_field('sutype') ||'') =~ /^(jobtype|contrattype)$/ ||
-                 $self->get_field('autoMemberFilter')) {
-                $self->base->log(LA_WARN,
-                    "Group %s is managed, ignoring member set request",
-                    $self->id);
-                next;
-            }
-            $res += $self->_set_group_members($data{$attr});
-            next;
-        };
-        $fdata{$attr} = $data{$attr};
-    }
-
-    if (keys %fdata) {
-            my $setres = $self->SUPER::set_fields(%fdata);
-        if (exists($fdata{autoMemberFilter})) {
-            $res += $self->populate_dyn_group;
-        }
-        return unless(defined($setres));
-            $res += ($setres || 0);
-    }
-    
-    $res
-}
-
 =head2 populate_dyn_group
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Nethost.pm

@@ -47 +47 @@
                     $base->search_objects('netzone', 'type=dhcp')
                 },
+                set => sub {
+                    my ($self, $data) = @_;
+                    foreach (ref $data ? @{$data} : $data) {
+                        my $zone = $self->base->get_object('netzone', $_)
+                            or next;
+                        my @freeips = $zone->get_attributes('freeIP') or next;
+                        my $idx = rand(scalar(@freeips));
+                        $self->object->_addAttributeValue('ip', $freeips[$idx]);
+                        $self->base->log(LA_NOTICE, "Assigning ip %s to host %s",
+                            $freeips[$idx], $self->object->id);
+                    }
+                },
             },
             macaddr => {
@@ -78 +90 @@
                 multiple => 1, ro => 1, managed => 1,
                 reference => 'netzone',
+                get => sub {
+                    my ($self) = @_;
+                    my $find = $self->base->db->prepare_cached(q{
+                        select name from netzone where ikey in
+                        (
+                        select netzone_attributes.okey from netzone_attributes join
+                        nethost_attributes_ips on netzone_attributes.attr='net'
+                            and 
+                        nethost_attributes_ips.value::inet <<=
+                        netzone_attributes.value::inet
+                        where nethost_attributes_ips.okey = $1
+                        except
+                        select netzone_attributes.okey from netzone_attributes join
+                        nethost_attributes_ips on netzone_attributes.attr='netExclude'
+                            and nethost_attributes_ips.value::inet <<= netzone_attributes.value::inet
+                        where nethost_attributes_ips.okey = $1
+                        )
+                        order by name
+                        });
+                    $find->execute($self->object->get_attributes('ikey'));
+                    my @zones;
+                    while (my $res = $find->fetchrow_hashref) {
+                        push(@zones, $res->{name});
+                    }
+                    return @zones ? [ @zones ] : undef;
+                },
             },
             puppetClass => { multiple => 1, },
@@ -83 +121 @@
                 multiple => 1, ro => 1, managed => 1,
                 reference => 'netzone',
+                get => sub {
+                    my ($self) = @_;
+                    my $find = $self->base->db->prepare_cached(q{
+                        select name from netzone where ikey in
+                        (
+                        select netzone_attributes.okey from netzone_attributes join
+                        nethost_attributes_ips on netzone_attributes.attr='netExclude'
+                            and 
+                        nethost_attributes_ips.value::inet <<=
+                        netzone_attributes.value::inet
+                        where nethost_attributes_ips.okey = $1
+                        )
+                            order by name
+                        });
+                    $find->execute($self->object->get_attributes('ikey'));
+                    my @zones;
+                    while (my $res = $find->fetchrow_hashref) {
+                        push(@zones, $res->{name});
+                    }
+                    return @zones ? [ @zones ] : undef;
+                },
             },
             noDynamic => { 
@@ -96 +155 @@
             sshfpUpdate  => {
                 managed => 1,
-            },
+                iname => 'sshfp',
+                input => sub {
+                    my ($self, $data) = @_;
+                    open(my $h, '<', $data) or return;
+                    my @sshfps;
+                    while (my $line = <$h>) {
+                        my ($type, $mode, $key) = $line =~ /^\S+\s+IN\s+SSHFP\s+(\d)\s+(\d)\s+(\S+)/i
+                            or do {
+                            la_log(LA_ERR, "Seems to not be a ssh-keygen line: %s", $line);
+                            return;
+                        };
+                        la_log(LA_DEBUG, "found sshfp %s %s %s", $type, $mode, $key);
+                        push(@sshfps, "$type $mode $key");
+                    }
+                    close($h);
+                    \@sshfps;
+                }
+            },
+            comment => { },
+            description => { },
+            encryptKey => { },
+            ip6 => { },
+            reverse => { },
+            serialNumber => { },
         }
     )
 }
 
-sub get_field {
-    my ($self, $field) = @_;
-
-    if ($field eq 'netZone') {
-        my $find = $self->base->db->prepare_cached(q{
-            select name from netzone where ikey in
-            (
-            select netzone_attributes.okey from netzone_attributes join
-            nethost_attributes_ips on netzone_attributes.attr='net'
-                and 
-            nethost_attributes_ips.value::inet <<=
-            netzone_attributes.value::inet
-            where nethost_attributes_ips.okey = $1
-            except
-            select netzone_attributes.okey from netzone_attributes join
-            nethost_attributes_ips on netzone_attributes.attr='netExclude'
-            and nethost_attributes_ips.value::inet <<= netzone_attributes.value::inet
-            where nethost_attributes_ips.okey = $1
-            )
-                order by name
-            });
-        $find->execute($self->get_attributes('ikey'));
-        my @zones;
-        while (my $res = $find->fetchrow_hashref) {
-            push(@zones, $res->{name});
-        }
-        return @zones ? [ @zones ] : undef;
-    } elsif ($field eq 'netZoneExclude') {
-        my $find = $self->base->db->prepare_cached(q{
-            select name from netzone where ikey in
-            (
-            select netzone_attributes.okey from netzone_attributes join
-            nethost_attributes_ips on netzone_attributes.attr='netExclude'
-                and 
-            nethost_attributes_ips.value::inet <<=
-            netzone_attributes.value::inet
-            where nethost_attributes_ips.okey = $1
-            )
-                order by name
-            });
-        $find->execute($self->get_attributes('ikey'));
-        my @zones;
-        while (my $res = $find->fetchrow_hashref) {
-            push(@zones, $res->{name});
-        }
-        return @zones ? [ @zones ] : undef;
-    } else {
-        return $self->SUPER::get_field($field);
-    }
-}
-
 sub set_fields {
     my ($self, %data) = @_;
-    if ($data{ipFrom}) {
-        my @currentips = grep { $_ } $self->get_attributes('ip');
-        foreach (ref $data{ipFrom} ? @{$data{ipFrom}} : $data{ipFrom}) {
-            my $zone = $self->base->get_object('netzone', $_)
-                or next;
-            my @freeips = $zone->get_attributes('freeIP') or next;
-            my $idx = rand(scalar(@freeips));
-            push(@currentips, $freeips[$idx]);
-            $self->base->log(LA_NOTICE, "Assigning ip %s to host %s",
-                $freeips[$idx], $self->id);
-        }
-        push(@currentips, ref $data{ip} ? @{$data{ip}} : $data{ip})
-            if ($data{ip});
-        $data{ip} = \@currentips;
-        delete($data{ipFrom});
-    }
-    if ($data{sshfpUpdate}) {
-        open my $h, '<', \$data{sshfpUpdate};
-        my @sshfps;
-        while (my $line = <$h>) {
-            my ($type, $mode, $key) = $line =~ /^\S+\s+IN\s+SSHFP\s+(\d)\s+(\d)\s+(\S+)/i
-                or do {
-                    la_log(LA_ERR, "Seems to not be a ssh-keygen line: %s", $line);
-                    return;
-                };
-            la_log(LA_DEBUG, "found sshfp %s %s %s", $type, $mode, $key);
-            push(@sshfps, "$type $mode $key");
-        }
-        close($h);
-        delete($data{sshfpUpdate});
-        $data{sshfp} = \@sshfps;
-    }
 
     my $res = $self->SUPER::set_fields(%data);
 
+    # Post update related
     if (exists $data{related}) {
         my %exists;

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Netzone.pm

@@ -44 +44 @@
             },
             output => {},
-            outputD => { hide => 1, ro => 1, managed => 1, },
+            outputD => {
+                hide => 1,
+                ro => 1,
+                managed => 1,
+                get => sub {
+                    $_[0]->object->_get_c_field('output') ||
+                    $_[0]->object->id
+                },
+            },
             template => {},
-            templateD => { hide => 1, ro => 1, managed => 1, },
+            templateD => {
+                hide => 1,
+                ro => 1,
+                managed => 1,
+                get => sub {
+                    $_[0]->object->_get_c_field('template') ||
+                    $_[0]->object->id
+                },
+            },
             type    => {
                 mandatory => 1,
@@ -63 +79 @@
                 },
             },
-            freeIP => { managed => 1, ro => 1, multiple => 1, },
-            freeIPCount => { managed => 1, ro => 1, },
-            ipCount => { managed => 1, ro => 1, },
-            hosts =>  { ro => 1, multiple => 1, reference => 'nethost', },
-            hostsExclude =>  { ro => 1, multiple => 1, reference => 'nethost' },
+            freeIP => {
+                managed => 1,
+                ro => 1,
+                multiple => 1,
+                get => sub {
+                    my $self = $_[0]->object;
+                    my @ips;
+                    my $findip = $self->base->db->prepare(q{
+                        select * from (
+                        select host(network(value::inet)+ (generate_series(1, broadcast(value::inet) - network(value::inet) -1))) from netzone_attributes where
+                        attr='net' and okey = $1 and family(value::inet) = 4
+                        except
+                        (
+                        select host(network(value::inet)+ (generate_series(0, broadcast(value::inet) - network(value::inet)))) from
+                        netzone_attributes where attr='netExclude' and okey = $1
+                        union
+                        select nethost_attributes_ips.value from nethost_attributes_ips join netzone_attributes on
+                        netzone_attributes.attr='net' and nethost_attributes_ips.value::inet <<= netzone_attributes.value::inet
+                        where netzone_attributes.okey = $1
+                        )
+                        ) as s
+                        order by host::inet
+                        });
+                    $findip->execute($self->get_attributes('ikey'));
+                    while (my $res = $findip->fetchrow_hashref) {
+                        push(@ips, $res->{host});
+                    }
+                    return scalar(@ips) ? \@ips : undef;
+                },
+            },
+            freeIPCount => {
+                managed => 1,
+                ro => 1,
+                get => sub {
+                    return scalar(grep { $_ } $_[0]->object->get_attributes('freeIP'));
+                },
+            },
+            ipCount => {
+                managed => 1,
+                ro => 1,
+                get => sub {
+                    my ($self) = $_[0]->object;
+                    my $findip = $self->base->db->prepare(q{
+                        select count(*) from (
+                        select host(network(value::inet)+ (generate_series(1, broadcast(value::inet) - network(value::inet) -1))) from netzone_attributes where
+                        attr='net' and okey = $1 and family(value::inet) = 4
+                        except
+                        (
+                        select host(network(value::inet)+ (generate_series(0, broadcast(value::inet) - network(value::inet)))) from
+                        netzone_attributes where attr='netExclude' and okey = $1
+                        )
+                        ) as s
+                        });
+                    $findip->execute($self->get_attributes('ikey'));
+                    my $res = $findip->fetchrow_hashref;
+                    $findip->finish;
+                    return $res->{count}
+                },
+            },
+            hosts =>  {
+                ro => 1,
+                multiple => 1,
+                reference => 'nethost',
+                get => sub {
+                    my ($self) = $_[0]->object;
+                    my $findhost = $self->base->db->prepare_cached(q{
+                        select name from nethost join nethost_attributes_ips on
+                        nethost.ikey = nethost_attributes_ips.okey
+                        where value::inet <<= any(?)
+                        } . ($self->base->{wexported} ? '' : 'and exported = true') .
+                        q{ except
+                        select name from nethost join nethost_attributes_ips on
+                        nethost.ikey = nethost_attributes_ips.okey
+                        where value::inet <<= any(?)
+                        order by name
+                        }
+                    );
+                    $findhost->execute(
+                        [ $self->get_attributes('net') ],
+                        [ $self->get_attributes('netExclude') ],
+                    );
+                    my @hosts;
+                    while (my $res = $findhost->fetchrow_hashref) {
+                        push(@hosts, $res->{name});
+                    }
+                    return scalar(@hosts) ? \@hosts : undef;
+                },
+            },
+            hostsExclude =>  {
+                ro => 1,
+                multiple => 1,
+                reference => 'nethost',
+                get => sub {
+                    my $self = $_[0]->object;
+                    my $findhost = $self->base->db->prepare_cached(q{
+                        select name from nethost join nethost_attributes_ips on
+                        nethost.ikey = nethost_attributes_ips.okey
+                        where value::inet <<= any(?)
+                        } . ($self->base->{wexported} ? '' : 'and exported = true') .
+                        q{
+                        order by name
+                        }
+                    );
+                    $findhost->execute(
+                        [ $self->get_attributes('netExclude') ],
+                    );
+                    my @hosts;
+                    while (my $res = $findhost->fetchrow_hashref) {
+                        push(@hosts, $res->{name});
+                    }
+                    return scalar(@hosts) ? \@hosts : undef;
+                },
+            },
             lastBuild => { hide => 1, },
             lastUpdate => { ro => 1, iname => 'lastBuild' },
@@ -74 +198 @@
             exported => { formtype => 'CHECKBOX', },
             puppetClass =>  { multiple => 1, },
+            domain => { },
+            description => { },
         }
     )
 }
 
-sub get_field {
-    my ($self, $field) = @_;
-    if ($field eq 'ipCount') {
-        my $findip = $self->base->db->prepare(q{
-            select count(*) from (
-            select host(network(value::inet)+ (generate_series(1, broadcast(value::inet) - network(value::inet) -1))) from netzone_attributes where
-            attr='net' and okey = $1 and family(value::inet) = 4
-            except
-            (
-            select host(network(value::inet)+ (generate_series(0, broadcast(value::inet) - network(value::inet)))) from
-            netzone_attributes where attr='netExclude' and okey = $1
-            )
-            ) as s
-            });
-        $findip->execute($self->get_attributes('ikey'));
-        my $res = $findip->fetchrow_hashref;
-        $findip->finish;
-        return $res->{count}
-    } elsif ($field eq 'freeIP') {
-        my @ips;
-        my $findip = $self->base->db->prepare(q{
-            select * from (
-            select host(network(value::inet)+ (generate_series(1, broadcast(value::inet) - network(value::inet) -1))) from netzone_attributes where
-            attr='net' and okey = $1 and family(value::inet) = 4
-            except
-            (
-            select host(network(value::inet)+ (generate_series(0, broadcast(value::inet) - network(value::inet)))) from
-            netzone_attributes where attr='netExclude' and okey = $1
-            union
-            select nethost_attributes_ips.value from nethost_attributes_ips join netzone_attributes on
-            netzone_attributes.attr='net' and nethost_attributes_ips.value::inet <<= netzone_attributes.value::inet
-            where netzone_attributes.okey = $1
-            )
-            ) as s
-            order by host::inet
-            });
-        $findip->execute($self->get_attributes('ikey'));
-        while (my $res = $findip->fetchrow_hashref) {
-            push(@ips, $res->{host});
-        }
-        return scalar(@ips) ? \@ips : undef;
-    } elsif ($field eq 'freeIPCount') {
-        return scalar(grep { $_ } $self->get_attributes('freeIP'));
-    } elsif ($field eq 'hosts') {
-        my $findhost = $self->base->db->prepare_cached(q{
-            select name from nethost join nethost_attributes_ips on
-            nethost.ikey = nethost_attributes_ips.okey
-            where value::inet <<= any(?)
-            } . ($self->base->{wexported} ? '' : 'and exported = true') .
-            q{ except
-            select name from nethost join nethost_attributes_ips on
-            nethost.ikey = nethost_attributes_ips.okey
-            where value::inet <<= any(?)
-            order by name
-            }
-        );
-        $findhost->execute(
-            [ $self->get_attributes('net') ],
-            [ $self->get_attributes('netExclude') ],
-        );
-        my @hosts;
-        while (my $res = $findhost->fetchrow_hashref) {
-            push(@hosts, $res->{name});
-        }
-        return scalar(@hosts) ? \@hosts : undef;
-    } elsif ($field eq 'hostsExclude') {
-        my $findhost = $self->base->db->prepare_cached(q{
-            select name from nethost join nethost_attributes_ips on
-            nethost.ikey = nethost_attributes_ips.okey
-            where value::inet <<= any(?)
-            } . ($self->base->{wexported} ? '' : 'and exported = true') .
-            q{
-            order by name
-            }
-        );
-        $findhost->execute(
-            [ $self->get_attributes('netExclude') ],
-        );
-        my @hosts;
-        while (my $res = $findhost->fetchrow_hashref) {
-            push(@hosts, $res->{name});
-        }
-        return scalar(@hosts) ? \@hosts : undef;
-    } elsif ($field eq 'templateD') {
-        return $self->get_attributes('template') || ($self->id . '.in');
-    } elsif ($field eq 'outputD') {
-        return $self->get_attributes('output') || $self->id;
-    } else {
-        return $self->SUPER::get_field($field);
-    }
-}
-
 1;
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Service.pm

@@ -54 +54 @@
                 reference => 'user',
             },
+            comment => { },
+            description => { },
         }
     )

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Site.pm

@@ -35 +35 @@
             create => { ro => 1, inline => 1, },
             streetAddress => { formtype => 'TEXTAREA' },
-            postalAddress => { ro => 1, },
+            postalAddress => {
+                ro => 1,
+                get => sub {
+                    my $self = $_[0]->object;
+                    my $bp = $self->_get_c_field('postOfficeBox');
+                    return join("\n", grep { $_ } (
+                            $self->_get_c_field('o'),
+                            $self->_get_c_field('streetAddress'),
+                            ($bp ? 'BP ' . $bp : ''),
+                            join(' ', grep { $_ } (
+                                    $self->_get_c_field('postalCode'),
+                                    $self->_get_c_field('l'),)),
+                            join(' ', grep { $_ } (
+                                    $self->_get_c_field('st'),
+                                    $self->_get_c_field('co'),),
+                            )
+                        )
+                    );
+                },
+            },
             siteNick => { uniq => 1 },
+            st => { },
+            postalCode => { },
+            postOfficeBox => { },
+            o => { },
+            l => { },
+            facsimileTelephoneNumber => { },
+            description => { },
+            co => { },
         }
     )
-}
-
-sub get_field {
-    my ($self, $field) = @_;
-    if ($field eq 'postalAddress' ) {
-        my $bp = $self->_get_c_field('postOfficeBox');
-        return join("\n", grep { $_ } (
-            $self->_get_c_field('o'),
-            $self->_get_c_field('streetAddress'),
-            ($bp ? 'BP ' . $bp : ''),
-            join(' ', grep { $_ } (
-                    $self->_get_c_field('postalCode'),
-                    $self->_get_c_field('l'),)),
-            join(' ', grep { $_ } (
-                    $self->_get_c_field('st'),
-                    $self->_get_c_field('co'),),
-            )
-        ));
-    } else {
-        return $self->SUPER::get_field($field);
-    }
 }
 

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

@@ -43 +43 @@
     my ($class, $base) = @_;
 
+    my $subsetaddress = sub {
+        my ($self, $data) = @_;
+        my $fmainaddress = $self->object->_get_c_field('mainaddress');
+
+        # set address attribute => create address object on the fly
+        # except if attr is empty !
+        if (!$fmainaddress && $data) {
+            $fmainaddress = $self->object->id . '-' . join('', map { ('a'..'z')[rand(26)] }
+                (0..4));
+            $self->base->_create_c_object(
+                'address', $fmainaddress,
+                user => $self->object->id,
+                isMainAddress => 1, ) or do {
+                $self->base->log(LA_ERR,
+                    "Cannot create main address for user %s", $self->object->id);
+                return;
+            };
+        }
+        if ($fmainaddress && 
+            (my $address = $self->base->get_object('address', $fmainaddress))) {
+            if ($address->attribute($self->name) &&
+                !$address->attribute($self->name)->ro) {
+                return $address->set_c_fields($self->name => $data) ||0;
+            }
+        }
+    };
+
     $class->SUPER::_get_attr_schema($base,
         {
+            exported => {
+                post => sub {
+                    my ($self, $value) = @_;
+                    my $attr = $self->name;
+
+                    if (my $obj = $self->base->
+                            get_object('revaliases', $self->object->id)) {
+                        my $ares = $obj->set_c_fields(
+                            ($attr eq 'exported' ? 'exported' : 'unexported') => $value
+                        );
+                        if (!defined($ares)) {
+                            $self->base->log(LA_ERR,
+                                'Cannot set revaliases exported attribute for user %s',
+                                $self->object->id);
+                        }
+                    }
+                    my $must_expire = $self->name eq 'exported'
+                        ? ($value ? 0 : 1 )
+                        : ($value ? 1 : 0 );
+
+                    foreach my $al ($self->object->get_attributes('aliases')) {
+                        my $obj = $self->base->get_object('aliases', $al) or next;
+                        $obj->_set_c_fields(
+                            expire => $must_expire
+                                ? strftime(
+                                    "%Y-%m-%d %H:%M:%S",
+                                    localtime(time + 3600 * 24 * 365)
+                                  )
+                                : undef,
+                        );
+                    }
+                },
+            },
             uidNumber => {
                 inline => 1,
@@ -58 +118 @@
                 mandatory => 1,
                 can_values => sub {
-                    map { $base->get_object('group',
-                            $_)->get_attributes('gidNumber') }
-                    $base->list_objects('group')
+                    my $sth = $base->db->prepare_cached(
+                        q{
+                        select gidnumber from "group" where exported = true
+                        }
+                    );
+                    $sth->execute();
+                    my @res;
+                    while (my $res = $sth->fetchrow_hashref) {
+                        push(@res, $res->{gidnumber});
+                    }
+                    return @res;
                 },
                 display => sub {
@@ -81 +149 @@
                 monitored => 1,
             },
-            exported  => {
-                inline => 1,
-                formtype => 'CHECKBOX',
-                monitored => 1,
-            },
             locked    => {
                 formtype => 'CHECKBOX',
@@ -92 +155 @@
             },
             expire    => { inline => 1, formtype => 'DATE', monitored => 1, },
-            name      => { inline => 1, ro => 1, },
             cn        => {
                 inline => 1, ro => 1,
@@ -107 +169 @@
                 },
             },
-            create    => { inline => 1, ro => 1, },
-            date      => { inline => 1, ro => 1, },
             memberOf  => {
                 multiple => 1, delayed => 1,
@@ -127 +187 @@
                     }
                     return \@res;
-                }
-            },
-            forward   => {},
+                },
+                set => sub {
+                    my ($self, $values) = @_;
+                    my %old = map { $_ => 'o' } @{ $self->get };
+                    foreach my $group (grep { $_ } ref $values ? @{ $values } : $values) {
+                        if ($old{$group}) {
+                            $old{$group} = undef; # no change
+                        } else {
+                            $old{$group} = 'n';
+                        }
+                    }
+
+                    my $res = 0;
+                    foreach my $group (keys %old) {
+                        $old{$group} or next; # no change
+
+                        my $ogroup = $self->base->get_object('group', $group) or next;
+                        ($ogroup->_get_c_field('sutype') || '') =~ /^(jobtype|contrattype)$/ and next;
+
+                        if ($old{$group} eq 'n') {
+                            $res += $ogroup->_addAttributeValue('memberUID', $self->object->id);
+                        } else {
+                            if (($self->object->_get_c_field('department') || '') eq $ogroup->id) {
+                                $self->base->log(LA_WARN,
+                                    "Don't removing user %s from group %s: is its department",
+                                    $self->object->id, $ogroup->id);
+                                next;
+                            }
+                            $res += $ogroup->_delAttributeValue('memberUID', $self->object->id);
+                        }
+                    }
+                    return $res;
+                },
+            },
+            forward => {
+                managed => 1,
+                get => sub {
+                    my ($self) = @_;
+                    my $sth = $self->base->db->prepare(q{
+                        select forward from aliases where name = ?
+                        } . ($self->base->{wexported} ? '' : ' and exported = true'));
+                    $sth->execute($self->object->id);
+                    my $res = $sth->fetchrow_hashref;
+                    $sth->finish;
+                    return $res->{forward}
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    if ($data) {
+                        if (my $f = $self->base->get_object('aliases', $self->object->id)) {
+                            return $f->_set_c_fields(forward => $data);
+                        } else {
+                            if ($self->base->_create_c_object(
+                                    'aliases', $self->object->id,
+                                    forward => $data,
+                                    description => 'automatically created for ' . $self->object->id,
+                                )) {
+                                return 1;
+                            } else {
+                                $self->base->log(LA_ERR, "Cannot add forward for %s",
+                                    $self->id);
+                            }
+                        }
+                    } else {
+                        if (my $res = $self->base->_delete_object('aliases', $self->id)) {
+                            return $res;
+                        } else {
+                            $self->base->log(LA_ERR, "Cannot remove forward for %s",
+                                $self->id);
+                        }
+                    }
+                    return;
+                },
+            },
             aliases   => {
                 reference => 'aliases',
                 formtype => 'TEXT',
                 multiple => 1,
+                get => sub {
+                    my ($self) = @_;
+                    my $sth = $self->base->db->prepare(q{
+                        select name from aliases where array[lower($1)] =
+                        string_to_array(lower(array_to_string("forward", ',')), ',')
+                        } . ($self->base->{wexported} ? '' : 'and exported = true'));
+                    $sth->execute($self->object->id);
+                    my @values;
+                    while (my $res = $sth->fetchrow_hashref) {
+                        push(@values, $res->{name});
+                    }
+                    return \@values;
+                },
+                set => sub {
+                    my ($self, $data) = @_;
+                    my $res = 0;
+                    my %aliases = map { $_ => 1 } grep { $_ } (ref $data ? @{$data} : $data);
+                    foreach ($self->object->_get_attributes('aliases')) {
+                        $aliases{$_} ||= 0;
+                        $aliases{$_} +=2;
+                    }
+                    foreach (keys %aliases) {
+                        if ($aliases{$_} == 2) {
+                            if ($self->base->_delete_object('aliases', $_)) {
+                                $res++
+                            } else {
+                                $self->base->log(LA_ERR,
+                                    "Cannot remove aliases %s from user %s", $_,
+                                    $self->object->id);
+                            }
+                        } elsif ($aliases{$_} == 1) {
+                            if ($self->base->_create_c_object(
+                                    'aliases', $_,
+                                    forward => [ $self->object->id ],
+                                    description => 'automatically created for ' . $self->object->id,
+                                )) {
+                                $res++
+                            } else {
+                                $self->base->log(LA_ERR, 'Cannot set forward %s to user %s',
+                                    $_, $self->object->id);
+                                return;
+                            }
+                        } # 3 no change
+                    }
+                    $res
+                },
             },
             revaliases => {
                 formtype => 'TEXT',
+                set => sub {
+                    my ($self, $data) = @_;
+                
+                    my $res = 0;
+                    if ($data) {
+                        if (my $obj = $self->base->
+                            get_object('revaliases', $self->object->id)) {
+                            my $ares = $obj->set_c_fields(
+                                'as' => $data,
+                                'exported' => ($self->get_attributes('exported') || 0),
+                            );
+                            if (defined($ares)) {
+                                $res+=$ares;
+                            } else {
+                                $self->base->log(LA_ERR, 'Cannot set revaliases for user %s',
+                                    $self->object->id);
+                            }
+                        } else {
+                            if ($self->base->_create_c_object(
+                                    'revaliases',
+                                    $self->object->id, as => $data,
+                                    'exported' => ($self->get_attributes('exported') || 0),
+                                    description => 'automatically created for ' . $self->object->id,
+                                )) {
+                                $res++;
+                            } else {
+                                $self->base->log(LA_ERR, 'Cannot set revaliases for user %s',
+                                    $self->object->id);
+                            }
+                        }
+                    } else {
+                        $self->base->_delete_object('revaliases', $self->object->id);
+                        $res++;
+                    }
+
+                    $res
+                },
             },
             manager => {
@@ -167 +381 @@
                 can_values => sub {
                     $base->search_objects('site')
-                }
-            },
-            co => { },
-            l => { },
-            postalCode => { },
-            streetAddress => { formtype => 'TEXTAREA', },
-            postOfficeBox => { },
-            st => { },
-            facsimileTelephoneNumber => { },
-            o => { iname => 'company', ro => 1 },
+                },
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
+            co => {
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
+            l => {
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
+            postalCode => {
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
+            streetAddress => {
+                formtype => 'TEXTAREA',
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
+            postOfficeBox => {
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
+            st => {
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
+            facsimileTelephoneNumber => {
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
+            o => {
+                ro => 1,
+                iname => 'company',
+            },
             ou => { iname => 'department', ro => 1 },
-            telephoneNumber => { },
-            physicalDeliveryOfficeName => { },
+            telephoneNumber => {
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
+            physicalDeliveryOfficeName => {
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+                set => $subsetaddress,
+            },
             uid => { iname => 'name', ro => 1 },
             cn =>  { iname => 'name', ro => 1 },
@@ -216 +543 @@
                 },
             },
-            sAMAccountName  => { ro => 1, managed => 1  },
+            sAMAccountName  => {
+                ro => 1,
+                managed => 1,
+                iname => 'name',
+            },
             accountExpires => {
                 ro => 1,
@@ -282 +613 @@
             },
             managedObjects => { ro => 1, reference => 'group', },
-            otheraddress => { ro => 1, reference => 'address', },
-            mainaddress => { ro => 1, reference => 'address', },
-            postalAddress => { ro => 1, },
+            otheraddress => {
+                ro => 1,
+                reference => 'address',
+                get => sub {
+                    my ($self) = @_;
+                    my $sth = $self->base->db->prepare_cached(q{
+                        select name from address left join address_attributes
+                        on address.ikey = address_attributes.okey and
+                        address_attributes.attr = 'isMainAddress'
+                        where "user" = ?
+                        order by address_attributes.attr
+                        });
+                    $sth->execute($self->object->id);
+                    my @values;
+                    while (my $res = $sth->fetchrow_hashref) {
+                        push(@values, $res->{name});
+                    }
+                    return \@values;
+                },
+            },
+            mainaddress => {
+                ro => 1,
+                reference => 'address',
+                get => sub {
+                    my ($self) = @_;
+                    my $sth = $self->base->db->prepare_cached(q{
+                        select name from address join address_attributes on ikey = okey
+                        where "user" = ? and attr = 'isMainAddress'
+                        });
+                    $sth->execute($self->object->id);
+                    my $res = $sth->fetchrow_hashref;
+                    $sth->finish;
+                    return $res->{name};
+                },
+            },
+            postalAddress => {
+                ro => 1,
+                get => sub {
+                    my ($self) = @_;
+                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                        $self->base->get_object('address', $fmainaddress)
+                            ->_get_c_field($self->name);
+                    } else {
+                        return;
+                    }
+                },
+            },
             facsimileTelephoneNumber => { ro => 1, },
             allsite   => {
@@ -324 +699 @@
                 },
             },
-            krb5ValidEnd => { ro => 1, },
+            krb5ValidEnd => {
+                ro => 1,
+                managed => 1,
+                get => sub {
+                    my ($self) = @_;
+                    my $sth = $self->object->db->prepare_cached(
+                        sprintf(
+                            q{select date_part('epoch', expire)::int as expire
+                            from %s where %s = ?},
+                            $self->object->db->quote_identifier($self->object->_object_table),
+                            $self->object->db->quote_identifier($self->object->_key_field),
+                        )
+                    );
+                    $sth->execute($self->object->id);
+                    my $res = $sth->fetchrow_hashref;
+                    $sth->finish;
+                    return $res->{expire}
+                },
+            },
             cells  => {
                 ro => 1,
@@ -362 +755 @@
             },
             userPassword => { readable => 0, },
+            wWWHomePage => { },
+            title => { },
+            snNative => { },
+            givenNameNative => { },
+            sn => { },
+            shadowWarning => { },
+            shadowMin => { },
+            shadowMax => { },
+            shadowLastChange => { },
+            shadowInactive => { },
+            shadowFlag => { },
+            otherTelephone => { },
+            nickname => { },
+            mobile => { },
+            mail => { },
+            labeledURI => { },
+            jobType => { },
+            ipPhone => { },
+            initials => { },
+            homePhone => { },
+            homeDirectory => { },
+            halReference => { },
+            grade => { },
+            givenName => { },
+            encryptedPassword => { },
+            description => { },
+            company => { },
+            comment => { },
+            college => { },
         }
     )
-}
-
-sub get_field {
-    my ($self, $field) = @_;
-    if ($field eq 'sAMAccountName') {
-        return $self->id;
-    } elsif ($field eq 'krb5ValidEnd') {
-        my $sth = $self->db->prepare_cached(
-            sprintf(
-                q{select date_part('epoch', expire)::int as expire
-                from %s where %s = ?},
-                $self->db->quote_identifier($self->_object_table),
-                $self->db->quote_identifier($self->_key_field),
-            )
-        );
-        $sth->execute($self->id);
-        my $res = $sth->fetchrow_hashref;
-        $sth->finish;
-        return $res->{expire}
-    } elsif ($field eq 'pwdAccountLockedTime') {
-    } elsif ($field eq 'otheraddress') {
-        my $sth = $self->db->prepare_cached(q{
-            select name from address left join address_attributes
-            on address.ikey = address_attributes.okey and
-            address_attributes.attr = 'isMainAddress'
-            where "user" = ?
-            order by address_attributes.attr
-        });
-        $sth->execute($self->id);
-        my @values;
-        while (my $res = $sth->fetchrow_hashref) {
-            push(@values, $res->{name});
-        }
-        return \@values;
-    } elsif ($field eq 'mainaddress') {
-        my $sth = $self->db->prepare_cached(q{
-            select name from address join address_attributes on ikey = okey
-            where "user" = ? and attr = 'isMainAddress'
-            });
-        $sth->execute($self->id);
-        my $res = $sth->fetchrow_hashref;
-        $sth->finish;
-        return $res->{name};
-    } elsif (grep { $field eq $_ } qw(postalAddress
-            co l postalCode streetAddress 
-            postOfficeBox st 
-            facsimileTelephoneNumber 
-            o telephoneNumber 
-            physicalDeliveryOfficeName 
-            site
-        )) {
-        if (my $fmainaddress = $self->_get_c_field('mainaddress')) {
-            my $address = $self->base->get_object('address', $fmainaddress);
-            if ($address) {
-                return $address->_get_c_field($field);
-            } else { # can't happend
-                return;
-            }
-        } else {
-            return $self->SUPER::get_field($field);
-        }
-    } elsif ($field eq 'aliases') {
-        my $sth = $self->db->prepare(q{
-            select name from aliases where array[lower($1)] =
-                string_to_array(lower(array_to_string("forward", ',')), ',')
-        } . ($self->base->{wexported} ? '' : 'and exported = true'));
-        $sth->execute($self->id);
-        my @values;
-        while (my $res = $sth->fetchrow_hashref) {
-            push(@values, $res->{name});
-        }
-        return \@values;
-    } elsif ($field eq 'forward') {
-        my $sth = $self->db->prepare(q{
-            select forward from aliases where name = ?
-        } . ($self->base->{wexported} ? '' : ' and exported = true'));
-        $sth->execute($self->id);
-        my $res = $sth->fetchrow_hashref;
-        $sth->finish;
-        return $res->{forward}
-    } elsif ($field eq 'revaliases') {
-        my $sth = $self->db->prepare(q{
-            select "as" from revaliases where name = ?
-        } . ($self->base->{wexported} ? '' : ' and exported = true'));
-        $sth->execute($self->id);
-        my $res = $sth->fetchrow_hashref;
-        $sth->finish;
-        return $res->{as}
-    } elsif ($field eq 'managerContact') {
-    } else {
-        return $self->SUPER::get_field($field);
-    }
 }
 
@@ -476 +806 @@
 }
 
-sub set_fields {
-    my ($self, %data) = @_;
-    my %fdata;
-    my $res = 0;
-    foreach my $attr (keys %data) {
-        $attr =~ /^(un)?exported$/ and do {
-            if (my $obj = $self->base->
-                get_object('revaliases', $self->id)) {
-                my $ares = $obj->set_c_fields(
-                    ($attr eq 'exported' ? 'exported' : 'unexported') => $data{$attr}
-                );
-                if (defined($ares)) {
-                    $res+=$ares;
-                } else {
-                    $self->base->log(LA_ERR,
-                        'Cannot set revaliases exported attribute for user %s',
-                        $self->id);
-                }
-            }
-            my $must_expire = $attr eq 'exported'
-                ? ($data{$attr} ? 0 : 1 )
-                : ($data{$attr} ? 1 : 0 );
-
-            foreach my $al ($self->get_attributes('aliases')) {
-                my $obj = $self->base->get_object('aliases', $al) or next;
-                $obj->_set_c_fields(
-                    expire => $must_expire
-                        ? strftime(
-                            "%Y-%m-%d %H:%M:%S",
-                            localtime(time + 3600 * 24 * 365)
-                          )
-                        : undef,
-                );
-            }
-        };
-        $attr eq 'gidnumber' && $data{$attr} !~ /^\d+$/ and do {
-            my $group = $self->base->get_object('group', $data{$attr}) or do {
-                $self->base->log(LA_ERROR,
-                    "Can't set gidNumber to %s: no such group", $data{$attr});
-                return;
-            };
-            $data{$attr} = $group->get_attributes('gidNumber');
-        };
-        $attr =~ /^memberOf$/ and do {
-            my %members;
-            my $memberof = $self->get_field('memberOf');
-            foreach (ref $memberof
-                ? @{ $memberof }
-                : $memberof || ()) {
-                $members{$_}{c} = 1;
-            }
-            foreach (grep { $_ } ref $data{$attr} ? @{ $data{$attr} || []} : $data{$attr}) {
-                $members{$_}{n} = 1;
-            }
-
-            foreach my $member (keys %members) {
-                $members{$member}{c} && $members{$member}{n} and next; # no change !
-                my $group = $self->base->get_object('group', $member) or do {
-                    la_log(LA_WARN, "Cannot get group %s to set members", $member); 
-                    next;
-                };
-                ($group->_get_c_field('sutype') || '') =~ /^(jobtype|contrattype)$/ and next;
-                if ($members{$member}{n}) {
-                    my @newmembers = $group->get_attributes('memberUID');
-                    $res += $group->_set_c_fields('memberUID', [ $self->id, @newmembers ]);
-                } elsif ($members{$member}{c}) {
-                    if (($self->_get_c_field('department') || '') eq $group->id) {
-                        $self->base->log(LA_WARN,
-                            "Don't removing user %s from group %s: is it's department",
-                            $self->id, $group->id);
-                        next;
-                    }
-                    my @newmembers = grep { $_ ne $self->id } $group->get_attributes('memberUID');
-                    $res += $group->_set_c_fields('memberUID', [ @newmembers ]);
-                } # else {} # can't happend
-            }
-            next;
-        };
-        $attr =~ /^forward$/ and do {
-            if ($data{$attr}) {
-                if (my $f = $self->base->get_object('aliases', $self->id)) {
-                    $res += $f->_set_c_fields(forward => $data{$attr});
-                } else {
-                    if ($self->base->_create_c_object(
-                            'aliases', $self->id,
-                            forward => $data{$attr},
-                            description => 'automatically created for ' . $self->id,
-                        )) {
-                        $res++;
-                    } else {
-                        $self->base->log(LA_ERR, "Cannot add forward for %s",
-                            $self->id);
-                    }
-                }
-            } else {
-                if ($self->base->_delete_object('aliases', $self->id)) {
-                    $res++;
-                } else {
-                    $self->base->log(LA_ERR, "Cannot remove forward for %s",
-                        $self->id);
-                }
-            }
-            next;
-        };
-        $attr =~ /^aliases$/ and do {
-            my %aliases = map { $_ => 1 } grep { $_ } (ref $data{$attr} ? @{$data{$attr}} :
-                $data{$attr});
-            foreach ($self->_get_attributes('aliases')) {
-                $aliases{$_} ||= 0;
-                $aliases{$_} +=2;
-            }
-            foreach (keys %aliases) {
-                if ($aliases{$_} == 2) {
-                    if ($self->base->_delete_object('aliases', $_)) {
-                        $res++
-                    } else {
-                        $self->base->log(LA_ERR,
-                            "Cannot remove aliases %s from user %s", $_,
-                            $self->id);
-                    }
-                } elsif ($aliases{$_} == 1) {
-                    if ($self->base->_create_c_object(
-                            'aliases', $_,
-                            forward => [ $self->id ],
-                            description => 'automatically created for ' . $self->id,
-                        )) {
-                        $res++
-                    } else {
-                        $self->base->log(LA_ERR, 'Cannot set forward %s to user %s',
-                            $_, $self->id);
-                        return
-                    }
-                } # 3 no change
-            }
-            next;
-        };
-        $attr =~ /^revaliases$/ and do {
-            if ($data{$attr}) {
-                if (my $obj = $self->base->
-                        get_object('revaliases', $self->id)) {
-                    my $ares = $obj->set_c_fields(
-                        'as' => $data{$attr},
-                        'exported' => ($self->get_attributes('exported') || 0),
-                    );
-                    if (defined($ares)) {
-                        $res+=$ares;
-                    } else {
-                        $self->base->log(LA_ERR, 'Cannot set revaliases for user %s',
-                            $self->id);
-                    }
-                } else {
-                    if ($self->base->_create_c_object(
-                        'revaliases',
-                        $self->id, as => $data{$attr},
-                        'exported' => ($self->get_attributes('exported') || 0),
-                        description => 'automatically created for ' . $self->id,
-                    )) {
-                        $res++;
-                    } else {
-                        $self->base->log(LA_ERR, 'Cannot set revaliases for user %s',
-                            $self->id);
-                    }
-                }
-            } else {
-                $self->base->_delete_object('revaliases', $self->id);
-                $res++;
-            }
-            next;
-        };
-        $attr =~ /^department$/ and do {
-            if ($data{$attr}) {
-                my $dpmt = $self->base->get_object('group', $data{$attr}) or do {
-                    $self->base->log(LA_ERR, 
-                        "Group %s does not exists",
-                        $data{$attr});
-                    return;
-                };
-                if ((($dpmt->_get_c_field('sutype') || '') ne 'dpmt')) {
-                    $self->base->log(LA_ERR, "Group %s is not a department",
-                        $data{$attr});
-                    return;
-                }
-            }
-        };          
-        $attr =~ /^jobType$/ and do {
-            if ($data{$attr}) {
-                my $dpmt = $self->base->get_object('group', $data{$attr}) or do {
-                    $self->base->log(LA_ERR, 
-                        "Group %s does not exists",
-                        $data{$attr});
-                    return;
-                };
-                if ((($dpmt->_get_c_field('sutype') || '') ne 'jobtype')) {
-                    $self->base->log(LA_ERR, "Group %s is not a jobtype",
-                        $data{$attr});
-                    return;
-                }
-            }
-        };          
-        $attr =~ /^contratType$/ and do {
-            if ($data{$attr}) {
-                my $dpmt = $self->base->get_object('group', $data{$attr}) or do {
-                    $self->base->log(LA_ERR, 
-                        "Group %s does not exists",
-                        $data{$attr});
-                    return;
-                };
-                if ((($dpmt->_get_c_field('sutype') || '') ne 'contrattype')) {
-                    $self->base->log(LA_ERR, "Group %s is not a contrattype",
-                        $data{$attr});
-                    return;
-                }
-            }
-        };          
-        grep { $attr eq $_ } (qw(co l postalCode streetAddress 
-            postOfficeBox st facsimileTelephoneNumber 
-            o telephoneNumber physicalDeliveryOfficeName site)) and do {
-            my $fmainaddress = $self->_get_c_field('mainaddress');
-            # set address attribute => create address object on the fly
-            # except if attr is empty !
-            if (!$fmainaddress && $data{$attr}) {
-                $fmainaddress = $self->id . '-' . join('', map { ('a'..'z')[rand(26)] }
-                (0..4));
-                $self->base->_create_c_object(
-                    'address', $fmainaddress,
-                    user => $self->id,
-                    isMainAddress => 1, ) or do {
-                    $self->base->log(LA_ERR,
-                        "Cannot create main address for user %s", $self->id);
-                    return;
-                };
-            }
-            if ($fmainaddress && 
-                (my $address = $self->base->get_object('address', $fmainaddress))) {
-                if ($address->attribute($attr) &&
-                    !$address->attribute($attr)->ro) {
-                    $res += $address->set_c_fields($attr => $data{$attr}) ||0;
-                }
-            }
-            next;
-        };
-        $fdata{$attr} = $data{$attr} || undef;
-    }
-    if (keys %fdata) {
-        if (defined(my $res2 = $self->SUPER::set_fields(%fdata))) {
-           return $res2 + $res;
-       } else {
-           return;
-       }
-    } else { return $res; }
-}
-
-
 1;
 

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

@@ -82 +82 @@
         }
     }
+
+    # Common to all object attribute:
+    my %commons = (
+        name      => { inline => 1, ro => 1, },
+        create    => { inline => 1, ro => 1, },
+        date      => { inline => 1, ro => 1, },
+        exported   =>   { inline => 1, formtype => 'CHECKBOX', hide => 1, monitored => 1 },
+        unexported =>   {
+            inline => 1,
+            managed => 1,
+            formtype => 'CHECKBOX',
+            get => sub {
+                my ($self) = @_;
+                return $self->object->get_field('exported') ? undef : 1;
+            },
+            set => sub {
+                my ($self, $data) = @_;
+                $self->object->_set_c_fields('exported', $data ? 'false' : 'true');
+            },
+        },
+        services   =>   { inline => 1, multiple => 1, reference => 'service' },
+    );
+
+    # Merging / overriding with common to all object attributes properties
+    foreach my $attr (keys %commons) {
+        foreach my $var (keys %{ $commons{$attr} }) {
+            $info->{$attr}{$var} = $commons{$attr}{$var};
+        }
+    }
+
+    # TODO kill this code: useless since everything is declared in perl code
     if ($class->_has_extended_attributes) {
         if (!$base->{__cache}{$class->_object_table}{extend}) {
@@ -98 +129 @@
         }
         foreach (@{$base->{__cache}{$class->_object_table}{extend}}) {
+            $base->log(LA_ERR, 'Attribute %s for %s not declared in code', $_, $class->type) if(!exists($info->{$_}));
             $info->{$_} ||= {};
         }
     }
-    $info->{exported}   = { inline => 1, formtype => 'CHECKBOX', hide => 1, monitored => 1 };
-    $info->{unexported} = { inline => 1, formtype => 'CHECKBOX', };
-    $info->{services}   = { inline => 1, multiple => 1, reference => 'service' };
 
     $info
@@ -249 +278 @@
 sub get_field {
     my ($self, $field) = @_;
-    if ($field eq 'unexported') {
-        return $self->get_field('exported') ? undef : 1;
-    }
     if ($field eq 'services') {
         my @services;
@@ -315 +341 @@
     my @vals;
     my %ext;
-    if (exists($data{unexported})) {
-        $data{exported} = $data{unexported} ? 0 : 1;
-    }
-    if (exists($data{exported})) {
-        $data{exported} ||= 0;
-    }
     if (exists($data{services})) {
         my %old = map { $_ => 0 } $self->get_attributes('services');
@@ -338 +358 @@
         delete($data{services});
     }
+    if (exists($data{services})) {
+        my %old = map { $_ => 0 } $self->get_attributes('services');
+        foreach my $serv (grep { $_ } ref $data{services} ? @{ $data{services} } : $data{services}) {
+            if (!exists($old{$serv})) {
+                my $oserv = $self->base->get_object('service', $serv) or next;
+                $oserv->addAttributeValue('dependOn', $self->type . '.' . $self->id);
+            }
+            $old{$serv} = 1;
+        }
+        foreach my $serv (keys %old) {
+            if (!$old{$serv}) {
+                my $oserv = $self->base->get_object('service', $serv) or next;
+                $oserv->delAttributeValue('dependOn', $self->type . '.' . $self->id);
+            }
+        }
+        delete($data{services});
+    }
     foreach my $field (keys %data) {
         my $attr = $self->attribute($field);
-        next if ($field eq 'unexported');
         my $oldval = $self->get_field($field);
         next if (($data{$field} || '') eq ($oldval || ''));