Changeset 1100

Timestamp:

08/07/12 18:26:26 (12 years ago)

Author:

nanardon

Message:

expired account are deleted by an automated request

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql.pm (modified) (2 diffs)
• Mail.pm (modified) (1 diff)
• Maintenance.pm (modified) (2 diffs)

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

@@ -540 +540 @@
 
 
-=head2 list_request_by_object ($otype, $id)
+=head2 list_request_by_object ($otype, $id, $req)
 
 Return the list of pending request for a specific object
 
+C<$req> is an optional forms name to limit search
+
 =cut
 
 sub list_request_by_object {
-    my ($self, $otype, $id) = @_;
+    my ($self, $otype, $id, $req) = @_;
 
     my $sth = $self->db->prepare(q{
@@ -558 +560 @@
         accreq_attributes.value = ?
         and request.object = ?
+    } .
+    ($req ? ' and request.name = ? ' : '')
+    . q{
         order by apply
     });
-    $sth->execute($otype, $id);
+    $sth->execute($otype, $id, ($req ? ($req) : ()));
     my @ids;
     while (my $res = $sth->fetchrow_hashref) {

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

@@ -107 +107 @@
     }
 
-    if (Mail::Sendmail::sendmail(
-            %mail,
-            Message => $message,
-        )) {
-        la_log(LA_DEBUG, "Mail for id %s sent to %s",
-            $mail{'Message-ID'},
-            $mail{to},
-        );
-        return 1;
+    if ($ENV{LA_NO_MAIL}) {
+        printf STDERR "mail %s to %s not sent due to \$LA_NO_MAIL env\n",
+            $mail{subject} || '', $mail{to};
     } else {
-        la_log(LA_ERR, "Cannot send mail: %s", $Mail::Sendmail::error);
-        return;
+        if (Mail::Sendmail::sendmail(
+                %mail,
+                Message => $message,
+            )) {
+            la_log(LA_DEBUG, "Mail for id %s sent to %s",
+                $mail{'Message-ID'},
+                $mail{to},
+            );
+            return 1;
+        } else {
+            la_log(LA_ERR, "Cannot send mail: %s", $Mail::Sendmail::error);
+            return;
+        }
     }
 }

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

@@ -5 +5 @@
 use base qw(LATMOS::Accounts);
 use LATMOS::Accounts::Log;
+use LATMOS::Accounts::Bases::Sql::DataRequest;
 use FindBin qw($Bin);
 
@@ -195 +196 @@
 
     my %managers;
-    foreach my $user (@users) {
-        my $uobj = $self->_base->get_object('user', $user);
-        $uobj->get_attributes('unexported') and next; # can't happend
-        my $manager = $uobj->get_attributes('managerContact') || 'N/A';
-        push(@{$managers{$manager}{users}}, $uobj);
-    }
-
-    foreach (keys %managers) {
-        my $oman = $self->_base->get_object('user', $_) or next; # can't happend
-        $managers{$_}{manager} = $oman;
-        my $mail = $oman->get_attributes('mail') or next;
-        
-        my %mail = (
-            Subject => 'LATMOS expired account',
-            'X-LATMOS-Reason' => 'Account destruction',
-        );
-        $mail{to} = $options{to} || $mail;
-        if ($lamail->process(\%mail, $managers{$oman->id})) {
-            la_log(LA_NOTICE,
-                "Expired account reminder mail for %s sent to %s (cc: %s) for %s",
-                $oman->id,
-                $mail{to},
-                ($mail{cc} || ''),
-                join(', ', map { $_->id } @{$managers{$oman->id}{users}})
+    if (my $accreq = $self->_base->get_object('accreq', 'user-removal')) {
+        foreach my $user (@users) {
+            my $uobj = $self->_base->get_object('user', $user);
+            $uobj->get_attributes('unexported') and next; # can't happend
+            my $manager = $uobj->get_attributes('managerContact') || 'N/A';
+            push(@{$managers{$manager}{users}}, $uobj);
+
+            my $req = LATMOS::Accounts::Bases::Sql::DataRequest->new($accreq);
+            $req->set_ptr_object($uobj);
+            my @date = localtime( time + 3600 * 24 * 30); # eg: 1 month
+            my $apply_date = sprintf(
+                '%02d/%02d/%d',
+                $date[3],
+                $date[4] + 1,
+                $date[5] + 1900
             );
+
+            if ($self->_base->list_request_by_object(
+                    'user', $user, 'user-removal')) {
+                $self->base->log(LA_NOTICE,
+                    "Request %s already exists for %s, skipping",
+                    'accreq',
+                    $user,
+                );
+            } else {
+                $req->register(
+                    {
+                        user => undef,
+                        apply => $apply_date,
+                        auto => 1,
+                    },
+                    exported => 0,
+                );
+                $self->_base->commit;
+            }
+        }
+    }
+
+    unless($options{test}) {
+        foreach (keys %managers) {
+            my $oman = $self->_base->get_object('user', $_) or next; # can't happend
+            $managers{$_}{manager} = $oman;
+            my $mail = $oman->get_attributes('mail') or next;
+
+            my %mail = (
+                Subject => 'LATMOS expired account',
+                'X-LATMOS-Reason' => 'Account destruction',
+            );
+            $mail{to} = $options{to} || $mail;
+            if ($lamail->process(\%mail, $managers{$oman->id})) {
+                la_log(LA_NOTICE,
+                    "Expired account reminder mail for %s sent to %s (cc: %s) for %s",
+                    $oman->id,
+                    $mail{to},
+                    ($mail{cc} || ''),
+                    join(', ', map { $_->id } @{$managers{$oman->id}{users}})
+                );
+            }
         }
     }