nextcloud / server

apps/dav/lib/CalDAV/BirthdayService.php

Indentation +232 added lines, -232 removed lines

@@ -39,256 +39,256 @@
 
 class BirthdayService {
 
-	const BIRTHDAY_CALENDAR_URI = 'contact_birthdays';
+    const BIRTHDAY_CALENDAR_URI = 'contact_birthdays';
 
-	/** @var GroupPrincipalBackend */
-	private $principalBackend;
+    /** @var GroupPrincipalBackend */
+    private $principalBackend;
 
-	/** @var CalDavBackend  */
-	private $calDavBackEnd;
+    /** @var CalDavBackend  */
+    private $calDavBackEnd;
 
-	/** @var CardDavBackend  */
-	private $cardDavBackEnd;
+    /** @var CardDavBackend  */
+    private $cardDavBackEnd;
 
-	/**
-	 * BirthdayService constructor.
-	 *
-	 * @param CalDavBackend $calDavBackEnd
-	 * @param CardDavBackend $cardDavBackEnd
-	 * @param GroupPrincipalBackend $principalBackend
-	 */
-	public function __construct(CalDavBackend $calDavBackEnd, CardDavBackend $cardDavBackEnd, GroupPrincipalBackend $principalBackend) {
-		$this->calDavBackEnd = $calDavBackEnd;
-		$this->cardDavBackEnd = $cardDavBackEnd;
-		$this->principalBackend = $principalBackend;
-	}
+    /**
+     * BirthdayService constructor.
+     *
+     * @param CalDavBackend $calDavBackEnd
+     * @param CardDavBackend $cardDavBackEnd
+     * @param GroupPrincipalBackend $principalBackend
+     */
+    public function __construct(CalDavBackend $calDavBackEnd, CardDavBackend $cardDavBackEnd, GroupPrincipalBackend $principalBackend) {
+        $this->calDavBackEnd = $calDavBackEnd;
+        $this->cardDavBackEnd = $cardDavBackEnd;
+        $this->principalBackend = $principalBackend;
+    }
 
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param string $cardData
-	 */
-	public function onCardChanged($addressBookId, $cardUri, $cardData) {
-		$targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     */
+    public function onCardChanged($addressBookId, $cardUri, $cardData) {
+        $targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
 		
-		$book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
-		$targetPrincipals[] = $book['principaluri'];
-		$datesToSync = [
-			['postfix' => '', 'field' => 'BDAY', 'symbol' => '*'],
-			['postfix' => '-death', 'field' => 'DEATHDATE', 'symbol' => "†"],
-			['postfix' => '-anniversary', 'field' => 'ANNIVERSARY', 'symbol' => "⚭"],
-		];
-		foreach ($targetPrincipals as $principalUri) {
-			$calendar = $this->ensureCalendarExists($principalUri);
-			foreach ($datesToSync as $type) {
-				$this->updateCalendar($cardUri, $cardData, $book, $calendar['id'], $type);
-			}
-		}
-	}
+        $book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
+        $targetPrincipals[] = $book['principaluri'];
+        $datesToSync = [
+            ['postfix' => '', 'field' => 'BDAY', 'symbol' => '*'],
+            ['postfix' => '-death', 'field' => 'DEATHDATE', 'symbol' => "†"],
+            ['postfix' => '-anniversary', 'field' => 'ANNIVERSARY', 'symbol' => "⚭"],
+        ];
+        foreach ($targetPrincipals as $principalUri) {
+            $calendar = $this->ensureCalendarExists($principalUri);
+            foreach ($datesToSync as $type) {
+                $this->updateCalendar($cardUri, $cardData, $book, $calendar['id'], $type);
+            }
+        }
+    }
 
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 */
-	public function onCardDeleted($addressBookId, $cardUri) {
-		$targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
-		$book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
-		$targetPrincipals[] = $book['principaluri'];
-		foreach ($targetPrincipals as $principalUri) {
-			$calendar = $this->ensureCalendarExists($principalUri);
-			foreach (['', '-death', '-anniversary'] as $tag) {
-				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
-				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
-			}
-		}
-	}
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     */
+    public function onCardDeleted($addressBookId, $cardUri) {
+        $targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
+        $book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
+        $targetPrincipals[] = $book['principaluri'];
+        foreach ($targetPrincipals as $principalUri) {
+            $calendar = $this->ensureCalendarExists($principalUri);
+            foreach (['', '-death', '-anniversary'] as $tag) {
+                $objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
+                $this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
+            }
+        }
+    }
 
-	/**
-	 * @param string $principal
-	 * @return array|null
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function ensureCalendarExists($principal) {
-		$book = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
-		if (!is_null($book)) {
-			return $book;
-		}
-		$this->calDavBackEnd->createCalendar($principal, self::BIRTHDAY_CALENDAR_URI, [
-			'{DAV:}displayname' => 'Contact birthdays',
-			'{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
-			'components'   => 'VEVENT',
-		]);
+    /**
+     * @param string $principal
+     * @return array|null
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function ensureCalendarExists($principal) {
+        $book = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
+        if (!is_null($book)) {
+            return $book;
+        }
+        $this->calDavBackEnd->createCalendar($principal, self::BIRTHDAY_CALENDAR_URI, [
+            '{DAV:}displayname' => 'Contact birthdays',
+            '{http://apple.com/ns/ical/}calendar-color' => '#FFFFCA',
+            'components'   => 'VEVENT',
+        ]);
 
-		return $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
-	}
+        return $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
+    }
 
-	/**
-	 * @param string $cardData
-	 * @param string $dateField
-	 * @param string $summarySymbol
-	 * @return null|VCalendar
-	 */
-	public function buildDateFromContact($cardData, $dateField, $summarySymbol) {
-		if (empty($cardData)) {
-			return null;
-		}
-		try {
-			$doc = Reader::read($cardData);
-			// We're always converting to vCard 4.0 so we can rely on the
-			// VCardConverter handling the X-APPLE-OMIT-YEAR property for us.
-			if (!$doc instanceof VCard) {
-				return null;
-			}
-			$doc = $doc->convert(Document::VCARD40);
-		} catch (Exception $e) {
-			return null;
-		}
+    /**
+     * @param string $cardData
+     * @param string $dateField
+     * @param string $summarySymbol
+     * @return null|VCalendar
+     */
+    public function buildDateFromContact($cardData, $dateField, $summarySymbol) {
+        if (empty($cardData)) {
+            return null;
+        }
+        try {
+            $doc = Reader::read($cardData);
+            // We're always converting to vCard 4.0 so we can rely on the
+            // VCardConverter handling the X-APPLE-OMIT-YEAR property for us.
+            if (!$doc instanceof VCard) {
+                return null;
+            }
+            $doc = $doc->convert(Document::VCARD40);
+        } catch (Exception $e) {
+            return null;
+        }
 
-		if (!isset($doc->{$dateField})) {
-			return null;
-		}
-		if (!isset($doc->FN)) {
-			return null;
-		}
-		$birthday = $doc->{$dateField};
-		if (!(string)$birthday) {
-			return null;
-		}
-		// Skip if the BDAY property is not of the right type.
-		if (!$birthday instanceof DateAndOrTime) {
-			return null;
-		}
+        if (!isset($doc->{$dateField})) {
+            return null;
+        }
+        if (!isset($doc->FN)) {
+            return null;
+        }
+        $birthday = $doc->{$dateField};
+        if (!(string)$birthday) {
+            return null;
+        }
+        // Skip if the BDAY property is not of the right type.
+        if (!$birthday instanceof DateAndOrTime) {
+            return null;
+        }
 
-		// Skip if we can't parse the BDAY value.
-		try {
-			$dateParts = DateTimeParser::parseVCardDateTime($birthday->getValue());
-		} catch (InvalidDataException $e) {
-			return null;
-		}
+        // Skip if we can't parse the BDAY value.
+        try {
+            $dateParts = DateTimeParser::parseVCardDateTime($birthday->getValue());
+        } catch (InvalidDataException $e) {
+            return null;
+        }
 
-		$unknownYear = false;
-		if (!$dateParts['year']) {
-			$birthday = '1900-' . $dateParts['month'] . '-' . $dateParts['date'];
+        $unknownYear = false;
+        if (!$dateParts['year']) {
+            $birthday = '1900-' . $dateParts['month'] . '-' . $dateParts['date'];
 
-			$unknownYear = true;
-		}
+            $unknownYear = true;
+        }
 
-		try {
-			$date = new \DateTime($birthday);
-		} catch (Exception $e) {
-			return null;
-		}
-		if ($unknownYear) {
-			$summary = $doc->FN->getValue() . ' ' . $summarySymbol;
-		} else {
-			$year = (int)$date->format('Y');
-			$summary = $doc->FN->getValue() . " ($summarySymbol$year)";
-		}
-		$vCal = new VCalendar();
-		$vCal->VERSION = '2.0';
-		$vEvent = $vCal->createComponent('VEVENT');
-		$vEvent->add('DTSTART');
-		$vEvent->DTSTART->setDateTime(
-			$date
-		);
-		$vEvent->DTSTART['VALUE'] = 'DATE';
-		$vEvent->add('DTEND');
-		$date->add(new \DateInterval('P1D'));
-		$vEvent->DTEND->setDateTime(
-			$date
-		);
-		$vEvent->DTEND['VALUE'] = 'DATE';
-		$vEvent->{'UID'} = $doc->UID;
-		$vEvent->{'RRULE'} = 'FREQ=YEARLY';
-		$vEvent->{'SUMMARY'} = $summary;
-		$vEvent->{'TRANSP'} = 'TRANSPARENT';
-		$alarm = $vCal->createComponent('VALARM');
-		$alarm->add($vCal->createProperty('TRIGGER', '-PT0M', ['VALUE' => 'DURATION']));
-		$alarm->add($vCal->createProperty('ACTION', 'DISPLAY'));
-		$alarm->add($vCal->createProperty('DESCRIPTION', $vEvent->{'SUMMARY'}));
-		$vEvent->add($alarm);
-		$vCal->add($vEvent);
-		return $vCal;
-	}
+        try {
+            $date = new \DateTime($birthday);
+        } catch (Exception $e) {
+            return null;
+        }
+        if ($unknownYear) {
+            $summary = $doc->FN->getValue() . ' ' . $summarySymbol;
+        } else {
+            $year = (int)$date->format('Y');
+            $summary = $doc->FN->getValue() . " ($summarySymbol$year)";
+        }
+        $vCal = new VCalendar();
+        $vCal->VERSION = '2.0';
+        $vEvent = $vCal->createComponent('VEVENT');
+        $vEvent->add('DTSTART');
+        $vEvent->DTSTART->setDateTime(
+            $date
+        );
+        $vEvent->DTSTART['VALUE'] = 'DATE';
+        $vEvent->add('DTEND');
+        $date->add(new \DateInterval('P1D'));
+        $vEvent->DTEND->setDateTime(
+            $date
+        );
+        $vEvent->DTEND['VALUE'] = 'DATE';
+        $vEvent->{'UID'} = $doc->UID;
+        $vEvent->{'RRULE'} = 'FREQ=YEARLY';
+        $vEvent->{'SUMMARY'} = $summary;
+        $vEvent->{'TRANSP'} = 'TRANSPARENT';
+        $alarm = $vCal->createComponent('VALARM');
+        $alarm->add($vCal->createProperty('TRIGGER', '-PT0M', ['VALUE' => 'DURATION']));
+        $alarm->add($vCal->createProperty('ACTION', 'DISPLAY'));
+        $alarm->add($vCal->createProperty('DESCRIPTION', $vEvent->{'SUMMARY'}));
+        $vEvent->add($alarm);
+        $vCal->add($vEvent);
+        return $vCal;
+    }
 
-	/**
-	 * @param string $user
-	 */
-	public function syncUser($user) {
-		$principal = 'principals/users/'.$user;
-		$this->ensureCalendarExists($principal);
-		$books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
-		foreach($books as $book) {
-			$cards = $this->cardDavBackEnd->getCards($book['id']);
-			foreach($cards as $card) {
-				$this->onCardChanged($book['id'], $card['uri'], $card['carddata']);
-			}
-		}
-	}
+    /**
+     * @param string $user
+     */
+    public function syncUser($user) {
+        $principal = 'principals/users/'.$user;
+        $this->ensureCalendarExists($principal);
+        $books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
+        foreach($books as $book) {
+            $cards = $this->cardDavBackEnd->getCards($book['id']);
+            foreach($cards as $card) {
+                $this->onCardChanged($book['id'], $card['uri'], $card['carddata']);
+            }
+        }
+    }
 
-	/**
-	 * @param string $existingCalendarData
-	 * @param VCalendar $newCalendarData
-	 * @return bool
-	 */
-	public function birthdayEvenChanged($existingCalendarData, $newCalendarData) {
-		try {
-			$existingBirthday = Reader::read($existingCalendarData);
-		} catch (Exception $ex) {
-			return true;
-		}
-		if ($newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
-			$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
-		) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $existingCalendarData
+     * @param VCalendar $newCalendarData
+     * @return bool
+     */
+    public function birthdayEvenChanged($existingCalendarData, $newCalendarData) {
+        try {
+            $existingBirthday = Reader::read($existingCalendarData);
+        } catch (Exception $ex) {
+            return true;
+        }
+        if ($newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
+            $newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
+        ) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param integer $addressBookId
-	 * @return mixed
-	 */
-	protected function getAllAffectedPrincipals($addressBookId) {
-		$targetPrincipals = [];
-		$shares = $this->cardDavBackEnd->getShares($addressBookId);
-		foreach ($shares as $share) {
-			if ($share['{http://owncloud.org/ns}group-share']) {
-				$users = $this->principalBackend->getGroupMemberSet($share['{http://owncloud.org/ns}principal']);
-				foreach ($users as $user) {
-					$targetPrincipals[] = $user['uri'];
-				}
-			} else {
-				$targetPrincipals[] = $share['{http://owncloud.org/ns}principal'];
-			}
-		}
-		return array_values(array_unique($targetPrincipals, SORT_STRING));
-	}
+    /**
+     * @param integer $addressBookId
+     * @return mixed
+     */
+    protected function getAllAffectedPrincipals($addressBookId) {
+        $targetPrincipals = [];
+        $shares = $this->cardDavBackEnd->getShares($addressBookId);
+        foreach ($shares as $share) {
+            if ($share['{http://owncloud.org/ns}group-share']) {
+                $users = $this->principalBackend->getGroupMemberSet($share['{http://owncloud.org/ns}principal']);
+                foreach ($users as $user) {
+                    $targetPrincipals[] = $user['uri'];
+                }
+            } else {
+                $targetPrincipals[] = $share['{http://owncloud.org/ns}principal'];
+            }
+        }
+        return array_values(array_unique($targetPrincipals, SORT_STRING));
+    }
 
-	/**
-	 * @param string $cardUri
-	 * @param string  $cardData
-	 * @param array $book
-	 * @param int $calendarId
-	 * @param string $type
-	 */
-	private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
-		$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
-		$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['symbol']);
-		$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
-		if (is_null($calendarData)) {
-			if (!is_null($existing)) {
-				$this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri);
-			}
-		} else {
-			if (is_null($existing)) {
-				$this->calDavBackEnd->createCalendarObject($calendarId, $objectUri, $calendarData->serialize());
-			} else {
-				if ($this->birthdayEvenChanged($existing['calendardata'], $calendarData)) {
-					$this->calDavBackEnd->updateCalendarObject($calendarId, $objectUri, $calendarData->serialize());
-				}
-			}
-		}
-	}
+    /**
+     * @param string $cardUri
+     * @param string  $cardData
+     * @param array $book
+     * @param int $calendarId
+     * @param string $type
+     */
+    private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
+        $objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
+        $calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['symbol']);
+        $existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
+        if (is_null($calendarData)) {
+            if (!is_null($existing)) {
+                $this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri);
+            }
+        } else {
+            if (is_null($existing)) {
+                $this->calDavBackEnd->createCalendarObject($calendarId, $objectUri, $calendarData->serialize());
+            } else {
+                if ($this->birthdayEvenChanged($existing['calendardata'], $calendarData)) {
+                    $this->calDavBackEnd->updateCalendarObject($calendarId, $objectUri, $calendarData->serialize());
+                }
+            }
+        }
+    }
 
 }

