nextcloud / server

apps/dav/appinfo/routes.php

Indentation +4 added lines, -4 removed lines

@@ -22,8 +22,8 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'],
-		['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'],
-	]
+    'routes' => [
+        ['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'],
+        ['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'],
+    ]
 ];

apps/dav/lib/Controller/BirthdayCalendarController.php

Indentation +38 added lines, -38 removed lines

@@ -32,50 +32,50 @@
 
 class BirthdayCalendarController extends Controller {
 
-	/**
-	 * @var IDBConnection
-	 */
-	protected $db;
+    /**
+     * @var IDBConnection
+     */
+    protected $db;
 
-	/**
-	 * @var IConfig
-	 */
-	protected $config;
+    /**
+     * @var IConfig
+     */
+    protected $config;
 
-	/**
-	 * BirthdayCalendar constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IDBConnection $db
-	 * @param IConfig $config
-	 */
-	public function __construct($appName, IRequest $request,
-								IDBConnection $db, IConfig $config){
-		parent::__construct($appName, $request);
-		$this->db = $db;
-		$this->config = $config;
-	}
+    /**
+     * BirthdayCalendar constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IDBConnection $db
+     * @param IConfig $config
+     */
+    public function __construct($appName, IRequest $request,
+                                IDBConnection $db, IConfig $config){
+        parent::__construct($appName, $request);
+        $this->db = $db;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return Response
-	 */
-	public function enable() {
-		$this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'yes');
+    /**
+     * @return Response
+     */
+    public function enable() {
+        $this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'yes');
 
-		// TODO schedule background job to regenerate
+        // TODO schedule background job to regenerate
 
-		return new JSONResponse([]);
-	}
+        return new JSONResponse([]);
+    }
 
-	/**
-	 * @return Response
-	 */
-	public function disable() {
-		$this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'no');
+    /**
+     * @return Response
+     */
+    public function disable() {
+        $this->config->setAppValue($this->appName, 'generateBirthdayCalendar', 'no');
 
-		// TODO delete all birthday calendars
+        // TODO delete all birthday calendars
 
-		return new JSONResponse([]);
-	}
+        return new JSONResponse([]);
+    }
 }

apps/dav/lib/Settings/CalDAVSettings.php

Indentation +32 added lines, -32 removed lines

@@ -29,41 +29,41 @@
 
 class CalDAVSettings implements ISettings {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * CalDAVSettings constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * CalDAVSettings constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			'send_invitations' => $this->config->getAppValue('dav', 'sendInvitations', 'yes'),
-			'generate_birthday_calendar' => $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes'),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'send_invitations' => $this->config->getAppValue('dav', 'sendInvitations', 'yes'),
+            'generate_birthday_calendar' => $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes'),
+        ];
 
-		return new TemplateResponse('dav', 'settings-admin-caldav', $parameters);
-	}
+        return new TemplateResponse('dav', 'settings-admin-caldav', $parameters);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getSection() {
-		return 'additional';
-	}
+    /**
+     * @return string
+     */
+    public function getSection() {
+        return 'additional';
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getPriority() {
-		return 20;
-	}
+    /**
+     * @return int
+     */
+    public function getPriority() {
+        return 20;
+    }
 }

apps/dav/lib/CalDAV/Calendar.php

Indentation +297 added lines, -297 removed lines

