nextcloud / server

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

Indentation +26 added lines, -26 removed lines

@@ -32,33 +32,33 @@
  * Verify that the public link share is valid
  */
 class PublicLinkCheckPlugin extends ServerPlugin {
-	/**
-	 * @var FileInfo
-	 */
-	private $fileInfo;
+    /**
+     * @var FileInfo
+     */
+    private $fileInfo;
 
-	/**
-	 * @param FileInfo $fileInfo
-	 */
-	public function setFileInfo($fileInfo) {
-		$this->fileInfo = $fileInfo;
-	}
+    /**
+     * @param FileInfo $fileInfo
+     */
+    public function setFileInfo($fileInfo) {
+        $this->fileInfo = $fileInfo;
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('beforeMethod', [$this, 'beforeMethod']);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('beforeMethod', [$this, 'beforeMethod']);
+    }
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response){
-		// verify that the owner didn't have his share permissions revoked
-		if ($this->fileInfo && !$this->fileInfo->isShareable()) {
-			throw new NotFound();
-		}
-	}
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response){
+        // verify that the owner didn't have his share permissions revoked
+        if ($this->fileInfo && !$this->fileInfo->isShareable()) {
+            throw new NotFound();
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		$server->on('beforeMethod', [$this, 'beforeMethod']);
 	}
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response){
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
 		// verify that the owner didn't have his share permissions revoked
 		if ($this->fileInfo && !$this->fileInfo->isShareable()) {
 			throw new NotFound();

apps/dav/lib/Upload/UploadFolder.php

Indentation +40 added lines, -40 removed lines

@@ -28,54 +28,54 @@
 
 class UploadFolder implements ICollection {
 
-	private $node;
+    private $node;
 
-	function __construct(Directory $node) {
-		$this->node = $node;
-	}
+    function __construct(Directory $node) {
+        $this->node = $node;
+    }
 
-	function createFile($name, $data = null) {
-		// TODO: verify name - should be a simple number
-		$this->node->createFile($name, $data);
-	}
+    function createFile($name, $data = null) {
+        // TODO: verify name - should be a simple number
+        $this->node->createFile($name, $data);
+    }
 
-	function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
+    function createDirectory($name) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
 
-	function getChild($name) {
-		if ($name === '.file') {
-			return new FutureFile($this->node, '.file');
-		}
-		return $this->node->getChild($name);
-	}
+    function getChild($name) {
+        if ($name === '.file') {
+            return new FutureFile($this->node, '.file');
+        }
+        return $this->node->getChild($name);
+    }
 
-	function getChildren() {
-		$children = $this->node->getChildren();
-		$children[] = new FutureFile($this->node, '.file');
-		return $children;
-	}
+    function getChildren() {
+        $children = $this->node->getChildren();
+        $children[] = new FutureFile($this->node, '.file');
+        return $children;
+    }
 
-	function childExists($name) {
-		if ($name === '.file') {
-			return true;
-		}
-		return $this->node->childExists($name);
-	}
+    function childExists($name) {
+        if ($name === '.file') {
+            return true;
+        }
+        return $this->node->childExists($name);
+    }
 
-	function delete() {
-		$this->node->delete();
-	}
+    function delete() {
+        $this->node->delete();
+    }
 
-	function getName() {
-		return $this->node->getName();
-	}
+    function getName() {
+        return $this->node->getName();
+    }
 
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
 
-	function getLastModified() {
-		return $this->node->getLastModified();
-	}
+    function getLastModified() {
+        return $this->node->getLastModified();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	}
 
 	function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+		throw new Forbidden('Permission denied to create file (filename '.$name.')');
 	}
 
 	function getChild($name) {

apps/dav/lib/Upload/UploadHome.php

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
 	}
 
 	function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+		throw new Forbidden('Permission denied to create file (filename '.$name.')');
 	}
 
 	function createDirectory($name) {
@@ -83,10 +83,10 @@ 
 		$rootView = new View();
 		$user = \OC::$server->getUserSession()->getUser();
 		Filesystem::initMountPoints($user->getUID());
-		if (!$rootView->file_exists('/' . $user->getUID() . '/uploads')) {
-			$rootView->mkdir('/' . $user->getUID() . '/uploads');
+		if (!$rootView->file_exists('/'.$user->getUID().'/uploads')) {
+			$rootView->mkdir('/'.$user->getUID().'/uploads');
 		}
-		$view = new View('/' . $user->getUID() . '/uploads');
+		$view = new View('/'.$user->getUID().'/uploads');
 		$rootInfo = $view->getFileInfo('');
 		$impl = new Directory($view, $rootInfo);
 		return $impl;

Indentation +52 added lines, -52 removed lines

@@ -29,66 +29,66 @@
 use Sabre\DAV\ICollection;
 
 class UploadHome implements ICollection {
-	/**
-	 * FilesHome constructor.
-	 *
-	 * @param array $principalInfo
-	 */
-	public function __construct($principalInfo) {
-		$this->principalInfo = $principalInfo;
-	}
+    /**
+     * FilesHome constructor.
+     *
+     * @param array $principalInfo
+     */
+    public function __construct($principalInfo) {
+        $this->principalInfo = $principalInfo;
+    }
 
-	function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
+    function createFile($name, $data = null) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
 
-	function createDirectory($name) {
-		$this->impl()->createDirectory($name);
-	}
+    function createDirectory($name) {
+        $this->impl()->createDirectory($name);
+    }
 
-	function getChild($name) {
-		return new UploadFolder($this->impl()->getChild($name));
-	}
+    function getChild($name) {
+        return new UploadFolder($this->impl()->getChild($name));
+    }
 
-	function getChildren() {
-		return array_map(function($node) {
-			return new UploadFolder($node);
-		}, $this->impl()->getChildren());
-	}
+    function getChildren() {
+        return array_map(function($node) {
+            return new UploadFolder($node);
+        }, $this->impl()->getChildren());
+    }
 
-	function childExists($name) {
-		return !is_null($this->getChild($name));
-	}
+    function childExists($name) {
+        return !is_null($this->getChild($name));
+    }
 
-	function delete() {
-		$this->impl()->delete();
-	}
+    function delete() {
+        $this->impl()->delete();
+    }
 
-	function getName() {
-		return 'uploads';
-	}
+    function getName() {
+        return 'uploads';
+    }
 
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
 
-	function getLastModified() {
-		return $this->impl()->getLastModified();
-	}
+    function getLastModified() {
+        return $this->impl()->getLastModified();
+    }
 
-	/**
-	 * @return Directory
-	 */
-	private function impl() {
-		$rootView = new View();
-		$user = \OC::$server->getUserSession()->getUser();
-		Filesystem::initMountPoints($user->getUID());
-		if (!$rootView->file_exists('/' . $user->getUID() . '/uploads')) {
-			$rootView->mkdir('/' . $user->getUID() . '/uploads');
-		}
-		$view = new View('/' . $user->getUID() . '/uploads');
-		$rootInfo = $view->getFileInfo('');
-		$impl = new Directory($view, $rootInfo);
-		return $impl;
-	}
+    /**
+     * @return Directory
+     */
+    private function impl() {
+        $rootView = new View();
+        $user = \OC::$server->getUserSession()->getUser();
+        Filesystem::initMountPoints($user->getUID());
+        if (!$rootView->file_exists('/' . $user->getUID() . '/uploads')) {
+            $rootView->mkdir('/' . $user->getUID() . '/uploads');
+        }
+        $view = new View('/' . $user->getUID() . '/uploads');
+        $rootInfo = $view->getFileInfo('');
+        $impl = new Directory($view, $rootInfo);
+        return $impl;
+    }
 }

apps/dav/lib/Upload/RootCollection.php

Indentation +12 added lines, -12 removed lines

@@ -26,18 +26,18 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChildForPrincipal(array $principalInfo) {
-		return new UploadHome($principalInfo);
-	}
+    /**
+     * @inheritdoc
+     */
+    function getChildForPrincipal(array $principalInfo) {
+        return new UploadHome($principalInfo);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getName() {
-		return 'uploads';
-	}
+    /**
+     * @inheritdoc
+     */
+    function getName() {
+        return 'uploads';
+    }
 
 }

apps/dav/lib/Upload/FutureFile.php

Indentation +72 added lines, -72 removed lines

@@ -37,87 +37,87 @@
  */
 class FutureFile implements \Sabre\DAV\IFile {
 
-	/** @var Directory */
-	private $root;
-	/** @var string */
-	private $name;
+    /** @var Directory */
+    private $root;
+    /** @var string */
+    private $name;
 
-	/**
-	 * @param Directory $root
-	 * @param string $name
-	 */
-	function __construct(Directory $root, $name) {
-		$this->root = $root;
-		$this->name = $name;
-	}
+    /**
+     * @param Directory $root
+     * @param string $name
+     */
+    function __construct(Directory $root, $name) {
+        $this->root = $root;
+        $this->name = $name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function put($data) {
-		throw new Forbidden('Permission denied to put into this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    function put($data) {
+        throw new Forbidden('Permission denied to put into this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function get() {
-		$nodes = $this->root->getChildren();
-		return AssemblyStream::wrap($nodes);
-	}
+    /**
+     * @inheritdoc
+     */
+    function get() {
+        $nodes = $this->root->getChildren();
+        return AssemblyStream::wrap($nodes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getContentType() {
-		return 'application/octet-stream';
-	}
+    /**
+     * @inheritdoc
+     */
+    function getContentType() {
+        return 'application/octet-stream';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getETag() {
-		return $this->root->getETag();
-	}
+    /**
+     * @inheritdoc
+     */
+    function getETag() {
+        return $this->root->getETag();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getSize() {
-		$children = $this->root->getChildren();
-		$sizes = array_map(function($node) {
-			/** @var IFile $node */
-			return $node->getSize();
-		}, $children);
+    /**
+     * @inheritdoc
+     */
+    function getSize() {
+        $children = $this->root->getChildren();
+        $sizes = array_map(function($node) {
+            /** @var IFile $node */
+            return $node->getSize();
+        }, $children);
 
-		return array_sum($sizes);
-	}
+        return array_sum($sizes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function delete() {
-		$this->root->delete();
-	}
+    /**
+     * @inheritdoc
+     */
+    function delete() {
+        $this->root->delete();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getName() {
-		return $this->name;
-	}
+    /**
+     * @inheritdoc
+     */
+    function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getLastModified() {
-		return $this->root->getLastModified();
-	}
+    /**
+     * @inheritdoc
+     */
+    function getLastModified() {
+        return $this->root->getLastModified();
+    }
 }

apps/dav/lib/CalDAV/CalendarHome.php

Spacing +1 added lines, -1 removed lines

@@ -109,6 +109,6 @@
 
 		}
 
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
+		throw new NotFound('Node with name \''.$name.'\' could not be found');
 	}
 }

Indentation +60 added lines, -60 removed lines

@@ -33,75 +33,75 @@
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 
-	/** @var \OCP\IL10N */
-	private $l10n;
+    /** @var \OCP\IL10N */
+    private $l10n;
 
-	public function __construct(BackendInterface $caldavBackend, $principalInfo) {
-		parent::__construct($caldavBackend, $principalInfo);
-		$this->l10n = \OC::$server->getL10N('dav');
-	}
+    public function __construct(BackendInterface $caldavBackend, $principalInfo) {
+        parent::__construct($caldavBackend, $principalInfo);
+        $this->l10n = \OC::$server->getL10N('dav');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChildren() {
-		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-		$objects = [];
-		foreach ($calendars as $calendar) {
-			$objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n);
-		}
+    /**
+     * @inheritdoc
+     */
+    function getChildren() {
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objects = [];
+        foreach ($calendars as $calendar) {
+            $objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n);
+        }
 
-		if ($this->caldavBackend instanceof SchedulingSupport) {
-			$objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-			$objects[] = new Outbox($this->principalInfo['uri']);
-		}
+        if ($this->caldavBackend instanceof SchedulingSupport) {
+            $objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+            $objects[] = new Outbox($this->principalInfo['uri']);
+        }
 
-		// We're adding a notifications node, if it's supported by the backend.
-		if ($this->caldavBackend instanceof NotificationSupport) {
-			$objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
+        // We're adding a notifications node, if it's supported by the backend.
+        if ($this->caldavBackend instanceof NotificationSupport) {
+            $objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
 
-		// If the backend supports subscriptions, we'll add those as well,
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				$objects[] = new Subscription($this->caldavBackend, $subscription);
-			}
-		}
+        // If the backend supports subscriptions, we'll add those as well,
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                $objects[] = new Subscription($this->caldavBackend, $subscription);
+            }
+        }
 
-		return $objects;
-	}
+        return $objects;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getChild($name) {
-		// Special nodes
-		if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Outbox($this->principalInfo['uri']);
-		}
-		if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
-			return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
+    /**
+     * @inheritdoc
+     */
+    function getChild($name) {
+        // Special nodes
+        if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Outbox($this->principalInfo['uri']);
+        }
+        if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
+            return new \Sabre\CalDAv\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
 
-		// Calendars
-		foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
-			if ($calendar['uri'] === $name) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n);
-			}
-		}
+        // Calendars
+        foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
+            if ($calendar['uri'] === $name) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n);
+            }
+        }
 
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($subscription['uri'] === $name) {
-					return new Subscription($this->caldavBackend, $subscription);
-				}
-			}
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($subscription['uri'] === $name) {
+                    return new Subscription($this->caldavBackend, $subscription);
+                }
+            }
 
