Changeset 2084 for trunk/LATMOS-Accounts/lib

Timestamp:

09/18/17 19:49:37 (7 years ago)

Author:

nanardon

Message:

Merge branch 'master' into sqlup

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm (modified) (3 diffs)

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 LATMOS::Accounts::Mail;
 use FindBin qw($Bin);
@@ -215 +214 @@
 
     my %managers;
-    my $accreq = $self->_base->get_object('accreq', 'user-removal');
-
-
-    $self->base->log(LA_DEBUG,
-        "Found accreq 'user-removal', using it to automated deletion",
-    ) if ($accreq);
 
     foreach my $user (@users) {
@@ -228 +221 @@
         push(@{$managers{$manager}{users}}, $uobj);
 
-        if ($accreq) {
-            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;
-            }
-        }
     }