@@ -39,302 +39,302 @@
  */
 class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
 
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10N $l10n, IConfig $config) {
-		parent::__construct($caldavBackend, $calendarInfo);
-
-		if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$this->calendarInfo['{DAV:}displayname'] = $l10n->t('Contact birthdays');
-		}
-		if ($this->getName() === CalDavBackend::PERSONAL_CALENDAR_URI &&
-			$this->calendarInfo['{DAV:}displayname'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
-			$this->calendarInfo['{DAV:}displayname'] = $l10n->t('Personal');
-		}
-
-		$this->config = $config;
-	}
-
-	/**
-	 * Updates the list of shares.
-	 *
-	 * The first array is a list of people that are to be added to the
-	 * resource.
-	 *
-	 * Every element in the add array has the following properties:
-	 *   * href - A url. Usually a mailto: address
-	 *   * commonName - Usually a first and last name, or false
-	 *   * summary - A description of the share, can also be false
-	 *   * readOnly - A boolean value
-	 *
-	 * Every element in the remove array is just the address string.
-	 *
-	 * @param array $add
-	 * @param array $remove
-	 * @return void
-	 * @throws Forbidden
-	 */
-	public function updateShares(array $add, array $remove) {
-		if ($this->isShared()) {
-			throw new Forbidden();
-		}
-		$this->caldavBackend->updateShares($this, $add, $remove);
-	}
-
-	/**
-	 * Returns the list of people whom this resource is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *   * summary - Optional, a description for the share
-	 *
-	 * @return array
-	 */
-	public function getShares() {
-		if ($this->isShared()) {
-			return [];
-		}
-		return $this->caldavBackend->getShares($this->getResourceId());
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getResourceId() {
-		return $this->calendarInfo['id'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPrincipalURI() {
-		return $this->calendarInfo['principaluri'];
-	}
-
-	public function getACL() {
-		$acl =  [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			]];
-		if ($this->getName() !== BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$acl[] = [
-				'privilege' => '{DAV:}write',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			];
-		} else {
-			$acl[] = [
-				'privilege' => '{DAV:}write-properties',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			];
-		}
-
-		if ($this->getOwner() !== parent::getOwner()) {
-			$acl[] =  [
-					'privilege' => '{DAV:}read',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			if ($this->canWrite()) {
-				$acl[] = [
-					'privilege' => '{DAV:}write',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			} else {
-				$acl[] = [
-					'privilege' => '{DAV:}write-properties',
-					'principal' => parent::getOwner(),
-					'protected' => true,
-				];
-			}
-		}
-		if ($this->isPublic()) {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => 'principals/system/public',
-				'protected' => true,
-			];
-		}
-
-		$acl = $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);
-
-		if (!$this->isShared()) {
-			return $acl;
-		}
-
-		$allowedPrincipals = [$this->getOwner(), parent::getOwner(), 'principals/system/public'];
-		return array_filter($acl, function($rule) use ($allowedPrincipals) {
-			return in_array($rule['principal'], $allowedPrincipals);
-		});
-	}
-
-	public function getChildACL() {
-		return $this->getACL();
-	}
-
-	public function getOwner() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
-		}
-		return parent::getOwner();
-	}
-
-	public function delete() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) &&
-			$this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri']) {
-			$principal = 'principal:' . parent::getOwner();
-			$shares = $this->caldavBackend->getShares($this->getResourceId());
-			$shares = array_filter($shares, function($share) use ($principal){
-				return $share['href'] === $principal;
-			});
-			if (empty($shares)) {
-				throw new Forbidden();
-			}
-
-			$this->caldavBackend->updateShares($this, [], [
-				'href' => $principal
-			]);
-			return;
-		}
-
-		// Remember when a user deleted their birthday calendar
-		// in order to not regenerate it on the next contacts change
-		if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-			$principalURI = $this->getPrincipalURI();
-			$userId = substr($principalURI, 17);
-
-			$this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'no');
-		}
-
-		parent::delete();
-	}
-
-	public function propPatch(PropPatch $propPatch) {
-		// parent::propPatch will only update calendars table
-		// if calendar is shared, changes have to be made to the properties table
-		if (!$this->isShared()) {
-			parent::propPatch($propPatch);
-		}
-	}
-
-	public function getChild($name) {
-
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
-
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		$obj['acl'] = $this->getChildACL();
-
-		return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-
-	}
-
-	public function getChildren() {
-
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-		return $children;
-
-	}
-
-	public function getMultipleChildren(array $paths) {
-
-		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-		return $children;
-
-	}
-
-	public function childExists($name) {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
-		if (!$obj) {
-			return false;
-		}
-		if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public function calendarQuery(array $filters) {
-
-		$uris = $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters);
-		if ($this->isShared()) {
-			return array_filter($uris, function ($uri) {
-				return $this->childExists($uri);
-			});
-		}
-
-		return $uris;
-	}
-
-	/**
-	 * @param boolean $value
-	 * @return string|null
-	 */
-	public function setPublishStatus($value) {
-		$publicUri = $this->caldavBackend->setPublishStatus($value, $this);
-		$this->calendarInfo['publicuri'] = $publicUri;
-		return $publicUri;
-	}
-
-	/**
-	 * @return mixed $value
-	 */
-	public function getPublishStatus() {
-		return $this->caldavBackend->getPublishStatus($this);
-	}
-
-	private function canWrite() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
-			return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
-		}
-		return true;
-	}
-
-	private function isPublic() {
-		return isset($this->calendarInfo['{http://owncloud.org/ns}public']);
-	}
-
-	protected function isShared() {
-		if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
-			return false;
-		}
-
-		return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri'];
-	}
-
-	public function isSubscription() {
-		return isset($this->calendarInfo['{http://calendarserver.org/ns/}source']);
-	}
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10N $l10n, IConfig $config) {
+        parent::__construct($caldavBackend, $calendarInfo);
+
+        if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $this->calendarInfo['{DAV:}displayname'] = $l10n->t('Contact birthdays');
+        }
+        if ($this->getName() === CalDavBackend::PERSONAL_CALENDAR_URI &&
+            $this->calendarInfo['{DAV:}displayname'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
+            $this->calendarInfo['{DAV:}displayname'] = $l10n->t('Personal');
+        }
+
+        $this->config = $config;
+    }
+
+    /**
+     * Updates the list of shares.
+     *
+     * The first array is a list of people that are to be added to the
+     * resource.
+     *
+     * Every element in the add array has the following properties:
+     *   * href - A url. Usually a mailto: address
+     *   * commonName - Usually a first and last name, or false
+     *   * summary - A description of the share, can also be false
+     *   * readOnly - A boolean value
+     *
+     * Every element in the remove array is just the address string.
+     *
+     * @param array $add
+     * @param array $remove
+     * @return void
+     * @throws Forbidden
+     */
+    public function updateShares(array $add, array $remove) {
+        if ($this->isShared()) {
+            throw new Forbidden();
+        }
+        $this->caldavBackend->updateShares($this, $add, $remove);
+    }
+
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *   * summary - Optional, a description for the share
+     *
+     * @return array
+     */
+    public function getShares() {
+        if ($this->isShared()) {
+            return [];
+        }
+        return $this->caldavBackend->getShares($this->getResourceId());
+    }
+
+    /**
+     * @return int
+     */
+    public function getResourceId() {
+        return $this->calendarInfo['id'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrincipalURI() {
+        return $this->calendarInfo['principaluri'];
+    }
+
+    public function getACL() {
+        $acl =  [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ]];
+        if ($this->getName() !== BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $acl[] = [
+                'privilege' => '{DAV:}write',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ];
+        } else {
+            $acl[] = [
+                'privilege' => '{DAV:}write-properties',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ];
+        }
+
+        if ($this->getOwner() !== parent::getOwner()) {
+            $acl[] =  [
+                    'privilege' => '{DAV:}read',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            if ($this->canWrite()) {
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            } else {
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => parent::getOwner(),
+                    'protected' => true,
+                ];
+            }
+        }
+        if ($this->isPublic()) {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/system/public',
+                'protected' => true,
+            ];
+        }
+
+        $acl = $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);
+
+        if (!$this->isShared()) {
+            return $acl;
+        }
+
+        $allowedPrincipals = [$this->getOwner(), parent::getOwner(), 'principals/system/public'];
+        return array_filter($acl, function($rule) use ($allowedPrincipals) {
+            return in_array($rule['principal'], $allowedPrincipals);
+        });
+    }
+
+    public function getChildACL() {
+        return $this->getACL();
+    }
+
+    public function getOwner() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'];
+        }
+        return parent::getOwner();
+    }
+
+    public function delete() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']) &&
+            $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri']) {
+            $principal = 'principal:' . parent::getOwner();
+            $shares = $this->caldavBackend->getShares($this->getResourceId());
+            $shares = array_filter($shares, function($share) use ($principal){
+                return $share['href'] === $principal;
+            });
+            if (empty($shares)) {
+                throw new Forbidden();
+            }
+
+            $this->caldavBackend->updateShares($this, [], [
+                'href' => $principal
+            ]);
+            return;
+        }
+
+        // Remember when a user deleted their birthday calendar
+        // in order to not regenerate it on the next contacts change
+        if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+            $principalURI = $this->getPrincipalURI();
+            $userId = substr($principalURI, 17);
+
+            $this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'no');
+        }
+
+        parent::delete();
+    }
+
+    public function propPatch(PropPatch $propPatch) {
+        // parent::propPatch will only update calendars table
+        // if calendar is shared, changes have to be made to the properties table
+        if (!$this->isShared()) {
+            parent::propPatch($propPatch);
+        }
+    }
+
+    public function getChild($name) {
+
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        $obj['acl'] = $this->getChildACL();
+
+        return new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+
+    }
+
+    public function getChildren() {
+
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+        return $children;
+
+    }
+
+    public function getMultipleChildren(array $paths) {
+
+        $objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new CalendarObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+        return $children;
+
+    }
+
+    public function childExists($name) {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+        if (!$obj) {
+            return false;
+        }
+        if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function calendarQuery(array $filters) {
+
+        $uris = $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters);
+        if ($this->isShared()) {
+            return array_filter($uris, function ($uri) {
+                return $this->childExists($uri);
+            });
+        }
+
+        return $uris;
+    }
+
+    /**
+     * @param boolean $value
+     * @return string|null
+     */
+    public function setPublishStatus($value) {
+        $publicUri = $this->caldavBackend->setPublishStatus($value, $this);
+        $this->calendarInfo['publicuri'] = $publicUri;
+        return $publicUri;
+    }
+
+    /**
+     * @return mixed $value
+     */
+    public function getPublishStatus() {
+        return $this->caldavBackend->getPublishStatus($this);
+    }
+
+    private function canWrite() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
+            return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
+        }
+        return true;
+    }
+
+    private function isPublic() {
+        return isset($this->calendarInfo['{http://owncloud.org/ns}public']);
+    }
+
+    protected function isShared() {
+        if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
+            return false;
+        }
+
+        return $this->calendarInfo['{http://owncloud.org/ns}owner-principal'] !== $this->calendarInfo['principaluri'];
+    }
+
+    public function isSubscription() {
+        return isset($this->calendarInfo['{http://calendarserver.org/ns/}source']);
+    }
 
 }

