nextcloud / server

lib/private/AppFramework/Middleware/Security/Exceptions/StrictCookieMissingException.php

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class StrictCookieMissingException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('Strict Cookie has not been found in request.', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

apps/dav/lib/Comments/RootCollection.php

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
 		if (isset($this->entityTypeCollections[$name])) {
 			return $this->entityTypeCollections[$name];
 		}
-		throw new NotFound('Entity type "' . $name . '" not found."');
+		throw new NotFound('Entity type "'.$name.'" not found."');
 	}
 
 	/**

Indentation +172 added lines, -172 removed lines

@@ -37,176 +37,176 @@
 
 class RootCollection implements ICollection {
 
-	/** @var EntityTypeCollection[]|null */
-	private $entityTypeCollections;
-
-	/** @var ICommentsManager */
-	protected $commentsManager;
-
-	/** @var string */
-	protected $name = 'comments';
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var EventDispatcherInterface */
-	protected $dispatcher;
-
-	/**
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		ICommentsManager $commentsManager,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		EventDispatcherInterface $dispatcher,
-		ILogger $logger) {
-		$this->commentsManager = $commentsManager;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * initializes the collection. At this point of time, we need the logged in
-	 * user. Since it is not the case when the instance is created, we cannot
-	 * have this in the constructor.
-	 *
-	 * @throws NotAuthenticated
-	 */
-	protected function initCollections() {
-		if ($this->entityTypeCollections !== null) {
-			return;
-		}
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			throw new NotAuthenticated();
-		}
-
-		$event = new CommentsEntityEvent(CommentsEntityEvent::EVENT_ENTITY);
-		$this->dispatcher->dispatch(CommentsEntityEvent::EVENT_ENTITY, $event);
-
-		$this->entityTypeCollections = [];
-		foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
-			$this->entityTypeCollections[$entity] = new EntityTypeCollection(
-				$entity,
-				$this->commentsManager,
-				$this->userManager,
-				$this->userSession,
-				$this->logger,
-				$entityExistsFunction
-			);
-		}
-	}
-
-	/**
-	 * Creates a new file in the directory
-	 *
-	 * @param string $name Name of the file
-	 * @param resource|string $data Initial payload
-	 * @return null|string
-	 * @throws Forbidden
-	 */
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Cannot create comments by id');
-	}
-
-	/**
-	 * Creates a new subdirectory
-	 *
-	 * @param string $name
-	 * @throws Forbidden
-	 */
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	/**
-	 * Returns a specific child node, referenced by its name
-	 *
-	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-	 * exist.
-	 *
-	 * @param string $name
-	 * @return \Sabre\DAV\INode
-	 * @throws NotFound
-	 */
-	public function getChild($name) {
-		$this->initCollections();
-		if (isset($this->entityTypeCollections[$name])) {
-			return $this->entityTypeCollections[$name];
-		}
-		throw new NotFound('Entity type "' . $name . '" not found."');
-	}
-
-	/**
-	 * Returns an array with all the child nodes
-	 *
-	 * @return \Sabre\DAV\INode[]
-	 */
-	public function getChildren() {
-		$this->initCollections();
-		return $this->entityTypeCollections;
-	}
-
-	/**
-	 * Checks if a child-node with the specified name exists
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name) {
-		$this->initCollections();
-		return isset($this->entityTypeCollections[$name]);
-	}
-
-	/**
-	 * Deleted the current node
-	 *
-	 * @throws Forbidden
-	 */
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 * @throws Forbidden
-	 */
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	public function getLastModified() {
-		return null;
-	}
+    /** @var EntityTypeCollection[]|null */
+    private $entityTypeCollections;
+
+    /** @var ICommentsManager */
+    protected $commentsManager;
+
+    /** @var string */
+    protected $name = 'comments';
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
+    /**
+     * @param ICommentsManager $commentsManager
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param EventDispatcherInterface $dispatcher
+     * @param ILogger $logger
+     */
+    public function __construct(
+        ICommentsManager $commentsManager,
+        IUserManager $userManager,
+        IUserSession $userSession,
+        EventDispatcherInterface $dispatcher,
+        ILogger $logger) {
+        $this->commentsManager = $commentsManager;
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * initializes the collection. At this point of time, we need the logged in
+     * user. Since it is not the case when the instance is created, we cannot
+     * have this in the constructor.
+     *
+     * @throws NotAuthenticated
+     */
+    protected function initCollections() {
+        if ($this->entityTypeCollections !== null) {
+            return;
+        }
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            throw new NotAuthenticated();
+        }
+
+        $event = new CommentsEntityEvent(CommentsEntityEvent::EVENT_ENTITY);
+        $this->dispatcher->dispatch(CommentsEntityEvent::EVENT_ENTITY, $event);
+
+        $this->entityTypeCollections = [];
+        foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
+            $this->entityTypeCollections[$entity] = new EntityTypeCollection(
+                $entity,
+                $this->commentsManager,
+                $this->userManager,
+                $this->userSession,
+                $this->logger,
+                $entityExistsFunction
+            );
+        }
+    }
+
+    /**
+     * Creates a new file in the directory
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     * @throws Forbidden
+     */
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Cannot create comments by id');
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @throws Forbidden
+     */
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * exist.
+     *
+     * @param string $name
+     * @return \Sabre\DAV\INode
+     * @throws NotFound
+     */
+    public function getChild($name) {
+        $this->initCollections();
+        if (isset($this->entityTypeCollections[$name])) {
+            return $this->entityTypeCollections[$name];
+        }
+        throw new NotFound('Entity type "' . $name . '" not found."');
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return \Sabre\DAV\INode[]
+     */
+    public function getChildren() {
+        $this->initCollections();
+        return $this->entityTypeCollections;
+    }
+
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+        $this->initCollections();
+        return isset($this->entityTypeCollections[$name]);
+    }
+
+    /**
+     * Deleted the current node
+     *
+     * @throws Forbidden
+     */
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @throws Forbidden
+     */
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified() {
+        return null;
+    }
 }

