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([]);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 * @param IConfig $config
 	 */
 	public function __construct($appName, IRequest $request,
-								IDBConnection $db, IConfig $config){
+								IDBConnection $db, IConfig $config) {
 		parent::__construct($appName, $request);
 		$this->db = $db;
 		$this->config = $config;

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/CalDAV/CalendarHome.php

Indentation +92 added lines, -92 removed lines

@@ -33,96 +33,96 @@
 
 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 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 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 +30 added lines, -30 removed lines

@@ -24,41 +24,41 @@
 
 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;
 
-	function __construct(CalDavBackend $caldavBackend) {
-		$this->caldavBackend = $caldavBackend;
-		$this->l10n = \OC::$server->getL10N('dav');
-		$this->config = \OC::$server->getConfig();
+    function __construct(CalDavBackend $caldavBackend) {
+        $this->caldavBackend = $caldavBackend;
+        $this->l10n = \OC::$server->getL10N('dav');
+        $this->config = \OC::$server->getConfig();
 
-	}
+    }
 
-	/**
-	 * @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 [];
+    }
 }