apps/dav/lib/Command/SyncBirthdayCalendar.php

Indentation +82 added lines, -82 removed lines

@@ -34,86 +34,86 @@
 
 class SyncBirthdayCalendar extends Command {
 
-	/** @var BirthdayService */
-	private $birthdayService;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param BirthdayService $birthdayService
-	 */
-	function __construct(IUserManager $userManager, IConfig $config,
-						 BirthdayService $birthdayService) {
-		parent::__construct();
-		$this->birthdayService = $birthdayService;
-		$this->config = $config;
-		$this->userManager = $userManager;
-	}
-
-	protected function configure() {
-		$this
-			->setName('dav:sync-birthday-calendar')
-			->setDescription('Synchronizes the birthday calendar')
-			->addArgument('user',
-				InputArgument::OPTIONAL,
-				'User for whom the birthday calendar will be synchronized');
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$this->verifyEnabled();
-
-		$user = $input->getArgument('user');
-		if (!is_null($user)) {
-			if (!$this->userManager->userExists($user)) {
-				throw new \InvalidArgumentException("User <$user> in unknown.");
-			}
-
-			// re-enable the birthday calendar in case it's called directly with a user name
-			$isEnabled = $this->config->getUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
-			if ($isEnabled !== 'yes') {
-				$this->config->setUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
-				$output->writeln("Re-enabling birthday calendar for $user");
-			}
-
-			$output->writeln("Start birthday calendar sync for $user");
-			$this->birthdayService->syncUser($user);
-			return;
-		}
-		$output->writeln("Start birthday calendar sync for all users ...");
-		$p = new ProgressBar($output);
-		$p->start();
-		$this->userManager->callForAllUsers(function($user) use ($p)  {
-			$p->advance();
-
-			$userId = $user->getUID();
-			$isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-			if ($isEnabled !== 'yes') {
-				return;
-			}
-
-			/** @var IUser $user */
-			$this->birthdayService->syncUser($user->getUID());
-		});
-
-		$p->finish();
-		$output->writeln('');
-	}
-
-	protected function verifyEnabled () {
-		$isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
-
-		if ($isEnabled !== 'yes') {
-			throw new \InvalidArgumentException('Birthday calendars are disabled');
-		}
-	}
+    /** @var BirthdayService */
+    private $birthdayService;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param BirthdayService $birthdayService
+     */
+    function __construct(IUserManager $userManager, IConfig $config,
+                            BirthdayService $birthdayService) {
+        parent::__construct();
+        $this->birthdayService = $birthdayService;
+        $this->config = $config;
+        $this->userManager = $userManager;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('dav:sync-birthday-calendar')
+            ->setDescription('Synchronizes the birthday calendar')
+            ->addArgument('user',
+                InputArgument::OPTIONAL,
+                'User for whom the birthday calendar will be synchronized');
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $this->verifyEnabled();
+
+        $user = $input->getArgument('user');
+        if (!is_null($user)) {
+            if (!$this->userManager->userExists($user)) {
+                throw new \InvalidArgumentException("User <$user> in unknown.");
+            }
+
+            // re-enable the birthday calendar in case it's called directly with a user name
+            $isEnabled = $this->config->getUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
+            if ($isEnabled !== 'yes') {
+                $this->config->setUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
+                $output->writeln("Re-enabling birthday calendar for $user");
+            }
+
+            $output->writeln("Start birthday calendar sync for $user");
+            $this->birthdayService->syncUser($user);
+            return;
+        }
+        $output->writeln("Start birthday calendar sync for all users ...");
+        $p = new ProgressBar($output);
+        $p->start();
+        $this->userManager->callForAllUsers(function($user) use ($p)  {
+            $p->advance();
+
+            $userId = $user->getUID();
+            $isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+            if ($isEnabled !== 'yes') {
+                return;
+            }
+
+            /** @var IUser $user */
+            $this->birthdayService->syncUser($user->getUID());
+        });
+
+        $p->finish();
+        $output->writeln('');
+    }
+
+    protected function verifyEnabled () {
+        $isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
+
+        if ($isEnabled !== 'yes') {
+            throw new \InvalidArgumentException('Birthday calendars are disabled');
+        }
+    }
 }

