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

Merge 2016.1 patches

Browse Source 
svn path=/Website/trunk/; revision=30730
This commit is contained in:
Jos Groot Lipman
2016-09-15 11:26:27 +00:00
parent f10deb630c
commit b7aa0e84c0
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
UTILS/Exchange/exchange.js
View File

@@ -139,6 +139,7 @@ catch(e)
}
__Log2File("Sync_" + room_id + ".xml", xmlDoc.xml); // moet straks gesynced
WScript.Echo("Fetching " + calItems.length + " calendar items");
var curDate = new Date();
for (var i = 0; i < calItems.length; i++)
{
var calItem = calItems[i];
@@ -149,8 +150,15 @@ for (var i = 0; i < calItems.length; i++)
//var subject = calItem.selectSingleNode("t:CalendarItemType").text;
var cal_id = room_id + "_" + i;
WScript.Echo(" " + cal_id + ": " + start + " type: " + type);
if (type == "Single" || type == "Occurrence" || type == "Exception")
{
var startDate = internal_parsedate(null, start);
if (startDate.getTime() < curDate.getTime())
{
WScript. Echo(" Appointment in the past; skip it.");
continue;
}
var fname = "CalItem_" + cal_id + ".xml";
getCalenderItem('<t:ItemId Id="' + Id + '" ChangeKey="' + ChangeKey + '" />', fname);
}
@@ -187,6 +195,12 @@ for (var i = 0; i < calItems.length; i++)
}
var start = xmlDoc.selectSingleNode("//t:Start").text;
var type = xmlDoc.selectSingleNode("//t:CalendarItemType").text;
var startDate = internal_parsedate(null, start);
if (startDate.getTime() < curDate.getTime())
{
WScript. Echo(" Appointment in the past; skip it.");
continue;
}
WScript.Echo(" Start: " + start + " " + type);
}
}
@@ -294,8 +308,24 @@ function safefilename (naam) // geen 'lage' karakters en geen (back)slashes, *,%
}
function __Log2File(log_file, data)
{
var fs = new ActiveXObject("Scripting.FileSystemObject");
var ts = fs.CreateTextFile(config.xmlfolder + safefilename(log_file), true); // overwrite
ts.WriteLine (data);
ts.Close();
var utf8Stream = new ActiveXObject("ADODB.Stream");
utf8Stream.Open();
utf8Stream.Type = 2;
utf8Stream.CharSet = "utf-8";
utf8Stream.WriteText(data);
utf8Stream.SaveToFile(config.xmlfolder + safefilename(log_file), 2);
utf8Stream.Close();
}
// From MyJSON in shared.inc
function internal_parsedate(key, value)
{
var a;
if (typeof value === 'string') {
a = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
if (a) {
return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4], +a[5], +a[6]));
}
}
return value;
}