nextcloud / server

lib/private/AppFramework/Middleware/OCSMiddleware.php

Indentation +109 added lines, -109 removed lines

@@ -39,116 +39,116 @@
 
 class OCSMiddleware extends Middleware {
 
-	/** @var IRequest */
-	private $request;
-
-	/** @var int */
-	private $ocsVersion;
-
-	/**
-	 * @param IRequest $request
-	 */
-	public function __construct(IRequest $request) {
-		$this->request = $request;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($controller instanceof OCSController) {
-			if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) {
-				$this->ocsVersion = 2;
-			} else {
-				$this->ocsVersion = 1;
-			}
-			$controller->setOCSVersion($this->ocsVersion);
-		}
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return BaseResponse
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($controller instanceof OCSController && $exception instanceof OCSException) {
-			$code = $exception->getCode();
-			if ($code === 0) {
-				$code = API::RESPOND_UNKNOWN_ERROR;
-			}
-
-			return $this->buildNewResponse($controller, $code, $exception->getMessage());
-		}
-
-		throw $exception;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return \OCP\AppFramework\Http\Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		/*
+    /** @var IRequest */
+    private $request;
+
+    /** @var int */
+    private $ocsVersion;
+
+    /**
+     * @param IRequest $request
+     */
+    public function __construct(IRequest $request) {
+        $this->request = $request;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     */
+    public function beforeController($controller, $methodName) {
+        if ($controller instanceof OCSController) {
+            if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) {
+                $this->ocsVersion = 2;
+            } else {
+                $this->ocsVersion = 1;
+            }
+            $controller->setOCSVersion($this->ocsVersion);
+        }
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return BaseResponse
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($controller instanceof OCSController && $exception instanceof OCSException) {
+            $code = $exception->getCode();
+            if ($code === 0) {
+                $code = API::RESPOND_UNKNOWN_ERROR;
+            }
+
+            return $this->buildNewResponse($controller, $code, $exception->getMessage());
+        }
+
+        throw $exception;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return \OCP\AppFramework\Http\Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        /*
 		 * If a different middleware has detected that a request unauthorized or forbidden
 		 * we need to catch the response and convert it to a proper OCS response.
 		 */
-		if ($controller instanceof OCSController && !($response instanceof BaseResponse)) {
-			if ($response->getStatus() === Http::STATUS_UNAUTHORIZED ||
-			    $response->getStatus() === Http::STATUS_FORBIDDEN) {
-
-				$message = '';
-				if ($response instanceof JSONResponse) {
-					/** @var DataResponse $response */
-					$message = $response->getData()['message'];
-				}
-
-				return $this->buildNewResponse($controller, API::RESPOND_UNAUTHORISED, $message);
-			}
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param int $code
-	 * @param string $message
-	 * @return V1Response|V2Response
-	 */
-	private function buildNewResponse(Controller $controller, $code, $message) {
-		$format = $this->getFormat($controller);
-
-		$data = new DataResponse();
-		$data->setStatus($code);
-		if ($this->ocsVersion === 1) {
-			$response = new V1Response($data, $format, $message);
-		} else {
-			$response = new V2Response($data, $format, $message);
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @return string
-	 */
-	private function getFormat(Controller $controller) {
-		// get format from the url format or request format parameter
-		$format = $this->request->getParam('format');
-
-		// if none is given try the first Accept header
-		if($format === null) {
-			$headers = $this->request->getHeader('Accept');
-			$format = $controller->getResponderByHTTPHeader($headers, 'xml');
-		}
-
-		return $format;
-	}
+        if ($controller instanceof OCSController && !($response instanceof BaseResponse)) {
+            if ($response->getStatus() === Http::STATUS_UNAUTHORIZED ||
+                $response->getStatus() === Http::STATUS_FORBIDDEN) {
+
+                $message = '';
+                if ($response instanceof JSONResponse) {
+                    /** @var DataResponse $response */
+                    $message = $response->getData()['message'];
+                }
+
+                return $this->buildNewResponse($controller, API::RESPOND_UNAUTHORISED, $message);
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param int $code
+     * @param string $message
+     * @return V1Response|V2Response
+     */
+    private function buildNewResponse(Controller $controller, $code, $message) {
+        $format = $this->getFormat($controller);
+
+        $data = new DataResponse();
+        $data->setStatus($code);
+        if ($this->ocsVersion === 1) {
+            $response = new V1Response($data, $format, $message);
+        } else {
+            $response = new V2Response($data, $format, $message);
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param Controller $controller
+     * @return string
+     */
+    private function getFormat(Controller $controller) {
+        // get format from the url format or request format parameter
+        $format = $this->request->getParam('format');
+
+        // if none is given try the first Accept header
+        if($format === null) {
+            $headers = $this->request->getHeader('Accept');
+            $format = $controller->getResponderByHTTPHeader($headers, 'xml');
+        }
+
+        return $format;
+    }
 }

lib/private/Calendar/Manager.php

Indentation +99 added lines, -99 removed lines

@@ -27,114 +27,114 @@
 
 class Manager implements \OCP\Calendar\IManager {
 
-	/**
-	 * @var ICalendar[] holds all registered calendars
-	 */
-	private $calendars=[];
+    /**
+     * @var ICalendar[] holds all registered calendars
+     */
+    private $calendars=[];
 
-	/**
-	 * @var \Closure[] to call to load/register calendar providers
-	 */
-	private $calendarLoaders=[];
+    /**
+     * @var \Closure[] to call to load/register calendar providers
+     */
+    private $calendarLoaders=[];
 
-	/**
-	 * This function is used to search and find objects within the user's calendars.
-	 * In case $pattern is empty all events/journals/todos will be returned.
-	 *
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - optional parameters:
-	 * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
-	 * @param integer|null $limit - limit number of search results
-	 * @param integer|null $offset - offset for paging of search results
-	 * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
-	 * @since 13.0.0
-	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
-		$this->loadCalendars();
-		$result = [];
-		foreach($this->calendars as $calendar) {
-			$r = $calendar->search($pattern, $searchProperties, $options, $limit, $offset);
-			foreach($r as $o) {
-				$o['calendar-key'] = $calendar->getKey();
-				$result[] = $o;
-			}
-		}
+    /**
+     * This function is used to search and find objects within the user's calendars.
+     * In case $pattern is empty all events/journals/todos will be returned.
+     *
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options - optional parameters:
+     * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
+     * @param integer|null $limit - limit number of search results
+     * @param integer|null $offset - offset for paging of search results
+     * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
+     * @since 13.0.0
+     */
+    public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
+        $this->loadCalendars();
+        $result = [];
+        foreach($this->calendars as $calendar) {
+            $r = $calendar->search($pattern, $searchProperties, $options, $limit, $offset);
+            foreach($r as $o) {
+                $o['calendar-key'] = $calendar->getKey();
+                $result[] = $o;
+            }
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Check if calendars are available
-	 *
-	 * @return bool true if enabled, false if not
-	 * @since 13.0.0
-	 */
-	public function isEnabled() {
-		return !empty($this->calendars) || !empty($this->calendarLoaders);
-	}
+    /**
+     * Check if calendars are available
+     *
+     * @return bool true if enabled, false if not
+     * @since 13.0.0
+     */
+    public function isEnabled() {
+        return !empty($this->calendars) || !empty($this->calendarLoaders);
+    }
 
-	/**
-	 * Registers a calendar
-	 *
-	 * @param ICalendar $calendar
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function registerCalendar(ICalendar $calendar) {
-		$this->calendars[$calendar->getKey()] = $calendar;
-	}
+    /**
+     * Registers a calendar
+     *
+     * @param ICalendar $calendar
+     * @return void
+     * @since 13.0.0
+     */
+    public function registerCalendar(ICalendar $calendar) {
+        $this->calendars[$calendar->getKey()] = $calendar;
+    }
 
-	/**
-	 * Unregisters a calendar
-	 *
-	 * @param ICalendar $calendar
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function unregisterCalendar(ICalendar $calendar) {
-		unset($this->calendars[$calendar->getKey()]);
-	}
+    /**
+     * Unregisters a calendar
+     *
+     * @param ICalendar $calendar
+     * @return void
+     * @since 13.0.0
+     */
+    public function unregisterCalendar(ICalendar $calendar) {
+        unset($this->calendars[$calendar->getKey()]);
+    }
 
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * calendars are actually requested
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function register(\Closure $callable) {
-		$this->calendarLoaders[] = $callable;
-	}
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * calendars are actually requested
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 13.0.0
+     */
+    public function register(\Closure $callable) {
+        $this->calendarLoaders[] = $callable;
+    }
 
-	/**
-	 * @return ICalendar[]
-	 * @since 13.0.0
-	 */
-	public function getCalendars() {
-		$this->loadCalendars();
+    /**
+     * @return ICalendar[]
+     * @since 13.0.0
+     */
+    public function getCalendars() {
+        $this->loadCalendars();
 
-		return array_values($this->calendars);
-	}
+        return array_values($this->calendars);
+    }
 
-	/**
-	 * removes all registered calendar instances
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function clear() {
-		$this->calendars = [];
-		$this->calendarLoaders = [];
-	}
+    /**
+     * removes all registered calendar instances
+     * @return void
+     * @since 13.0.0
+     */
+    public function clear() {
+        $this->calendars = [];
+        $this->calendarLoaders = [];
+    }
 
-	/**
-	 * loads all calendars
-	 */
-	private function loadCalendars() {
-		foreach($this->calendarLoaders as $callable) {
-			$callable($this);
-		}
-		$this->calendarLoaders = [];
-	}
+    /**
+     * loads all calendars
+     */
+    private function loadCalendars() {
+        foreach($this->calendarLoaders as $callable) {
+            $callable($this);
+        }
+        $this->calendarLoaders = [];
+    }
 }

lib/public/Calendar/IManager.php

Indentation +57 added lines, -57 removed lines

@@ -55,67 +55,67 @@
  */
 interface IManager {
 
-	/**
-	 * This function is used to search and find objects within the user's calendars.
-	 * In case $pattern is empty all events/journals/todos will be returned.
-	 *
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - optional parameters:
-	 * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
-	 * @param integer|null $limit - limit number of search results
-	 * @param integer|null $offset - offset for paging of search results
-	 * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
-	 * @since 13.0.0
-	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null);
+    /**
+     * This function is used to search and find objects within the user's calendars.
+     * In case $pattern is empty all events/journals/todos will be returned.
+     *
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options - optional parameters:
+     * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
+     * @param integer|null $limit - limit number of search results
+     * @param integer|null $offset - offset for paging of search results
+     * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs
+     * @since 13.0.0
+     */
+    public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null);
 
-	/**
-	 * Check if calendars are available
-	 *
-	 * @return bool true if enabled, false if not
-	 * @since 13.0.0
-	 */
-	public function isEnabled();
+    /**
+     * Check if calendars are available
+     *
+     * @return bool true if enabled, false if not
+     * @since 13.0.0
+     */
+    public function isEnabled();
 
-	/**
-	 * Registers a calendar
-	 *
-	 * @param ICalendar $calendar
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function registerCalendar(ICalendar $calendar);
+    /**
+     * Registers a calendar
+     *
+     * @param ICalendar $calendar
+     * @return void
+     * @since 13.0.0
+     */
+    public function registerCalendar(ICalendar $calendar);
 
-	/**
-	 * Unregisters a calendar
-	 *
-	 * @param ICalendar $calendar
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function unregisterCalendar(ICalendar $calendar);
+    /**
+     * Unregisters a calendar
+     *
+     * @param ICalendar $calendar
+     * @return void
+     * @since 13.0.0
+     */
+    public function unregisterCalendar(ICalendar $calendar);
 
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * calendars are actually requested
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function register(\Closure $callable);
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * calendars are actually requested
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 13.0.0
+     */
+    public function register(\Closure $callable);
 
-	/**
-	 * @return ICalendar[]
-	 * @since 13.0.0
-	 */
-	public function getCalendars();
+    /**
+     * @return ICalendar[]
+     * @since 13.0.0
+     */
+    public function getCalendars();
 
-	/**
-	 * removes all registered calendar instances
-	 * @return void
-	 * @since 13.0.0
-	 */
-	public function clear();
+    /**
+     * removes all registered calendar instances
+     * @return void
+     * @since 13.0.0
+     */
+    public function clear();
 }

apps/dav/lib/CalDAV/CalendarImpl.php

Indentation +79 added lines, -79 removed lines

@@ -28,92 +28,92 @@
 
 class CalendarImpl implements ICalendar {
 
-	/** @var CalDavBackend */
-	private $backend;
+    /** @var CalDavBackend */
+    private $backend;
 
-	/** @var Calendar */
-	private $calendar;
+    /** @var Calendar */
+    private $calendar;
 
-	/** @var array */
-	private $calendarInfo;
+    /** @var array */
+    private $calendarInfo;
 
-	/**
-	 * CalendarImpl constructor.
-	 *
-	 * @param Calendar $calendar
-	 * @param array $calendarInfo
-	 * @param CalDavBackend $backend
-	 */
-	public function __construct(Calendar $calendar, array $calendarInfo,
-								CalDavBackend $backend) {
-		$this->calendar = $calendar;
-		$this->calendarInfo = $calendarInfo;
-		$this->backend = $backend;
-	}
+    /**
+     * CalendarImpl constructor.
+     *
+     * @param Calendar $calendar
+     * @param array $calendarInfo
+     * @param CalDavBackend $backend
+     */
+    public function __construct(Calendar $calendar, array $calendarInfo,
+                                CalDavBackend $backend) {
+        $this->calendar = $calendar;
+        $this->calendarInfo = $calendarInfo;
+        $this->backend = $backend;
+    }
 	
-	/**
-	 * @return string defining the technical unique key
-	 * @since 13.0.0
-	 */
-	public function getKey() {
-		return $this->calendarInfo['id'];
-	}
+    /**
+     * @return string defining the technical unique key
+     * @since 13.0.0
+     */
+    public function getKey() {
+        return $this->calendarInfo['id'];
+    }
 
-	/**
-	 * In comparison to getKey() this function returns a human readable (maybe translated) name
-	 * @return null|string
-	 * @since 13.0.0
-	 */
-	public function getDisplayName() {
-		return $this->calendarInfo['{DAV:}displayname'];
-	}
+    /**
+     * In comparison to getKey() this function returns a human readable (maybe translated) name
+     * @return null|string
+     * @since 13.0.0
+     */
+    public function getDisplayName() {
+        return $this->calendarInfo['{DAV:}displayname'];
+    }
 
-	/**
-	 * Calendar color
-	 * @return null|string
-	 * @since 13.0.0
-	 */
-	public function getDisplayColor() {
-		return $this->calendarInfo['{http://apple.com/ns/ical/}calendar-color'];
-	}
+    /**
+     * Calendar color
+     * @return null|string
+     * @since 13.0.0
+     */
+    public function getDisplayColor() {
+        return $this->calendarInfo['{http://apple.com/ns/ical/}calendar-color'];
+    }
 
-	/**
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - optional parameters:
-	 * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
-	 * @param integer|null $limit - limit number of search results
-	 * @param integer|null $offset - offset for paging of search results
-	 * @return array an array of events/journals/todos which are arrays of key-value-pairs
-	 * @since 13.0.0
-	 */
-	public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
-		return $this->backend->search($this->calendarInfo, $pattern,
-			$searchProperties, $options, $limit, $offset);
-	}
+    /**
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options - optional parameters:
+     * 	['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
+     * @param integer|null $limit - limit number of search results
+     * @param integer|null $offset - offset for paging of search results
+     * @return array an array of events/journals/todos which are arrays of key-value-pairs
+     * @since 13.0.0
+     */
+    public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null) {
+        return $this->backend->search($this->calendarInfo, $pattern,
+            $searchProperties, $options, $limit, $offset);
+    }
 
-	/**
-	 * @return integer build up using \OCP\Constants
-	 * @since 13.0.0
-	 */
-	public function getPermissions() {
-		$permissions = $this->calendar->getACL();
-		$result = 0;
-		foreach ($permissions as $permission) {
-			switch($permission['privilege']) {
-				case '{DAV:}read':
-					$result |= Constants::PERMISSION_READ;
-					break;
-				case '{DAV:}write':
-					$result |= Constants::PERMISSION_CREATE;
-					$result |= Constants::PERMISSION_UPDATE;
-					break;
-				case '{DAV:}all':
-					$result |= Constants::PERMISSION_ALL;
-					break;
-			}
-		}
+    /**
+     * @return integer build up using \OCP\Constants
+     * @since 13.0.0
+     */
+    public function getPermissions() {
+        $permissions = $this->calendar->getACL();
+        $result = 0;
+        foreach ($permissions as $permission) {
+            switch($permission['privilege']) {
+                case '{DAV:}read':
+                    $result |= Constants::PERMISSION_READ;
+                    break;
+                case '{DAV:}write':
+                    $result |= Constants::PERMISSION_CREATE;
+                    $result |= Constants::PERMISSION_UPDATE;
+                    break;
+                case '{DAV:}all':
+                    $result |= Constants::PERMISSION_ALL;
+                    break;
+            }
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 }

apps/dav/lib/CalDAV/PublicCalendarRoot.php

Indentation +38 added lines, -38 removed lines

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

apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php

Indentation +98 added lines, -98 removed lines

@@ -38,102 +38,102 @@
  * @package OCA\DAV\CalDAV\BirthdayCalendar
  */
 class EnablePlugin extends ServerPlugin {
-	const NS_Nextcloud = 'http://nextcloud.com/ns';
-
-	/**
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var BirthdayService
-	 */
-	protected $birthdayService;
-
-	/**
-	 * @var Server
-	 */
-	protected $server;
-
-	/**
-	 * PublishPlugin constructor.
-	 *
-	 * @param IConfig $config
-	 * @param BirthdayService $birthdayService
-	 */
-	public function __construct(IConfig $config, BirthdayService $birthdayService) {
-		$this->config = $config;
-		$this->birthdayService = $birthdayService;
-	}
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		return ['nc-enable-birthday-calendar'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName()	{
-		return 'nc-enable-birthday-calendar';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-	}
-
-	/**
-	 * We intercept this to handle POST requests on calendar homes.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 *
-	 * @return bool|void
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-		if (!($node instanceof CalendarHome)) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-		$this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-		if ($documentType !== '{'.self::NS_Nextcloud.'}enable-birthday-calendar') {
-			return;
-		}
-
-		$principalUri = $node->getOwner();
-		$userId = substr($principalUri, 17);
-
-		$this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-		$this->birthdayService->syncUser($userId);
-
-		$this->server->httpResponse->setStatus(204);
-
-		return false;
-	}
+    const NS_Nextcloud = 'http://nextcloud.com/ns';
+
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var BirthdayService
+     */
+    protected $birthdayService;
+
+    /**
+     * @var Server
+     */
+    protected $server;
+
+    /**
+     * PublishPlugin constructor.
+     *
+     * @param IConfig $config
+     * @param BirthdayService $birthdayService
+     */
+    public function __construct(IConfig $config, BirthdayService $birthdayService) {
+        $this->config = $config;
+        $this->birthdayService = $birthdayService;
+    }
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        return ['nc-enable-birthday-calendar'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName()	{
+        return 'nc-enable-birthday-calendar';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+    }
+
+    /**
+     * We intercept this to handle POST requests on calendar homes.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     *
+     * @return bool|void
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
+        if (!($node instanceof CalendarHome)) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+        $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+        if ($documentType !== '{'.self::NS_Nextcloud.'}enable-birthday-calendar') {
+            return;
+        }
+
+        $principalUri = $node->getOwner();
+        $userId = substr($principalUri, 17);
+
+        $this->config->setUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+        $this->birthdayService->syncUser($userId);
+
+        $this->server->httpResponse->setStatus(204);
+
+        return false;
+    }
 }

apps/dav/lib/CalDAV/CalendarObject.php

Indentation +110 added lines, -110 removed lines

@@ -32,114 +32,114 @@
 
 class CalendarObject extends \Sabre\CalDAV\CalendarObject {
 
-	/**
-	 * CalendarObject constructor.
-	 *
-	 * @param CalDavBackend $caldavBackend
-	 * @param array $calendarInfo
-	 * @param array $objectData
-	 */
-	public function __construct(CalDavBackend $caldavBackend, array $calendarInfo,
-								array $objectData) {
-		parent::__construct($caldavBackend, $calendarInfo, $objectData);
-
-		if ($this->isShared()) {
-			unset($this->objectData['size']);
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get() {
-		$data = parent::get();
-
-		if (!$this->isShared()) {
-			return $data;
-		}
-
-		$vObject = Reader::read($data);
-
-		// remove VAlarms if calendar is shared read-only
-		if (!$this->canWrite()) {
-			$this->removeVAlarms($vObject);
-		}
-
-		// shows as busy if event is declared confidential
-		if ($this->objectData['classification'] === CalDavBackend::CLASSIFICATION_CONFIDENTIAL) {
-			$this->createConfidentialObject($vObject);
-		}
-
-		return $vObject->serialize();
-	}
-
-	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'];
-	}
-
-	/**
-	 * @param Component\VCalendar $vObject
-	 * @return void
-	 */
-	private static function createConfidentialObject(Component\VCalendar $vObject) {
-		/** @var Component $vElement */
-		$vElement = null;
-		if(isset($vObject->VEVENT)) {
-			$vElement = $vObject->VEVENT;
-		}
-		if(isset($vObject->VJOURNAL)) {
-			$vElement = $vObject->VJOURNAL;
-		}
-		if(isset($vObject->VTODO)) {
-			$vElement = $vObject->VTODO;
-		}
-		if(!is_null($vElement)) {
-			foreach ($vElement->children() as &$property) {
-				/** @var Property $property */
-				switch($property->name) {
-					case 'CREATED':
-					case 'DTSTART':
-					case 'RRULE':
-					case 'DURATION':
-					case 'DTEND':
-					case 'CLASS':
-					case 'UID':
-						break;
-					case 'SUMMARY':
-						$property->setValue('Busy');
-						break;
-					default:
-						$vElement->__unset($property->name);
-						unset($property);
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param Component\VCalendar $vObject
-	 * @return void
-	 */
-	private function removeVAlarms(Component\VCalendar $vObject) {
-		$subcomponents = $vObject->getComponents();
-
-		foreach($subcomponents as $subcomponent) {
-			unset($subcomponent->VALARM);
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	private function canWrite() {
-		if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
-			return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
-		}
-		return true;
-	}
+    /**
+     * CalendarObject constructor.
+     *
+     * @param CalDavBackend $caldavBackend
+     * @param array $calendarInfo
+     * @param array $objectData
+     */
+    public function __construct(CalDavBackend $caldavBackend, array $calendarInfo,
+                                array $objectData) {
+        parent::__construct($caldavBackend, $calendarInfo, $objectData);
+
+        if ($this->isShared()) {
+            unset($this->objectData['size']);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get() {
+        $data = parent::get();
+
+        if (!$this->isShared()) {
+            return $data;
+        }
+
+        $vObject = Reader::read($data);
+
+        // remove VAlarms if calendar is shared read-only
+        if (!$this->canWrite()) {
+            $this->removeVAlarms($vObject);
+        }
+
+        // shows as busy if event is declared confidential
+        if ($this->objectData['classification'] === CalDavBackend::CLASSIFICATION_CONFIDENTIAL) {
+            $this->createConfidentialObject($vObject);
+        }
+
+        return $vObject->serialize();
+    }
+
+    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'];
+    }
+
+    /**
+     * @param Component\VCalendar $vObject
+     * @return void
+     */
+    private static function createConfidentialObject(Component\VCalendar $vObject) {
+        /** @var Component $vElement */
+        $vElement = null;
+        if(isset($vObject->VEVENT)) {
+            $vElement = $vObject->VEVENT;
+        }
+        if(isset($vObject->VJOURNAL)) {
+            $vElement = $vObject->VJOURNAL;
+        }
+        if(isset($vObject->VTODO)) {
+            $vElement = $vObject->VTODO;
+        }
+        if(!is_null($vElement)) {
+            foreach ($vElement->children() as &$property) {
+                /** @var Property $property */
+                switch($property->name) {
+                    case 'CREATED':
+                    case 'DTSTART':
+                    case 'RRULE':
+                    case 'DURATION':
+                    case 'DTEND':
+                    case 'CLASS':
+                    case 'UID':
+                        break;
+                    case 'SUMMARY':
+                        $property->setValue('Busy');
+                        break;
+                    default:
+                        $vElement->__unset($property->name);
+                        unset($property);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param Component\VCalendar $vObject
+     * @return void
+     */
+    private function removeVAlarms(Component\VCalendar $vObject) {
+        $subcomponents = $vObject->getComponents();
+
+        foreach($subcomponents as $subcomponent) {
+            unset($subcomponent->VALARM);
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    private function canWrite() {
+        if (isset($this->calendarInfo['{http://owncloud.org/ns}read-only'])) {
+            return !$this->calendarInfo['{http://owncloud.org/ns}read-only'];
+        }
+        return true;
+    }
 }

lib/public/Support/CrashReport/IReporter.php

Indentation +8 added lines, -8 removed lines

@@ -30,12 +30,12 @@
  */
 interface IReporter {
 
-	/**
-	 * Report an (unhandled) exception
-	 *
-	 * @since 13.0.0
-	 * @param Exception|Throwable $exception
-	 * @param array $context
-	 */
-	public function report($exception, array $context = []);
+    /**
+     * Report an (unhandled) exception
+     *
+     * @since 13.0.0
+     * @param Exception|Throwable $exception
+     * @param array $context
+     */
+    public function report($exception, array $context = []);
 }

lib/private/Hooks/EmitterTrait.php

Indentation +72 added lines, -72 removed lines

@@ -24,80 +24,80 @@
 
 trait EmitterTrait {
 
-	/**
-	 * @var callable[][] $listeners
-	 */
-	protected $listeners = array();
+    /**
+     * @var callable[][] $listeners
+     */
+    protected $listeners = array();
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
-		if (!isset($this->listeners[$eventName])) {
-			$this->listeners[$eventName] = array();
-		}
-		if (array_search($callback, $this->listeners[$eventName], true) === false) {
-			$this->listeners[$eventName][] = $callback;
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        $eventName = $scope . '::' . $method;
+        if (!isset($this->listeners[$eventName])) {
+            $this->listeners[$eventName] = array();
+        }
+        if (array_search($callback, $this->listeners[$eventName], true) === false) {
+            $this->listeners[$eventName][] = $callback;
+        }
+    }
 
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null) {
-		$names = array();
-		$allNames = array_keys($this->listeners);
-		if ($scope and $method) {
-			$name = $scope . '::' . $method;
-			if (isset($this->listeners[$name])) {
-				$names[] = $name;
-			}
-		} elseif ($scope) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[0] == $scope) {
-					$names[] = $name;
-				}
-			}
-		} elseif ($method) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[1] == $method) {
-					$names[] = $name;
-				}
-			}
-		} else {
-			$names = $allNames;
-		}
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null) {
+        $names = array();
+        $allNames = array_keys($this->listeners);
+        if ($scope and $method) {
+            $name = $scope . '::' . $method;
+            if (isset($this->listeners[$name])) {
+                $names[] = $name;
+            }
+        } elseif ($scope) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[0] == $scope) {
+                    $names[] = $name;
+                }
+            }
+        } elseif ($method) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[1] == $method) {
+                    $names[] = $name;
+                }
+            }
+        } else {
+            $names = $allNames;
+        }
 
-		foreach ($names as $name) {
-			if ($callback) {
-				$index = array_search($callback, $this->listeners[$name], true);
-				if ($index !== false) {
-					unset($this->listeners[$name][$index]);
-				}
-			} else {
-				$this->listeners[$name] = array();
-			}
-		}
-	}
+        foreach ($names as $name) {
+            if ($callback) {
+                $index = array_search($callback, $this->listeners[$name], true);
+                if ($index !== false) {
+                    unset($this->listeners[$name][$index]);
+                }
+            } else {
+                $this->listeners[$name] = array();
+            }
+        }
+    }
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments optional
-	 */
-	protected function emit($scope, $method, array $arguments = array()) {
-		$eventName = $scope . '::' . $method;
-		if (isset($this->listeners[$eventName])) {
-			foreach ($this->listeners[$eventName] as $callback) {
-				call_user_func_array($callback, $arguments);
-			}
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments optional
+     */
+    protected function emit($scope, $method, array $arguments = array()) {
+        $eventName = $scope . '::' . $method;
+        if (isset($this->listeners[$eventName])) {
+            foreach ($this->listeners[$eventName] as $callback) {
+                call_user_func_array($callback, $arguments);
+            }
+        }
+    }
 }