apps/dav/lib/CalDAV/CalendarHome.php

Indentation +105 added lines, -105 removed lines

@@ -35,109 +35,109 @@
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	/** @var \OCP\IConfig */
-	private $config;
-
-	public function __construct(BackendInterface $caldavBackend, $principalInfo) {
-		parent::__construct($caldavBackend, $principalInfo);
-		$this->l10n = \OC::$server->getL10N('dav');
-		$this->config = \OC::$server->getConfig();
-	}
-
-	/**
-	 * @return BackendInterface
-	 */
-	public function getCalDAVBackend() {
-		return $this->caldavBackend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function createExtendedCollection($name, MkCol $mkCol) {
-		$reservedNames = [BirthdayService::BIRTHDAY_CALENDAR_URI];
-
-		if (in_array($name, $reservedNames)) {
-			throw new MethodNotAllowed('The resource you tried to create has a reserved name');
-		}
-
-		parent::createExtendedCollection($name, $mkCol);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function getChildren() {
-		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-		$objects = [];
-		foreach ($calendars as $calendar) {
-			$objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-		}
-
-		if ($this->caldavBackend instanceof SchedulingSupport) {
-			$objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-			$objects[] = new Outbox($this->principalInfo['uri']);
-		}
-
-		// We're adding a notifications node, if it's supported by the backend.
-		if ($this->caldavBackend instanceof NotificationSupport) {
-			$objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-
-		// If the backend supports subscriptions, we'll add those as well,
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				$objects[] = new Subscription($this->caldavBackend, $subscription);
-			}
-		}
-
-		return $objects;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function getChild($name) {
-		// Special nodes
-		if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Outbox($this->principalInfo['uri']);
-		}
-		if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
-			return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-
-		// Calendars
-		foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
-			if ($calendar['uri'] === $name) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-			}
-		}
-
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($subscription['uri'] === $name) {
-					return new Subscription($this->caldavBackend, $subscription);
-				}
-			}
-
-		}
-
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
-	}
-
-	/**
-	 * @param array $filters
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 */
-	function calendarSearch(array $filters, $limit=null, $offset=null) {
-		$principalUri = $this->principalInfo['uri'];
-		return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
-	}
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    /** @var \OCP\IConfig */
+    private $config;
+
+    public function __construct(BackendInterface $caldavBackend, $principalInfo) {
+        parent::__construct($caldavBackend, $principalInfo);
+        $this->l10n = \OC::$server->getL10N('dav');
+        $this->config = \OC::$server->getConfig();
+    }
+
+    /**
+     * @return BackendInterface
+     */
+    public function getCalDAVBackend() {
+        return $this->caldavBackend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function createExtendedCollection($name, MkCol $mkCol) {
+        $reservedNames = [BirthdayService::BIRTHDAY_CALENDAR_URI];
+
+        if (in_array($name, $reservedNames)) {
+            throw new MethodNotAllowed('The resource you tried to create has a reserved name');
+        }
+
+        parent::createExtendedCollection($name, $mkCol);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function getChildren() {
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objects = [];
+        foreach ($calendars as $calendar) {
+            $objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+        }
+
+        if ($this->caldavBackend instanceof SchedulingSupport) {
+            $objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+            $objects[] = new Outbox($this->principalInfo['uri']);
+        }
+
+        // We're adding a notifications node, if it's supported by the backend.
+        if ($this->caldavBackend instanceof NotificationSupport) {
+            $objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+
+        // If the backend supports subscriptions, we'll add those as well,
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                $objects[] = new Subscription($this->caldavBackend, $subscription);
+            }
+        }
+
+        return $objects;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function getChild($name) {
+        // Special nodes
+        if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Outbox($this->principalInfo['uri']);
+        }
+        if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
+            return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+
+        // Calendars
+        foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
+            if ($calendar['uri'] === $name) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+            }
+        }
+
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($subscription['uri'] === $name) {
+                    return new Subscription($this->caldavBackend, $subscription);
+                }
+            }
+
+        }
+
+        throw new NotFound('Node with name \'' . $name . '\' could not be found');
+    }
+
+    /**
+     * @param array $filters
+     * @param integer|null $limit
+     * @param integer|null $offset
+     */
+    function calendarSearch(array $filters, $limit=null, $offset=null) {
+        $principalUri = $this->principalInfo['uri'];
+        return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
+    }
 }

