FSN#38685 Algemene voorwaarden iets robuuster

svn path=/Website/trunk/; revision=32094

APPL/PRS/terms_save.asp

@@ -29,8 +29,8 @@ var sql = "UPDATE prs_perslid"
         + "   SET prs_perslid_terms_datum = SYSDATE"
         + "     , prs_perslid_terms_version = " + safe.quoted_sql(terms_version)
         + " WHERE prs_perslid_key = " + user_key;
-
 Oracle.Execute(sql);
+Session.Contents.Remove("must_accept_terms");
 
 var result = { success: true };
 Response.Write(JSON.stringify(result));

APPL/Shared/Common.inc

@@ -333,13 +333,10 @@ if (user_key > 0)
         }
     }
 
-    if (S("fac_accept_terms") > 0
-        && (!(Session("org_user_key") > 0))
+    if (Session("must_accept_terms") == 1
         && typeof TERMS_CONDITIONS_OK == "undefined")
     {
-        var uvers = String(user.terms_version()).split("|")[0]; // Haal de digest er af
-        if (uvers != L("lcl_terms_filename"))
-            Response.Redirect(rooturl + "/appl/prs/terms.asp");
+        Response.Redirect(rooturl + "/appl/prs/terms.asp");
     }
 
     CheckForLogging(Request.QueryString("LOGGING"));

APPL/Shared/Login.inc

@@ -104,6 +104,29 @@ function doLogin(prs_key, params)
     Session("user_key") = user_key; // Nu ben je pas *echt* ingelogd
     /* global */ user = new Perslid(user_key);
 
+    Session.Contents.Remove("must_accept_terms");
+    if (S("fac_accept_terms") > 0
+        && (!(Session("org_user_key") > 0))
+        && !user.isGroupedUser()
+        && !params.noFacSession
+        && !user.has("WEB_FACTAB") // die er niet mee lastig vallen
+       )
+    {
+        var termsPath = custpath + "/bdradrfiles/" + L("lcl_terms_filename");
+        var fso = Server.CreateObject("Scripting.FileSystemObject");
+        var termsFile = Server.MapPath(termsPath);
+        if (!fso.FileExists(termsFile))
+        {
+            __DoLog("fac_accept_terms is set but '{0}' is not found.".format(termsPath), '#f00');
+        }
+        else
+        {
+            var uvers = String(user.terms_version()).split("|")[0]; // Haal de digest er af
+            if (uvers != L("lcl_terms_filename"))
+                Session("must_accept_terms") = 1; // Wordt opgepikt in common.inc
+        }
+    }
+
     // Normaal gesproken zou ik hier new Date() gebruiken
     // Omdat zelfs kleine afwijkingen al grote problemen zouden kunnen
     // geven consequent altijd de Oracle-tijd gebruiken