From 591bd4a200695663361aaab8d528cd0fc53b0df1 Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Wed, 9 Aug 2017 09:22:40 +0000
Subject: [PATCH] PNBR#40889 Account verloop datum

svn path=/Website/trunk/; revision=34865
---
 APPL/AUT/Login.inc | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/APPL/AUT/Login.inc b/APPL/AUT/Login.inc
index f57571584e..4a435a991a 100644
--- a/APPL/AUT/Login.inc
+++ b/APPL/AUT/Login.inc
@@ -24,6 +24,7 @@ function doLogin(prs_key, params)
     params = params || {};
     // Paranoia mode
     var sql = "SELECT prs_perslid_login"
+            + "     , prs_perslid_einddatum"
             + "  FROM prs_perslid"
             + " WHERE prs_perslid_verwijder IS NULL"
             + "   AND prs_perslid_key = " + prs_key;
@@ -34,8 +35,20 @@ function doLogin(prs_key, params)
         eval("INTERNAL_ERROR_INVALID_LOGIN_" + prs_key);
     }
     var first_login = (oRs("prs_perslid_login").Value == null);
+    var einddatum = oRs("prs_perslid_einddatum").Value != null?new Date(oRs("prs_perslid_einddatum").Value): null;
     oRs.Close();
 
+    if (S("prs_einddatum_login_grace") >= 0 && einddatum)
+    {
+        var last_allow_login = einddatum;
+        last_allow_login.setDate(last_allow_login.getDate() + S("prs_einddatum_login_grace"))
+        if (new Date().midnight() > last_allow_login)
+        {
+            doLogoff();
+            shared.simpel_page(L("lcl_einddatum_login_expired"));
+        }
+    }
+
     if ("isFACFACinternal" in params) // vanuit JWT-sso
     {
         var deze = new Perslid(prs_key);
@@ -619,8 +632,8 @@ function getIdentity(username, wachtwoord, params)
         logins.push(" prs_perslid_oslogin = " + safe.quoted_sql_upper(username, 30));
         logins.push(" prs_perslid_oslogin2 = " + safe.quoted_sql_upper(username, 30));
     }
-    var sql = " SELECT prs_perslid_key, "
-            + "        prs_perslid_flags"
+    var sql = " SELECT prs_perslid_key "
+            + "      , prs_perslid_flags"
             + "      , prs_perslid_otpsecret"
             + "      , prs_perslid_otpcounter"
             + "   FROM prs_perslid"