apps/dav/lib/CalDAV/PublicCalendarRoot.php

Indentation +38 added lines, -38 removed lines

@@ -30,49 +30,49 @@
 
 class PublicCalendarRoot extends Collection {
 
-	/** @var CalDavBackend */
-	protected $caldavBackend;
+    /** @var CalDavBackend */
+    protected $caldavBackend;
 
-	/** @var \OCP\IL10N */
-	protected $l10n;
+    /** @var \OCP\IL10N */
+    protected $l10n;
 
-	/** @var \OCP\IConfig */
-	protected $config;
+    /** @var \OCP\IConfig */
+    protected $config;
 
-	/**
-	 * PublicCalendarRoot constructor.
-	 *
-	 * @param CalDavBackend $caldavBackend
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 */
-	function __construct(CalDavBackend $caldavBackend, IL10N $l10n,
-						 IConfig $config) {
-		$this->caldavBackend = $caldavBackend;
-		$this->l10n = $l10n;
-		$this->config = $config;
+    /**
+     * PublicCalendarRoot constructor.
+     *
+     * @param CalDavBackend $caldavBackend
+     * @param IL10N $l10n
+     * @param IConfig $config
+     */
+    function __construct(CalDavBackend $caldavBackend, IL10N $l10n,
+                            IConfig $config) {
+        $this->caldavBackend = $caldavBackend;
+        $this->l10n = $l10n;
+        $this->config = $config;
 
-	}
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getName() {
-		return 'public-calendars';
-	}
+    /**
+     * @inheritdoc
+     */
+    function getName() {
+        return 'public-calendars';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChild($name) {
-		$calendar = $this->caldavBackend->getPublicCalendar($name);
-		return new PublicCalendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-	}
+    /**
+     * @inheritdoc
+     */
+    function getChild($name) {
+        $calendar = $this->caldavBackend->getPublicCalendar($name);
+        return new PublicCalendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChildren() {
-		return [];
-	}
+    /**
+     * @inheritdoc
+     */
+    function getChildren() {
+        return [];
+    }
 }

apps/dav/lib/RootCollection.php

Indentation +77 added lines, -77 removed lines

@@ -37,90 +37,90 @@
 
 class RootCollection extends SimpleCollection {
 
-	public function __construct() {
-		$config = \OC::$server->getConfig();
-		$l10n = \OC::$server->getL10N('dav');
-		$random = \OC::$server->getSecureRandom();
-		$userManager = \OC::$server->getUserManager();
-		$groupManager = \OC::$server->getGroupManager();
-		$db = \OC::$server->getDatabaseConnection();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			$groupManager
-		);
-		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager);
-		// as soon as debug mode is enabled we allow listing of principals
-		$disableListing = !$config->getSystemValue('debug', false);
+    public function __construct() {
+        $config = \OC::$server->getConfig();
+        $l10n = \OC::$server->getL10N('dav');
+        $random = \OC::$server->getSecureRandom();
+        $userManager = \OC::$server->getUserManager();
+        $groupManager = \OC::$server->getGroupManager();
+        $db = \OC::$server->getDatabaseConnection();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            $groupManager
+        );
+        $groupPrincipalBackend = new GroupPrincipalBackend($groupManager);
+        // as soon as debug mode is enabled we allow listing of principals
+        $disableListing = !$config->getSystemValue('debug', false);
 
-		// setup the first level of the dav tree
-		$userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
-		$userPrincipals->disableListing = $disableListing;
-		$groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
-		$groupPrincipals->disableListing = $disableListing;
-		$systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
-		$systemPrincipals->disableListing = $disableListing;
-		$filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
-		$filesCollection->disableListing = $disableListing;
-		$caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $dispatcher);
-		$calendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
-		$calendarRoot->disableListing = $disableListing;
-		$publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
-		$publicCalendarRoot->disableListing = $disableListing;
+        // setup the first level of the dav tree
+        $userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
+        $userPrincipals->disableListing = $disableListing;
+        $groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
+        $groupPrincipals->disableListing = $disableListing;
+        $systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
+        $systemPrincipals->disableListing = $disableListing;
+        $filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
+        $filesCollection->disableListing = $disableListing;
+        $caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $dispatcher);
+        $calendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
+        $calendarRoot->disableListing = $disableListing;
+        $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
+        $publicCalendarRoot->disableListing = $disableListing;
 
-		$systemTagCollection = new SystemTag\SystemTagsByIdCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getUserSession(),
-			$groupManager
-		);
-		$systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getSystemTagObjectMapper(),
-			\OC::$server->getUserSession(),
-			$groupManager,
-			\OC::$server->getEventDispatcher()
-		);
-		$commentsCollection = new Comments\RootCollection(
-			\OC::$server->getCommentsManager(),
-			$userManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getEventDispatcher(),
-			\OC::$server->getLogger()
-		);
+        $systemTagCollection = new SystemTag\SystemTagsByIdCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getUserSession(),
+            $groupManager
+        );
+        $systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getSystemTagObjectMapper(),
+            \OC::$server->getUserSession(),
+            $groupManager,
+            \OC::$server->getEventDispatcher()
+        );
+        $commentsCollection = new Comments\RootCollection(
+            \OC::$server->getCommentsManager(),
+            $userManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getEventDispatcher(),
+            \OC::$server->getLogger()
+        );
 
