Commit c6406d4a authored by Karl Dennigner's avatar Karl Dennigner

ZP-1278 Fix caldav backend so the user and (if supplied) domain are picked

up for blank organizer fields when sent to mobile. Released under the Affero GNU General Public License (AGPL) version 3.
parent d788cf91
......@@ -63,6 +63,12 @@ class BackendCalDAV extends BackendDiff {
$this->_caldav = new CalDAVClient($url, $username, $password);
if ($connected = $this->_caldav->CheckConnection()) {
ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendCalDAV->Logon(): User '%s' is authenticated on CalDAV '%s'", $username, $url));
if ($domain == "") {
$this->originalUsername = $username;
}
else {
$this->originalUsername = $username . '@' . $domain;
}
}
else {
ZLog::Write(LOGLEVEL_WARN, sprintf("BackendCalDAV->Logon(): User '%s' is not authenticated on CalDAV '%s'", $username, $url));
......@@ -1510,4 +1516,4 @@ class BackendCalDAV extends BackendDiff {
}
return base64_encode(pack('la64vvvvvvvvla64vvvvvvvvl', 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0));
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment