From 35c4ad13a52bdcaab251358e4b7df99dd852c76d Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem.moulin@fripost.org>
Date: Sun, 20 Jan 2013 03:04:17 +0100
Subject: New domains.

---
 lib/Fripost/Schema/User.pm | 54 +++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'lib/Fripost/Schema/User.pm')

diff --git a/lib/Fripost/Schema/User.pm b/lib/Fripost/Schema/User.pm
index 7d79e69..3b5cfca 100644
--- a/lib/Fripost/Schema/User.pm
+++ b/lib/Fripost/Schema/User.pm
@@ -72,23 +72,23 @@ Replace an existing account with the given one.
 
 sub replace {
     my $self = shift;
-    my $m = shift;
+    my $u = shift;
     my %options = @_;
 
     foreach (qw/description forwards/) {
-        $m->{$_} = explode ($options{'-concat'}, $m->{$_})
-            if defined $m->{$_};
+        $u->{$_} = explode ($options{'-concat'}, $u->{$_})
+            if defined $u->{$_};
     }
 
     eval {
-        my ($l,$d) = split_addr( $m->{user}, -encode => 'ascii' );
-        &_is_valid($m);
+        my ($l,$d) = split_addr( $u->{user}, -encode => 'ascii' );
+        &_is_valid($u);
         my $mesg = $self->ldap->modify(
                        canonical_dn( {fvu => $l}, {fvd => $d}, @{$self->suffix} ),
-                       replace => { fripostIsStatusActive => $m->{isactive} ?
+                       replace => { fripostIsStatusActive => $u->{isactive} ?
                                         'TRUE' : 'FALSE'
-                                  , description => $m->{description}
-                                  , fripostOptionalMaildrop => $m->{forwards}
+                                  , description => $u->{description}
+                                  , fripostOptionalMaildrop => $u->{forwards}
                    } );
         die $mesg->error."\n" if $mesg->code;
     };
@@ -126,30 +126,30 @@ Add the given account.
 
 sub add {
     my $self = shift;
-    my $m = shift;
+    my $u = shift;
     my %options = @_;
 
     foreach (qw/description forwards/) {
-        $m->{$_} = explode ($options{'-concat'}, $m->{$_})
-            if defined $m->{$_};
+        $u->{$_} = explode ($options{'-concat'}, $u->{$_})
+            if defined $u->{$_};
     }
 
     eval {
-        die "Missing user name\n" unless $m->{user} =~ /^.+\@.+$/;
-        my ($l,$d) = split_addr( $m->{user}, -encode => 'ascii' );
-        &_is_valid($m);
-        die "‘".$m->{user}."’ already exists\n"
-            if $self->local->exists($m->{user},%options);
+        die "Missing user name\n" unless $u->{user} =~ /^.+\@.+$/;
+        my ($l,$d) = split_addr( $u->{user}, -encode => 'ascii' );
+        &_is_valid($u);
+        die "‘".$u->{user}."’ already exists\n"
+            if $self->local->exists($u->{user},%options);
 
         my %attrs = ( objectClass => 'FripostVirtualUser'
-                    , fripostIsStatusActive => $m->{isactive} ? 'TRUE' : 'FALSE'
-                    , userPassword => $m->{password}
+                    , fripostIsStatusActive => $u->{isactive} ? 'TRUE' : 'FALSE'
+                    , userPassword => $u->{password}
                     );
-        $attrs{description} = $m->{description}
-            if defined $m->{description} and @{$m->{description}};
-        $attrs{fripostUserQuota} = $m->{quota} if defined $m->{quota};
-        $attrs{fripostOptionalMaildrop} = $m->{forwards}
-            if defined $m->{forwards} and @{$m->{forwards}};
+        $attrs{description} = $u->{description}
+            if defined $u->{description} and @{$u->{description}};
+        $attrs{fripostUserQuota} = $u->{quota} if defined $u->{quota};
+        $attrs{fripostOptionalMaildrop} = $u->{forwards}
+            if defined $u->{forwards} and @{$u->{forwards}};
 
         my $mesg = $self->ldap->add(
                        canonical_dn( {fvu => $l}, {fvd => $d}, @{$self->suffix} ),
@@ -203,10 +203,10 @@ The B<-die> option, if present, overides LDAP croaks and errors.
 
 # Ensure that the given user is valid.
 sub _is_valid {
-    my $m = shift;
-    must_attrs( $m, qw/user isactive/ );
-    $m->{user} = email_valid( $m->{user}, -exact => 1);
-    $m->{forwards} = [ map { email_valid($_) } @{$m->{forwards}} ];
+    my $u = shift;
+    must_attrs( $u, qw/user isactive/ );
+    $u->{user} = email_valid( $u->{user}, -exact => 1);
+    $u->{forwards} = [ map { email_valid($_) } @{$u->{forwards}} ];
     # TODO: match 'quota' against the Dovecot specifications
 }
 
-- 
cgit v1.2.3