-		$usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, 'principals/users');
-		$usersAddressBookRoot->disableListing = $disableListing;
+        $usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, 'principals/users');
+        $usersAddressBookRoot->disableListing = $disableListing;
 
-		$systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, 'principals/system');
-		$systemAddressBookRoot->disableListing = $disableListing;
+        $systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, 'principals/system');
+        $systemAddressBookRoot->disableListing = $disableListing;
 
-		$uploadCollection = new Upload\RootCollection($userPrincipalBackend, 'principals/users');
-		$uploadCollection->disableListing = $disableListing;
+        $uploadCollection = new Upload\RootCollection($userPrincipalBackend, 'principals/users');
+        $uploadCollection->disableListing = $disableListing;
 
-		$avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
-		$avatarCollection->disableListing = $disableListing;
+        $avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
+        $avatarCollection->disableListing = $disableListing;
 
-		$children = [
-				new SimpleCollection('principals', [
-						$userPrincipals,
-						$groupPrincipals,
-						$systemPrincipals]),
-				$filesCollection,
-				$calendarRoot,
-				$publicCalendarRoot,
-				new SimpleCollection('addressbooks', [
-						$usersAddressBookRoot,
-						$systemAddressBookRoot]),
-				$systemTagCollection,
-				$systemTagRelationsCollection,
-				$commentsCollection,
-				$uploadCollection,
-				$avatarCollection
-		];
+        $children = [
+                new SimpleCollection('principals', [
+                        $userPrincipals,
+                        $groupPrincipals,
+                        $systemPrincipals]),
+                $filesCollection,
+                $calendarRoot,
+                $publicCalendarRoot,
+                new SimpleCollection('addressbooks', [
+                        $usersAddressBookRoot,
+                        $systemAddressBookRoot]),
+                $systemTagCollection,
+                $systemTagRelationsCollection,
+                $commentsCollection,
+                $uploadCollection,
+                $avatarCollection
+        ];
 