apps/dav/lib/CalDAV/Schedule/Plugin.php

Indentation +55 added lines, -55 removed lines

@@ -34,68 +34,68 @@
 
 class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 
-	/**
-	 * Initializes the plugin
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		parent::initialize($server);
-		$server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
-	}
+    /**
+     * Initializes the plugin
+     *
+     * @param Server $server
+     * @return void
+     */
+    function initialize(Server $server) {
+        parent::initialize($server);
+        $server->on('propFind', [$this, 'propFindDefaultCalendarUrl'], 90);
+    }
 
-	/**
-	 * Returns a list of addresses that are associated with a principal.
-	 *
-	 * @param string $principal
-	 * @return array
-	 */
-	protected function getAddressesForPrincipal($principal) {
-		$result = parent::getAddressesForPrincipal($principal);
+    /**
+     * Returns a list of addresses that are associated with a principal.
+     *
+     * @param string $principal
+     * @return array
+     */
+    protected function getAddressesForPrincipal($principal) {
+        $result = parent::getAddressesForPrincipal($principal);
 
-		if ($result === null) {
-			$result = [];
-		}
+        if ($result === null) {
+            $result = [];
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Always use the personal calendar as target for scheduled events
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
-		if ($node instanceof IPrincipal) {
-			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
-				/** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
-				$caldavPlugin = $this->server->getPlugin('caldav');
-				$principalUrl = $node->getPrincipalUrl();
+    /**
+     * Always use the personal calendar as target for scheduled events
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) {
+        if ($node instanceof IPrincipal) {
+            $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) {
+                /** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */
+                $caldavPlugin = $this->server->getPlugin('caldav');
+                $principalUrl = $node->getPrincipalUrl();
 
-				$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+                $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
 
-				if (!$calendarHomePath) {
-					return null;
-				}
+                if (!$calendarHomePath) {
+                    return null;
+                }
 
-				/** @var CalendarHome $calendarHome */
-				$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
-				if (!$calendarHome->childExists(CalDavBackend::PERSONAL_CALENDAR_URI)) {
-					$calendarHome->getCalDAVBackend()->createCalendar($principalUrl, CalDavBackend::PERSONAL_CALENDAR_URI, [
-						'{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
-					]);
-				}
+                /** @var CalendarHome $calendarHome */
+                $calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
+                if (!$calendarHome->childExists(CalDavBackend::PERSONAL_CALENDAR_URI)) {
+                    $calendarHome->getCalDAVBackend()->createCalendar($principalUrl, CalDavBackend::PERSONAL_CALENDAR_URI, [
+                        '{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
+                    ]);
+                }
 
-				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . CalDavBackend::PERSONAL_CALENDAR_URI, [], 1);
-				if (empty($result)) {
-					return null;
-				}
+                $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . CalDavBackend::PERSONAL_CALENDAR_URI, [], 1);
+                if (empty($result)) {
+                    return null;
+                }
 
-				return new LocalHref($result[0]['href']);
-			});
-		}
-	}
+                return new LocalHref($result[0]['href']);
+            });
+        }
+    }
 }

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