apps/dav/lib/Comments/EntityTypeCollection.php

Indentation +74 added lines, -74 removed lines

@@ -43,84 +43,84 @@
  */
 class EntityTypeCollection extends RootCollection {
 
-	/** @var ILogger */
-	protected $logger;
+    /** @var ILogger */
+    protected $logger;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var \Closure */
-	protected $childExistsFunction;
+    /** @var \Closure */
+    protected $childExistsFunction;
 
-	/**
-	 * @param string $name
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param ILogger $logger
-	 * @param \Closure $childExistsFunction
-	 */
-	public function __construct(
-		$name,
-		ICommentsManager $commentsManager,
-		IUserManager $userManager,
-		IUserSession $userSession,
-		ILogger $logger,
-		\Closure $childExistsFunction
-	) {
-		$name = trim($name);
-		if (empty($name) || !is_string($name)) {
-			throw new \InvalidArgumentException('"name" parameter must be non-empty string');
-		}
-		$this->name = $name;
-		$this->commentsManager = $commentsManager;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->childExistsFunction = $childExistsFunction;
-	}
+    /**
+     * @param string $name
+     * @param ICommentsManager $commentsManager
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param ILogger $logger
+     * @param \Closure $childExistsFunction
+     */
+    public function __construct(
+        $name,
+        ICommentsManager $commentsManager,
+        IUserManager $userManager,
+        IUserSession $userSession,
+        ILogger $logger,
+        \Closure $childExistsFunction
+    ) {
+        $name = trim($name);
+        if (empty($name) || !is_string($name)) {
+            throw new \InvalidArgumentException('"name" parameter must be non-empty string');
+        }
+        $this->name = $name;
+        $this->commentsManager = $commentsManager;
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->childExistsFunction = $childExistsFunction;
+    }
 
-	/**
-	 * Returns a specific child node, referenced by its name
-	 *
-	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-	 * exist.
-	 *
-	 * @param string $name
-	 * @return \Sabre\DAV\INode
-	 * @throws NotFound
-	 */
-	public function getChild($name) {
-		if (!$this->childExists($name)) {
-			throw new NotFound('Entity does not exist or is not available');
-		}
-		return new EntityCollection(
-			$name,
-			$this->name,
-			$this->commentsManager,
-			$this->userManager,
-			$this->userSession,
-			$this->logger
-		);
-	}
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * exist.
+     *
+     * @param string $name
+     * @return \Sabre\DAV\INode
+     * @throws NotFound
+     */
+    public function getChild($name) {
+        if (!$this->childExists($name)) {
+            throw new NotFound('Entity does not exist or is not available');
+        }
+        return new EntityCollection(
+            $name,
+            $this->name,
+            $this->commentsManager,
+            $this->userManager,
+            $this->userSession,
+            $this->logger
+        );
+    }
 
-	/**
-	 * Returns an array with all the child nodes
-	 *
-	 * @return \Sabre\DAV\INode[]
-	 * @throws MethodNotAllowed
-	 */
-	public function getChildren() {
-		throw new MethodNotAllowed('No permission to list folder contents');
-	}
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return \Sabre\DAV\INode[]
+     * @throws MethodNotAllowed
+     */
+    public function getChildren() {
+        throw new MethodNotAllowed('No permission to list folder contents');
+    }
 
-	/**
-	 * Checks if a child-node with the specified name exists
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function childExists($name) {
-		return call_user_func($this->childExistsFunction, $name);
-	}
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name) {
+        return call_user_func($this->childExistsFunction, $name);
+    }
 }

apps/dav/lib/Files/Sharing/FilesDropPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		$path = array_pop($path);
 
 		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
+		$url = $request->getBaseUrl().$newName;
 		$request->setUrl($url);
 	}
 }

Indentation +38 added lines, -38 removed lines

@@ -35,51 +35,51 @@
  */
 class FilesDropPlugin extends ServerPlugin {
 
-	/** @var View */
-	private $view;
+    /** @var View */
+    private $view;
 
-	/** @var bool */
-	private $enabled = false;
+    /** @var bool */
+    private $enabled = false;
 
-	/**
-	 * @param View $view
-	 */
-	public function setView($view) {
-		$this->view = $view;
-	}
+    /**
+     * @param View $view
+     */
+    public function setView($view) {
+        $this->view = $view;
+    }
 
-	public function enable() {
-		$this->enabled = true;
-	}
+    public function enable() {
+        $this->enabled = true;
+    }
 
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 * @throws MethodNotAllowed
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
-		$this->enabled = false;
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     * @throws MethodNotAllowed
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
+        $this->enabled = false;
+    }
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-		if (!$this->enabled) {
-			return;
-		}
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+        if (!$this->enabled) {
+            return;
+        }
 
-		if ($request->getMethod() !== 'PUT') {
-			throw new MethodNotAllowed('Only PUT is allowed on files drop');
-		}
+        if ($request->getMethod() !== 'PUT') {
+            throw new MethodNotAllowed('Only PUT is allowed on files drop');
+        }
 
-		$path = explode('/', $request->getPath());
-		$path = array_pop($path);
+        $path = explode('/', $request->getPath());
+        $path = array_pop($path);
 
-		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
-		$request->setUrl($url);
-	}
+        $newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
+        $url = $request->getBaseUrl() . $newName;
+        $request->setUrl($url);
+    }
 }

