admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 2022.3 RC2 patches

Browse Source 
svn path=/Website/trunk/; revision=57561
This commit is contained in:
Jos Groot Lipman
2022-10-10 08:18:37 +00:00
parent b8c142b9d2
commit 222e8daea4
10 changed files with 81 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/API2/model_fac_widget.inc
View File

@@ -222,6 +222,10 @@ function model_fac_widget(onpage_mode)
if (onpage_mode)
widget_type_LOV = L("fac_widget_typeWGT") + ";" + widget_type_LOV;
if (S("fac_html_strictness") == 0) {
widget_type_LOV += ";" + L("fac_widget_typeRAW");
}
if (S("faq_enabled") == 1)
{
authFAQ = user.func_enabled2("FAQ", { prs_key: user_key, isOptional: true });

31
APPL/API2/plugins/scimusers.wsc
View File

@@ -132,14 +132,36 @@ function transform_incoming(params, data)
employeenumber : get_element(enterprise["employeeNumber"])
};
person["function"] = { name: "Onbekend" }; // geen onderdeel van de interface
if (facilitor["title"])
{
var srtperslidname = get_element(facilitor["title"]);
// Als de functie (srt_perslid) nog niet bestaat gaan we deze aanmaken.
var sql = "SELECT prs_srtperslid_omschrijving"
+ " FROM prs_srtperslid "
+ " WHERE prs_srtperslid_verwijder IS NULL "
+ " AND prs_srtperslid_upper = " + FCLT.DEZE.safe.quoted_sql_upper(srtperslidname);
var oRs = FCLT.DEZE.Oracle.Execute(sql);
if (oRs.eof)
{
sql = "INSERT INTO prs_srtperslid (prs_srtperslid_omschrijving) "
+ "VALUES (" + FCLT.DEZE.safe.quoted_sql(srtperslidname) + ")";
FCLT.DEZE.Oracle.Execute(sql);
}
else
srtperslidname = oRs("prs_srtperslid_omschrijving").Value;
oRs.Close();
person["function"] = { name: srtperslidname }; // id mag achterwege blijven omdat desc_is_unique
}
else
{
person["function"] = { name: "Onbekend" }; // geen onderdeel van de interface
}
var dep_id = "";
if (facilitor["orgUnit"] && facilitor["orgUnit"]["value"] )
dep_id = facilitor["orgUnit"]["value"].replace (FCLT.DEZE.customerId + "_department_", "");
else
dep_id = 1; // bij het aanmaken van een nieuwe persoon is de afdeling nog leeg. Dan tijdelijke even onder onbekend hangen.
dep_id = 1; // bij het aanmaken van een nieuwe persoon is de afdeling nog leeg. Dan tijdelijk even onder onbekend hangen.
if (facilitor["initials"])
person.initials = get_element(facilitor["initials"]);
@@ -205,7 +227,8 @@ function transform_one_person(params, person)
"value":FCLT.DEZE.customerId + "_department_" + String(person.department.id),
"$ref":FCLT.DEZE.HTTP.urlzelf() + "/appl/SCIM/OrgUnits/" + FCLT.DEZE.customerId + "_department_" + String(person.department.id)
},
"initials":person.initials
"initials":person.initials,
"title":person["function"].name
}
}

17
APPL/FAC/fac_verify.inc
View File