Indentation +83 added lines, -83 removed lines

@@ -42,88 +42,88 @@
  */
 class IMipPlugin extends SabreIMipPlugin {
 
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * Creates the email handler.
-	 *
-	 * @param IMailer $mailer
-	 */
-	function __construct(IMailer $mailer, ILogger $logger) {
-		parent::__construct('');
-		$this->mailer = $mailer;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Event handler for the 'schedule' event.
-	 *
-	 * @param ITip\Message $iTipMessage
-	 * @return void
-	 */
-	function schedule(ITip\Message $iTipMessage) {
-
-		// Not sending any emails if the system considers the update
-		// insignificant.
-		if (!$iTipMessage->significantChange) {
-			if (!$iTipMessage->scheduleStatus) {
-				$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			}
-			return;
-		}
-
-		$summary = $iTipMessage->message->VEVENT->SUMMARY;
-
-		if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') {
-			return;
-		}
-
-		if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
-			return;
-		}
-
-		$sender = substr($iTipMessage->sender, 7);
-		$recipient = substr($iTipMessage->recipient, 7);
-
-		$senderName = ($iTipMessage->senderName) ? $iTipMessage->senderName : null;
-		$recipientName = ($iTipMessage->recipientName) ? $iTipMessage->recipientName : null;
-
-		$subject = 'SabreDAV iTIP message';
-		switch (strtoupper($iTipMessage->method)) {
-			case 'REPLY' :
-				$subject = 'Re: ' . $summary;
-				break;
-			case 'REQUEST' :
-				$subject = $summary;
-				break;
-			case 'CANCEL' :
-				$subject = 'Cancelled: ' . $summary;
-				break;
-		}
-
-		$contentType = 'text/calendar; charset=UTF-8; method=' . $iTipMessage->method;
-
-		$message = $this->mailer->createMessage();
-
-		$message->setReplyTo([$sender => $senderName])
-			->setTo([$recipient => $recipientName])
-			->setSubject($subject)
-			->setBody($iTipMessage->message->serialize(), $contentType);
-		try {
-			$failed = $this->mailer->send($message);
-			if ($failed) {
-				$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' =>  implode(', ', $failed)]);
-				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			}
-			$iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
-		} catch(\Exception $ex) {
-			$this->logger->logException($ex, ['app' => 'dav']);
-			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-		}
-	}
+    /** @var IMailer */
+    private $mailer;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * Creates the email handler.
+     *
+     * @param IMailer $mailer
+     */
+    function __construct(IMailer $mailer, ILogger $logger) {
+        parent::__construct('');
+        $this->mailer = $mailer;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Event handler for the 'schedule' event.
+     *
+     * @param ITip\Message $iTipMessage
+     * @return void
+     */
+    function schedule(ITip\Message $iTipMessage) {
+
+        // Not sending any emails if the system considers the update
+        // insignificant.
+        if (!$iTipMessage->significantChange) {
+            if (!$iTipMessage->scheduleStatus) {
+                $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+            }
+            return;
+        }
+
+        $summary = $iTipMessage->message->VEVENT->SUMMARY;
+
+        if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') {
+            return;
+        }
+
+        if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
+            return;
+        }
+
+        $sender = substr($iTipMessage->sender, 7);
+        $recipient = substr($iTipMessage->recipient, 7);
+
+        $senderName = ($iTipMessage->senderName) ? $iTipMessage->senderName : null;
+        $recipientName = ($iTipMessage->recipientName) ? $iTipMessage->recipientName : null;
+
+        $subject = 'SabreDAV iTIP message';
+        switch (strtoupper($iTipMessage->method)) {
+            case 'REPLY' :
+                $subject = 'Re: ' . $summary;
+                break;
+            case 'REQUEST' :
+                $subject = $summary;
+                break;
+            case 'CANCEL' :
+                $subject = 'Cancelled: ' . $summary;
+                break;
+        }
+
+        $contentType = 'text/calendar; charset=UTF-8; method=' . $iTipMessage->method;
+
+        $message = $this->mailer->createMessage();
+
+        $message->setReplyTo([$sender => $senderName])
+            ->setTo([$recipient => $recipientName])
+            ->setSubject($subject)
+            ->setBody($iTipMessage->message->serialize(), $contentType);
+        try {
+            $failed = $this->mailer->send($message);
+            if ($failed) {
+                $this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' =>  implode(', ', $failed)]);
+                $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+            }
+            $iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
+        } catch(\Exception $ex) {
+            $this->logger->logException($ex, ['app' => 'dav']);
+            $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+        }
+    }
 
 }