-		}
+        }
 
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
-	}
+        throw new NotFound('Node with name \'' . $name . '\' could not be found');
+    }
 }

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

Indentation +83 added lines, -83 removed lines

@@ -42,88 +42,88 @@
  */
 class IMipPlugin extends SabreIMipPlugin {
 
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * Creates the email handler.
-	 *
-	 * @param IMailer $mailer
-	 */
-	function __construct(IMailer $mailer, ILogger $logger) {
-		parent::__construct('');
-		$this->mailer = $mailer;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Event handler for the 'schedule' event.
-	 *
-	 * @param ITip\Message $iTipMessage
-	 * @return void
-	 */
-	function schedule(ITip\Message $iTipMessage) {
-
-		// Not sending any emails if the system considers the update
-		// insignificant.
-		if (!$iTipMessage->significantChange) {
-			if (!$iTipMessage->scheduleStatus) {
-				$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			}
-			return;
-		}
-
-		$summary = $iTipMessage->message->VEVENT->SUMMARY;
-
-		if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') {
-			return;
-		}
-
-		if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
-			return;
-		}
-
-		$sender = substr($iTipMessage->sender, 7);
-		$recipient = substr($iTipMessage->recipient, 7);
-
-		$senderName = ($iTipMessage->senderName) ? $iTipMessage->senderName : null;
-		$recipientName = ($iTipMessage->recipientName) ? $iTipMessage->recipientName : null;
-
-		$subject = 'SabreDAV iTIP message';
-		switch (strtoupper($iTipMessage->method)) {
-			case 'REPLY' :
-				$subject = 'Re: ' . $summary;
-				break;
-			case 'REQUEST' :
-				$subject = $summary;
-				break;
-			case 'CANCEL' :
-				$subject = 'Cancelled: ' . $summary;
-				break;
-		}
-
-		$contentType = 'text/calendar; charset=UTF-8; method=' . $iTipMessage->method;
-
-		$message = $this->mailer->createMessage();
-
-		$message->setReplyTo([$sender => $senderName])
-			->setTo([$recipient => $recipientName])
-			->setSubject($subject)
-			->setBody($iTipMessage->message->serialize(), $contentType);
-		try {
-			$failed = $this->mailer->send($message);
-			if ($failed) {
-				$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' =>  implode(', ', $failed)]);
-				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			}
-			$iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
-		} catch(\Exception $ex) {
-			$this->logger->logException($ex, ['app' => 'dav']);
-			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-		}
-	}
+    /** @var IMailer */
+    private $mailer;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * Creates the email handler.
+     *
+     * @param IMailer $mailer
+     */
+    function __construct(IMailer $mailer, ILogger $logger) {
+        parent::__construct('');
+        $this->mailer = $mailer;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Event handler for the 'schedule' event.
+     *
+     * @param ITip\Message $iTipMessage
+     * @return void
+     */
+    function schedule(ITip\Message $iTipMessage) {
+
+        // Not sending any emails if the system considers the update
+        // insignificant.
+        if (!$iTipMessage->significantChange) {
+            if (!$iTipMessage->scheduleStatus) {
+                $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+            }
+            return;
+        }
+
+        $summary = $iTipMessage->message->VEVENT->SUMMARY;
+
+        if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') {
+            return;
+        }
+
+        if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
+            return;
+        }
+
+        $sender = substr($iTipMessage->sender, 7);
+        $recipient = substr($iTipMessage->recipient, 7);
+
+        $senderName = ($iTipMessage->senderName) ? $iTipMessage->senderName : null;
+        $recipientName = ($iTipMessage->recipientName) ? $iTipMessage->recipientName : null;
+
+        $subject = 'SabreDAV iTIP message';
+        switch (strtoupper($iTipMessage->method)) {
+            case 'REPLY' :
+                $subject = 'Re: ' . $summary;
+                break;
+            case 'REQUEST' :
+                $subject = $summary;
+                break;
+            case 'CANCEL' :
+                $subject = 'Cancelled: ' . $summary;
+                break;
+        }
+
+        $contentType = 'text/calendar; charset=UTF-8; method=' . $iTipMessage->method;
+
+        $message = $this->mailer->createMessage();
+
+        $message->setReplyTo([$sender => $senderName])
+            ->setTo([$recipient => $recipientName])
+            ->setSubject($subject)
+            ->setBody($iTipMessage->message->serialize(), $contentType);
+        try {
+            $failed = $this->mailer->send($message);
+            if ($failed) {
+                $this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' =>  implode(', ', $failed)]);
+                $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+            }
+            $iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
+        } catch(\Exception $ex) {
+            $this->logger->logException($ex, ['app' => 'dav']);
+            $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+        }
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -95,17 +95,17 @@ 
 		$subject = 'SabreDAV iTIP message';
 		switch (strtoupper($iTipMessage->method)) {
 			case 'REPLY' :
-				$subject = 'Re: ' . $summary;
+				$subject = 'Re: '.$summary;
 				break;
 			case 'REQUEST' :
 				$subject = $summary;
 				break;
 			case 'CANCEL' :
-				$subject = 'Cancelled: ' . $summary;
+				$subject = 'Cancelled: '.$summary;
 				break;
 		}
 
