Changeset 861 for LATMOS-Accounts-Web/lib/LATMOS/Accounts

Timestamp:

12/02/11 11:42:17 (13 years ago)

Author:

nanardon

Message:

• reimport missing files from previous svn

Location:

LATMOS-Accounts-Web/lib/LATMOS/Accounts

Files:

• Web.pm (modified) (1 diff)
• Web/Controller.pm (modified) (1 diff)
• Web/Controller/About.pm (added)
• Web/Controller/Ajax.pm (modified) (4 diffs)
• Web/Controller/Aliases.pm (modified) (1 diff)
• Web/Controller/Create.pm (modified) (2 diffs)
• Web/Controller/Groups.pm (modified) (3 diffs)
• Web/Controller/NetHosts.pm (added)
• Web/Controller/NetZones.pm (added)
• Web/Controller/Sites.pm (modified) (2 diffs)
• Web/Controller/Users.pm (modified) (4 diffs)
• Web/Model/Accounts.pm (modified) (1 diff)
• Web/Model/AttrFilter.pm (modified) (1 diff)
• Web/Model/AttrForms.pm (modified) (12 diffs)

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web.pm

@@ -24 +24 @@
     /;
 
-our $VERSION = '0.0.11';
+our $VERSION = '2.0.0';
 
 # Configure the application. 
-#
-# Note that settings in LATMOS::Accounts::Web.yml (or other external
-# configuration file that you set up manually) take precedence
-# over this when using ConfigLoader. Thus configuration
-# details given here can function as a default configuration,
-# with a external configuration file acting as an override for
-# local deployment.
+
+my $config_file = '/etc/latmos-accounts/latmos-accounts-web.yml';
+if (-r $config_file ) {
+    __PACKAGE__->config( 'Plugin::ConfigLoader' => { 
+            file => $config_file 
+        } 
+    );
+}
 
 # http://stackoverflow.com/questions/1664816/is-there-a-way-to-force-c-urifor-in-catalyst-to-generate-a-uri-that-begins-wit

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller.pm

@@ -25 +25 @@
 
     if (!$c->user_exists) {
-        if ($c->req->path ne 'login') {
-            $c->forward('/login');
+        # No need to login for About section
+        if ($c->namespace ne 'about') {
+            if ($c->req->path ne 'login') {
+                $c->forward('/login');
+            }
+            return;
         }
     } else {
-        $c->model('Accounts')->db->connect($c->user->{username},
+        $c->model('Accounts')->db->connect(
+            $c->user->{username},
             $c->user->{password});
     }
-    
-    my $menu = '';
-    my @menus = (
-        [ 'users' => 'Utilisateurs' ],
-        ($c->model('Accounts')->db->check_acl('user', '@CREATE', 'w')
-            ? [ 'create/user' => 'Nouvel Util.' ]
-            : ()),
-        [ 'groups' => 'Groupes' ],
-        ($c->model('Accounts')->db->check_acl('group', '@CREATE', 'w')
-            ? [ 'create/group' => 'Nouveau Groupe' ]
-            : ()),
-        [ 'sites' => 'Sites' ],
-        [ 'aliases' => 'Alias Mail' ],
-    );
-    foreach(@menus) {
-        $menu .= sprintf(
-            q{<a href="%s"><span%s>%s</span></a>},
-            $c->uri_for('/' . $_->[0]),
-            ($c->req->path =~ m:^$_->[0]: ? ' id="actif"' : ''),
-            $_->[1],
-        );
-
-    }
-    $c->stash->{mainmenu} = $menu;
 }
 

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Ajax.pm

@@ -45 +45 @@
 }
 
+sub displayattr : Local {
+    my ($self, $c, $otype) = @_;
+    my $attribute = $c->model('Accounts')->db->attribute($otype,
+        $c->req->param('attr')) or return;
+    $c->stash->{value} = $attribute->display($c->req->param('id'));
+}
+
 sub attrvalues : Local {
     my ($self, $c, $otype, $attr) = @_;
@@ -63 +70 @@
 
     $c->stash->{'exists'} = join(', ', $obj->get_attributes($c->req->param('attr') ||
-            'displayName')) if($obj);
+            'displayName') || $obj->id) if($obj);
 }
 
@@ -88 +95 @@
     my ($self, $c, $otype, $attr) = @_;
     my $base = $c->model('Accounts')->db;
-    my $val = $c->req->param('val');
+    my $attribute = $base->attribute($otype, $attr) or return;
+    my $val = $attribute->input($c->req->param('val'));
     my @obj = $val ? $base->search_objects($otype, "$attr=$val") : ();
 
@@ -125 +133 @@
 }
 