@@ -2067,11 +2067,11 @@ checker("E-mail sending",
iConf.Fields(sch+"sendusing") = 2;
iConf.Fields(sch+"smtpserver") = mailrelay;
iConf.Fields(sch+"smtpserverport") = mailrelayport;
if (S("puo_smtpusessl") == "true" || S("puo_smtpusessl") == "True")
if (mailrelayssl == "true" || mailrelayssl == "True"|| mailrelayssl == "1")
{
iConf.Fields(sch + "smtpusessl").Value = true;
}
//if (mailrelayuser)
if (mailrelayuser)
{
iConf.Fields(sch + "smtpauthenticate").Value = 1; // default 0=cdoAnonymous, 1=cdoBasic, 2=cdoNTLM
iConf.Fields(sch + "sendusername").Value = mailrelayuser;
@@ -2088,10 +2088,19 @@ checker("E-mail sending",
objMail.From = mailfrom;
objMail.ReplyTo = mailreply;
objMail.Subject = txt;
objMail.HtmlBody = txt + "<br>To: " + Server.HTMLEncode(mailto)
objMail.HtmlBody = "<html><head></head><body>"
+ txt
+ "<br>(htmlbody)"
+ "<br>To: " + Server.HTMLEncode(mailto)
+ "<br>From: " + Server.HTMLEncode(mailfrom)
+ "<br>Reply: " + Server.HTMLEncode(mailreply)
+ "<br>Relay: " + Server.HTMLEncode(mailrelay);
+ "<br>Relay: " + Server.HTMLEncode(mailrelay) + ":" + mailrelayport + " SSL: " + mailrelayssl
+ "</body>";
objMail.TextBody = txt + "\n(textbody)"
+ "\nTo: " + Server.HTMLEncode(mailto)
+ "\nFrom: " + Server.HTMLEncode(mailfrom)
+ "\nReply: " + Server.HTMLEncode(mailreply)
+ "\nRelay: " + Server.HTMLEncode(mailrelay) + ":" + mailrelayport + " SSL: " + mailrelayssl;
objMail.Send();
}

5
APPL/FAC/fac_widget.inc
View File

@@ -207,7 +207,7 @@ wgt = {
<%=(mode == "edit" ? "<div class=\"widget-col-bg\">" + I("fa-repeat", { fastyle: "far" }) + "</div>" : "")%>
<%=(mode == "edit" ? "<div class=\"widget-col\">" : "")%>
<%=(widget.title ? '<div class="widget-title">' + safe.html(widget.title) + '</div>' : '')%>
<%=(widget.title ? '<div' + (widget.url && widget.url.indexOf("fac_nieuws.asp") > -1 ? ' id="mywelcomeinfo"' : '') + ' class="widget-title">' + safe.html(widget.title) + '</div>' : '')%>
<%
switch (widget.type)
{
@@ -359,6 +359,9 @@ wgt = {
<%
break;
case "RAW": // HTML, geen sandbox attribuut, type HTML is gewoon onveilig en moet voorzichtig gebruikt worden
if (S("fac_html_strictness") == 1) {
break;
}
%>
<div class="widget-type-raw">
<iframe srcdoc="<%=safe.htmlattr(widget.content)%>" src="about:blank" id="frame_<%=safe.htmlattr(widget.id)%>" name="frame_<%=safe.htmlattr(widget.id)%>"

1
APPL/PDA/reservering.asp
View File

@@ -214,6 +214,7 @@ else
, act_key: getQParamInt("act_key", -1)
, ab_mode: getQParamInt("cvab", -1)
, res_deel_key: getQParamInt("res_deel", -1)
, artikel_key: -1
, kostenklant: S("kosten_klant_default") == 1
, account: -1
, status_fo: S("res_default_fo_status_key")

7
APPL/PRS/prs_edit_dienstlocs.asp
View File

@@ -159,6 +159,9 @@ var immediate = getQParamInt("immediate", 0) == 1;
+ " AND dl.prs_dienst_key = " + dienst_key
+ " AND dl.prs_bedrijf_key = " + bedrijf_key
+ " AND dl.alg_locatie_key IS NOT NULL"
+ " AND ( l.alg_locatie_vervaldatum IS NULL"
+ " OR l.alg_locatie_vervaldatum > TRUNC(SYSDATE)"
+ " )"
+ getFiltClauseLocatie("EXP").where;
var loc_sql =
@@ -166,7 +169,9 @@ var immediate = getQParamInt("immediate", 0) == 1;
+ " , l.alg_locatie_omschrijving"
+ " , 'L' locorgeb"
+ " FROM alg_v_aanweziglocatie l"
+ " WHERE 1=1"
+ " WHERE ( l.alg_locatie_vervaldatum IS NULL"
+ " OR l.alg_locatie_vervaldatum > TRUNC(SYSDATE)"
+ " )"
+ getFiltClauseLocatie("EXP").where;
FCLTselector("locPossible", loc_sql + " MINUS " + existing_loc_sql + " ORDER BY 2",

12
APPL/RES/res_list_ppi.inc
View File

@@ -156,18 +156,18 @@ function res_list_ppi(pautfunction, params)
//date_sql = " AND beschik.res_reservering_van BETWEEN " + ora_date1 + " AND " + ora_date2;
if (room_key_arr)
if (room_key_arr.length)
sql_rooms = " AND ruimte_geg.alg_ruimte_key IN (" + room_key_arr.join(",") + ")";
else if (flr_key_arr)
else if (flr_key_arr.length)
sql_floor = " AND ruimte_geg.alg_verdieping_key IN (" + flr_key_arr.join(",") + ")";
else if (bld_key_arr)
else if (bld_key_arr.length)
sql_bld = " AND ruimte_geg.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")";
else if (loc_key_arr)
else if (loc_key_arr.length)
sql_loc = " AND ruimte_geg.alg_locatie_key IN (" + loc_key_arr.join(",") + ")";
else if (dist_key_arr)
else if (dist_key_arr.length)
sql_dis = " AND ruimte_geg.alg_district_key IN (" + dist_key_arr.join(",") + ")";
if (roomcat_key_arr)
if (roomcat_key_arr.length)
sql_roomcat_key = " AND beschik.res_discipline_key IN (" + roomcat_key_arr.join(",") + ")";
function forhours(fn)

17
APPL/SCIM/Schemas/default.asp
View File

@@ -387,7 +387,7 @@
}],
"mutability": "readWrite",
"returned": "default"
},
},
{
"name": "initials",
"type": "string",
@@ -398,12 +398,23 @@
"mutability": "readWrite",
"returned": "default",
"uniqueness": "server"
}
},
{
"name": "title",
"type": "string",
"multiValued": false,
"description": "A short descripton of the employee's job.",
"required": false,
"caseExact": false,
"mutability": "readWrite",
"returned": "default",
"uniqueness": "server"
}
],
"meta": {
"resourceType": "Schema",
"location": "\/v2\/Schemas\/urn:ietf:params:scim:schemas:extension:facilitor:2.0:User"
}
}
}
]
}

