Merge 2025.1 Gold C patches (ongoing)

svn path=/Website/trunk/; revision=69039
This commit is contained in:
Jos Groot Lipman
2025-05-15 15:51:32 +00:00
parent 61362a9e1d
commit 9ad68b62ab
3 changed files with 5 additions and 3 deletions

View File

@@ -119,12 +119,14 @@ if (fso.FileExists(logfile_path)) { // Notificaties zijn uniek obv etag, deze is
+ " fac_notificatie_queue,"
+ " fac_notificatie_refkey,"
+ " fac_notificatie_attachments,"
+ " fac_notificatie_naam,"
+ " fac_notificatie_notbefore,"
+ " fac_notificatie_status)"
+ " SELECT fac_srtnotificatie_key"
+ " , 'EXCHANGE'"
+ " , " + res_ruimte_key
+ " , " + safe.quoted_sql(logfile_path)
+ " , " + safe.quoted_sql(zaalemail)
+ " , SYSDATE"
+ " , 1" // Met 1 omzeilen we fac.cleannotifications en zorgen we dat fac_t_fac_notificatie_A_IU niet de PUTORDERS inschiet (Wij doen er verder niets mee)
+ " FROM fac_srtnotificatie"

View File

@@ -117,7 +117,8 @@ function doLogin(prs_key, params)
}
var registersql = "UPDATE prs_perslid"
+ " SET prs_perslid_login = SYSDATE"
+ " WHERE prs_perslid_key=" + user_key;
+ " WHERE prs_perslid_key=" + user_key
+ " AND (prs_perslid_login IS NULL OR prs_perslid_login < SYSDATE - 1/24/60)"; // Eens per minuut bijwerken is genoeg
Oracle.Execute(registersql);
Session("user_key") = user_key; // Nu ben je pas *echt* ingelogd

View File

@@ -19,8 +19,7 @@ var message_key = getQParamInt("msg_key");
+ " , pf.prs_perslid_naam_friendly"
+ " FROM msg_message m, prs_v_perslid_fullnames_all pf"
+ " WHERE m.msg_message_key = " + message_key
+ " AND m.prs_perslid_key = pf.prs_perslid_key"
+ " AND m.prs_perslid_key = " + user_key;
+ " AND m.prs_perslid_key = pf.prs_perslid_key";
oRs = Oracle.Execute(sql);
var title = oRs("msg_message_onderwerp").value;
var msg_date = new Date(oRs("msg_message_aanmaak").value);