+sub select_freeip_select : Local {
+    my ($self, $c) = @_;
+
+}
+
+sub goto : Local {
+    my ($self, $c) = @_;
+
+    $c->res->redirect(
+        $c->uri_for('/' . $c->req->param('otype') . 's', $c->req->param('goto'),
+        $c->req->param('subform'))
+    );
+    $c->stash->{template} = 'no_object.tt';
+}
+
+
 sub end : Private {
     my ( $self, $c ) = @_;

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Aliases.pm

@@ -29 +29 @@
     my @name = $c->req->param('name');
     my @forward = $c->req->param('forward');
+    $c->stash->{page}{title} = "Gestion des alias";
     foreach my $idx (0 .. scalar(@name) - 1) {
 

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Create.pm

@@ -5 +5 @@
 use base 'LATMOS::Accounts::Web::Controller';
 use LATMOS::Accounts::Utils;
+use LATMOS::Accounts::Log;
 
 =head1 NAME
@@ -29 +30 @@
 }
 
-sub user : Local {
-    my ( $self, $c ) = @_;
-
+sub default : LocalPath {
+    my ($self, $c, undef, $otype ) = @_;
     my $base = $c->model('Accounts')->db;
-    $c->stash->{form} = $c->model('AttrForms', undef, 'user', $base);
-    for ($c->req->param('step') || '') {
-        /^1$/ and do {
-            $c->stash->{step} = 2;
-            my $acc = $c->model('Accounts')->accounts;
-            foreach ($acc->Parameters('_defattr_')) {
-                if (/^user\.(.*)/) {
-                    $c->req->params->{$1} ||= $acc->val('_defattr_', $_);
-                }
-            }
-            $c->req->params->{exported} = 1;
-            if (! $c->req->params->{id}) {
-                for (1) {
-                    my $login;
-                    if ($c->req->param('sn')) {
-                        $login = lc(to_ascii($c->req->param('sn')));
-                        length($login) > 10 and $login = substr($login, 0, 8);
-                        $base->get_object('user', $login) or do {
-                            $c->req->params->{id} = $login;
-                            last;
-                        };
-                        if ($c->req->param('givenName')) {
-                            length($login) > 8 and $login = substr($login, 0, 8);
-                            $login .= substr(lc(to_ascii($c->req->param('givenName'))), 0, 1);
-                            $base->get_object('user', $login) or do {
-                                $c->req->params->{id} = $login;
-                                last;
-                            };
-                        }
-                    }
-                }
-
-                my $mailid = $c->req->params->{givenName} && $c->req->params->{sn}
-                ? sprintf('%s.%s',
-                    to_ascii(lc($c->req->params->{givenName})),
-                    to_ascii(lc($c->req->params->{sn})),)
-                : undef;
-
-                if ($mailid &&
-                    $base->is_supported_object('aliases') &&
-                    ! $base->get_object('aliases', $mailid)) {
-                    if ($base->get_field_name('user', 'mail', 'write')) {
-                        if ($base->{defattr}{'user.maildomain'}) {
-                            $c->req->params->{mail} ||= sprintf('%s@%s',
-                                $mailid,
-                                $base->{defattr}{'user.maildomain'});
-                        }
-                    }
-                    if ($base->get_field_name('user', 'aliases', 'write')) {
-                        $c->req->params->{aliases} ||= $mailid;
-                    }
-                    warn $base->get_field_name('user', 'revaliases', 'write');
-                    if ($base->get_field_name('user', 'revaliases', 'write')) {
-                        $c->req->params->{revaliases} ||= $mailid;
-                    }
-                }
-            }
-            last;
-        };
-        /^2$/ and do {
-            $c->stash->{step} = 2;
-            $c->req->params->{id} or return;
-            $base->get_object('user', $c->req->params->{id}) and do {
-                $c->stash->{idexists} = 1;
-                return;
-            };
-            $base->create_c_object('user', $c->req->params->{id},
-                %{ $c->req->params },
-                exported => $c->req->param('exported') ? 1 : 0,
-            ) or return;
-            $base->commit;
-            $c->res->redirect($c->uri_for('/users', $c->req->params->{id}));
-            last;
-        };
+    my ($step) = $c->req->param('step');
+    my $form = $c->model('AttrForms', undef, $otype, $base);
+    my ($status, $info);
+    $c->stash->{page}{title} = "Ajouter un objet / $otype";
+    if ($step) {
+        $info = $c->session->{ochelper};
     }
+    if ($info->{name}{ask}) {
+        $info->{name}{content} = $c->req->param('_name');
+    }
+    foreach my $attr (@{$info->{ask} || []}) {
+        $info->{contents}{$attr} = $c->req->param($form->attr_field_name($attr));
+    }
+    my $ochelper = $base->ochelper($otype);
+    ($status, $info) = $ochelper->step($info);
+    
+    if ($status eq 'CREATED') {
+        $base->commit;
+        $c->res->redirect($c->uri_for('/' . $otype . 's',
+                $info->{name}{content}));
+    } elsif ($status eq 'ERROR') {
+        # On error, restart the process
+        $c->stash->{page}{error} =
+            'Erreur lors de la création de l\'objet: ' .
+            LATMOS::Accounts::Log::lastmessage(LA_ERR);
+        foreach my $attr (@{$info->{ask} || []}) {
+            $c->req->params->{$form->attr_field_name($attr)} = $info->{contents}{$attr};
+        }
+        $info->{step} = 0; # reset
+        ($status, $info) = $ochelper->step($info);
+    } else {
+        foreach my $attr (@{$info->{ask} || []}) {
+            $c->req->params->{$form->attr_field_name($attr)} = $info->{contents}{$attr};
+        }
+    }
+    $c->stash->{form} = $form;
+    $c->stash->{ochelper} = $info; 
+    $c->session->{ochelper} = $info;
 }
 
-sub group : Local {
-    my ( $self, $c ) = @_;
-
-    my $base = $c->model('Accounts')->db;
-    $c->stash->{form} = $c->model('AttrForms', undef, 'group', $base);
-    if (!exists($c->req->params->{id})) {
-        $c->req->params->{exported} = 1;
-    }
-
-    if ($c->req->params->{id}) {
-        $base->get_object('group', $c->req->params->{id}) and do {
-            $c->stash->{idexists} = 1;
-            return;
-        };
-        $base->create_c_object('group', $c->req->params->{id},
-            %{ $c->req->params },
-            exported => $c->req->param('exported') ? 1 : 0,
-        ) or return;
-        $base->commit;
-        $c->res->redirect($c->uri_for('/groups', $c->req->params->{id}));
-    }
-}
 
 =head1 AUTHOR

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Groups.pm

@@ -27 +27 @@
     $c->stash->{ofilter} = $c->model('AttrFilter', 'group');
     $c->stash->{groupslist} = [  map { $_->id } @{ $c->stash->{objectslist} } ];
+    $c->stash->{page}{title} = "Liste des groupes";
 
 }
@@ -35 +36 @@
     my $base = $c->model('Accounts')->db;
 
+    $c->stash->{page}{title} = "Groupe :: $groupname";
     $c->stash->{groupname} = $groupname;
     $c->stash->{group} = $base->get_object('group', $groupname) or do {
@@ -65 +67 @@
             last;
         };
+        /^dpmt$/ and do {
+            $c->stash->{template} = 'groups/dpmt.tt';
+            my @filter = ();
+            push(@filter, 'active=*') if (!$c->req->param('inactive'));
+            push(@filter, 'mail=*') if ($c->req->param('mail'));
+            push(@filter, 'company=' . $c->req->param('company')) if
+                ($c->req->param('company'));
+            $c->stash->{dpmt} = $groupname;
+            $c->stash->{odpmt} = $c->stash->{group};
+            $c->stash->{user} = [ $base->search_objects('user',
+                    'department=' . $c->stash->{dpmt},
+                    @filter,
+                ) ];
+            foreach my $u ($base->search_objects('user',
+                    'memberOf=' . $c->stash->{dpmt},
+                    @filter,
+                )) {
+                push(@{$c->{stash}->{guser}}, $u)
+                unless(grep { $u eq $_ } @{$c->stash->{user}});
+            }
+            last;
+        };
 
         $c->stash->{form} = $c->model('AttrForms', 'group' . $c->stash->{subform}, $c->stash->{group});

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Sites.pm

@@ -27 +27 @@
     $c->stash->{ofilter} = $c->model('AttrFilter', 'site');
     $c->stash->{siteslist} = [  map { $_->id } @{ $c->stash->{objectslist} } ];
+    $c->stash->{page}{title} = "Liste des sites";
 }
 
@@ -34 +35 @@
     my $base = $c->model('Accounts')->db;
 
+    $c->stash->{page}{title} = "Site :: $sitename";
     $c->stash->{sitename} = $sitename;
     $c->stash->{site} = $base->get_object('site', $sitename) or do {

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm

@@ -43 +43 @@
         $c->stash->{initials} = [ sort keys %initials ];
     }
+    $c->stash->{page}{title} = 'Listes des utilisateurs (' . scalar(@{
+                $c->stash->{objectslist} }) . ')';
     $c->stash->{userslist} = \@userlist;
 }