apps/dav/lib/Command/SyncSystemAddressBook.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		$output->writeln('Syncing users ...');
 		$progress = new ProgressBar($output);
 		$progress->start();
-		$this->syncService->syncInstance(function () use ($progress) {
+		$this->syncService->syncInstance(function() use ($progress) {
 			$progress->advance();
 		});
 

Indentation +29 added lines, -29 removed lines

@@ -32,37 +32,37 @@
 
 class SyncSystemAddressBook extends Command {
 
-	/** @var SyncService */
-	private $syncService;
+    /** @var SyncService */
+    private $syncService;
 
-	/**
-	 * @param SyncService $syncService
-	 */
-	public function __construct(SyncService $syncService) {
-		parent::__construct();
-		$this->syncService = $syncService;
-	}
+    /**
+     * @param SyncService $syncService
+     */
+    public function __construct(SyncService $syncService) {
+        parent::__construct();
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:sync-system-addressbook')
-			->setDescription('Synchronizes users to the system addressbook');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:sync-system-addressbook')
+            ->setDescription('Synchronizes users to the system addressbook');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$output->writeln('Syncing users ...');
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncInstance(function () use ($progress) {
-			$progress->advance();
-		});
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $output->writeln('Syncing users ...');
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncInstance(function () use ($progress) {
+            $progress->advance();
+        });
 
-		$progress->finish();
-		$output->writeln('');
-		return 0;
-	}
+        $progress->finish();
+        $output->writeln('');
+        return 0;
+    }
 }

apps/dav/lib/Avatars/AvatarHome.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 	public function getChild($name) {
 		$elements = pathinfo($name);
 		$ext = isset($elements['extension']) ? $elements['extension'] : '';
-		$size = (int)(isset($elements['filename']) ? $elements['filename'] : '64');
+		$size = (int) (isset($elements['filename']) ? $elements['filename'] : '64');
 		if (!in_array($ext, ['jpeg', 'png'], true)) {
 			throw new MethodNotAllowed('File format not allowed');
 		}

Indentation +73 added lines, -73 removed lines

@@ -33,87 +33,87 @@
 
 class AvatarHome implements ICollection {
 
-	/** @var array */
-	private $principalInfo;
-	/** @var IAvatarManager */
-	private $avatarManager;
+    /** @var array */
+    private $principalInfo;
+    /** @var IAvatarManager */
+    private $avatarManager;
 
-	/**
-	 * AvatarHome constructor.
-	 *
-	 * @param array $principalInfo
-	 * @param IAvatarManager $avatarManager
-	 */
-	public function __construct($principalInfo, IAvatarManager $avatarManager) {
-		$this->principalInfo = $principalInfo;
-		$this->avatarManager = $avatarManager;
-	}
+    /**
+     * AvatarHome constructor.
+     *
+     * @param array $principalInfo
+     * @param IAvatarManager $avatarManager
+     */
+    public function __construct($principalInfo, IAvatarManager $avatarManager) {
+        $this->principalInfo = $principalInfo;
+        $this->avatarManager = $avatarManager;
+    }
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create a file');
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Permission denied to create a file');
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden('Permission denied to create a folder');
-	}
+    public function createDirectory($name) {
+        throw new Forbidden('Permission denied to create a folder');
+    }
 
-	public function getChild($name) {
-		$elements = pathinfo($name);
-		$ext = isset($elements['extension']) ? $elements['extension'] : '';
-		$size = (int)(isset($elements['filename']) ? $elements['filename'] : '64');
-		if (!in_array($ext, ['jpeg', 'png'], true)) {
-			throw new MethodNotAllowed('File format not allowed');
-		}
-		if ($size <= 0 || $size > 1024) {
-			throw new MethodNotAllowed('Invalid image size');
-		}
-		$avatar = $this->avatarManager->getAvatar($this->getName());
-		if (!$avatar->exists()) {
-			throw new NotFound();
-		}
-		return new AvatarNode($size, $ext, $avatar);
-	}
+    public function getChild($name) {
+        $elements = pathinfo($name);
+        $ext = isset($elements['extension']) ? $elements['extension'] : '';
+        $size = (int)(isset($elements['filename']) ? $elements['filename'] : '64');
+        if (!in_array($ext, ['jpeg', 'png'], true)) {
+            throw new MethodNotAllowed('File format not allowed');
+        }
+        if ($size <= 0 || $size > 1024) {
+            throw new MethodNotAllowed('Invalid image size');
+        }
+        $avatar = $this->avatarManager->getAvatar($this->getName());
+        if (!$avatar->exists()) {
+            throw new NotFound();
+        }
+        return new AvatarNode($size, $ext, $avatar);
+    }
 
-	public function getChildren() {
-		try {
-			return [
-				$this->getChild('96.jpeg')
-			];
-		} catch (NotFound $exception) {
-			return [];
-		}
-	}
+    public function getChildren() {
+        try {
+            return [
+                $this->getChild('96.jpeg')
+            ];
+        } catch (NotFound $exception) {
+            return [];
+        }
+    }
 
-	public function childExists($name) {
-		try {
-			$ret = $this->getChild($name);
-			return $ret !== null;
-		} catch (NotFound $ex) {
-			return false;
-		} catch (MethodNotAllowed $ex) {
-			return false;
-		}
-	}
+    public function childExists($name) {
+        try {
+            $ret = $this->getChild($name);
+            return $ret !== null;
+        } catch (NotFound $ex) {
+            return false;
+        } catch (MethodNotAllowed $ex) {
+            return false;
+        }
+    }
 
-	public function delete() {
-		throw new Forbidden('Permission denied to delete this folder');
-	}
+    public function delete() {
+        throw new Forbidden('Permission denied to delete this folder');
+    }
 
-	public function getName() {
-		list(,$name) = Uri\split($this->principalInfo['uri']);
-		return $name;
-	}
+    public function getName() {
+        list(,$name) = Uri\split($this->principalInfo['uri']);
+        return $name;
+    }
 
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
 
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int|null
-	 */
-	public function getLastModified() {
-		return null;
-	}
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int|null
+     */
+    public function getLastModified() {
+        return null;
+    }
 }

apps/dav/lib/Avatars/AvatarNode.php

Indentation +59 added lines, -59 removed lines

@@ -26,71 +26,71 @@
 use Sabre\DAV\File;
 
 class AvatarNode extends File {
-	private $ext;
-	private $size;
-	private $avatar;
+    private $ext;
+    private $size;
+    private $avatar;
 
-	/**
-	 * AvatarNode constructor.
-	 *
-	 * @param integer $size
-	 * @param string $ext
-	 * @param IAvatar $avatar
-	 */
-	public function __construct($size, $ext, $avatar) {
-		$this->size = $size;
-		$this->ext = $ext;
-		$this->avatar = $avatar;
-	}
+    /**
+     * AvatarNode constructor.
+     *
+     * @param integer $size
+     * @param string $ext
+     * @param IAvatar $avatar
+     */
+    public function __construct($size, $ext, $avatar) {
+        $this->size = $size;
+        $this->ext = $ext;
+        $this->avatar = $avatar;
+    }
 
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return "$this->size.$this->ext";
-	}
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+        return "$this->size.$this->ext";
+    }
 