-		parent::__construct('root', $children);
-	}
+        parent::__construct('root', $children);
+    }
 
 }

apps/dav/lib/CalDAV/BirthdayService.php

Indentation +272 added lines, -272 removed lines

@@ -42,303 +42,303 @@
 
 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;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * BirthdayService constructor.
-	 *
-	 * @param CalDavBackend $calDavBackEnd
-	 * @param CardDavBackend $cardDavBackEnd
-	 * @param GroupPrincipalBackend $principalBackend
-	 * @param IConfig $config;
-	 */
-	public function __construct(CalDavBackend $calDavBackEnd, CardDavBackend $cardDavBackEnd, GroupPrincipalBackend $principalBackend, IConfig $config) {
-		$this->calDavBackEnd = $calDavBackEnd;
-		$this->cardDavBackEnd = $cardDavBackEnd;
-		$this->principalBackend = $principalBackend;
-		$this->config = $config;
-	}
+    /**
+     * BirthdayService constructor.
+     *
+     * @param CalDavBackend $calDavBackEnd
+     * @param CardDavBackend $cardDavBackEnd
+     * @param GroupPrincipalBackend $principalBackend
+     * @param IConfig $config;
+     */
+    public function __construct(CalDavBackend $calDavBackEnd, CardDavBackend $cardDavBackEnd, GroupPrincipalBackend $principalBackend, IConfig $config) {
+        $this->calDavBackEnd = $calDavBackEnd;
+        $this->cardDavBackEnd = $cardDavBackEnd;
+        $this->principalBackend = $principalBackend;
+        $this->config = $config;
+    }
 
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param string $cardData
-	 */
-	public function onCardChanged($addressBookId, $cardUri, $cardData) {
-		if (!$this->isGloballyEnabled()) {
-			return;
-		}
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     */
+    public function onCardChanged($addressBookId, $cardUri, $cardData) {
+        if (!$this->isGloballyEnabled()) {
+            return;
+        }
 
-		$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) {
-			if (!$this->isUserEnabled($principalUri)) {
-				continue;
-			}
+        $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) {
+            if (!$this->isUserEnabled($principalUri)) {
+                continue;
+            }
 
-			$calendar = $this->ensureCalendarExists($principalUri);
-			foreach ($datesToSync as $type) {
-				$this->updateCalendar($cardUri, $cardData, $book, $calendar['id'], $type);
-			}
-		}
-	}
+            $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) {
-		if (!$this->isGloballyEnabled()) {
-			return;
-		}
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     */
+    public function onCardDeleted($addressBookId, $cardUri) {
+        if (!$this->isGloballyEnabled()) {
+            return;
+        }
 
-		$targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
-		$book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
-		$targetPrincipals[] = $book['principaluri'];
-		foreach ($targetPrincipals as $principalUri) {
-			if (!$this->isUserEnabled($principalUri)) {
-				continue;
-			}
+        $targetPrincipals = $this->getAllAffectedPrincipals($addressBookId);
+        $book = $this->cardDavBackEnd->getAddressBookById($addressBookId);
+        $targetPrincipals[] = $book['principaluri'];
+        foreach ($targetPrincipals as $principalUri) {
+            if (!$this->isUserEnabled($principalUri)) {
+                continue;
+            }
 
-			$calendar = $this->ensureCalendarExists($principalUri);
-			foreach (['', '-death', '-anniversary'] as $tag) {
-				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
-				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
-			}
-		}
-	}
+            $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());
+                }
+            }
+        }
+    }
 