-		$contentType = 'text/calendar; charset=UTF-8; method=' . $iTipMessage->method;
+		$contentType = 'text/calendar; charset=UTF-8; method='.$iTipMessage->method;
 
 		$message = $this->mailer->createMessage();
 
@@ -120,7 +120,7 @@ 
 				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
 			}
 			$iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
-		} catch(\Exception $ex) {
+		} catch (\Exception $ex) {
 			$this->logger->logException($ex, ['app' => 'dav']);
 			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
 		}

apps/dav/lib/CalDAV/CalendarRoot.php

Indentation +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@
 
 class CalendarRoot extends \Sabre\CalDAV\CalendarRoot {
 
-	function getChildForPrincipal(array $principal) {
-		return new CalendarHome($this->caldavBackend, $principal);
-	}
+    function getChildForPrincipal(array $principal) {
+        return new CalendarHome($this->caldavBackend, $principal);
+    }
 }
\ No newline at end of file

apps/dav/lib/CardDAV/Plugin.php

Indentation +40 added lines, -40 removed lines

@@ -30,51 +30,51 @@
 
 class Plugin extends \Sabre\CardDAV\Plugin {
 
-	function initialize(Server $server) {
-		$server->on('propFind', [$this, 'propFind']);
-		parent::initialize($server);
-	}
+    function initialize(Server $server) {
+        $server->on('propFind', [$this, 'propFind']);
+        parent::initialize($server);
+    }
 
-	/**
-	 * Returns the addressbook home for a given principal
-	 *
-	 * @param string $principal
-	 * @return string
-	 */
-	protected function getAddressbookHomeForPrincipal($principal) {
+    /**
+     * Returns the addressbook home for a given principal
+     *
+     * @param string $principal
+     * @return string
+     */
+    protected function getAddressbookHomeForPrincipal($principal) {
 
-		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
-			list(, $principalId) = URLUtil::splitPath($principal);
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
-			list(, $principalId) = URLUtil::splitPath($principal);
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
-			list(, $principalId) = URLUtil::splitPath($principal);
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
-		}
+        if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
+            list(, $principalId) = URLUtil::splitPath($principal);
+            return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
+            list(, $principalId) = URLUtil::splitPath($principal);
+            return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
+            list(, $principalId) = URLUtil::splitPath($principal);
+            return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
+        }
 
-		throw new \LogicException('This is not supposed to happen');
-	}
+        throw new \LogicException('This is not supposed to happen');
+    }
 