@@ -51 +53 @@
     my $base = $c->model('Accounts')->db;
 
+    $c->stash->{page}{title} = "Utilisateur :: $username";
     $c->stash->{username} = $username;
     $c->stash->{user} = $base->get_object('user', $username) or do {
@@ -57 +60 @@
     };
     $c->stash->{subform} = $subform || '';
+    $c->stash->{page}{title} = "Utilisateur :: $username";
 
     for ($subform || '') {
@@ -155 +159 @@
             last;
         };
+        /^my$/ and do {
+            $c->stash->{db} = $base;
+            $c->stash->{template} = 'users/my.tt';
+        };
         /^dump$/ and do {
             $c->stash->{db} = $base;

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/Accounts.pm

@@ -56 +56 @@
 }
 
+sub object_navigate {
+    my ($self, $otype, $id, @filter) = @_;
+
+    my @list = $self->db->search_objects($otype, @filter);
+
+    my $i = 0;
+    for($i = 0; $i <= $#list; $i++) {
+        $list[$i] eq $id and last;
+    }
+
+    my %ptr = ();
+    $ptr{oprev} = $list[$i-1] if ($i > 0);
+    $ptr{'onext'} = $list[$i+1] if ($i < $#list);
+    $ptr{ofirst} = $list[0] if ($i > 1);
+    $ptr{'olast'} = $list[$#list] if ($i < $#list -1);
+    $ptr{list} = \@list;
+
+    return \%ptr;
+}
+
 # Such function must not be here, but in LATMOS::Accounts
 # But code does not allow this at time

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFilter.pm

@@ -19 +19 @@
     group => [ qw(cn description gidNumber sutype) ],
     site => [ qw(l) ],
+    nethost => [ qw(name cname otherName ip macaddr owner serialNumber) ],
+    netzone => [ qw(net group type site) ],
 };
 

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -4 +4 @@
 use warnings;
 use base 'Catalyst::Model';
+use LATMOS::Accounts::Log;
 
 =head1 NAME
@@ -39 +40 @@
     sutype => [ 'Structure admin.', 'select-N:sutype' ],
     exported => [ 'Propagé', 'label' ],
+    unexported => [ 'Caché' ],
     locked => [ 'Vérouillé', 'checkbox:l' ],
     isMainAddress => [ 'Adresse principale', 'checkbox' ],
@@ -54 +56 @@
     contratType => [ 'Type de contrat', 'select-N:group/sutype=contrattype' ],
     managerContact => [ 'Contact' ],
+    owner => [ 'Propriétaire' ],
+    description => [ 'Description' ],
+    name => [ 'Nom' ],
+    net => [ "Réseau" ],
+    macaddr => [ "Adresse Ethernet" ],
+    noDynamic => [ "Pas d'adressage dyn." ],
+    cname => [ "Alias (CName)" ],
+    type => [ "Type" ],
+    netExclude => [ "Réseau exclus" ],
+    output => [ "Sortie" ],
+    template => [ "ModÚle" ],
+    outputD => [ "Sortie" ],
+    templateD => [ "ModÚle" ],
+    group => [ "Groupe" ],
+    allow_dyn => [ "DHCP dynamique" ],
+    ipCount => [ "Nb d'IP" ],
+    freeIPCount => [ "Nb d'IP libres" ],
+    dnsRevision => [ "Révision DNS" ],
+    lastUpdate => [ "DerniÚre mise à jour "],
+    otherName => [ "Autres noms (A)" ],
+    'reverse' => [ "Forcer le reverse à " ],
+    dynFrom => [ 'Sans Ip depuis' ],
+    siteNick => [ 'Acronyme' ],
+    serialNumber => [ 'N° de série' ],
+    snNative => [ 'Nom d\'origine' ],
+    givenNameNative => [ 'Prénom d\'origine' ],
+    wWWHomePage => [ 'Site Web' ],
+    halReference => [ 'Référence HAL' ],
 };
 
