PCHE#36077 Added terms&conditions

svn path=/Website/trunk/; revision=31878
This commit is contained in:
Jos Groot Lipman
2016-12-07 12:04:40 +00:00
parent eb473cccaa
commit a08e25b61d
4 changed files with 30 additions and 25 deletions

View File

@@ -14,25 +14,22 @@ var TERMS_CONDITIONS_OK = true;
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/save2db.inc" -->
<!-- #include file="../Shared/login.inc" -->
<!-- #include file="../Shared/json2.js" -->
<!-- #include file="../Shared/flexfiles.inc" -->
<%
var readonly = user.terms_version() == L("lcl_terms_filename");
var termsPath = custpath + "/bdradrfiles/" + L("lcl_terms_filename");
var fso = Server.CreateObject("Scripting.FileSystemObject");
var termsFile = Server.MapPath(termsPath);
if (!fso.FileExists(termsFile))
var flexparam = flexProps("BDRADR", null, null, null, { getFile: L("lcl_terms_filename") });
if (!flexparam.files.length)
abort_with_warning(L("lcl_internal_error"));
else
{
var ftekst = fso.OpenTextFile(termsFile);
var tekst = ftekst.ReadAll();
ftekst.Close();
}
var termsFile = flexparam.AttachPath + flexparam.files[0].name;
var ftekst = fso.OpenTextFile(termsFile);
var tekst = ftekst.ReadAll();
ftekst.Close();
%>
<html>
<html id="termshtml" cla>
<head>
<% FCLTHeader.Generate(); %>
<script type="text/javascript">
@@ -74,17 +71,17 @@ var TERMS_CONDITIONS_OK = true;
<form action="terms_save.asp?submit=1" method="post" name="u2">
<%
BLOCK_START("prsAV", L("lcl_terms_conditions"));
%><tr><td><div id='terms'><%
Response.Write(safe.html(tekst));
%></div></td></tr><%
if (!readonly)
RWCHECKBOXTR("termsAcc", "trm_acc", L("lcl_terms_accept") + " " + L("lcl_terms_conditions") , null, { boxfirst: true } );
RWTEXTAREATR("terms", "terms", null, tekst, { readonly: true, maxlength: -1, html: "style='height: auto; width: 100%;'" , tdhtml_ta: "colspan=\"2\"" });
BLOCK_END();
IFACE.FORM_END();
IFACE.FORM_END();
%>
</form>
<%
var buttons = [];
if (!readonly)
buttons.push({title: L("lcl_terms_volgende"), xclass: "next", action:"doAccept()"});

View File

@@ -15,14 +15,19 @@ var JSON_Result = true;
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/json2.js" -->
<!-- #include file="../Shared/save2db.inc" -->
<!-- #include file="../Shared/login.inc" -->
<!-- #include file="../Shared/flexfiles.inc" -->
<%
protectRequest.validateToken();
var flexparam = flexProps("BDRADR", null, null, null, { getFile: L("lcl_terms_filename") });
if (!flexparam.files.length)
abort_with_warning(L("lcl_internal_error"));
var terms_version = flexparam.files[0].name + "|" + flexparam.files[0].digest;
var sql = "UPDATE prs_perslid"
+ " SET prs_perslid_terms_datum = SYSDATE"
+ " , prs_perslid_terms_version = " + safe.quoted_sql(L("lcl_terms_filename"))
+ " , prs_perslid_terms_version = " + safe.quoted_sql(terms_version)
+ " WHERE prs_perslid_key = " + user_key;
Oracle.Execute(sql);

View File

@@ -332,12 +332,13 @@ if (user_key > 0)
Session.Contents.Remove("user_key");
}
}
if (typeof TERMS_CONDITIONS_OK == "undefined")
if (S("fac_accept_terms") > 0
&& (!(Session("org_user_key") > 0))
&& typeof TERMS_CONDITIONS_OK == "undefined")
{
var termsPath = custpath + "/bdradrfiles/" + L("lcl_terms_filename");
var fso = Server.CreateObject("Scripting.FileSystemObject");
var termsFile = Server.MapPath(termsPath);
if (fso.FileExists(termsFile) && user.terms_version() != L("lcl_terms_filename"))
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");
}

View File

@@ -8,6 +8,8 @@
Je moet ingelogd zijn met FACTAB rechten
Context: Met knop vanuit de logfile
*/
var TERMS_CONDITIONS_OK = true;
if (Application("otap_environment") == "O")
ANONYMOUS_Allowed = 1;
%>