Changeset 1307

Timestamp:

04/01/15 18:41:34 (9 years ago)

Author:

nanardon

Message:

Reorder some code for logic

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm (modified) (6 diffs)

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

@@ -59 +59 @@
 }
 
+=head2 load
+
+Make account base loading data into memory if need.
+Should always be called, if database fetch data on the fly
+(SQL, LDAP), the function just return True.
+
+=cut
+
+# override by the database driver if need
+sub load { 1 }
+
+=head2 label
+
+Return the database label
+
+=cut
+
+sub label {
+    $_[0]->{_label} || 'NoLabel';
+}
+
+=head2 type
+
+Return the type of the base
+
+=cut
+
+sub type {
+    $_[0]->{_type};
+}
+
+=head2 la
+
+return LATMOS::Accounts object parent to the base
+
+=cut
+
+sub la { $_[0]->{_la} };
+
+=head2 config ($opt)
+
+Return options from config
+
+=cut
+
+sub config {
+    my ($self, $opt) = @_;
+    return $self->{_options}{$opt};
+}
+
 =head2 wexported
 
@@ -118 +168 @@
 =cut 
 
-sub ReportChange {
-    my ($self, $otype, $name, $ref, $changetype, $message, @args) = @_;
-
-}
-
-=head2 label
-
-Return the database label
-
-=cut
-
-sub label {
-    $_[0]->{_label} || 'NoLabel';
-}
-
-=head2 type
-
-Return the type of the base
-
-=cut
-
-sub type {
-    $_[0]->{_type};
-}
-
-=head2 la
-
-return LATMOS::Accounts object parent to the base
-
-=cut
-
-sub la { $_[0]->{_la} };
-
-=head2 config ($opt)
-
-Return options from config
-
-=cut
-
-sub config {
-    my ($self, $opt) = @_;
-    return $self->{_options}{$opt};
-}
+sub ReportChange {}
 
 =head2 list_supported_objects(@otype)
@@ -294 +302 @@
 }
 
+=head2 create_c_object($type, $id, %data)
+
+Create and return an object of type $type with unique id
+$id having %data using canonical fields
+
+=cut
+
+sub create_c_object {
+    my ($self, $otype, $id, %cdata) = @_;
+    $self->check_acl($otype, '@CREATE', 'w') or do {
+        $self->log(LA_WARN, 'permission denied to create object type %s',
+            $otype);
+        return;
+    };
+
+    $self->_create_c_object($otype, $id, %cdata);
+}
+
+sub _create_c_object {
+    my ($self, $otype, $id, %cdata) = @_;
+
+    $id ||= ''; # Avoid undef
+
+    if (my $chk = (
+        lc($otype) eq 'user' || lc($otype) eq 'group')
+        ? LATMOS::Accounts::Utils::check_ug_validity($id)
+        : LATMOS::Accounts::Utils::check_oid_validity($id)) {
+        $self->log(LA_ERR, "Cannot create $otype with ID $id `%s:'", $chk);
+        return;
+    }
+    foreach my $cfield (keys %cdata) {
+        $self->check_allowed_values($otype, $cfield, $cdata{$cfield}) or do {
+            $self->log(LA_ERR, "Cannot create $otype, wrong value");
+            return;
+        };
+    }
+
+    # populating default value
+    {
+        my %default = $self->compute_default($otype, $id, %cdata);
+        foreach my $k (keys %default) {
+            $cdata{$k} = $default{$k};
+        }
+    }
+
+    my %data;
+    foreach my $cfield (keys %cdata) {
+        my $attribute = $self->attribute($otype, $cfield) or next;
+        $attribute->ro and next;
+        $data{$attribute->iname} = $cdata{$cfield};
+    }
+    $self->create_object($otype, $id, %data) or return;
+    my $obj = $self->get_object($otype, $id) or return;
+    $obj->ReportChange('Create', 'Object created with %s', join(', ', sort keys %cdata));
+
+    foreach my $attrname (keys %data) {
+        my $attribute = $self->attribute($obj->type, $attrname) or next;
+        $attribute->monitored or next;
+
+        $obj->ReportChange('Attributes', '%s set to %s', $attrname,
+            (ref $data{$attrname}
+                ? join(', ', @{ $data{$attrname} })
+                : $data{$attrname}) || '(none)');
+    }
+
+    $obj
+}
+
 =head2 create_object($type, $id, %data)
 
@@ -330 +406 @@
 }
 
-=head2 create_c_object($type, $id, %data)
-
-Create and return an object of type $type with unique id
-$id having %data using canonical fields
-
-=cut
-
-sub create_c_object {
-    my ($self, $otype, $id, %cdata) = @_;
-    $self->check_acl($otype, '@CREATE', 'w') or do {
-        $self->log(LA_WARN, 'permission denied to create object type %s',
-            $otype);
-        return;
-    };
-
-    $self->_create_c_object($otype, $id, %cdata);
-}
 
 =head2 compute_default($otype, $id, %cdata)
@@ -414 +473 @@
 }
 
-sub _create_c_object {
-    my ($self, $otype, $id, %cdata) = @_;
-
-    $id ||= ''; # Avoid undef
-
-    if (my $chk = (
-        lc($otype) eq 'user' || lc($otype) eq 'group')
-        ? LATMOS::Accounts::Utils::check_ug_validity($id)
-        : LATMOS::Accounts::Utils::check_oid_validity($id)) {
-        $self->log(LA_ERR, "Cannot create $otype with ID $id `%s:'", $chk);
-        return;
-    }
-    foreach my $cfield (keys %cdata) {
-        $self->check_allowed_values($otype, $cfield, $cdata{$cfield}) or do {
-            $self->log(LA_ERR, "Cannot create $otype, wrong value");
-            return;
-        };
-    }
-
-    # populating default value
-    {
-        my %default = $self->compute_default($otype, $id, %cdata);
-        foreach my $k (keys %default) {
-            $cdata{$k} = $default{$k};
-        }
-    }
-
-    my %data;
-    foreach my $cfield (keys %cdata) {
-        my $attribute = $self->attribute($otype, $cfield) or next;
-        $attribute->ro and next;
-        $data{$attribute->iname} = $cdata{$cfield};
-    }
-    $self->create_object($otype, $id, %data) or return;
-    my $obj = $self->get_object($otype, $id) or return;
-    $obj->ReportChange('Create', 'Object created with %s', join(', ', sort keys %cdata));
-
-    foreach my $attrname (keys %data) {
-        my $attribute = $self->attribute($obj->type, $attrname) or next;
-        $attribute->monitored or next;
-
-        $obj->ReportChange('Attributes', '%s set to %s', $attrname,
-            (ref $data{$attrname}
-                ? join(', ', @{ $data{$attrname} })
-                : $data{$attrname}) || '(none)');
-    }
-
-    $obj
-}
-
 sub _allowed_values {
     $_[0]->{_allowed_values}
@@ -704 +713 @@
     $pclass->_rename($self, $id, $newid);
 }
-
-=head2 load
-
-Make account base loading data into memory if need.
-Should always be called, if database fetch data on the fly
-(SQL, LDAP), the function just return True.
-
-=cut
-
-sub load { 1 }
 
 =head2 is_transactionnal