-	/**
-	 * checks if the admin opted-out of birthday calendars
-	 *
-	 * @return bool
-	 */
-	private function isGloballyEnabled() {
-		$isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
-		return $isGloballyEnabled === 'yes';
-	}
+    /**
+     * checks if the admin opted-out of birthday calendars
+     *
+     * @return bool
+     */
+    private function isGloballyEnabled() {
+        $isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
+        return $isGloballyEnabled === 'yes';
+    }
 
-	/**
-	 * checks if the user opted-out of birthday calendars
-	 *
-	 * @param $userPrincipal
-	 * @return bool
-	 */
-	private function isUserEnabled($userPrincipal) {
-		if (strpos($userPrincipal, 'principals/users/') === 0) {
-			$userId = substr($userPrincipal, 17);
-			$isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-			return $isEnabled === 'yes';
-		}
+    /**
+     * checks if the user opted-out of birthday calendars
+     *
+     * @param $userPrincipal
+     * @return bool
+     */
+    private function isUserEnabled($userPrincipal) {
+        if (strpos($userPrincipal, 'principals/users/') === 0) {
+            $userId = substr($userPrincipal, 17);
+            $isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+            return $isEnabled === 'yes';
+        }
 
-		// not sure how we got here, just be on the safe side and return true
-		return true;
-	}
+        // not sure how we got here, just be on the safe side and return true
+        return true;
+    }
 
 }