nextcloud / server

apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php

Spacing +9 added lines, -9 removed lines

@@ -106,7 +106,7 @@ 
 	 * @return boolean
 	 */
 	public function httpGet(RequestInterface $request, ResponseInterface $response):bool {
-		if ($request->getPath() !== 'provisioning/' . AppleProvisioningNode::FILENAME) {
+		if ($request->getPath() !== 'provisioning/'.AppleProvisioningNode::FILENAME) {
 			return true;
 		}
 
@@ -144,19 +144,19 @@ 
 		$carddavUUID = call_user_func($this->uuidClosure);
 		$profileUUID = call_user_func($this->uuidClosure);
 
-		$caldavIdentifier = $reverseDomain . '.' . $caldavUUID;
-		$carddavIdentifier = $reverseDomain . '.' . $carddavUUID;
-		$profileIdentifier = $reverseDomain . '.' . $profileUUID;
+		$caldavIdentifier = $reverseDomain.'.'.$caldavUUID;
+		$carddavIdentifier = $reverseDomain.'.'.$carddavUUID;
+		$profileIdentifier = $reverseDomain.'.'.$profileUUID;
 
 		$caldavDescription = $this->l10n->t('Configures a CalDAV account');
-		$caldavDisplayname = $description . ' CalDAV';
+		$caldavDisplayname = $description.' CalDAV';
 		$carddavDescription = $this->l10n->t('Configures a CardDAV account');
-		$carddavDisplayname = $description . ' CardDAV';
+		$carddavDisplayname = $description.' CardDAV';
 
-		$filename = $userId . '-' . AppleProvisioningNode::FILENAME;
+		$filename = $userId.'-'.AppleProvisioningNode::FILENAME;
 
 		$xmlSkeleton = $this->getTemplate();
-		$body = vsprintf($xmlSkeleton, array_map(function ($v) {
+		$body = vsprintf($xmlSkeleton, array_map(function($v) {
 			return \htmlspecialchars($v, ENT_XML1, 'UTF-8');
 		}, [
 			$description,
@@ -182,7 +182,7 @@ 
 		));
 
 		$response->setStatus(200);
-		$response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+		$response->setHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
 		$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
 		$response->setBody($body);
 

Indentation +133 added lines, -133 removed lines

@@ -36,162 +36,162 @@ 
 use Sabre\HTTP\ResponseInterface;
 
 class AppleProvisioningPlugin extends ServerPlugin {
-	/**
-	 * @var Server
-	 */
-	protected $server;
+    /**
+     * @var Server
+     */
+    protected $server;
 
-	/**
-	 * @var IURLGenerator
-	 */
-	protected $urlGenerator;
+    /**
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
 
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
 
-	/**
-	 * @var \OC_Defaults
-	 */
-	protected $themingDefaults;
+    /**
+     * @var \OC_Defaults
+     */
+    protected $themingDefaults;
 
-	/**
-	 * @var IRequest
-	 */
-	protected $request;
+    /**
+     * @var IRequest
+     */
+    protected $request;
 
-	/**
-	 * @var IL10N
-	 */
-	protected $l10n;
+    /**
+     * @var IL10N
+     */
+    protected $l10n;
 
-	/**
-	 * @var \Closure
-	 */
-	protected $uuidClosure;
+    /**
+     * @var \Closure
+     */
+    protected $uuidClosure;
 
-	/**
-	 * AppleProvisioningPlugin constructor.
-	 */
-	public function __construct(
-		IUserSession $userSession,
-		IURLGenerator $urlGenerator,
-		\OC_Defaults $themingDefaults,
-		IRequest $request,
-		IL10N $l10n,
-		\Closure $uuidClosure
-	) {
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->themingDefaults = $themingDefaults;
-		$this->request = $request;
-		$this->l10n = $l10n;
-		$this->uuidClosure = $uuidClosure;
-	}
+    /**
+     * AppleProvisioningPlugin constructor.
+     */
+    public function __construct(
+        IUserSession $userSession,
+        IURLGenerator $urlGenerator,
+        \OC_Defaults $themingDefaults,
+        IRequest $request,
+        IL10N $l10n,
+        \Closure $uuidClosure
+    ) {
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->themingDefaults = $themingDefaults;
+        $this->request = $request;
+        $this->l10n = $l10n;
+        $this->uuidClosure = $uuidClosure;
+    }
 
-	/**
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->on('method:GET', [$this, 'httpGet'], 90);
-	}
+    /**
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->on('method:GET', [$this, 'httpGet'], 90);
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return boolean
-	 */
-	public function httpGet(RequestInterface $request, ResponseInterface $response):bool {
-		if ($request->getPath() !== 'provisioning/' . AppleProvisioningNode::FILENAME) {
-			return true;
-		}
+    /**
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return boolean
+     */
+    public function httpGet(RequestInterface $request, ResponseInterface $response):bool {
+        if ($request->getPath() !== 'provisioning/' . AppleProvisioningNode::FILENAME) {
+            return true;
+        }
 
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return true;
-		}
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return true;
+        }
 
-		$serverProtocol = $this->request->getServerProtocol();
-		$useSSL = ($serverProtocol === 'https');
+        $serverProtocol = $this->request->getServerProtocol();
+        $useSSL = ($serverProtocol === 'https');
 
-		if (!$useSSL) {
-			$response->setStatus(200);
-			$response->setHeader('Content-Type', 'text/plain; charset=utf-8');
-			$response->setBody($this->l10n->t('Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS.', [$this->themingDefaults->getName()]));
+        if (!$useSSL) {
+            $response->setStatus(200);
+            $response->setHeader('Content-Type', 'text/plain; charset=utf-8');
+            $response->setBody($this->l10n->t('Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS.', [$this->themingDefaults->getName()]));
 
-			return false;
-		}
+            return false;
+        }
 
-		$absoluteURL = $this->urlGenerator->getBaseUrl();
-		$parsedUrl = parse_url($absoluteURL);
-		if (isset($parsedUrl['port'])) {
-			$serverPort = $parsedUrl['port'];
-		} else {
-			$serverPort = 443;
-		}
-		$server_url = $parsedUrl['host'];
+        $absoluteURL = $this->urlGenerator->getBaseUrl();
+        $parsedUrl = parse_url($absoluteURL);
+        if (isset($parsedUrl['port'])) {
+            $serverPort = $parsedUrl['port'];
+        } else {
+            $serverPort = 443;
+        }
+        $server_url = $parsedUrl['host'];
 
-		$description = $this->themingDefaults->getName();
-		$userId = $user->getUID();
+        $description = $this->themingDefaults->getName();
+        $userId = $user->getUID();
 
-		$reverseDomain = implode('.', array_reverse(explode('.', $parsedUrl['host'])));
+        $reverseDomain = implode('.', array_reverse(explode('.', $parsedUrl['host'])));
 
-		$caldavUUID = call_user_func($this->uuidClosure);
-		$carddavUUID = call_user_func($this->uuidClosure);
-		$profileUUID = call_user_func($this->uuidClosure);
+        $caldavUUID = call_user_func($this->uuidClosure);
+        $carddavUUID = call_user_func($this->uuidClosure);
+        $profileUUID = call_user_func($this->uuidClosure);
 
-		$caldavIdentifier = $reverseDomain . '.' . $caldavUUID;
-		$carddavIdentifier = $reverseDomain . '.' . $carddavUUID;
-		$profileIdentifier = $reverseDomain . '.' . $profileUUID;
+        $caldavIdentifier = $reverseDomain . '.' . $caldavUUID;
+        $carddavIdentifier = $reverseDomain . '.' . $carddavUUID;
+        $profileIdentifier = $reverseDomain . '.' . $profileUUID;
 
-		$caldavDescription = $this->l10n->t('Configures a CalDAV account');
-		$caldavDisplayname = $description . ' CalDAV';
-		$carddavDescription = $this->l10n->t('Configures a CardDAV account');
-		$carddavDisplayname = $description . ' CardDAV';
+        $caldavDescription = $this->l10n->t('Configures a CalDAV account');
+        $caldavDisplayname = $description . ' CalDAV';
+        $carddavDescription = $this->l10n->t('Configures a CardDAV account');
+        $carddavDisplayname = $description . ' CardDAV';
 
-		$filename = $userId . '-' . AppleProvisioningNode::FILENAME;
+        $filename = $userId . '-' . AppleProvisioningNode::FILENAME;
 
-		$xmlSkeleton = $this->getTemplate();
-		$body = vsprintf($xmlSkeleton, array_map(function ($v) {
-			return \htmlspecialchars($v, ENT_XML1, 'UTF-8');
-		}, [
-			$description,
-			$server_url,
-			$userId,
-			$serverPort,
-			$caldavDescription,
-			$caldavDisplayname,
-			$caldavIdentifier,
-			$caldavUUID,
-			$description,
-			$server_url,
-			$userId,
-			$serverPort,
-			$carddavDescription,
-			$carddavDisplayname,
-			$carddavIdentifier,
-			$carddavUUID,
-			$description,
-			$profileIdentifier,
-			$profileUUID
-		]
-		));
+        $xmlSkeleton = $this->getTemplate();
+        $body = vsprintf($xmlSkeleton, array_map(function ($v) {
+            return \htmlspecialchars($v, ENT_XML1, 'UTF-8');
+        }, [
+            $description,
+            $server_url,
+            $userId,
+            $serverPort,
+            $caldavDescription,
+            $caldavDisplayname,
+            $caldavIdentifier,
+            $caldavUUID,
+            $description,
+            $server_url,
+            $userId,
+            $serverPort,
+            $carddavDescription,
+            $carddavDisplayname,
+            $carddavIdentifier,
+            $carddavUUID,
+            $description,
+            $profileIdentifier,
+            $profileUUID
+        ]
+        ));
 
-		$response->setStatus(200);
-		$response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
-		$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
-		$response->setBody($body);
+        $response->setStatus(200);
+        $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+        $response->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $response->setBody($body);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * @return string
-	 */
-	private function getTemplate():string {
-		return <<<EOF
+    /**
+     * @return string
+     */
+    private function getTemplate():string {
+        return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -263,5 +263,5 @@ 
 </plist>
 
 EOF;
-	}
+    }
 }

apps/dav/lib/CalDAV/Integration/ExternalCalendar.php

Indentation +84 added lines, -84 removed lines

@@ -33,99 +33,99 @@
  */
 abstract class ExternalCalendar implements CalDAV\ICalendar, DAV\IProperties {
 
-	/** @var string */
-	private const PREFIX = 'app-generated';
+    /** @var string */
+    private const PREFIX = 'app-generated';
 
-	/**
-	 * @var string
-	 *
-	 * Double dash is a valid delimiter,
-	 * because it will always split the calendarURIs correctly:
-	 * - our prefix contains only one dash and won't be split
-	 * - appIds are not allowed to contain dashes as per spec:
-	 * > must contain only lowercase ASCII characters and underscore
-	 * - explode has a limit of three, so even if the app-generated
-	 *   calendar uri has double dashes, it won't be split
-	 */
-	private const DELIMITER = '--';
+    /**
+     * @var string
+     *
+     * Double dash is a valid delimiter,
+     * because it will always split the calendarURIs correctly:
+     * - our prefix contains only one dash and won't be split
+     * - appIds are not allowed to contain dashes as per spec:
+     * > must contain only lowercase ASCII characters and underscore
+     * - explode has a limit of three, so even if the app-generated
+     *   calendar uri has double dashes, it won't be split
+     */
+    private const DELIMITER = '--';
 
-	/** @var string */
-	private $appId;
+    /** @var string */
+    private $appId;
 
-	/** @var string */
-	private $calendarUri;
+    /** @var string */
+    private $calendarUri;
 
-	/**
-	 * ExternalCalendar constructor.
-	 *
-	 * @param string $appId
-	 * @param string $calendarUri
-	 */
-	public function __construct(string $appId, string $calendarUri) {
-		$this->appId = $appId;
-		$this->calendarUri = $calendarUri;
-	}
+    /**
+     * ExternalCalendar constructor.
+     *
+     * @param string $appId
+     * @param string $calendarUri
+     */
+    public function __construct(string $appId, string $calendarUri) {
+        $this->appId = $appId;
+        $this->calendarUri = $calendarUri;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function getName() {
-		return implode(self::DELIMITER, [
-			self::PREFIX,
-			$this->appId,
-			$this->calendarUri,
-		]);
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function getName() {
+        return implode(self::DELIMITER, [
+            self::PREFIX,
+            $this->appId,
+            $this->calendarUri,
+        ]);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function setName($name) {
-		throw new DAV\Exception\MethodNotAllowed('Renaming calendars is not yet supported');
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function setName($name) {
+        throw new DAV\Exception\MethodNotAllowed('Renaming calendars is not yet supported');
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	final public function createDirectory($name) {
-		throw new DAV\Exception\MethodNotAllowed('Creating collections in calendar objects is not allowed');
-	}
+    /**
+     * @inheritDoc
+     */
+    final public function createDirectory($name) {
+        throw new DAV\Exception\MethodNotAllowed('Creating collections in calendar objects is not allowed');
+    }
 
-	/**
-	 * Checks whether the calendar uri is app-generated
-	 *
-	 * @param string $calendarUri
-	 * @return bool
-	 */
-	public static function isAppGeneratedCalendar(string $calendarUri):bool {
-		return strpos($calendarUri, self::PREFIX) === 0 && substr_count($calendarUri, self::DELIMITER) >= 2;
-	}
+    /**
+     * Checks whether the calendar uri is app-generated
+     *
+     * @param string $calendarUri
+     * @return bool
+     */
+    public static function isAppGeneratedCalendar(string $calendarUri):bool {
+        return strpos($calendarUri, self::PREFIX) === 0 && substr_count($calendarUri, self::DELIMITER) >= 2;
+    }
 
-	/**
-	 * Splits an app-generated calendar-uri into appId and calendarUri
-	 *
-	 * @param string $calendarUri
-	 * @return array
-	 */
-	public static function splitAppGeneratedCalendarUri(string $calendarUri):array {
-		$array = array_slice(explode(self::DELIMITER, $calendarUri, 3), 1);
-		// Check the array has expected amount of elements
-		// and none of them is an empty string
-		if (\count($array) !== 2 || \in_array('', $array, true)) {
-			throw new \InvalidArgumentException('Provided calendar uri was not app-generated');
-		}
+    /**
+     * Splits an app-generated calendar-uri into appId and calendarUri
+     *
+     * @param string $calendarUri
+     * @return array
+     */
+    public static function splitAppGeneratedCalendarUri(string $calendarUri):array {
+        $array = array_slice(explode(self::DELIMITER, $calendarUri, 3), 1);
+        // Check the array has expected amount of elements
+        // and none of them is an empty string
+        if (\count($array) !== 2 || \in_array('', $array, true)) {
+            throw new \InvalidArgumentException('Provided calendar uri was not app-generated');
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 
-	/**
-	 * Checks whether a calendar-name, the user wants to create, violates
-	 * the reserved name for calendar uris
-	 *
-	 * @param string $calendarUri
-	 * @return bool
-	 */
-	public static function doesViolateReservedName(string $calendarUri):bool {
-		return strpos($calendarUri, self::PREFIX) === 0;
-	}
+    /**
+     * Checks whether a calendar-name, the user wants to create, violates
+     * the reserved name for calendar uris
+     *
+     * @param string $calendarUri
+     * @return bool
+     */
+    public static function doesViolateReservedName(string $calendarUri):bool {
+        return strpos($calendarUri, self::PREFIX) === 0;
+    }
 }

apps/dav/lib/CalDAV/CachedSubscription.php

Spacing +5 added lines, -5 removed lines

@@ -60,16 +60,16 @@ 
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 			[
-				'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
+				'privilege' => '{'.Plugin::NS_CALDAV.'}read-free-busy',
 				'principal' => '{DAV:}authenticated',
 				'protected' => true,
 			],
@@ -89,12 +89,12 @@ 
 
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 

Indentation +165 added lines, -165 removed lines

@@ -42,171 +42,171 @@
  */
 class CachedSubscription extends \Sabre\CalDAV\Calendar {
 
-	/**
-	 * @return string
-	 */
-	public function getPrincipalURI():string {
-		return $this->calendarInfo['principaluri'];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getACL() {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
-				'principal' => '{DAV:}authenticated',
-				'protected' => true,
-			],
-		];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getChildACL() {
-		return [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-
-		];
-	}
-
-	/**
-	 * @return null|string
-	 */
-	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();
-	}
+    /**
+     * @return string
+     */
+    public function getPrincipalURI():string {
+        return $this->calendarInfo['principaluri'];
+    }
+
+    /**
+     * @return array
+     */
+    public function getACL() {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
+                'principal' => '{DAV:}authenticated',
+                'protected' => true,
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getChildACL() {
+        return [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+
+        ];
+    }
+
+    /**
+     * @return null|string
+     */
+    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() {
-		$this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
-	}
-
-	/**
-	 * @param PropPatch $propPatch
-	 */
-	public function propPatch(PropPatch $propPatch) {
-		$this->caldavBackend->updateSubscription($this->calendarInfo['id'], $propPatch);
-	}
-
-	/**
-	 * @param string $name
-	 * @return CalendarObject|\Sabre\CalDAV\ICalendarObject
-	 * @throws NotFound
-	 */
-	public function getChild($name) {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		$obj['acl'] = $this->getChildACL();
-		return new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-	}
-
-	/**
-	 * @return INode[]
-	 */
-	public function getChildren(): array {
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-
-		$children = [];
-		foreach ($objs as $obj) {
-			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param array $paths
-	 * @return array
-	 */
-	public function getMultipleChildren(array $paths):array {
-		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-
-		$children = [];
-		foreach ($objs as $obj) {
-			$children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param string $name
-	 * @param null|resource|string $calendarData
-	 * @return null|string
-	 * @throws MethodNotAllowed
-	 */
-	public function createFile($name, $calendarData = null) {
-		throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
-	}
-
-	/**
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name):bool {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-		if (!$obj) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param array $filters
-	 * @return array
-	 */
-	public function calendarQuery(array $filters):array {
-		return $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getChanges($syncToken, $syncLevel, $limit = null) {
-		if (!$syncToken && $limit) {
-			throw new UnsupportedLimitOnInitialSyncException();
-		}
-
-		return parent::getChanges($syncToken, $syncLevel, $limit);
-	}
+    public function delete() {
+        $this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
+    }
+
+    /**
+     * @param PropPatch $propPatch
+     */
+    public function propPatch(PropPatch $propPatch) {
+        $this->caldavBackend->updateSubscription($this->calendarInfo['id'], $propPatch);
+    }
+
+    /**
+     * @param string $name
+     * @return CalendarObject|\Sabre\CalDAV\ICalendarObject
+     * @throws NotFound
+     */
+    public function getChild($name) {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+
+        $obj['acl'] = $this->getChildACL();
+        return new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+    }
+
+    /**
+     * @return INode[]
+     */
+    public function getChildren(): array {
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+
+        $children = [];
+        foreach ($objs as $obj) {
+            $children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+
+        return $children;
+    }
+
+    /**
+     * @param array $paths
+     * @return array
+     */
+    public function getMultipleChildren(array $paths):array {
+        $objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+
+        $children = [];
+        foreach ($objs as $obj) {
+            $children[] = new CachedSubscriptionObject($this->caldavBackend, $this->calendarInfo, $obj);
+        }
+
+        return $children;
+    }
+
+    /**
+     * @param string $name
+     * @param null|resource|string $calendarData
+     * @return null|string
+     * @throws MethodNotAllowed
+     */
+    public function createFile($name, $calendarData = null) {
+        throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name):bool {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+        if (!$obj) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param array $filters
+     * @return array
+     */
+    public function calendarQuery(array $filters):array {
+        return $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters, CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getChanges($syncToken, $syncLevel, $limit = null) {
+        if (!$syncToken && $limit) {
+            throw new UnsupportedLimitOnInitialSyncException();
+        }
+
+        return parent::getChanges($syncToken, $syncLevel, $limit);
+    }
 }

apps/dav/lib/Command/ListCalendars.php

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
 			}
 
 			$readOnly = false;
-			$readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+			$readOnlyIndex = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only';
 			if (isset($calendar[$readOnlyIndex])) {
 				$readOnly = $calendar[$readOnlyIndex];
 			}
@@ -85,8 +85,8 @@ 
 			$calendarTableData[] = [
 				$calendar['uri'],
 				$calendar['{DAV:}displayname'],
-				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'],
-				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'],
+				$calendar['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal'],
+				$calendar['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}owner-displayname'],
 				$readOnly ? ' x ' : ' ✓ ',
 			];
 		}

Indentation +56 added lines, -56 removed lines

@@ -37,70 +37,70 @@
 
 class ListCalendars extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var CalDavBackend */
-	private $caldav;
+    /** @var CalDavBackend */
+    private $caldav;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param CalDavBackend $caldav
-	 */
-	public function __construct(IUserManager $userManager, CalDavBackend $caldav) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->caldav = $caldav;
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param CalDavBackend $caldav
+     */
+    public function __construct(IUserManager $userManager, CalDavBackend $caldav) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->caldav = $caldav;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:list-calendars')
-			->setDescription('List all calendars of a user')
-			->addArgument('uid',
-				InputArgument::REQUIRED,
-				'User for whom all calendars will be listed');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:list-calendars')
+            ->setDescription('List all calendars of a user')
+            ->addArgument('uid',
+                InputArgument::REQUIRED,
+                'User for whom all calendars will be listed');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getArgument('uid');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException("User <$user> is unknown.");
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getArgument('uid');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException("User <$user> is unknown.");
+        }
 
-		$calendars = $this->caldav->getCalendarsForUser("principals/users/$user");
+        $calendars = $this->caldav->getCalendarsForUser("principals/users/$user");
 
-		$calendarTableData = [];
-		foreach ($calendars as $calendar) {
-			// skip birthday calendar
-			if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-				continue;
-			}
+        $calendarTableData = [];
+        foreach ($calendars as $calendar) {
+            // skip birthday calendar
+            if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+                continue;
+            }
 
-			$readOnly = false;
-			$readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
-			if (isset($calendar[$readOnlyIndex])) {
-				$readOnly = $calendar[$readOnlyIndex];
-			}
+            $readOnly = false;
+            $readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+            if (isset($calendar[$readOnlyIndex])) {
+                $readOnly = $calendar[$readOnlyIndex];
+            }
 
-			$calendarTableData[] = [
-				$calendar['uri'],
-				$calendar['{DAV:}displayname'],
-				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'],
-				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'],
-				$readOnly ? ' x ' : ' ✓ ',
-			];
-		}
+            $calendarTableData[] = [
+                $calendar['uri'],
+                $calendar['{DAV:}displayname'],
+                $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'],
+                $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'],
+                $readOnly ? ' x ' : ' ✓ ',
+            ];
+        }
 
-		if (count($calendarTableData) > 0) {
-			$table = new Table($output);
-			$table->setHeaders(['uri', 'displayname', 'owner\'s userid', 'owner\'s displayname', 'writable'])
-				->setRows($calendarTableData);
+        if (count($calendarTableData) > 0) {
+            $table = new Table($output);
+            $table->setHeaders(['uri', 'displayname', 'owner\'s userid', 'owner\'s displayname', 'writable'])
+                ->setRows($calendarTableData);
 
-			$table->render();
-		} else {
-			$output->writeln("<info>User <$user> has no calendars</info>");
-		}
-		return 0;
-	}
+            $table->render();
+        } else {
+            $output->writeln("<info>User <$user> has no calendars</info>");
+        }
+        return 0;
+    }
 }

apps/dav/lib/Comments/CommentsPlugin.php

Spacing +7 added lines, -7 removed lines

@@ -91,7 +91,7 @@ 
 
 		$this->server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
 
-		$this->server->xml->classMap['DateTime'] = function (Writer $writer, \DateTime $value) {
+		$this->server->xml->classMap['DateTime'] = function(Writer $writer, \DateTime $value) {
 			$writer->write(\Sabre\HTTP\toDate($value));
 		};
 
@@ -125,7 +125,7 @@ 
 		// having their own comments marked as unread
 		$node->setReadMarker(null);
 
-		$url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId());
+		$url = rtrim($request->getUrl(), '/').'/'.urlencode($comment->getId());
 
 		$response->setHeader('Content-Location', $url);
 
@@ -167,7 +167,7 @@ 
 			$this::REPORT_PARAM_OFFSET,
 			$this::REPORT_PARAM_TIMESTAMP
 		];
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		foreach ($report as $parameter) {
 			if (!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) {
 				continue;
@@ -183,11 +183,11 @@ 
 
 		$responses = [];
 		foreach ($results as $node) {
-			$nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId();
+			$nodePath = $this->server->getRequestUri().'/'.$node->comment->getId();
 			$resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames());
 			if (isset($resultSet[0]) && isset($resultSet[0][200])) {
 				$responses[] = new Response(
-					$this->server->getBaseUri() . $nodePath,
+					$this->server->getBaseUri().$nodePath,
 					[200 => $resultSet[0][200]],
 					200
 				);
@@ -234,7 +234,7 @@ 
 			}
 		}
 		if (is_null($actorId)) {
-			throw new BadRequest('Invalid actor "' .  $actorType .'"');
+			throw new BadRequest('Invalid actor "'.$actorType.'"');
 		}
 
 		try {
@@ -247,7 +247,7 @@ 
 			throw new BadRequest('Invalid input values', 0, $e);
 		} catch (\OCP\Comments\MessageTooLongException $e) {
 			$msg = 'Message exceeds allowed character limit of ';
-			throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0,	$e);
+			throw new BadRequest($msg.\OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0, $e);
 		}
 	}
 }

Indentation +206 added lines, -206 removed lines

@@ -44,210 +44,210 @@
  * Sabre plugin to handle comments:
  */
 class CommentsPlugin extends ServerPlugin {
-	// namespace
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-
-	public const REPORT_NAME = '{http://owncloud.org/ns}filter-comments';
-	public const REPORT_PARAM_LIMIT = '{http://owncloud.org/ns}limit';
-	public const REPORT_PARAM_OFFSET = '{http://owncloud.org/ns}offset';
-	public const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime';
-
-	/** @var ICommentsManager  */
-	protected $commentsManager;
-
-	/** @var \Sabre\DAV\Server $server */
-	private $server;
-
-	/** @var  \OCP\IUserSession */
-	protected $userSession;
-
-	/**
-	 * Comments plugin
-	 *
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
-		$this->commentsManager = $commentsManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		if (strpos($this->server->getRequestUri(), 'comments/') !== 0) {
-			return;
-		}
-
-		$this->server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-
-		$this->server->xml->classMap['DateTime'] = function (Writer $writer, \DateTime $value) {
-			$writer->write(\Sabre\HTTP\toDate($value));
-		};
-
-		$this->server->on('report', [$this, 'onReport']);
-		$this->server->on('method:POST', [$this, 'httpPost']);
-	}
-
-	/**
-	 * POST operation on Comments collections
-	 *
-	 * @param RequestInterface $request request object
-	 * @param ResponseInterface $response response object
-	 * @return null|false
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-		$node = $this->server->tree->getNodeForPath($path);
-		if (!$node instanceof EntityCollection) {
-			return null;
-		}
-
-		$data = $request->getBodyAsString();
-		$comment = $this->createComment(
-			$node->getName(),
-			$node->getId(),
-			$data,
-			$request->getHeader('Content-Type')
-		);
-
-		// update read marker for the current user/poster to avoid
-		// having their own comments marked as unread
-		$node->setReadMarker(null);
-
-		$url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId());
-
-		$response->setHeader('Content-Location', $url);
-
-		// created
-		$response->setStatus(201);
-		return false;
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		return [self::REPORT_NAME];
-	}
-
-	/**
-	 * REPORT operations to look for comments
-	 *
-	 * @param string $reportName
-	 * @param array $report
-	 * @param string $uri
-	 * @return bool
-	 * @throws NotFound
-	 * @throws ReportNotSupported
-	 */
-	public function onReport($reportName, $report, $uri) {
-		$node = $this->server->tree->getNodeForPath($uri);
-		if (!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) {
-			throw new ReportNotSupported();
-		}
-		$args = ['limit' => 0, 'offset' => 0, 'datetime' => null];
-		$acceptableParameters = [
-			$this::REPORT_PARAM_LIMIT,
-			$this::REPORT_PARAM_OFFSET,
-			$this::REPORT_PARAM_TIMESTAMP
-		];
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
-		foreach ($report as $parameter) {
-			if (!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) {
-				continue;
-			}
-			$args[str_replace($ns, '', $parameter['name'])] = $parameter['value'];
-		}
-
-		if (!is_null($args['datetime'])) {
-			$args['datetime'] = new \DateTime($args['datetime']);
-		}
-
-		$results = $node->findChildren($args['limit'], $args['offset'], $args['datetime']);
-
-		$responses = [];
-		foreach ($results as $node) {
-			$nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId();
-			$resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames());
-			if (isset($resultSet[0]) && isset($resultSet[0][200])) {
-				$responses[] = new Response(
-					$this->server->getBaseUri() . $nodePath,
-					[200 => $resultSet[0][200]],
-					200
-				);
-			}
-		}
-
-		$xml = $this->server->xml->write(
-			'{DAV:}multistatus',
-			new MultiStatus($responses)
-		);
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-		$this->server->httpResponse->setBody($xml);
-
-		return false;
-	}
-
-	/**
-	 * Creates a new comment
-	 *
-	 * @param string $objectType e.g. "files"
-	 * @param string $objectId e.g. the file id
-	 * @param string $data JSON encoded string containing the properties of the tag to create
-	 * @param string $contentType content type of the data
-	 * @return IComment newly created comment
-	 *
-	 * @throws BadRequest if a field was missing
-	 * @throws UnsupportedMediaType if the content type is not supported
-	 */
-	private function createComment($objectType, $objectId, $data, $contentType = 'application/json') {
-		if (explode(';', $contentType)[0] === 'application/json') {
-			$data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
-		} else {
-			throw new UnsupportedMediaType();
-		}
-
-		$actorType = $data['actorType'];
-		$actorId = null;
-		if ($actorType === 'users') {
-			$user = $this->userSession->getUser();
-			if (!is_null($user)) {
-				$actorId = $user->getUID();
-			}
-		}
-		if (is_null($actorId)) {
-			throw new BadRequest('Invalid actor "' .  $actorType .'"');
-		}
-
-		try {
-			$comment = $this->commentsManager->create($actorType, $actorId, $objectType, $objectId);
-			$comment->setMessage($data['message']);
-			$comment->setVerb($data['verb']);
-			$this->commentsManager->save($comment);
-			return $comment;
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid input values', 0, $e);
-		} catch (\OCP\Comments\MessageTooLongException $e) {
-			$msg = 'Message exceeds allowed character limit of ';
-			throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0,	$e);
-		}
-	}
+    // namespace
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+    public const REPORT_NAME = '{http://owncloud.org/ns}filter-comments';
+    public const REPORT_PARAM_LIMIT = '{http://owncloud.org/ns}limit';
+    public const REPORT_PARAM_OFFSET = '{http://owncloud.org/ns}offset';
+    public const REPORT_PARAM_TIMESTAMP = '{http://owncloud.org/ns}datetime';
+
+    /** @var ICommentsManager  */
+    protected $commentsManager;
+
+    /** @var \Sabre\DAV\Server $server */
+    private $server;
+
+    /** @var  \OCP\IUserSession */
+    protected $userSession;
+
+    /**
+     * Comments plugin
+     *
+     * @param ICommentsManager $commentsManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
+        $this->commentsManager = $commentsManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        if (strpos($this->server->getRequestUri(), 'comments/') !== 0) {
+            return;
+        }
+
+        $this->server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+
+        $this->server->xml->classMap['DateTime'] = function (Writer $writer, \DateTime $value) {
+            $writer->write(\Sabre\HTTP\toDate($value));
+        };
+
+        $this->server->on('report', [$this, 'onReport']);
+        $this->server->on('method:POST', [$this, 'httpPost']);
+    }
+
+    /**
+     * POST operation on Comments collections
+     *
+     * @param RequestInterface $request request object
+     * @param ResponseInterface $response response object
+     * @return null|false
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+        $node = $this->server->tree->getNodeForPath($path);
+        if (!$node instanceof EntityCollection) {
+            return null;
+        }
+
+        $data = $request->getBodyAsString();
+        $comment = $this->createComment(
+            $node->getName(),
+            $node->getId(),
+            $data,
+            $request->getHeader('Content-Type')
+        );
+
+        // update read marker for the current user/poster to avoid
+        // having their own comments marked as unread
+        $node->setReadMarker(null);
+
+        $url = rtrim($request->getUrl(), '/') . '/' . urlencode($comment->getId());
+
+        $response->setHeader('Content-Location', $url);
+
+        // created
+        $response->setStatus(201);
+        return false;
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        return [self::REPORT_NAME];
+    }
+
+    /**
+     * REPORT operations to look for comments
+     *
+     * @param string $reportName
+     * @param array $report
+     * @param string $uri
+     * @return bool
+     * @throws NotFound
+     * @throws ReportNotSupported
+     */
+    public function onReport($reportName, $report, $uri) {
+        $node = $this->server->tree->getNodeForPath($uri);
+        if (!$node instanceof EntityCollection || $reportName !== self::REPORT_NAME) {
+            throw new ReportNotSupported();
+        }
+        $args = ['limit' => 0, 'offset' => 0, 'datetime' => null];
+        $acceptableParameters = [
+            $this::REPORT_PARAM_LIMIT,
+            $this::REPORT_PARAM_OFFSET,
+            $this::REPORT_PARAM_TIMESTAMP
+        ];
+        $ns = '{' . $this::NS_OWNCLOUD . '}';
+        foreach ($report as $parameter) {
+            if (!in_array($parameter['name'], $acceptableParameters) || empty($parameter['value'])) {
+                continue;
+            }
+            $args[str_replace($ns, '', $parameter['name'])] = $parameter['value'];
+        }
+
+        if (!is_null($args['datetime'])) {
+            $args['datetime'] = new \DateTime($args['datetime']);
+        }
+
+        $results = $node->findChildren($args['limit'], $args['offset'], $args['datetime']);
+
+        $responses = [];
+        foreach ($results as $node) {
+            $nodePath = $this->server->getRequestUri() . '/' . $node->comment->getId();
+            $resultSet = $this->server->getPropertiesForPath($nodePath, CommentNode::getPropertyNames());
+            if (isset($resultSet[0]) && isset($resultSet[0][200])) {
+                $responses[] = new Response(
+                    $this->server->getBaseUri() . $nodePath,
+                    [200 => $resultSet[0][200]],
+                    200
+                );
+            }
+        }
+
+        $xml = $this->server->xml->write(
+            '{DAV:}multistatus',
+            new MultiStatus($responses)
+        );
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $this->server->httpResponse->setBody($xml);
+
+        return false;
+    }
+
+    /**
+     * Creates a new comment
+     *
+     * @param string $objectType e.g. "files"
+     * @param string $objectId e.g. the file id
+     * @param string $data JSON encoded string containing the properties of the tag to create
+     * @param string $contentType content type of the data
+     * @return IComment newly created comment
+     *
+     * @throws BadRequest if a field was missing
+     * @throws UnsupportedMediaType if the content type is not supported
+     */
+    private function createComment($objectType, $objectId, $data, $contentType = 'application/json') {
+        if (explode(';', $contentType)[0] === 'application/json') {
+            $data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
+        } else {
+            throw new UnsupportedMediaType();
+        }
+
+        $actorType = $data['actorType'];
+        $actorId = null;
+        if ($actorType === 'users') {
+            $user = $this->userSession->getUser();
+            if (!is_null($user)) {
+                $actorId = $user->getUID();
+            }
+        }
+        if (is_null($actorId)) {
+            throw new BadRequest('Invalid actor "' .  $actorType .'"');
+        }
+
+        try {
+            $comment = $this->commentsManager->create($actorType, $actorId, $objectType, $objectId);
+            $comment->setMessage($data['message']);
+            $comment->setVerb($data['verb']);
+            $this->commentsManager->save($comment);
+            return $comment;
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid input values', 0, $e);
+        } catch (\OCP\Comments\MessageTooLongException $e) {
+            $msg = 'Message exceeds allowed character limit of ';
+            throw new BadRequest($msg . \OCP\Comments\IComment::MAX_MESSAGE_LENGTH, 0,	$e);
+        }
+    }
 }

apps/dav/lib/Files/BrowserErrorPagePlugin.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 
 		$templateName = 'exception';
 		if ($httpCode === 403 || $httpCode === 404) {
-			$templateName = (string)$httpCode;
+			$templateName = (string) $httpCode;
 		}
 
 		$content = new OC_Template('core', $templateName, 'guest');

Indentation +75 added lines, -75 removed lines

@@ -34,86 +34,86 @@
 use Sabre\DAV\ServerPlugin;
 
 class BrowserErrorPagePlugin extends ServerPlugin {
-	/** @var Server */
-	private $server;
+    /** @var Server */
+    private $server;
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$server->on('exception', [$this, 'logException'], 1000);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $server->on('exception', [$this, 'logException'], 1000);
+    }
 
-	/**
-	 * @param IRequest $request
-	 * @return bool
-	 */
-	public static function isBrowserRequest(IRequest $request) {
-		if ($request->getMethod() !== 'GET') {
-			return false;
-		}
-		return $request->isUserAgent([
-			Request::USER_AGENT_IE,
-			Request::USER_AGENT_MS_EDGE,
-			Request::USER_AGENT_CHROME,
-			Request::USER_AGENT_FIREFOX,
-			Request::USER_AGENT_SAFARI,
-		]);
-	}
+    /**
+     * @param IRequest $request
+     * @return bool
+     */
+    public static function isBrowserRequest(IRequest $request) {
+        if ($request->getMethod() !== 'GET') {
+            return false;
+        }
+        return $request->isUserAgent([
+            Request::USER_AGENT_IE,
+            Request::USER_AGENT_MS_EDGE,
+            Request::USER_AGENT_CHROME,
+            Request::USER_AGENT_FIREFOX,
+            Request::USER_AGENT_SAFARI,
+        ]);
+    }
 
-	/**
-	 * @param \Exception $ex
-	 */
-	public function logException(\Exception $ex) {
-		if ($ex instanceof Exception) {
-			$httpCode = $ex->getHTTPCode();
-			$headers = $ex->getHTTPHeaders($this->server);
-		} else {
-			$httpCode = 500;
-			$headers = [];
-		}
-		$this->server->httpResponse->addHeaders($headers);
-		$this->server->httpResponse->setStatus($httpCode);
-		$body = $this->generateBody($httpCode);
-		$this->server->httpResponse->setBody($body);
-		$csp = new ContentSecurityPolicy();
-		$this->server->httpResponse->addHeader('Content-Security-Policy', $csp->buildPolicy());
-		$this->sendResponse();
-	}
+    /**
+     * @param \Exception $ex
+     */
+    public function logException(\Exception $ex) {
+        if ($ex instanceof Exception) {
+            $httpCode = $ex->getHTTPCode();
+            $headers = $ex->getHTTPHeaders($this->server);
+        } else {
+            $httpCode = 500;
+            $headers = [];
+        }
+        $this->server->httpResponse->addHeaders($headers);
+        $this->server->httpResponse->setStatus($httpCode);
+        $body = $this->generateBody($httpCode);
+        $this->server->httpResponse->setBody($body);
+        $csp = new ContentSecurityPolicy();
+        $this->server->httpResponse->addHeader('Content-Security-Policy', $csp->buildPolicy());
+        $this->sendResponse();
+    }
 
-	/**
-	 * @codeCoverageIgnore
-	 * @return bool|string
-	 */
-	public function generateBody(int $httpCode) {
-		$request = \OC::$server->getRequest();
+    /**
+     * @codeCoverageIgnore
+     * @return bool|string
+     */
+    public function generateBody(int $httpCode) {
+        $request = \OC::$server->getRequest();
 
-		$templateName = 'exception';
-		if ($httpCode === 403 || $httpCode === 404) {
-			$templateName = (string)$httpCode;
-		}
+        $templateName = 'exception';
+        if ($httpCode === 403 || $httpCode === 404) {
+            $templateName = (string)$httpCode;
+        }
 
-		$content = new OC_Template('core', $templateName, 'guest');
-		$content->assign('title', $this->server->httpResponse->getStatusText());
-		$content->assign('remoteAddr', $request->getRemoteAddress());
-		$content->assign('requestID', $request->getId());
-		return $content->fetchPage();
-	}
+        $content = new OC_Template('core', $templateName, 'guest');
+        $content->assign('title', $this->server->httpResponse->getStatusText());
+        $content->assign('remoteAddr', $request->getRemoteAddress());
+        $content->assign('requestID', $request->getId());
+        return $content->fetchPage();
+    }
 
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public function sendResponse() {
-		$this->server->sapi->sendResponse($this->server->httpResponse);
-		exit();
-	}
+    /**
+     * @codeCoverageIgnore
+     */
+    public function sendResponse() {
+        $this->server->sapi->sendResponse($this->server->httpResponse);
+        exit();
+    }
 }

apps/dav/lib/Migration/RefreshWebcalJobRegistrar.php

Indentation +41 added lines, -41 removed lines

@@ -34,52 +34,52 @@
 
 class RefreshWebcalJobRegistrar implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/**
-	 * FixBirthdayCalendarComponent constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IJobList $jobList
-	 */
-	public function __construct(IDBConnection $connection, IJobList $jobList) {
-		$this->connection = $connection;
-		$this->jobList = $jobList;
-	}
+    /**
+     * FixBirthdayCalendarComponent constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IJobList $jobList
+     */
+    public function __construct(IDBConnection $connection, IJobList $jobList) {
+        $this->connection = $connection;
+        $this->jobList = $jobList;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return 'Registering background jobs to update cache for webcal calendars';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return 'Registering background jobs to update cache for webcal calendars';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['principaluri', 'uri'])
-			->from('calendarsubscriptions');
-		$stmt = $query->execute();
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['principaluri', 'uri'])
+            ->from('calendarsubscriptions');
+        $stmt = $query->execute();
 
-		$count = 0;
-		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$args = [
-				'principaluri' => $row['principaluri'],
-				'uri' => $row['uri'],
-			];
+        $count = 0;
+        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            $args = [
+                'principaluri' => $row['principaluri'],
+                'uri' => $row['uri'],
+            ];
 
-			if (!$this->jobList->has(RefreshWebcalJob::class, $args)) {
-				$this->jobList->add(RefreshWebcalJob::class, $args);
-				$count++;
-			}
-		}
+            if (!$this->jobList->has(RefreshWebcalJob::class, $args)) {
+                $this->jobList->add(RefreshWebcalJob::class, $args);
+                $count++;
+            }
+        }
 
-		$output->info("Added $count background jobs to update webcal calendars");
-	}
+        $output->info("Added $count background jobs to update webcal calendars");
+    }
 }

apps/workflowengine/lib/Helper/ScopeContext.php

Indentation +41 added lines, -41 removed lines

@@ -28,51 +28,51 @@
 use OCP\WorkflowEngine\IManager;
 
 class ScopeContext {
-	/** @var int */
-	private $scope;
-	/** @var string */
-	private $scopeId;
-	/** @var string */
-	private $hash;
+    /** @var int */
+    private $scope;
+    /** @var string */
+    private $scopeId;
+    /** @var string */
+    private $hash;
 
-	public function __construct(int $scope, string $scopeId = null) {
-		$this->scope = $this->evaluateScope($scope);
-		$this->scopeId = $this->evaluateScopeId($scopeId);
-	}
+    public function __construct(int $scope, string $scopeId = null) {
+        $this->scope = $this->evaluateScope($scope);
+        $this->scopeId = $this->evaluateScopeId($scopeId);
+    }
 
-	private function evaluateScope(int $scope): int {
-		if (in_array($scope, [IManager::SCOPE_ADMIN, IManager::SCOPE_USER], true)) {
-			return $scope;
-		}
-		throw new \InvalidArgumentException('Invalid scope');
-	}
+    private function evaluateScope(int $scope): int {
+        if (in_array($scope, [IManager::SCOPE_ADMIN, IManager::SCOPE_USER], true)) {
+            return $scope;
+        }
+        throw new \InvalidArgumentException('Invalid scope');
+    }
 
-	private function evaluateScopeId(string $scopeId = null): string {
-		if ($this->scope === IManager::SCOPE_USER
-			&& trim((string)$scopeId) === '') {
-			throw new \InvalidArgumentException('user scope requires a user id');
-		}
-		return trim((string)$scopeId);
-	}
+    private function evaluateScopeId(string $scopeId = null): string {
+        if ($this->scope === IManager::SCOPE_USER
+            && trim((string)$scopeId) === '') {
+            throw new \InvalidArgumentException('user scope requires a user id');
+        }
+        return trim((string)$scopeId);
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getScope(): int {
-		return $this->scope;
-	}
+    /**
+     * @return int
+     */
+    public function getScope(): int {
+        return $this->scope;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getScopeId(): string {
-		return $this->scopeId;
-	}
+    /**
+     * @return string
+     */
+    public function getScopeId(): string {
+        return $this->scopeId;
+    }
 
-	public function getHash(): string {
-		if ($this->hash === null) {
-			$this->hash = \hash('sha256', $this->getScope() . '::' . $this->getScopeId());
-		}
-		return $this->hash;
-	}
+    public function getHash(): string {
+        if ($this->hash === null) {
+            $this->hash = \hash('sha256', $this->getScope() . '::' . $this->getScopeId());
+        }
+        return $this->hash;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -49,10 +49,10 @@ 
 
 	private function evaluateScopeId(string $scopeId = null): string {
 		if ($this->scope === IManager::SCOPE_USER
-			&& trim((string)$scopeId) === '') {
+			&& trim((string) $scopeId) === '') {
 			throw new \InvalidArgumentException('user scope requires a user id');
 		}
-		return trim((string)$scopeId);
+		return trim((string) $scopeId);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 
 	public function getHash(): string {
 		if ($this->hash === null) {
-			$this->hash = \hash('sha256', $this->getScope() . '::' . $this->getScopeId());
+			$this->hash = \hash('sha256', $this->getScope().'::'.$this->getScopeId());
 		}
 		return $this->hash;
 	}

apps/workflowengine/lib/Helper/LogContext.php

Indentation +56 added lines, -56 removed lines

@@ -30,67 +30,67 @@
 use OCP\WorkflowEngine\IOperation;
 
 class LogContext {
-	/** @var array */
-	protected $details;
+    /** @var array */
+    protected $details;
 
-	public function setDescription(string $description): LogContext {
-		$this->details['message'] = $description;
-		return $this;
-	}
+    public function setDescription(string $description): LogContext {
+        $this->details['message'] = $description;
+        return $this;
+    }
 
-	public function setScopes(array $scopes): LogContext {
-		$this->details['scopes'] = [];
-		foreach ($scopes as $scope) {
-			if ($scope instanceof ScopeContext) {
-				switch ($scope->getScope()) {
-					case IManager::SCOPE_ADMIN:
-						$this->details['scopes'][] = ['scope' => 'admin'];
-						break;
-					case IManager::SCOPE_USER:
-						$this->details['scopes'][] = [
-							'scope' => 'user',
-							'uid' => $scope->getScopeId(),
-						];
-						break;
-					default:
-						continue 2;
-				}
-			}
-		}
-		return $this;
-	}
+    public function setScopes(array $scopes): LogContext {
+        $this->details['scopes'] = [];
+        foreach ($scopes as $scope) {
+            if ($scope instanceof ScopeContext) {
+                switch ($scope->getScope()) {
+                    case IManager::SCOPE_ADMIN:
+                        $this->details['scopes'][] = ['scope' => 'admin'];
+                        break;
+                    case IManager::SCOPE_USER:
+                        $this->details['scopes'][] = [
+                            'scope' => 'user',
+                            'uid' => $scope->getScopeId(),
+                        ];
+                        break;
+                    default:
+                        continue 2;
+                }
+            }
+        }
+        return $this;
+    }
 
-	public function setOperation(?IOperation $operation): LogContext {
-		if ($operation instanceof IOperation) {
-			$this->details['operation'] = [
-				'class' => get_class($operation),
-				'name' => $operation->getDisplayName(),
-			];
-		}
-		return $this;
-	}
+    public function setOperation(?IOperation $operation): LogContext {
+        if ($operation instanceof IOperation) {
+            $this->details['operation'] = [
+                'class' => get_class($operation),
+                'name' => $operation->getDisplayName(),
+            ];
+        }
+        return $this;
+    }
 
-	public function setEntity(?IEntity $entity): LogContext {
-		if ($entity instanceof IEntity) {
-			$this->details['entity'] = [
-				'class' => get_class($entity),
-				'name' => $entity->getName(),
-			];
-		}
-		return $this;
-	}
+    public function setEntity(?IEntity $entity): LogContext {
+        if ($entity instanceof IEntity) {
+            $this->details['entity'] = [
+                'class' => get_class($entity),
+                'name' => $entity->getName(),
+            ];
+        }
+        return $this;
+    }
 
-	public function setConfiguration(array $configuration): LogContext {
-		$this->details['configuration'] = $configuration;
-		return $this;
-	}
+    public function setConfiguration(array $configuration): LogContext {
+        $this->details['configuration'] = $configuration;
+        return $this;
+    }
 
-	public function setEventName(string $eventName): LogContext {
-		$this->details['eventName'] = $eventName;
-		return $this;
-	}
+    public function setEventName(string $eventName): LogContext {
+        $this->details['eventName'] = $eventName;
+        return $this;
+    }
 
-	public function getDetails(): array {
-		return $this->details;
-	}
+    public function getDetails(): array {
+        return $this->details;
+    }
 }