27
APPL/Shared/default.csx
View File

@@ -2937,6 +2937,9 @@ div.wbackground {
margin-top: 1px;
font-size: 1.2em;
}
#mywelcomeinfo.widget-title {
font-size: 1.44em;
}
.ui-tabs-nav {
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
@@ -6808,29 +6811,9 @@ td.mjbrejected {
.hamburger {
cursor:pointer;
}
/* reset all styling for the frametabs, then restyle */
.frametabs,
.frametabs li {
border: 0 !important;
background-image: none !important;
background-color: ==frameheaderbackgroundcolor==;
padding: 0 !important;
.frametabs.ui-tabs .ui-tabs-nav li.ui-tabs-active {
padding-bottom: 0; /* Niet bij Graphics */
}
.frametabs li {
border-left: 1px solid rgba(255,255,255,0.25) !important;
}
.frametabs li a {
color: ==frameheadercolor== !important;
}
.frametabs li:hover a {
text-decoration: underline !important;
}
.frametabs .ui-state-active a,
.frametabs .ui-state-active a:link {
font-weight: bold !important;
}
td.multi_cb, th.multi_cb {
text-align: center;
}

2
UTILS/Exchange/exchange.js
View File

@@ -302,7 +302,7 @@ function doHTTP(method, url, body)
var objXMLHTTP = new ActiveXObject("MSXML2.ServerXMLHTTP.6.0");
// objXMLHTTP.setProxy(SXH_PROXY_SET_PROXY, "127.0.0.1:8888");
objXMLHTTP.open(method, url, false);
objXMLHTTP.open(method, url, false, config.username, config.password);
objXMLHTTP.setRequestHeader("Content-Type", "text/xml; charset=utf-8")
objXMLHTTP.setOption(SXH_OPTION_IGNORE_SERVER_SSL_CERT_ERROR_FLAGS, SXH_SERVER_CERT_IGNORE_ALL_SERVER_ERRORS);