apps/dav/lib/CalDAV/Publishing/PublishPlugin.php

Indentation +189 added lines, -189 removed lines

@@ -34,194 +34,194 @@
 use OCP\IConfig;
 
 class PublishPlugin extends ServerPlugin {
-	const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * Config instance to get instance secret.
-	 *
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * URL Generator for absolute URLs.
-	 *
-	 * @var IURLGenerator
-	 */
-	protected $urlGenerator;
-
-	/**
-	 * PublishPlugin constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(IConfig $config, IURLGenerator $urlGenerator) {
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		// May have to be changed to be detected
-		return ['oc-calendar-publishing', 'calendarserver-sharing'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName()	{
-		return 'oc-calendar-publishing';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
-	}
-
-	public function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof Calendar) {
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
-				if ($node->getPublishStatus()) {
-					// We return the publish-url only if the calendar is published.
-					$token = $node->getPublishStatus();
-					$publishUrl = $this->urlGenerator->getAbsoluteURL($this->server->getBaseUri().'public-calendars/').$token;
-
-					return new Publisher($publishUrl, true);
-				}
-			});
-
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function() use ($node) {
-				return new AllowedSharingModes(!$node->isSubscription(), !$node->isSubscription());
-			});
-		}
-	}
-
-	/**
-	 * We intercept this to handle POST requests on calendars.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 *
-	 * @return void|bool
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-
-		// Only handling xml
-		$contentType = $request->getHeader('Content-Type');
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
-			return;
-		}
-
-		// Making sure the node exists
-		try {
-			$node = $this->server->tree->getNodeForPath($path);
-		} catch (NotFound $e) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-
-		// If this request handler could not deal with this POST request, it
-		// will return 'null' and other plugins get a chance to handle the
-		// request.
-		//
-		// However, we already requested the full body. This is a problem,
-		// because a body can only be read once. This is why we preemptively
-		// re-populated the request body with the existing data.
-		$request->setBody($requestBody);
-
-		$this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-		switch ($documentType) {
-
-			case '{'.self::NS_CALENDARSERVER.'}publish-calendar' :
-
-			// We can only deal with IShareableCalendar objects
-			if (!$node instanceof Calendar) {
-				return;
-			}
-			$this->server->transactionType = 'post-publish-calendar';
-
-			// Getting ACL info
-			$acl = $this->server->getPlugin('acl');
-
-			// If there's no ACL support, we allow everything
-			if ($acl) {
-				$acl->checkPrivileges($path, '{DAV:}write');
-			}
-
-			$node->setPublishStatus(true);
-
-			// iCloud sends back the 202, so we will too.
-			$response->setStatus(202);
-
-			// Adding this because sending a response body may cause issues,
-			// and I wanted some type of indicator the response was handled.
-			$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-			// Breaking the event chain
-			return false;
-
-			case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar' :
-
-			// We can only deal with IShareableCalendar objects
-			if (!$node instanceof Calendar) {
-				return;
-			}
-			$this->server->transactionType = 'post-unpublish-calendar';
-
-			// Getting ACL info
-			$acl = $this->server->getPlugin('acl');
-
-			// If there's no ACL support, we allow everything
-			if ($acl) {
-				$acl->checkPrivileges($path, '{DAV:}write');
-			}
-
-			$node->setPublishStatus(false);
-
-			$response->setStatus(200);
-
-			// Adding this because sending a response body may cause issues,
-			// and I wanted some type of indicator the response was handled.
-			$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-			// Breaking the event chain
-			return false;
+    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * Config instance to get instance secret.
+     *
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * URL Generator for absolute URLs.
+     *
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
+
+    /**
+     * PublishPlugin constructor.
+     *
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(IConfig $config, IURLGenerator $urlGenerator) {
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        // May have to be changed to be detected
+        return ['oc-calendar-publishing', 'calendarserver-sharing'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName()	{
+        return 'oc-calendar-publishing';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+        $this->server->on('propFind',    [$this, 'propFind']);
+    }
+
+    public function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof Calendar) {
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
+                if ($node->getPublishStatus()) {
+                    // We return the publish-url only if the calendar is published.
+                    $token = $node->getPublishStatus();
+                    $publishUrl = $this->urlGenerator->getAbsoluteURL($this->server->getBaseUri().'public-calendars/').$token;
+
+                    return new Publisher($publishUrl, true);
+                }
+            });
+
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function() use ($node) {
+                return new AllowedSharingModes(!$node->isSubscription(), !$node->isSubscription());
+            });
+        }
+    }
+
+    /**
+     * We intercept this to handle POST requests on calendars.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     *
+     * @return void|bool
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+
+        // Only handling xml
+        $contentType = $request->getHeader('Content-Type');
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
+            return;
+        }
+
+        // Making sure the node exists
+        try {
+            $node = $this->server->tree->getNodeForPath($path);
+        } catch (NotFound $e) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $request->setBody($requestBody);
+
+        $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+        switch ($documentType) {
+
+            case '{'.self::NS_CALENDARSERVER.'}publish-calendar' :
+
+            // We can only deal with IShareableCalendar objects
+            if (!$node instanceof Calendar) {
+                return;
+            }
+            $this->server->transactionType = 'post-publish-calendar';
+
+            // Getting ACL info
+            $acl = $this->server->getPlugin('acl');
+
+            // If there's no ACL support, we allow everything
+            if ($acl) {
+                $acl->checkPrivileges($path, '{DAV:}write');
+            }
+
+            $node->setPublishStatus(true);
+
+            // iCloud sends back the 202, so we will too.
+            $response->setStatus(202);
+
+            // Adding this because sending a response body may cause issues,
+            // and I wanted some type of indicator the response was handled.
+            $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+            // Breaking the event chain
+            return false;
+
+            case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar' :
+
+            // We can only deal with IShareableCalendar objects
+            if (!$node instanceof Calendar) {
+                return;
+            }
+            $this->server->transactionType = 'post-unpublish-calendar';
+
+            // Getting ACL info
+            $acl = $this->server->getPlugin('acl');
+
+            // If there's no ACL support, we allow everything
+            if ($acl) {
+                $acl->checkPrivileges($path, '{DAV:}write');
+            }
+
+            $node->setPublishStatus(false);
+
+            $response->setStatus(200);
+
+            // Adding this because sending a response body may cause issues,
+            // and I wanted some type of indicator the response was handled.
+            $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+            // Breaking the event chain
+            return false;
 
-		}
-	}
+        }
+    }
 }

apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php

Indentation +50 added lines, -50 removed lines

@@ -26,58 +26,58 @@
 
 class Publisher implements XmlSerializable {
 
-	/**
-	 * @var string $publishUrl
-	 */
-	protected $publishUrl;
+    /**
+     * @var string $publishUrl
+     */
+    protected $publishUrl;
 
-	/**
-	 * @var boolean $isPublished
-	 */
-	protected $isPublished;
+    /**
+     * @var boolean $isPublished
+     */
+    protected $isPublished;
 
-	/**
-	 * @param string $publishUrl
-	 * @param boolean $isPublished
-	 */
-	function __construct($publishUrl, $isPublished) {
-		$this->publishUrl = $publishUrl;
-		$this->isPublished = $isPublished;
-	}
+    /**
+     * @param string $publishUrl
+     * @param boolean $isPublished
+     */
+    function __construct($publishUrl, $isPublished) {
+        $this->publishUrl = $publishUrl;
+        $this->isPublished = $isPublished;
+    }
 
-	/**
-	 * @return string
-	 */
-	function getValue() {
-		return $this->publishUrl;
-	}
+    /**
+     * @return string
+     */
+    function getValue() {
+        return $this->publishUrl;
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	function xmlSerialize(Writer $writer) {
-		if (!$this->isPublished) {
-			// for pre-publish-url
-			$writer->write($this->publishUrl);
-		} else {
-			// for publish-url
-			$writer->writeElement('{DAV:}href', $this->publishUrl);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
+        if (!$this->isPublished) {
+            // for pre-publish-url
+            $writer->write($this->publishUrl);
+        } else {
+            // for publish-url
+            $writer->writeElement('{DAV:}href', $this->publishUrl);
+        }
+    }
 }

apps/dav/lib/CalDAV/CalendarRoot.php

Indentation +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@
 
 class CalendarRoot extends \Sabre\CalDAV\CalendarRoot {
 
-	function getChildForPrincipal(array $principal) {
-		return new CalendarHome($this->caldavBackend, $principal);
-	}
+    function getChildForPrincipal(array $principal) {
+        return new CalendarHome($this->caldavBackend, $principal);
+    }
 }
\ No newline at end of file

apps/dav/lib/CardDAV/AddressBookImpl.php

Indentation +251 added lines, -251 removed lines

@@ -34,255 +34,255 @@
 
 class AddressBookImpl implements IAddressBook {
 
-	/** @var CardDavBackend */
-	private $backend;
-
-	/** @var array */
-	private $addressBookInfo;
-
-	/** @var AddressBook */
-	private $addressBook;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/**
-	 * AddressBookImpl constructor.
-	 *
-	 * @param AddressBook $addressBook
-	 * @param array $addressBookInfo
-	 * @param CardDavBackend $backend
-	 * @param IUrlGenerator $urlGenerator
-	 */
-	public function __construct(
-			AddressBook $addressBook,
-			array $addressBookInfo,
-			CardDavBackend $backend,
-			IURLGenerator $urlGenerator) {
-
-		$this->addressBook = $addressBook;
-		$this->addressBookInfo = $addressBookInfo;
-		$this->backend = $backend;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * @return string defining the technical unique key
-	 * @since 5.0.0
-	 */
-	public function getKey() {
-		return $this->addressBookInfo['id'];
-	}
-
-	/**
-	 * In comparison to getKey() this function returns a human readable (maybe translated) name
-	 *
-	 * @return mixed
-	 * @since 5.0.0
-	 */
-	public function getDisplayName() {
-		return $this->addressBookInfo['{DAV:}displayname'];
-	}
-
-	/**
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - for future use. One should always have options!
-	 * @return array an array of contacts which are arrays of key-value-pairs
-	 * @since 5.0.0
-	 */
-	public function search($pattern, $searchProperties, $options) {
-		$results = $this->backend->search($this->getKey(), $pattern, $searchProperties);
-
-		$vCards = [];
-		foreach ($results as $result) {
-			$vCards[] = $this->vCard2Array($result['uri'], $this->readCard($result['carddata']));
-		}
-
-		return $vCards;
-	}
-
-	/**
-	 * @param array $properties this array if key-value-pairs defines a contact
-	 * @return array an array representing the contact just created or updated
-	 * @since 5.0.0
-	 */
-	public function createOrUpdate($properties) {
-		$update = false;
-		if (!isset($properties['URI'])) { // create a new contact
-			$uid = $this->createUid();
-			$uri = $uid . '.vcf';
-			$vCard = $this->createEmptyVCard($uid);
-		} else { // update existing contact
-			$uri = $properties['URI'];
-			$vCardData = $this->backend->getCard($this->getKey(), $uri);
-			$vCard = $this->readCard($vCardData['carddata']);
-			$update = true;
-		}
-
-		foreach ($properties as $key => $value) {
-			$vCard->$key = $vCard->createProperty($key, $value);
-		}
-
-		if ($update) {
-			$this->backend->updateCard($this->getKey(), $uri, $vCard->serialize());
-		} else {
-			$this->backend->createCard($this->getKey(), $uri, $vCard->serialize());
-		}
-
-		return $this->vCard2Array($uri, $vCard);
-
-	}
-
-	/**
-	 * @return mixed
-	 * @since 5.0.0
-	 */
-	public function getPermissions() {
-		$permissions = $this->addressBook->getACL();
-		$result = 0;
-		foreach ($permissions as $permission) {
-			switch($permission['privilege']) {
-				case '{DAV:}read':
-					$result |= Constants::PERMISSION_READ;
-					break;
-				case '{DAV:}write':
-					$result |= Constants::PERMISSION_CREATE;
-					$result |= Constants::PERMISSION_UPDATE;
-					break;
-				case '{DAV:}all':
-					$result |= Constants::PERMISSION_ALL;
-					break;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param object $id the unique identifier to a contact
-	 * @return bool successful or not
-	 * @since 5.0.0
-	 */
-	public function delete($id) {
-		$uri = $this->backend->getCardUri($id);
-		return $this->backend->deleteCard($this->addressBookInfo['id'], $uri);
-	}
-
-	/**
-	 * read vCard data into a vCard object
-	 *
-	 * @param string $cardData
-	 * @return VCard
-	 */
-	protected function readCard($cardData) {
-		return  Reader::read($cardData);
-	}
-
-	/**
-	 * create UID for contact
-	 *
-	 * @return string
-	 */
-	protected function createUid() {
-		do {
-			$uid = $this->getUid();
-			$contact = $this->backend->getContact($this->getKey(), $uid . '.vcf');
-		} while (!empty($contact));
-
-		return $uid;
-	}
-
-	/**
-	 * getUid is only there for testing, use createUid instead
-	 */
-	protected function getUid() {
-		return UUIDUtil::getUUID();
-	}
-
-	/**
-	 * create empty vcard
-	 *
-	 * @param string $uid
-	 * @return VCard
-	 */
-	protected function createEmptyVCard($uid) {
-		$vCard = new VCard();
-		$vCard->UID = $uid;
-		return $vCard;
-	}
-
-	/**
-	 * create array with all vCard properties
-	 *
-	 * @param string $uri
-	 * @param VCard $vCard
-	 * @return array
-	 */
-	protected function vCard2Array($uri, VCard $vCard) {
-		$result = [
-			'URI' => $uri,
-		];
-
-		foreach ($vCard->children() as $property) {
-			if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') {
-				$url = $this->urlGenerator->getAbsoluteURL(
-					$this->urlGenerator->linkTo('', 'remote.php') . '/dav/');
-				$url .= implode('/', [
-					'addressbooks',
-					substr($this->addressBookInfo['principaluri'], 11), //cut off 'principals/'
-					$this->addressBookInfo['uri'],
-					$uri
-				]) . '?photo';
-
-				$result['PHOTO'] = 'VALUE=uri:' . $url;
-
-			} else if ($property->name === 'X-SOCIALPROFILE') {
-				$type = $this->getTypeFromProperty($property);
-
-				// Type is the social network, when it's empty we don't need this.
-				if ($type !== null) {
-					if (!isset($result[$property->name])) {
-						$result[$property->name] = [];
-					}
-					$result[$property->name][$type] = $property->getValue();
-				}
-
-			// The following properties can be set multiple times
-			} else if (in_array($property->name, ['CLOUD', 'EMAIL', 'IMPP', 'TEL', 'URL'])) {
-				if (!isset($result[$property->name])) {
-					$result[$property->name] = [];
-				}
-
-				$result[$property->name][] = $property->getValue();
-
-			} else {
-				$result[$property->name] = $property->getValue();
-			}
-		}
-
-		if ($this->addressBookInfo['principaluri'] === 'principals/system/system' &&
-			$this->addressBookInfo['uri'] === 'system') {
-			$result['isLocalSystemBook'] = true;
-		}
-		return $result;
-	}
-
-	/**
-	 * Get the type of the current property
-	 *
-	 * @param Property $property
-	 * @return null|string
-	 */
-	protected function getTypeFromProperty(Property $property) {
-		$parameters = $property->parameters();
-		// Type is the social network, when it's empty we don't need this.
-		if (isset($parameters['TYPE'])) {
-			/** @var \Sabre\VObject\Parameter $type */
-			$type = $parameters['TYPE'];
-			return $type->getValue();
-		}
-
-		return null;
-	}
+    /** @var CardDavBackend */
+    private $backend;
+
+    /** @var array */
+    private $addressBookInfo;
+
+    /** @var AddressBook */
+    private $addressBook;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /**
+     * AddressBookImpl constructor.
+     *
+     * @param AddressBook $addressBook
+     * @param array $addressBookInfo
+     * @param CardDavBackend $backend
+     * @param IUrlGenerator $urlGenerator
+     */
+    public function __construct(
+            AddressBook $addressBook,
+            array $addressBookInfo,
+            CardDavBackend $backend,
+            IURLGenerator $urlGenerator) {
+
+        $this->addressBook = $addressBook;
+        $this->addressBookInfo = $addressBookInfo;
+        $this->backend = $backend;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * @return string defining the technical unique key
+     * @since 5.0.0
+     */
+    public function getKey() {
+        return $this->addressBookInfo['id'];
+    }
+
+    /**
+     * In comparison to getKey() this function returns a human readable (maybe translated) name
+     *
+     * @return mixed
+     * @since 5.0.0
+     */
+    public function getDisplayName() {
+        return $this->addressBookInfo['{DAV:}displayname'];
+    }
+
+    /**
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options - for future use. One should always have options!
+     * @return array an array of contacts which are arrays of key-value-pairs
+     * @since 5.0.0
+     */
+    public function search($pattern, $searchProperties, $options) {
+        $results = $this->backend->search($this->getKey(), $pattern, $searchProperties);
+
+        $vCards = [];
+        foreach ($results as $result) {
+            $vCards[] = $this->vCard2Array($result['uri'], $this->readCard($result['carddata']));
+        }
+
+        return $vCards;
+    }
+
+    /**
+     * @param array $properties this array if key-value-pairs defines a contact
+     * @return array an array representing the contact just created or updated
+     * @since 5.0.0
+     */
+    public function createOrUpdate($properties) {
+        $update = false;
+        if (!isset($properties['URI'])) { // create a new contact
+            $uid = $this->createUid();
+            $uri = $uid . '.vcf';
+            $vCard = $this->createEmptyVCard($uid);
+        } else { // update existing contact
+            $uri = $properties['URI'];
+            $vCardData = $this->backend->getCard($this->getKey(), $uri);
+            $vCard = $this->readCard($vCardData['carddata']);
+            $update = true;
+        }
+
+        foreach ($properties as $key => $value) {
+            $vCard->$key = $vCard->createProperty($key, $value);
+        }
+
+        if ($update) {
+            $this->backend->updateCard($this->getKey(), $uri, $vCard->serialize());
+        } else {
+            $this->backend->createCard($this->getKey(), $uri, $vCard->serialize());
+        }
+
+        return $this->vCard2Array($uri, $vCard);
+
+    }
+
+    /**
+     * @return mixed
+     * @since 5.0.0
+     */
+    public function getPermissions() {
+        $permissions = $this->addressBook->getACL();
+        $result = 0;
+        foreach ($permissions as $permission) {
+            switch($permission['privilege']) {
+                case '{DAV:}read':
+                    $result |= Constants::PERMISSION_READ;
+                    break;
+                case '{DAV:}write':
+                    $result |= Constants::PERMISSION_CREATE;
+                    $result |= Constants::PERMISSION_UPDATE;
+                    break;
+                case '{DAV:}all':
+                    $result |= Constants::PERMISSION_ALL;
+                    break;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param object $id the unique identifier to a contact
+     * @return bool successful or not
+     * @since 5.0.0
+     */
+    public function delete($id) {
+        $uri = $this->backend->getCardUri($id);
+        return $this->backend->deleteCard($this->addressBookInfo['id'], $uri);
+    }
+
+    /**
+     * read vCard data into a vCard object
+     *
+     * @param string $cardData
+     * @return VCard
+     */
+    protected function readCard($cardData) {
+        return  Reader::read($cardData);
+    }
+
+    /**
+     * create UID for contact
+     *
+     * @return string
+     */
+    protected function createUid() {
+        do {
+            $uid = $this->getUid();
+            $contact = $this->backend->getContact($this->getKey(), $uid . '.vcf');
+        } while (!empty($contact));
+
+        return $uid;
+    }
+
+    /**
+     * getUid is only there for testing, use createUid instead
+     */
+    protected function getUid() {
+        return UUIDUtil::getUUID();
+    }
+
+    /**
+     * create empty vcard
+     *
+     * @param string $uid
+     * @return VCard
+     */
+    protected function createEmptyVCard($uid) {
+        $vCard = new VCard();
+        $vCard->UID = $uid;
+        return $vCard;
+    }
+
+    /**
+     * create array with all vCard properties
+     *
+     * @param string $uri
+     * @param VCard $vCard
+     * @return array
+     */
+    protected function vCard2Array($uri, VCard $vCard) {
+        $result = [
+            'URI' => $uri,
+        ];
+
+        foreach ($vCard->children() as $property) {
+            if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') {
+                $url = $this->urlGenerator->getAbsoluteURL(
+                    $this->urlGenerator->linkTo('', 'remote.php') . '/dav/');
+                $url .= implode('/', [
+                    'addressbooks',
+                    substr($this->addressBookInfo['principaluri'], 11), //cut off 'principals/'
+                    $this->addressBookInfo['uri'],
+                    $uri
+                ]) . '?photo';
+
+                $result['PHOTO'] = 'VALUE=uri:' . $url;
+
+            } else if ($property->name === 'X-SOCIALPROFILE') {
+                $type = $this->getTypeFromProperty($property);
+
+                // Type is the social network, when it's empty we don't need this.
+                if ($type !== null) {
+                    if (!isset($result[$property->name])) {
+                        $result[$property->name] = [];
+                    }
+                    $result[$property->name][$type] = $property->getValue();
+                }
+
+            // The following properties can be set multiple times
+            } else if (in_array($property->name, ['CLOUD', 'EMAIL', 'IMPP', 'TEL', 'URL'])) {
+                if (!isset($result[$property->name])) {
+                    $result[$property->name] = [];
+                }
+
+                $result[$property->name][] = $property->getValue();
+
+            } else {
+                $result[$property->name] = $property->getValue();
+            }
+        }
+
+        if ($this->addressBookInfo['principaluri'] === 'principals/system/system' &&
+            $this->addressBookInfo['uri'] === 'system') {
+            $result['isLocalSystemBook'] = true;
+        }
+        return $result;
+    }
+
+    /**
+     * Get the type of the current property
+     *
+     * @param Property $property
+     * @return null|string
+     */
+    protected function getTypeFromProperty(Property $property) {
+        $parameters = $property->parameters();
+        // Type is the social network, when it's empty we don't need this.
+        if (isset($parameters['TYPE'])) {
+            /** @var \Sabre\VObject\Parameter $type */
+            $type = $parameters['TYPE'];
+            return $type->getValue();
+        }
+
+        return null;
+    }
 }

apps/dav/lib/CardDAV/Xml/Groups.php

Indentation +14 added lines, -14 removed lines

@@ -26,21 +26,21 @@
 use Sabre\Xml\Writer;
 
 class Groups implements XmlSerializable {
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private $groups;
+    /** @var string[] of TYPE:CHECKSUM */
+    private $groups;
 
-	/**
-	 * @param string $groups
-	 */
-	public function __construct($groups) {
-		$this->groups = $groups;
-	}
+    /**
+     * @param string $groups
+     */
+    public function __construct($groups) {
+        $this->groups = $groups;
+    }
 
-	function xmlSerialize(Writer $writer) {
-		foreach ($this->groups as $group) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
-		}
-	}
+    function xmlSerialize(Writer $writer) {
+        foreach ($this->groups as $group) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
+        }
+    }
 }

apps/dav/lib/CardDAV/AddressBookRoot.php

Indentation +33 added lines, -33 removed lines

@@ -25,46 +25,46 @@
 
 class AddressBookRoot extends \Sabre\CardDAV\AddressBookRoot {
 
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param \Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend
-	 * @param \Sabre\CardDAV\Backend\BackendInterface $carddavBackend
-	 * @param string $principalPrefix
-	 */
-	public function __construct(\Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend, \Sabre\CardDAV\Backend\BackendInterface $carddavBackend, $principalPrefix = 'principals') {
-		parent::__construct($principalBackend, $carddavBackend, $principalPrefix);
-		$this->l10n = \OC::$server->getL10N('dav');
-	}
+    /**
+     * @param \Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend
+     * @param \Sabre\CardDAV\Backend\BackendInterface $carddavBackend
+     * @param string $principalPrefix
+     */
+    public function __construct(\Sabre\DAVACL\PrincipalBackend\BackendInterface $principalBackend, \Sabre\CardDAV\Backend\BackendInterface $carddavBackend, $principalPrefix = 'principals') {
+        parent::__construct($principalBackend, $carddavBackend, $principalPrefix);
+        $this->l10n = \OC::$server->getL10N('dav');
+    }
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principal
-	 * @return \Sabre\DAV\INode
-	 */
-	function getChildForPrincipal(array $principal) {
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principal
+     * @return \Sabre\DAV\INode
+     */
+    function getChildForPrincipal(array $principal) {
 
-		return new UserAddressBooks($this->carddavBackend, $principal['uri'], $this->l10n);
+        return new UserAddressBooks($this->carddavBackend, $principal['uri'], $this->l10n);
 
-	}
+    }
 
-	function getName() {
+    function getName() {
 
-		if ($this->principalPrefix === 'principals') {
-			return parent::getName();
-		}
-		// Grabbing all the components of the principal path.
-		$parts = explode('/', $this->principalPrefix);
+        if ($this->principalPrefix === 'principals') {
+            return parent::getName();
+        }
+        // Grabbing all the components of the principal path.
+        $parts = explode('/', $this->principalPrefix);
 
-		// We are only interested in the second part.
-		return $parts[1];
+        // We are only interested in the second part.
+        return $parts[1];
 
-	}
+    }
 
 }