-	/**
-	 * Adds all CardDAV-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFind(PropFind $propFind, INode $node) {
+    /**
+     * Adds all CardDAV-specific properties
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFind(PropFind $propFind, INode $node) {
 
-		$ns = '{http://owncloud.org/ns}';
+        $ns = '{http://owncloud.org/ns}';
 
-		if ($node instanceof AddressBook) {
+        if ($node instanceof AddressBook) {
 
-			$propFind->handle($ns . 'groups', function () use ($node) {
-				return new Groups($node->getContactsGroups());
-			});
-		}
-	}
+            $propFind->handle($ns . 'groups', function () use ($node) {
+                return new Groups($node->getContactsGroups());
+            });
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -45,15 +45,15 @@ 
 
 		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
 			list(, $principalId) = URLUtil::splitPath($principal);
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/users/'.$principalId;
 		}
 		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
 			list(, $principalId) = URLUtil::splitPath($principal);
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/groups/'.$principalId;
 		}
 		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
 			list(, $principalId) = URLUtil::splitPath($principal);
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/system/'.$principalId;
 		}
 
 		throw new \LogicException('This is not supposed to happen');
@@ -72,7 +72,7 @@ 
 
 		if ($node instanceof AddressBook) {
 
-			$propFind->handle($ns . 'groups', function () use ($node) {
+			$propFind->handle($ns.'groups', function() use ($node) {
 				return new Groups($node->getContactsGroups());
 			});
 		}