rysiek
/
owncalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve CalDAV bday calendar. Fix owncloud/contacts#299

master
Thomas Tanghus 2014-01-23 09:08:05 +01:00
parent 03fa275351
commit c3b82c1e70
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/sabre/backend.php
View File

@ -58,8 +58,6 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
$calendars[] = $calendar;
}
if(\OCP\App::isEnabled('contacts')) {
\OCP\Share::registerBackend('addressbook', 'OCA\Contacts\Share\Addressbook', 'contact');
$app = new \OCA\Contacts\App(\OCP\User::getUser());
$calendars[] = array(
'id' => 'contact_birthdays',
'uri' => 'contact_birthdays',
@ -262,13 +260,10 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
$data = array();
if($calendarId === 'contact_birthdays') {
$app = new \OCA\Contacts\App();
$addressBooks = $app->getAddressBooksForUser();
foreach($addressBooks as $addressBook) {
if($addressBook->getBackend()->name !== 'local'
|| !$addressBook->getBackend()->isActive($addressBook->getId())
) {
continue;
}
$backend = $app->getBackend('local');
$addressBooks = $backend->getAddressBooksForUser();
foreach($addressBooks as $addressBookInfo) {
$addressBook = $app->getAddressBook('local', $addressBookInfo['id']);
foreach($addressBook->getChildren() as $contact) {
$vevent = $contact->getBirthdayEvent();
if(is_null($vevent)) {