@@ -64 +94 @@
             mail initials nickname
             locked
-            exported
             create
             date
@@ -76 +105 @@
         ) ],
     },
-    userstatus => {
-        name => 'Status',
+    userstatut => {
+        name => 'Statut',
         attrs => [ qw(
             company
@@ -87 +116 @@
         ) ],
     },
+    usermy => {
+        name => 'My',
+        attrs => [ qw(
+            snNative
+            givenNameNative
+            wWWHomePage
+            halReference
+        ) ],
+    },
     site => {
         name => 'Site',
         attrs => [ qw(
             description
+            siteNick
             streetAddress
             postOfficeBox
@@ -115 +154 @@
             site
             co
-            exported
+            unexported
             description
         ) ],
@@ -124 +163 @@
             gidNumber description
             managedBy
-            sutype exported
+            sutype
             create
             date
+        ) ],
+    },
+    nethost => {
+        name => 'Ordinateur',
+        attrs => [ qw(
+            name
+            description
+            serialNumber
+            owner
+            ip
+            macaddr
+            noDynamic
+            cname
+            otherName
+            reverse
+            create
+            date
+            unexported
+        ) ],
+    },
+    netzone => {
+        name => 'Zone réseau',
+        attrs => [ qw(
+            name
+            description
+            type
+            net
+            netExclude
+            outputD
+            templateD
+            site
+            allow_dyn
+            dynFrom
+            domain
+            ipCount
+            freeIPCount
+            create
+            date
+            dnsRevision
+            lastUpdate
+            unexported
         ) ],
     },
