Changeset 2156

Timestamp:

11/30/18 23:21:16 (6 years ago)

Author:

nanardon

Message:

Add an option 'endCircuitdontExpire' to disable endcircuit attribute behavior

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (4 diffs)
• man/man8/latmos-accounts-base-sql.pod (modified) (1 diff)

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

@@ -105 +105 @@
 
 sub config {
-    my ($self, $opt) = @_;
-    return $self->{_options}{$opt};
+    my ($self, $opt, $default) = @_;
+    return defined($self->{_options}{$opt}) ? $self->{_options}{$opt} : $default;
 }
 

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

@@ -964 +964 @@
                     my $sth = $obj->db->prepare_cached(
                         sprintf(
-                            q{select extract(epoch from COALESCE(endcircuit,  expire)) + 11644474161 as expire
+                            q{select extract(epoch from %s) + 11644474161 as expire
                             from %s where %s = ?},
+                            $base->config('endCircuitdontExpire') ? 'expire' : 'COALESCE(endcircuit,  expire)',
                             $obj->db->quote_identifier($obj->_object_table),
                             $obj->db->quote_identifier($obj->_key_field),
@@ -984 +985 @@
                     my $sth = $obj->db->prepare_cached(
                         sprintf(
-                            q{select justify_hours(COALESCE(endcircuit,  expire) - '1/1/1970'::timestamp) as expire
+                            q{select justify_hours(%s - '1/1/1970'::timestamp) as expire
                             from %s where %s = ?},
+                            $base->config('endCircuitdontExpire') ? 'expire' : 'COALESCE(endcircuit,  expire)',
                             $obj->db->quote_identifier($obj->_object_table),
                             $obj->db->quote_identifier($obj->_key_field),
@@ -1122 +1124 @@
                     my $sth = $obj->db->prepare_cached(
                         sprintf(
-                            q{select to_char(COALESCE(endcircuit,  expire), 'YYYY/MM/DD') as expire
+                            q{select to_char(%s, 'YYYY/MM/DD') as expire
                             from %s where %s = ?},
+                            $base->config('endCircuitdontExpire') ? 'expire' : 'COALESCE(endcircuit,  expire)',
                             $obj->db->quote_identifier($obj->_object_table),
                             $obj->db->quote_identifier($obj->_key_field),
@@ -1207 +1210 @@
                         my $sth = $obj->db->prepare_cached(
                             sprintf(
-                                q{select to_char(COALESCE(endcircuit,  expire) AT TIME ZONE 'Z', 'YYYYMMDDHH24MISSZ') as expire
+                                q{select to_char(%s AT TIME ZONE 'Z', 'YYYYMMDDHH24MISSZ') as expire
                                 from %s where %s = ? and expire < now()},
+                                $base->config('endCircuitdontExpire') ? 'expire' : 'COALESCE(endcircuit,  expire)',
                                 $obj->db->quote_identifier($obj->_object_table),
                                 $obj->db->quote_identifier($obj->_key_field),

trunk/LATMOS-Accounts/man/man8/latmos-accounts-base-sql.pod

@@ -88 +88 @@
 attributes (C<accountExpires> for Active Directory).
 
+Setting C<endCircuitdontExpire> option to the database disable this behavior and
+C<endcircuit> attribute become informationnal only.
+
 =head2 User Employment