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

Merge 2015.2 Gold E patches

Browse Source 
svn path=/Website/branches/v2015.3/; revision=27584
This commit is contained in:
Jos Groot Lipman
2016-01-04 09:04:34 +00:00
parent c20e218436
commit 6d22c7e747
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
UTILS/Exchange/exchange.js
View File

@@ -34,7 +34,10 @@ var soapRequest = '<m:SyncFolderItems'
+ ' <t:AdditionalProperties>'
+ ' <t:FieldURI FieldURI="calendar:CalendarItemType" />'
+ ' <t:FieldURI FieldURI="calendar:Start" />'
+ ' <t:ExtendedFieldURI DistinguishedPropertySetId="Meeting" PropertyId="35" PropertyType="Binary" />' // 35=PidLidCleanGlobalObjectId
// + ' <t:ExtendedFieldURI DistinguishedPropertySetId="Meeting" PropertyId="3" PropertyType="Binary" />' // 3=PidLidGlobalObjectId
// + ' <t:ExtendedFieldURI DistinguishedPropertySetId="Meeting" PropertyId="35" PropertyType="Binary" />' // 35=PidLidCleanGlobalObjectId
// + ' <t:ExtendedFieldURI DistinguishedPropertySetId="Meeting" PropertyId="40" PropertyType="Binary" />' // 40=PidLidOldLocation
// + ' <t:ExtendedFieldURI DistinguishedPropertySetId="Meeting" PropertyId="98" PropertyType="Binary" />' // 98=PidTagOwnerAppointmentId
// + ' <t:FieldURI FieldURI="calendar:Subject" />'
+ ' </t:AdditionalProperties>'
+ ' </m:ItemShape>'
@@ -123,6 +126,8 @@ function getCalenderItem(filter, fname)
+ ' <t:BaseShape>AllProperties</t:BaseShape>' // TODO: Dit kan heel traag zijn. Alleen opvragen wat gewenst is
+ ' <t:AdditionalProperties>'
+ ' <t:ExtendedFieldURI DistinguishedPropertySetId="Meeting" PropertyId="35" PropertyType="Binary" />' // 35=PidLidCleanGlobalObjectId
+ ' <t:ExtendedFieldURI DistinguishedPropertySetId="Meeting" PropertyId="3" PropertyType="Binary" />' // 3=PidLidGlobalObjectId
+ ' <t:ExtendedFieldURI DistinguishedPropertySetId="Meeting" PropertyId="40" PropertyType="String" />' // 40=PidLidOldLocation
+ ' </t:AdditionalProperties>'
+ ' </m:ItemShape>'
+ ' <m:ItemIds>'

2
UTILS/PutOrders/puo_sendhttp.js
View File

@@ -47,7 +47,7 @@ function submitHTTP( p_connect
// Call XMLhttp.setOption(SXH_OPTION_IGNORE_SERVER_SSL_CERT_ERROR_FLAGS, secu)
XMLhttp.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
if (p_bedrijfadres.username != "")
if (p_bedrijfadres.username)
{
var base64 = new Base64Cls();
XMLhttp.setRequestHeader("Authorization", "Basic " + base64.encode(p_bedrijfadres.username + ":" + p_bedrijfadres.password));