@@ -179 +259 @@
     my ($self, $for) = @_;
     grep { $_ }
-    grep { $self->base->check_acl($self->{object} || $self->otype, $_, 'r') }
-    grep { $self->base->get_field_name($self->otype, $_, $for || 'a') }
+    grep { $self->base->attribute($self->otype, $_) }
     @{ $forms->{$self->{form}}->{attrs} };
 }
@@ -196 +275 @@
     my ($self, $attr) = @_;
     return $self->{c}->req->param($attr) ||
-        ($self->{object} ? $self->{object}->get_c_field($attr) : '')
-}
-
-sub attr_field {
-    my ($self, $attr, $type) = @_;
-    my $modallow = $self->base->check_acl($self->{object}
-        ? ($self->{object}, $attr, 'w')
-        : ($self->otype, '@CREATE', 'w'));
-    $type ||= $attrs->{$attr}[1] || '';
-    if (!($self->base->get_field_name($self->otype, $attr, 'w') && $modallow)) {
-        $type = 'label';
-    }
-    # exception: gidNumber is used also in group, but we don't want
-    # group list here, really the number !
-    $type = $modallow ? 'text-U:6' : 'label' if ($self->{otype} eq 'group' && $attr eq 'gidNumber');
-    $type ||= 'text';
-    
-    my $htmlname = $self->escape(($self->{object} 
+        ($self->{object} ? $self->{object}->get_attributes($attr) : '')
+}
+
+sub attr_field_name {
+    my ($self, $attr) = @_;
+    return ($self->{object}
             ? $self->{object}->id . '_'
             : ''
         ) . $attr
-    );
-    for ($type) {
-        /^textarea$/ and return sprintf(
-            '<textarea id="%s" name="%s" cols="40">%s</textarea>',
-            $self->escape($htmlname),
-            $self->escape($htmlname),
-            $self->escape($self->attr_raw_value($attr) || ''),
-        );
-        /^label$/ and do {
-            my $field = $self->escape(
-                $self->attr_raw_value($attr)
-            );
-            $field =~ s/\n/<br>/g;
-            return $field . sprintf('<input type="hidden" name="%s" value="%s">',
-                $self->escape($htmlname), ($self->attr_raw_value($attr) || ''));
-        };
-        /^date$/ and do {
-            my ($date, $time) = split(/ /, $self->attr_raw_value($attr) || '');
-            if ($date && $date =~ /^(\d+)-(\d+)-(\d+)$/) {
-                $date = "$3/$2/$1";
-            }
-            my $html = "\n" . q{<SCRIPT LANGUAGE="JavaScript" ID="js13">
-            var cal13 = new CalendarPopup();
-            </SCRIPT>} . "\n";
-            $html .= sprintf(
-                '<input type="text" id="%s" name="%s" value="%s" size="12">',
-                $self->escape($htmlname),
-                $self->escape($htmlname),
-                $self->escape($date)
-            );
-            $html .= q{<DIV ID="testdiv1" STYLE="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></DIV>};
-            $html .= qq|
-            <A HREF="#"
-                onClick="cal13.select(document.forms[0].$htmlname,'${htmlname}_anc','dd/MM/yyyy');return false;"
-                TITLE="cal13.select(document.forms[0].$htmlname,'${htmlname}_anc','dd/MM/yyyy');return false;"
-                NAME="${htmlname}_anc" ID="${htmlname}_anc">
-                <img src="| . $self->{c}->uri_for(qw(/static icons view-calendar-day.png))
-                . qq{" style="ref"></A>
-                } . "\n";
-            return $html;
-        };
-        /^checkbox(?::(\w+))?$/ and do {
-            my $options = $1 || '';
-            my $text = sprintf('<input type="checkbox" name="%s"%s>',
-                $self->escape($htmlname),
-                $self->attr_raw_value($attr) ? '  checked="yes"' : ''
-            ); 
-            $text .= sprintf('<input type="hidden" name="%s">',
-                $self->escape($htmlname));
-            if ($options =~ /l/) {
-                $text .= $self->attr_raw_value($attr)
-                    ? ' ' . $self->attr_raw_value($attr)
-                    : ''; 
-            }
-            return $text;
-        };
-        /^select(-\w+)?:([^:\/]+)(?:\/([^:]+))?(?::(.*))?/ and do {
-            my $options = $1 || '';
-            my $otype = $2;
-            my $filter = $3;
-            my $keyfield = $4;
-            my $observe_keyfield = $keyfield || 'displayName';
-            my $select = sprintf('<select id="%s" name="%s">',
-                $self->escape($htmlname),
-                $self->escape($htmlname)) . "\n";
-            $select .= '<option value="">--</option>' . "\n" if ($options =~ /N/);
-            my $value = $self->attr_raw_value($attr) || '';
-            my $initial_observed = '';
-            foreach my $id (sort $filter
-                ? $self->base->search_objects($otype, $filter)
-                : $self->base->list_objects($otype)) {
-                my $val = $id;
-                if ($keyfield) {
-                    my $obj = $self->base->get_object($otype, $id) or next;
-                    $val = $obj->get_c_field($keyfield);
-                }
-                $select .= sprintf(
-                    '    <option value="%s"%s>%s</option>',
-                    $self->escape($val || ''),
-                    $value eq $val ? ' selected="selected"' : '',
-                    $self->escape($id || ''),
+}
+
+sub attr_field {
+    my ($self, $attr, $type) = @_;
+
+    my $attribute = ($self->{object}
+        ? $self->{object}->attribute($attr)
+        : $self->base->attribute($self->otype, $attr)) or return;
+
+    my $htmlname = $self->escape($self->attr_field_name($attr));
+
+    my @html_fields;
+    foreach my $attr_raw_value (
+        $attribute->{multiple}
+            ? ((grep { $_ } $self->attr_raw_value($attr)),
+                $attribute->readonly
+                    ? ()
+                    : ('')
+            )
+            : ($self->attr_raw_value($attr))) {
+
+        my $html_id = $htmlname .
+            (scalar(@html_fields) ? scalar(@html_fields) : '');
+
+        my $html_field = '';
+        for ($attribute->form_type) {
+            /^textarea$/i and do {
+                $html_field = sprintf(
+                    '<textarea id="%s" name="%s" cols="40">%s</textarea>',
+                    $self->escape($html_id),
+                    $self->escape($htmlname),
+                    $self->escape($attr_raw_value || ''),
                 );
-                $select .= "\n";
-                if($value eq $val) {
-                    if (my $obj = $self->base->get_object($otype, $id)) {
-                        $initial_observed = $obj->get_c_field($observe_keyfield)
-                        || '';
-                    }
-                }
-            }
-            $select .= "</select>\n";
-            $select .= $self->{c}->prototype->observe_field( $htmlname, {
-                update => "${htmlname}_span",
-                url => $self->{c}->uri_for('/ajax', 'rawattr', $otype),
-                frequency => 1,
-                with   => "'attr=" . $observe_keyfield .
-                "&id='+element.options[element.selectedIndex].text",
-            }) .
-            qq|<span id="${htmlname}_span">$initial_observed</span>|;
-            return $select;
-        };
-        /^text(-\w+)?(?::(\d+))?/ and do {
-            my $flag = $1 || '';
-            if (my @allowed = $self->base->obj_attr_allowed_values(
-                    $self->{otype}, $attr)) {
-                my $cvalue = $self->attr_raw_value($attr);
-                my $textf = sprintf('<select  id="%s" name="%s">',
+                last;
+            };
+            /^label$/i and do {
+                $attr_raw_value or last;
+                $html_field = $self->escape($attr_raw_value);
+                $html_field =~ s/\n/<br>/g;
+                $html_field .= sprintf('<input type="hidden" name="%s" value="%s">',
+                    $self->escape($htmlname), ($attr_raw_value || ''));
+                last;
+            };
+            /^date$/i and do {
+                my ($date, $time) = split(/ /, $self->attr_raw_value($attr) || '');
+                if ($date && $date =~ /^(\d+)-(\d+)-(\d+)$/) {
+                    $date = "$3/$2/$1";
+                }
+                my $html = "\n" . q{<SCRIPT LANGUAGE="JavaScript" ID="js13">
+                var cal13 = new CalendarPopup();
+                </SCRIPT>} . "\n";
+                $html .= sprintf(
+                    '<input type="text" id="%s" name="%s" value="%s" size="12">',
+                    $self->escape($html_id),
                     $self->escape($htmlname),
+                    $self->escape($date)
+                );
+                $html .= q{<DIV ID="testdiv1" STYLE="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></DIV>};
+                $html .= qq|
+                <A HREF="#"
+                    onClick="cal13.select(document.getElementById('$html_id'),'${html_id}_anc','dd/MM/yyyy');return false;"
+                    TITLE="Date"
+                    NAME="${html_id}_anc" ID="${html_id}_anc">
+                    <img class="attr" src="| . $self->{c}->uri_for(qw(/static icons view-calendar-day.png))
+                    . qq{" style="ref"></A>
+                    } . "\n";
+                $html_field = $html;
+                last;
+            };
+            /^checkbox(?::(\w+))?$/i and do {
+                my $options = $1 || '';
+                $html_field = sprintf('<input type="checkbox" name="%s"%s>',
+                    $self->escape($htmlname),
+                    $attr_raw_value ? '  checked="yes"' : ''
+                ); 
+                $html_field .= sprintf('<input type="hidden" name="%s">',
+                    $self->escape($htmlname));
+                if ($attribute->form_option('rawvalue')) {
+                    $html_field .= $attr_raw_value
+                        ? ' ' . $attr_raw_value
+                        : ''; 
+                }
+                last;
+            };
+            /^LIST/ and do {
+                my $options = $1 || '';
+                my $select = sprintf('<select id="%s" name="%s">',
+                    $self->escape($html_id),
                     $self->escape($htmlname)) . "\n";
-                $textf .= '<option value="">--</option>' . "\n";
-                foreach (sort @allowed) {
-                    $textf .= sprintf('<option value="%s"%s>%s</option>' . "\n",
-                        $self->escape($_),
-                        (($cvalue || '') eq $_ ? ' selected="selected"' : ''),
-                        $self->escape($_),
+                $select .= '<option value="">--</option>' . "\n"
+                    unless($attribute->mandatory);
+                my $value = $attr_raw_value || '';
+                my $initial_observed = '';
+                my @valslist;
+                foreach my $val (sort $attribute->can_values) {
+                    push(@valslist, {
+                        val => $val,
+                        disp => $attribute->display($val || ''),
+                    });
+                }
+                foreach (sort { $a->{disp} cmp $b->{disp} } @valslist) {
+                    $select .= sprintf(
+                        '    <option value="%s"%s>%s</option>',
+                        $self->escape($_->{val} || ''),
+                        $value eq $_->{val} ? ' selected="selected"' : '',
+                        $self->escape($_->{disp} || ''),
                     );
-                }
-                $textf .= "</select>\n";
-                return $textf;
-            } else {
-                my $textf = sprintf(
+                    $select .= "\n";
+                }
+                $select .= "</select>\n";
+
+                $html_field = $select;
+                last;
+            };
+            /^text(-\w+)?(?::(\d+))?/i and do {
+                my $flag = $1 || '';
+                $html_field = sprintf(
                     '<input type="text" id="%s" name="%s" value="%s" size="%d">',
+                    $self->escape($html_id),
                     $self->escape($htmlname),
-                    $self->escape($htmlname),
-                    $self->escape($self->attr_raw_value($attr)),
-                    $2 || 30,
+                    $self->escape($attr_raw_value),
+                    $attribute->form_option('length') || 30,
                 );
                 if ($flag =~ /A/) {
-                $textf .= qq|<span id="${htmlname}_auto_complete"></span>|;
-                $textf .= "\n";
-                $textf .= $self->{c}->prototype->auto_complete_field(
-                    $htmlname,
-                    {
-                    update => "${htmlname}_auto_complete",
-                    url => $self->{c}->uri_for('/ajax', 'attrvalues', $self->otype, $attr),
-                    indicator => "${htmlname}_stat", min_chars => 1,
-                    with => "'val='+document.getElementById('$htmlname').value",
-                    frequency => 2,
-                    }
-                );
-                }
-                if ($flag =~ /U/) {
-                $textf .= qq|<span id="${htmlname}_observer_uniq"></span>|;
-                $textf .= "\n";
-                $textf .= $self->{c}->prototype->observe_field(
-                    $htmlname,
-                    {
-                    update => "${htmlname}_observer_uniq",
-                    url => $self->{c}->uri_for('/ajax', 'objattrexist',
-                        $self->otype, $attr),
-                    frequency => 2,
-                    indicator => "${htmlname}_stat", min_chars => 1,
-                    with => "'val='+document.getElementById('$htmlname').value" .
-                        ($self->{object} ? "+'&exclude=" . $self->{object}->id . "'" :
-                            ''),
-                    }
-                );
-                }
-                $textf .= qq|<span style="display:none" id="${htmlname}_stat">Searching...</span>|;
-
-                return $textf;
+                    $html_field .= qq|<span id="${html_id}_auto_complete"></span>|;
+                    $html_field .= "\n";
+                    $html_field .= $self->{c}->prototype->auto_complete_field(
+                        $html_id,
+                        {
+                            update => "${html_id}_auto_complete",
+                            url => $self->{c}->uri_for('/ajax', 'attrvalues', $self->otype, $attr),
+                            indicator => "${html_id}_stat", min_chars => 1,
+                            with => "'val='+document.getElementById('$html_id').value",
+                            frequency => 2,
+                        }
+                    );
+                }
+                if ($attribute->uniq) {
+                    $html_field .= qq|<span class="inputvalidate" id="${html_id}_observer_uniq"></span>|;
+                    $html_field .= "\n";
+                    $html_field .= $self->{c}->prototype->observe_field(
+                        $html_id,
+                        {
+                            update => "${html_id}_observer_uniq",
+                            url => $self->{c}->uri_for('/ajax', 'objattrexist',
+                                $self->otype, $attr),
+                            frequency => 2,
+                            indicator => "${html_id}_stat", min_chars => 1,
+                            with => "'val='+document.getElementById('$html_id').value" .
+                            ($self->{object} ? "+'&exclude=" . $self->{object}->id . "'" :
+                                ''),
+                        }
+                    );
+                    $html_field .= qq|<span style="display:none" id="${html_id}_stat">Searching...</span>|;
+                }
+                last;
+            };
+        }
+        if (my $ref = $attribute->reference) {
+            my $uri_part= {
+                user => 'users',
+                group => 'groups',
+                nethost => 'nethosts',
+                netzone => 'netzones',
+                site => 'sites'
+            }->{$ref};
+            my $text;
+            if ($self->base->attribute($ref, 'displayName')) {
+                if ($attr_raw_value &&
+                    (my $obj = $self->base->get_object($ref, $attr_raw_value)))
+                {
+                    $text = $obj->get_attributes('displayName');
+                }
+                
+                $html_field .= $self->{c}->prototype->observe_field( $html_id, {
+                        update => "${html_id}_span",
+                        url => $self->{c}->uri_for('/ajax', 'rawattr', $ref),
+                        frequency => 1,
+                        with   => "'attr=displayName" .
+                        "&id=' + element.options[element.selectedIndex].text",
+                    }) . "\n" if ($attribute->form_type =~ /list/i);
+            } elsif($attr_raw_value && $uri_part) {
+                $text = sprintf(
+                    '<img class="attr" src="%s" title="%s">',
+                    $self->{c}->uri_for('/static', 'icons', 'arrow-right.png'),
+                    $attr_raw_value,
+                )
             }
-        };
+            $html_field .= sprintf(qq{<span id="%s" style="margin-left: 1em">},
+                "${html_id}_span");
+
+            if (defined($text)) {
+                $html_field .= $uri_part
+                    ? sprintf('<a href="%s">%s</a>',
+                        $self->{c}->uri_for("/$uri_part", $attribute->display($attr_raw_value)),
+                        $text,)
+                    : $text;
+            }
+
+            $html_field .= "</span>\n";
+        }
+        push(@html_fields, $html_field);
     }
+    return join("<br>\n", @html_fields);
 }
 
@@ -391 +498 @@
 }
 
+sub write_attributes {
+    my ($self) = @_;
+    my @attrs;
+    foreach ($self->attributes) {
+        my $attr = ($self->{object}
+            ? $self->{object}->attribute($_)
+            : $self->base->attribute($self->otype, $_)) or next;
+        $attr->readonly and next;
+        push(@attrs, $_);
+    }
+    @attrs;
+}
+
 sub set_attrs {
     my ($self) = @_;
@@ -396 +516 @@
     my $prefix = $self->{object}->id . '_';
     my %fields;
-    foreach (
-        grep { $self->base->get_field_name($self->otype, $_, 'w') }
-        $self->attributes) {
+    foreach ($self->write_attributes) {
+        my $attr = ($self->{object}
+            ? $self->{object}->attribute($_)
+            : $self->base->attribute($self->otype, $_)) or next;
         if (($attrs->{$_}[1] || '') eq 'checkbox') {
             $fields{$_} = $self->{c}->req->param("$prefix$_") ? 1 : 0;
+        } elsif ($attr->{multiple}) {
+            $fields{$_} = [ grep { $_ } $self->{c}->req->param("$prefix$_") ];
         } else {
             $fields{$_} = $self->{c}->req->param("$prefix$_");
         }
     }
-    $self->{object}->set_c_fields(%fields) or return;
+    $self->{object}->set_c_fields(%fields) or do {
+        $self->{c}->stash->{page}{error} =
+            LATMOS::Accounts::Log::lastmessage(LA_ERR);
+        $self->{object}->base->rollback;
+        return;
+    };
     $self->{object}->base->commit;
 }