-	public function get() {
-		$image = $this->avatar->get($this->size);
-		$res = $image->resource();
+    public function get() {
+        $image = $this->avatar->get($this->size);
+        $res = $image->resource();
 
-		ob_start();
-		if ($this->ext === 'png') {
-			imagepng($res);
-		} else {
-			imagejpeg($res);
-		}
+        ob_start();
+        if ($this->ext === 'png') {
+            imagepng($res);
+        } else {
+            imagejpeg($res);
+        }
 
-		return ob_get_clean();
-	}
+        return ob_get_clean();
+    }
 
-	/**
-	 * Returns the mime-type for a file
-	 *
-	 * If null is returned, we'll assume application/octet-stream
-	 *
-	 * @return string|null
-	 */
-	public function getContentType() {
-		if ($this->ext === 'png') {
-			return 'image/png';
-		}
-		return 'image/jpeg';
-	}
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string|null
+     */
+    public function getContentType() {
+        if ($this->ext === 'png') {
+            return 'image/png';
+        }
+        return 'image/jpeg';
+    }
 
-	public function getETag() {
-		return $this->avatar->getFile($this->size)->getEtag();
-	}
+    public function getETag() {
+        return $this->avatar->getFile($this->size)->getEtag();
+    }
 
-	public function getLastModified() {
-		$timestamp = $this->avatar->getFile($this->size)->getMTime();
-		if (!empty($timestamp)) {
-			return (int)$timestamp;
-		}
-		return $timestamp;
-	}
+    public function getLastModified() {
+        $timestamp = $this->avatar->getFile($this->size)->getMTime();
+        if (!empty($timestamp)) {
+            return (int)$timestamp;
+        }
+        return $timestamp;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 	public function getLastModified() {
 		$timestamp = $this->avatar->getFile($this->size)->getMTime();
 		if (!empty($timestamp)) {
-			return (int)$timestamp;
+			return (int) $timestamp;
 		}
 		return $timestamp;
 	}

apps/dav/lib/CardDAV/ImageExportPlugin.php

Indentation +80 added lines, -80 removed lines

@@ -32,84 +32,84 @@
 
 class ImageExportPlugin extends ServerPlugin {
 
-	/** @var Server */
-	protected $server;
-	/** @var PhotoCache */
-	private $cache;
-
-	/**
-	 * ImageExportPlugin constructor.
-	 *
-	 * @param PhotoCache $cache
-	 */
-	public function __construct(PhotoCache $cache) {
-		$this->cache = $cache;
-	}
-
-	/**
-	 * Initializes the plugin and registers event handlers
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->on('method:GET', [$this, 'httpGet'], 90);
-	}
-
-	/**
-	 * Intercepts GET requests on addressbook urls ending with ?photo.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function httpGet(RequestInterface $request, ResponseInterface $response) {
-		$queryParams = $request->getQueryParameters();
-		// TODO: in addition to photo we should also add logo some point in time
-		if (!array_key_exists('photo', $queryParams)) {
-			return true;
-		}
-
-		$size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
-
-		$path = $request->getPath();
-		$node = $this->server->tree->getNodeForPath($path);
-
-		if (!($node instanceof Card)) {
-			return true;
-		}
-
-		$this->server->transactionType = 'carddav-image-export';
-
-		// Checking ACL, if available.
-		if ($aclPlugin = $this->server->getPlugin('acl')) {
-			/** @var \Sabre\DAVACL\Plugin $aclPlugin */
-			$aclPlugin->checkPrivileges($path, '{DAV:}read');
-		}
-
-		// Fetch addressbook
-		$addressbookpath = explode('/', $path);
-		array_pop($addressbookpath);
-		$addressbookpath = implode('/', $addressbookpath);
-		/** @var AddressBook $addressbook */
-		$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
-
-		$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
-		$response->setHeader('Etag', $node->getETag());
-		$response->setHeader('Pragma', 'public');
-
-		try {
-			$file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
-			$response->setHeader('Content-Type', $file->getMimeType());
-			$response->setHeader('Content-Disposition', 'attachment');
-			$response->setStatus(200);
-
-			$response->setBody($file->getContent());
-		} catch (NotFoundException $e) {
-			$response->setStatus(404);
-		}
-
-		return false;
-	}
+    /** @var Server */
+    protected $server;
+    /** @var PhotoCache */
+    private $cache;
+
+    /**
+     * ImageExportPlugin constructor.
+     *
+     * @param PhotoCache $cache
+     */
+    public function __construct(PhotoCache $cache) {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->on('method:GET', [$this, 'httpGet'], 90);
+    }
+
+    /**
+     * Intercepts GET requests on addressbook urls ending with ?photo.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function httpGet(RequestInterface $request, ResponseInterface $response) {
+        $queryParams = $request->getQueryParameters();
+        // TODO: in addition to photo we should also add logo some point in time
+        if (!array_key_exists('photo', $queryParams)) {
+            return true;
+        }
+
+        $size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
+
+        $path = $request->getPath();
+        $node = $this->server->tree->getNodeForPath($path);
+
+        if (!($node instanceof Card)) {
+            return true;
+        }
+
+        $this->server->transactionType = 'carddav-image-export';
+
+        // Checking ACL, if available.
+        if ($aclPlugin = $this->server->getPlugin('acl')) {
+            /** @var \Sabre\DAVACL\Plugin $aclPlugin */
+            $aclPlugin->checkPrivileges($path, '{DAV:}read');
+        }
+
+        // Fetch addressbook
+        $addressbookpath = explode('/', $path);
+        array_pop($addressbookpath);
+        $addressbookpath = implode('/', $addressbookpath);
+        /** @var AddressBook $addressbook */
+        $addressbook = $this->server->tree->getNodeForPath($addressbookpath);
+
+        $response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
+        $response->setHeader('Etag', $node->getETag());
+        $response->setHeader('Pragma', 'public');
+
+        try {
+            $file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
+            $response->setHeader('Content-Type', $file->getMimeType());
+            $response->setHeader('Content-Disposition', 'attachment');
+            $response->setStatus(200);
+
+            $response->setBody($file->getContent());
+        } catch (NotFoundException $e) {
+            $response->setStatus(404);
+        }
+
+        return false;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 			return true;
 		}
 
-		$size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
+		$size = isset($queryParams['size']) ? (int) $queryParams['size'] : -1;
 
 		$path = $request->getPath();
 		$node = $this->server->tree->getNodeForPath($path);

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

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->groups as $group) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}group', $group);
 		}
 	}
 }

Indentation +14 added lines, -14 removed lines

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