Changeset 1649

Timestamp:

01/21/16 17:22:05 (8 years ago)

Author:

nanardon

Message:

Don't change expiration date for expired account if already expired

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (2 diffs)

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

@@ -1400 +1400 @@
     my $currentemployment = $self->get_attributes('currentEmployment') || '';
 
-    my $expire = str2time($self->get_attributes('expire') || '1970-01-01T00:00:00');
+    my $expire = str2time($self->_get_attributes('expire') || '1970-01-01T00:00:00');
 
     my %changes;
@@ -1435 +1435 @@
 
     if ($expireOn ne 'never') {
-        my $endemploy = $self->_get_attributes("_$end2start{$expireOn}")
-            ? $self->_get_attributes("_$expireOn")
-            : (($self->base->config('unemployed_expire') ||'') eq 'no'
-                ? undef
-                : $self->_get_attributes('create'));
-
-        my $nextexpire = str2time( $endemploy || '1970-01-01T00:00:00' );
-
-        if ($expire != $nextexpire) {
-            $changes{expire} = $endemploy;
+        my $endemploy;
+        if ($self->_get_attributes("_$end2start{$expireOn}")) {
+            $endemploy = $self->_get_attributes("_$expireOn");
+        } elsif (($self->base->config('unemployed_expire') ||'') eq 'no') {
+            $endemploy = undef;
+        } else {
+            if ($expire && $expire < time) {
+                $endemploy = 'UNCHANGED';
+            } else {
+                $endemploy = $self->_get_attributes('create');
+            }
+        }
+
+        if ($endemploy ne 'UNCHANGED') {
+            my $nextexpire = str2time( $endemploy || '1970-01-01T00:00:00' );
+
+            if ($expire != $nextexpire) {
+                $changes{expire} = $endemploy;
+            }
         }
     }