nextcloud / server

lib/private/Files/Storage/FailedStorage.php

Indentation +165 added lines, -165 removed lines

@@ -34,185 +34,185 @@
  */
 class FailedStorage extends Common {
 
-	/** @var \Exception */
-	protected $e;
-
-	/**
-	 * @param array $params ['exception' => \Exception]
-	 */
-	public function __construct($params) {
-		$this->e = $params['exception'];
-		if (!$this->e) {
-			throw new \InvalidArgumentException('Missing "exception" argument in FailedStorage constructor');
-		}
-	}
-
-	public function getId() {
-		// we can't return anything sane here
-		return 'failedstorage';
-	}
-
-	public function mkdir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function rmdir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function opendir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function is_dir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function is_file($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function stat($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function filetype($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function filesize($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isCreatable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isReadable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isUpdatable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isDeletable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isSharable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function getPermissions($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function file_exists($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function filemtime($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function file_get_contents($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function file_put_contents($path, $data) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function unlink($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function rename($path1, $path2) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function copy($path1, $path2) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function fopen($path, $mode) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function getMimeType($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function hash($type, $path, $raw = false) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function free_space($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    /** @var \Exception */
+    protected $e;
+
+    /**
+     * @param array $params ['exception' => \Exception]
+     */
+    public function __construct($params) {
+        $this->e = $params['exception'];
+        if (!$this->e) {
+            throw new \InvalidArgumentException('Missing "exception" argument in FailedStorage constructor');
+        }
+    }
+
+    public function getId() {
+        // we can't return anything sane here
+        return 'failedstorage';
+    }
+
+    public function mkdir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function rmdir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function opendir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function is_dir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function is_file($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function stat($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function filetype($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function filesize($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isCreatable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isReadable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isUpdatable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isDeletable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isSharable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function getPermissions($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function file_exists($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function filemtime($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function file_get_contents($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function file_put_contents($path, $data) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function unlink($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function rename($path1, $path2) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function copy($path1, $path2) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function fopen($path, $mode) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function getMimeType($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function hash($type, $path, $raw = false) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function free_space($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function search($query) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function search($query) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function touch($path, $mtime = null) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function touch($path, $mtime = null) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getLocalFile($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getLocalFile($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getLocalFolder($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getLocalFolder($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function hasUpdated($path, $time) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function hasUpdated($path, $time) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getETag($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getETag($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getDirectDownload($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getDirectDownload($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function verifyPath($path, $fileName) {
-		return true;
-	}
+    public function verifyPath($path, $fileName) {
+        return true;
+    }
 
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function acquireLock($path, $type, ILockingProvider $provider) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function acquireLock($path, $type, ILockingProvider $provider) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function releaseLock($path, $type, ILockingProvider $provider) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function releaseLock($path, $type, ILockingProvider $provider) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function changeLock($path, $type, ILockingProvider $provider) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function changeLock($path, $type, ILockingProvider $provider) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getAvailability() {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getAvailability() {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function setAvailability($isAvailable) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function setAvailability($isAvailable) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getCache($path = '', $storage = null) {
-		return new FailedCache();
-	}
+    public function getCache($path = '', $storage = null) {
+        return new FailedCache();
+    }
 }

lib/private/Mail/Mailer.php

Spacing +4 added lines, -4 removed lines

@@ -129,7 +129,7 @@ 
 		$mailer = $this->getInstance();
 
 		// Enable logger if debug mode is enabled
-		if($debugMode) {
+		if ($debugMode) {
 			$mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
 			$mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
 		}
@@ -139,7 +139,7 @@ 
 		// Debugging logging
 		$logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
 		$this->logger->debug($logMessage, ['app' => 'core']);
-		if($debugMode && isset($mailLogger)) {
+		if ($debugMode && isset($mailLogger)) {
 			$this->logger->debug($mailLogger->dump(), ['app' => 'core']);
 		}
 
@@ -170,7 +170,7 @@ 
 		}
 
 		list($name, $domain) = explode('@', $email, 2);
-		$domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
+		$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
 		return $name.'@'.$domain;
 	}
 
@@ -240,7 +240,7 @@ 
 				break;
 		}
 
-		return \Swift_SendmailTransport::newInstance($binaryPath . ' -bs');
+		return \Swift_SendmailTransport::newInstance($binaryPath.' -bs');
 	}
 
 	/**

Indentation +212 added lines, -212 removed lines

@@ -55,242 +55,242 @@
  * @package OC\Mail
  */
 class Mailer implements IMailer {
-	/** @var \Swift_SmtpTransport|\Swift_SendmailTransport|\Swift_MailTransport Cached transport */
-	private $instance = null;
-	/** @var IConfig */
-	private $config;
-	/** @var ILogger */
-	private $logger;
-	/** @var Defaults */
-	private $defaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l10n;
+    /** @var \Swift_SmtpTransport|\Swift_SendmailTransport|\Swift_MailTransport Cached transport */
+    private $instance = null;
+    /** @var IConfig */
+    private $config;
+    /** @var ILogger */
+    private $logger;
+    /** @var Defaults */
+    private $defaults;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l10n;
 
-	/**
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param Defaults $defaults
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IConfig $config,
-						 ILogger $logger,
-						 Defaults $defaults,
-						 IURLGenerator $urlGenerator,
-						 IL10N $l10n) {
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->defaults = $defaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param Defaults $defaults
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $l10n
+     */
+    public function __construct(IConfig $config,
+                            ILogger $logger,
+                            Defaults $defaults,
+                            IURLGenerator $urlGenerator,
+                            IL10N $l10n) {
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->defaults = $defaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Creates a new message object that can be passed to send()
-	 *
-	 * @return IMessage
-	 */
-	public function createMessage(): IMessage {
-		$plainTextOnly = $this->config->getSystemValue('mail_send_plaintext_only', false);
-		return new Message(new \Swift_Message(), $plainTextOnly);
-	}
+    /**
+     * Creates a new message object that can be passed to send()
+     *
+     * @return IMessage
+     */
+    public function createMessage(): IMessage {
+        $plainTextOnly = $this->config->getSystemValue('mail_send_plaintext_only', false);
+        return new Message(new \Swift_Message(), $plainTextOnly);
+    }
 
-	/**
-	 * @param string|null $data
-	 * @param string|null $filename
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment {
-		return new Attachment(\Swift_Attachment::newInstance($data, $filename, $contentType));
-	}
+    /**
+     * @param string|null $data
+     * @param string|null $filename
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment {
+        return new Attachment(\Swift_Attachment::newInstance($data, $filename, $contentType));
+    }
 
-	/**
-	 * @param string $path
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachmentFromPath(string $path, $contentType = null): IAttachment {
-		return new Attachment(\Swift_Attachment::fromPath($path, $contentType));
-	}
+    /**
+     * @param string $path
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachmentFromPath(string $path, $contentType = null): IAttachment {
+        return new Attachment(\Swift_Attachment::fromPath($path, $contentType));
+    }
 
-	/**
-	 * Creates a new email template object
-	 *
-	 * @param string $emailId
-	 * @param array $data
-	 * @return IEMailTemplate
-	 * @since 12.0.0
-	 */
-	public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate {
-		$class = $this->config->getSystemValue('mail_template_class', '');
+    /**
+     * Creates a new email template object
+     *
+     * @param string $emailId
+     * @param array $data
+     * @return IEMailTemplate
+     * @since 12.0.0
+     */
+    public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate {
+        $class = $this->config->getSystemValue('mail_template_class', '');
 
-		if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) {
-			return new $class(
-				$this->defaults,
-				$this->urlGenerator,
-				$this->l10n,
-				$emailId,
-				$data
-			);
-		}
+        if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) {
+            return new $class(
+                $this->defaults,
+                $this->urlGenerator,
+                $this->l10n,
+                $emailId,
+                $data
+            );
+        }
 
-		return new EMailTemplate(
-			$this->defaults,
-			$this->urlGenerator,
-			$this->l10n,
-			$emailId,
-			$data
-		);
-	}
+        return new EMailTemplate(
+            $this->defaults,
+            $this->urlGenerator,
+            $this->l10n,
+            $emailId,
+            $data
+        );
+    }
 
-	/**
-	 * Send the specified message. Also sets the from address to the value defined in config.php
-	 * if no-one has been passed.
-	 *
-	 * @param IMessage|Message $message Message to send
-	 * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and
-	 * therefore should be considered
-	 * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address
-	 * has been supplied.)
-	 */
-	public function send(IMessage $message): array {
-		$debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
+    /**
+     * Send the specified message. Also sets the from address to the value defined in config.php
+     * if no-one has been passed.
+     *
+     * @param IMessage|Message $message Message to send
+     * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and
+     * therefore should be considered
+     * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address
+     * has been supplied.)
+     */
+    public function send(IMessage $message): array {
+        $debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
 
-		if (empty($message->getFrom())) {
-			$message->setFrom([\OCP\Util::getDefaultEmailAddress($this->defaults->getName()) => $this->defaults->getName()]);
-		}
+        if (empty($message->getFrom())) {
+            $message->setFrom([\OCP\Util::getDefaultEmailAddress($this->defaults->getName()) => $this->defaults->getName()]);
+        }
 
-		$failedRecipients = [];
+        $failedRecipients = [];
 
-		$mailer = $this->getInstance();
+        $mailer = $this->getInstance();
 
-		// Enable logger if debug mode is enabled
-		if($debugMode) {
-			$mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
-			$mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
-		}
+        // Enable logger if debug mode is enabled
+        if($debugMode) {
+            $mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
+            $mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
+        }
 
-		$mailer->send($message->getSwiftMessage(), $failedRecipients);
+        $mailer->send($message->getSwiftMessage(), $failedRecipients);
 
-		// Debugging logging
-		$logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
-		$this->logger->debug($logMessage, ['app' => 'core']);
-		if($debugMode && isset($mailLogger)) {
-			$this->logger->debug($mailLogger->dump(), ['app' => 'core']);
-		}
+        // Debugging logging
+        $logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
+        $this->logger->debug($logMessage, ['app' => 'core']);
+        if($debugMode && isset($mailLogger)) {
+            $this->logger->debug($mailLogger->dump(), ['app' => 'core']);
+        }
 
-		return $failedRecipients;
-	}
+        return $failedRecipients;
+    }
 
-	/**
-	 * Checks if an e-mail address is valid
-	 *
-	 * @param string $email Email address to be validated
-	 * @return bool True if the mail address is valid, false otherwise
-	 */
-	public function validateMailAddress(string $email): bool {
-		return \Swift_Validate::email($this->convertEmail($email));
-	}
+    /**
+     * Checks if an e-mail address is valid
+     *
+     * @param string $email Email address to be validated
+     * @return bool True if the mail address is valid, false otherwise
+     */
+    public function validateMailAddress(string $email): bool {
+        return \Swift_Validate::email($this->convertEmail($email));
+    }
 
-	/**
-	 * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
-	 *
-	 * FIXME: Remove this once SwiftMailer supports IDN
-	 *
-	 * @param string $email
-	 * @return string Converted mail address if `idn_to_ascii` exists
-	 */
-	protected function convertEmail(string $email): string {
-		if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46') || strpos($email, '@') === false) {
-			return $email;
-		}
+    /**
+     * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
+     *
+     * FIXME: Remove this once SwiftMailer supports IDN
+     *
+     * @param string $email
+     * @return string Converted mail address if `idn_to_ascii` exists
+     */
+    protected function convertEmail(string $email): string {
+        if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46') || strpos($email, '@') === false) {
+            return $email;
+        }
 
-		list($name, $domain) = explode('@', $email, 2);
-		$domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
-		return $name.'@'.$domain;
-	}
+        list($name, $domain) = explode('@', $email, 2);
+        $domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
+        return $name.'@'.$domain;
+    }
 
-	/**
-	 * Returns whatever transport is configured within the config
-	 *
-	 * @return \Swift_SmtpTransport|\Swift_SendmailTransport|\Swift_MailTransport
-	 */
-	protected function getInstance() {
-		if (!is_null($this->instance)) {
-			return $this->instance;
-		}
+    /**
+     * Returns whatever transport is configured within the config
+     *
+     * @return \Swift_SmtpTransport|\Swift_SendmailTransport|\Swift_MailTransport
+     */
+    protected function getInstance() {
+        if (!is_null($this->instance)) {
+            return $this->instance;
+        }
 
-		switch ($this->config->getSystemValue('mail_smtpmode', 'php')) {
-			case 'smtp':
-				$this->instance = $this->getSmtpInstance();
-				break;
-			case 'sendmail':
-				// FIXME: Move into the return statement but requires proper testing
-				//       for SMTP and mail as well. Thus not really doable for a
-				//       minor release.
-				$this->instance = \Swift_Mailer::newInstance($this->getSendMailInstance());
-				break;
-			default:
-				$this->instance = $this->getMailInstance();
-				break;
-		}
+        switch ($this->config->getSystemValue('mail_smtpmode', 'php')) {
+            case 'smtp':
+                $this->instance = $this->getSmtpInstance();
+                break;
+            case 'sendmail':
+                // FIXME: Move into the return statement but requires proper testing
+                //       for SMTP and mail as well. Thus not really doable for a
+                //       minor release.
+                $this->instance = \Swift_Mailer::newInstance($this->getSendMailInstance());
+                break;
+            default:
+                $this->instance = $this->getMailInstance();
+                break;
+        }
 
-		return $this->instance;
-	}
+        return $this->instance;
+    }
 
-	/**
-	 * Returns the SMTP transport
-	 *
-	 * @return \Swift_SmtpTransport
-	 */
-	protected function getSmtpInstance(): \Swift_SmtpTransport {
-		$transport = \Swift_SmtpTransport::newInstance();
-		$transport->setTimeout($this->config->getSystemValue('mail_smtptimeout', 10));
-		$transport->setHost($this->config->getSystemValue('mail_smtphost', '127.0.0.1'));
-		$transport->setPort($this->config->getSystemValue('mail_smtpport', 25));
-		if ($this->config->getSystemValue('mail_smtpauth', false)) {
-			$transport->setUsername($this->config->getSystemValue('mail_smtpname', ''));
-			$transport->setPassword($this->config->getSystemValue('mail_smtppassword', ''));
-			$transport->setAuthMode($this->config->getSystemValue('mail_smtpauthtype', 'LOGIN'));
-		}
-		$smtpSecurity = $this->config->getSystemValue('mail_smtpsecure', '');
-		if (!empty($smtpSecurity)) {
-			$transport->setEncryption($smtpSecurity);
-		}
-		$transport->start();
-		return $transport;
-	}
+    /**
+     * Returns the SMTP transport
+     *
+     * @return \Swift_SmtpTransport
+     */
+    protected function getSmtpInstance(): \Swift_SmtpTransport {
+        $transport = \Swift_SmtpTransport::newInstance();
+        $transport->setTimeout($this->config->getSystemValue('mail_smtptimeout', 10));
+        $transport->setHost($this->config->getSystemValue('mail_smtphost', '127.0.0.1'));
+        $transport->setPort($this->config->getSystemValue('mail_smtpport', 25));
+        if ($this->config->getSystemValue('mail_smtpauth', false)) {
+            $transport->setUsername($this->config->getSystemValue('mail_smtpname', ''));
+            $transport->setPassword($this->config->getSystemValue('mail_smtppassword', ''));
+            $transport->setAuthMode($this->config->getSystemValue('mail_smtpauthtype', 'LOGIN'));
+        }
+        $smtpSecurity = $this->config->getSystemValue('mail_smtpsecure', '');
+        if (!empty($smtpSecurity)) {
+            $transport->setEncryption($smtpSecurity);
+        }
+        $transport->start();
+        return $transport;
+    }
 
-	/**
-	 * Returns the sendmail transport
-	 *
-	 * @return \Swift_SendmailTransport
-	 */
-	protected function getSendMailInstance(): \Swift_SendmailTransport {
-		switch ($this->config->getSystemValue('mail_smtpmode', 'php')) {
-			case 'qmail':
-				$binaryPath = '/var/qmail/bin/sendmail';
-				break;
-			default:
-				$binaryPath = '/usr/sbin/sendmail';
-				break;
-		}
+    /**
+     * Returns the sendmail transport
+     *
+     * @return \Swift_SendmailTransport
+     */
+    protected function getSendMailInstance(): \Swift_SendmailTransport {
+        switch ($this->config->getSystemValue('mail_smtpmode', 'php')) {
+            case 'qmail':
+                $binaryPath = '/var/qmail/bin/sendmail';
+                break;
+            default:
+                $binaryPath = '/usr/sbin/sendmail';
+                break;
+        }
 
-		return \Swift_SendmailTransport::newInstance($binaryPath . ' -bs');
-	}
+        return \Swift_SendmailTransport::newInstance($binaryPath . ' -bs');
+    }
 
-	/**
-	 * Returns the mail transport
-	 *
-	 * @return \Swift_MailTransport
-	 */
-	protected function getMailInstance(): \Swift_MailTransport {
-		return \Swift_MailTransport::newInstance();
-	}
+    /**
+     * Returns the mail transport
+     *
+     * @return \Swift_MailTransport
+     */
+    protected function getMailInstance(): \Swift_MailTransport {
+        return \Swift_MailTransport::newInstance();
+    }
 
 }

lib/private/Route/Route.php

Indentation +115 added lines, -115 removed lines

@@ -32,128 +32,128 @@
 use Symfony\Component\Routing\Route as SymfonyRoute;
 
 class Route extends SymfonyRoute implements IRoute {
-	/**
-	 * Specify the method when this route is to be used
-	 *
-	 * @param string $method HTTP method (uppercase)
-	 * @return \OC\Route\Route
-	 */
-	public function method($method) {
-		$this->setMethods($method);
-		return $this;
-	}
+    /**
+     * Specify the method when this route is to be used
+     *
+     * @param string $method HTTP method (uppercase)
+     * @return \OC\Route\Route
+     */
+    public function method($method) {
+        $this->setMethods($method);
+        return $this;
+    }
 
-	/**
-	 * Specify POST as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function post() {
-		$this->method('POST');
-		return $this;
-	}
+    /**
+     * Specify POST as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function post() {
+        $this->method('POST');
+        return $this;
+    }
 
-	/**
-	 * Specify GET as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function get() {
-		$this->method('GET');
-		return $this;
-	}
+    /**
+     * Specify GET as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function get() {
+        $this->method('GET');
+        return $this;
+    }
 
-	/**
-	 * Specify PUT as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function put() {
-		$this->method('PUT');
-		return $this;
-	}
+    /**
+     * Specify PUT as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function put() {
+        $this->method('PUT');
+        return $this;
+    }
 
-	/**
-	 * Specify DELETE as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function delete() {
-		$this->method('DELETE');
-		return $this;
-	}
+    /**
+     * Specify DELETE as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function delete() {
+        $this->method('DELETE');
+        return $this;
+    }
 
-	/**
-	 * Specify PATCH as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function patch() {
-		$this->method('PATCH');
-		return $this;
-	}
+    /**
+     * Specify PATCH as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function patch() {
+        $this->method('PATCH');
+        return $this;
+    }
 
-	/**
-	 * Defaults to use for this route
-	 *
-	 * @param array $defaults The defaults
-	 * @return \OC\Route\Route
-	 */
-	public function defaults($defaults) {
-		$action = $this->getDefault('action');
-		$this->setDefaults($defaults);
-		if (isset($defaults['action'])) {
-			$action = $defaults['action'];
-		}
-		$this->action($action);
-		return $this;
-	}
+    /**
+     * Defaults to use for this route
+     *
+     * @param array $defaults The defaults
+     * @return \OC\Route\Route
+     */
+    public function defaults($defaults) {
+        $action = $this->getDefault('action');
+        $this->setDefaults($defaults);
+        if (isset($defaults['action'])) {
+            $action = $defaults['action'];
+        }
+        $this->action($action);
+        return $this;
+    }
 
-	/**
-	 * Requirements for this route
-	 *
-	 * @param array $requirements The requirements
-	 * @return \OC\Route\Route
-	 */
-	public function requirements($requirements) {
-		$method = $this->getMethods();
-		$this->setRequirements($requirements);
-		if (isset($requirements['_method'])) {
-			$method = $requirements['_method'];
-		}
-		if ($method) {
-			$this->method($method);
-		}
-		return $this;
-	}
+    /**
+     * Requirements for this route
+     *
+     * @param array $requirements The requirements
+     * @return \OC\Route\Route
+     */
+    public function requirements($requirements) {
+        $method = $this->getMethods();
+        $this->setRequirements($requirements);
+        if (isset($requirements['_method'])) {
+            $method = $requirements['_method'];
+        }
+        if ($method) {
+            $this->method($method);
+        }
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches
-	 *
-	 * @param string|callable $class the class or a callable
-	 * @param string $function the function to use with the class
-	 * @return \OC\Route\Route
-	 *
-	 * This function is called with $class set to a callable or
-	 * to the class with $function
-	 */
-	public function action($class, $function = null) {
-		$action = array($class, $function);
-		if (is_null($function)) {
-			$action = $class;
-		}
-		$this->setDefault('action', $action);
-		return $this;
-	}
+    /**
+     * The action to execute when this route matches
+     *
+     * @param string|callable $class the class or a callable
+     * @param string $function the function to use with the class
+     * @return \OC\Route\Route
+     *
+     * This function is called with $class set to a callable or
+     * to the class with $function
+     */
+    public function action($class, $function = null) {
+        $action = array($class, $function);
+        if (is_null($function)) {
+            $action = $class;
+        }
+        $this->setDefault('action', $action);
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches, includes a file like
-	 * it is called directly
-	 * @param string $file
-	 * @return void
-	 */
-	public function actionInclude($file) {
-		$function = function($param) use ($file) {
-			unset($param["_route"]);
-			$_GET=array_merge($_GET, $param);
-			unset($param);
-			require_once "$file";
-		} ;
-		$this->action($function);
-	}
+    /**
+     * The action to execute when this route matches, includes a file like
+     * it is called directly
+     * @param string $file
+     * @return void
+     */
+    public function actionInclude($file) {
+        $function = function($param) use ($file) {
+            unset($param["_route"]);
+            $_GET=array_merge($_GET, $param);
+            unset($param);
+            require_once "$file";
+        } ;
+        $this->action($function);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 	public function actionInclude($file) {
 		$function = function($param) use ($file) {
 			unset($param["_route"]);
-			$_GET=array_merge($_GET, $param);
+			$_GET = array_merge($_GET, $param);
 			unset($param);
 			require_once "$file";
 		} ;

apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php

Indentation +58 added lines, -58 removed lines

@@ -13,74 +13,74 @@
 use OCP\Share\IManager;
 
 class ShareInfoMiddleware extends Middleware {
-	/** @var IManager */
-	private $shareManager;
+    /** @var IManager */
+    private $shareManager;
 
-	public function __construct(IManager $shareManager) {
-		$this->shareManager = $shareManager;
-	}
+    public function __construct(IManager $shareManager) {
+        $this->shareManager = $shareManager;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws S2SException
-	 */
-	public function beforeController($controller, $methodName) {
-		if (!($controller instanceof ShareInfoController)) {
-			return;
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws S2SException
+     */
+    public function beforeController($controller, $methodName) {
+        if (!($controller instanceof ShareInfoController)) {
+            return;
+        }
 
-		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			throw new S2SException();
-		}
-	}
+        if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            throw new S2SException();
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return Response
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if (!($controller instanceof ShareInfoController)) {
-			throw $exception;
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return Response
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if (!($controller instanceof ShareInfoController)) {
+            throw $exception;
+        }
 
-		if ($exception instanceof S2SException) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+        if ($exception instanceof S2SException) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		if (!($controller instanceof ShareInfoController)) {
-			return $response;
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        if (!($controller instanceof ShareInfoController)) {
+            return $response;
+        }
 
-		if (!($response instanceof JSONResponse)) {
-			return $response;
-		}
+        if (!($response instanceof JSONResponse)) {
+            return $response;
+        }
 
-		$data = $response->getData();
-		$status = 'error';
+        $data = $response->getData();
+        $status = 'error';
 
-		if ($response->getStatus() === Http::STATUS_OK) {
-			$status = 'success';
-		}
+        if ($response->getStatus() === Http::STATUS_OK) {
+            $status = 'success';
+        }
 
-		$response->setData([
-			'data' => $data,
-			'status' => $status,
-		]);
+        $response->setData([
+            'data' => $data,
+            'status' => $status,
+        ]);
 
-		return $response;
-	}
+        return $response;
+    }
 }

apps/files_sharing/lib/Controller/ShareInfoController.php

Indentation +110 added lines, -110 removed lines

@@ -17,114 +17,114 @@
 
 class ShareInfoController extends ApiController {
 
-	/** @var IManager */
-	private $shareManager;
-
-	/**
-	 * ShareInfoController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IManager $shareManager) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $t
-	 * @param null $password
-	 * @param null $dir
-	 * @return JSONResponse
-	 * @throws ShareNotFound
-	 */
-	public function info($t, $password = null, $dir = null) {
-		try {
-			$share = $this->shareManager->getShareByToken($t);
-		} catch (ShareNotFound $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if ($share->getPassword() && !$this->shareManager->checkPassword($share, $password)) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		if (!($share->getPermissions() & Constants::PERMISSION_READ)) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
-		if (!$isWritable) {
-			$this->addROWrapper();
-		}
-
-		$node = $share->getNode();
-
-		if ($dir !== null && $node instanceof Folder) {
-			try {
-				$node = $node->get($dir);
-			} catch (NotFoundException $e) {
-
-			}
-		}
-
-		return new JSONResponse($this->parseNode($node));
-	}
-
-	private function parseNode(Node $node) {
-		if ($node instanceof File) {
-			return $this->parseFile($node);
-		}
-		return $this->parseFolder($node);
-	}
-
-	private function parseFile(File $file) {
-		return $this->format($file);
-	}
-
-	private function parseFolder(Folder $folder) {
-		$data = $this->format($folder);
-
-		$data['children'] = [];
-
-		$nodes = $folder->getDirectoryListing();
-		foreach ($nodes as $node) {
-			$data['children'][] = $this->parseNode($node);
-		}
-
-		return $data;
-	}
-
-	private function format(Node $node) {
-		$entry = [];
-
-		$entry['id'] = $node->getId();
-		$entry['parentId'] = $node->getParent()->getId();
-		$entry['mtime'] = $node->getMTime();
-
-		$entry['name'] = $node->getName();
-		$entry['permissions'] = $node->getPermissions();
-		$entry['mimetype'] = $node->getMimetype();
-		$entry['size'] = $node->getSize();
-		$entry['type'] = $node->getType();
-		$entry['etag'] = $node->getEtag();
-
-		return $entry;
-	}
-
-	protected function addROWrapper() {
-		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-		$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
-			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
-		});
-		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
-	}
+    /** @var IManager */
+    private $shareManager;
+
+    /**
+     * ShareInfoController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IManager $shareManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IManager $shareManager) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $t
+     * @param null $password
+     * @param null $dir
+     * @return JSONResponse
+     * @throws ShareNotFound
+     */
+    public function info($t, $password = null, $dir = null) {
+        try {
+            $share = $this->shareManager->getShareByToken($t);
+        } catch (ShareNotFound $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if ($share->getPassword() && !$this->shareManager->checkPassword($share, $password)) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        if (!($share->getPermissions() & Constants::PERMISSION_READ)) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
+        if (!$isWritable) {
+            $this->addROWrapper();
+        }
+
+        $node = $share->getNode();
+
+        if ($dir !== null && $node instanceof Folder) {
+            try {
+                $node = $node->get($dir);
+            } catch (NotFoundException $e) {
+
+            }
+        }
+
+        return new JSONResponse($this->parseNode($node));
+    }
+
+    private function parseNode(Node $node) {
+        if ($node instanceof File) {
+            return $this->parseFile($node);
+        }
+        return $this->parseFolder($node);
+    }
+
+    private function parseFile(File $file) {
+        return $this->format($file);
+    }
+
+    private function parseFolder(Folder $folder) {
+        $data = $this->format($folder);
+
+        $data['children'] = [];
+
+        $nodes = $folder->getDirectoryListing();
+        foreach ($nodes as $node) {
+            $data['children'][] = $this->parseNode($node);
+        }
+
+        return $data;
+    }
+
+    private function format(Node $node) {
+        $entry = [];
+
+        $entry['id'] = $node->getId();
+        $entry['parentId'] = $node->getParent()->getId();
+        $entry['mtime'] = $node->getMTime();
+
+        $entry['name'] = $node->getName();
+        $entry['permissions'] = $node->getPermissions();
+        $entry['mimetype'] = $node->getMimetype();
+        $entry['size'] = $node->getSize();
+        $entry['type'] = $node->getType();
+        $entry['etag'] = $node->getEtag();
+
+        return $entry;
+    }
+
+    protected function addROWrapper() {
+        // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+        $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+        \OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+            return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
+        });
+        \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 	protected function addROWrapper() {
 		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
 		$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+		\OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) {
 			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
 		});
 		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);

lib/private/Repair/Owncloud/DropAccountTermsTable.php

Indentation +27 added lines, -27 removed lines

@@ -29,32 +29,32 @@
 
 class DropAccountTermsTable implements IRepairStep {
 
-	/** @var IDBConnection */
-	protected $db;
-
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Drop account terms table when migrating from ownCloud';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->db->tableExists('account_terms')) {
-			return;
-		}
-
-		$this->db->dropTable('account_terms');
-	}
+    /** @var IDBConnection */
+    protected $db;
+
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Drop account terms table when migrating from ownCloud';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->db->tableExists('account_terms')) {
+            return;
+        }
+
+        $this->db->dropTable('account_terms');
+    }
 }
 

lib/private/Contacts/ContactsMenu/ContactsStore.php

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	/**
 	 * @param IUser $user
 	 * @param string|null $filter
-	 * @return IEntry[]
+	 * @return Entry[]
 	 */
 	public function getContacts(IUser $user, $filter) {
 		$allContacts = $this->contactsManager->search($filter ?: '', [

Spacing +7 added lines, -7 removed lines

@@ -117,7 +117,7 @@ 
 		if ($excludedGroups) {
 			$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
 			$decodedExcludeGroups = json_decode($excludedGroups, true);
-			$excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups :  [];
+			$excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups : [];
 
 			if (count(array_intersect($excludeGroupsList, $selfGroups)) !== 0) {
 				// a group of the current user is excluded -> filter all local users
@@ -133,22 +133,22 @@ 
 			}
 
 			// Prevent enumerating local users
-			if($disallowEnumeration && $entry->getProperty('isLocalSystemBook')) {
+			if ($disallowEnumeration && $entry->getProperty('isLocalSystemBook')) {
 				$filterUser = true;
 
 				$mailAddresses = $entry->getEMailAddresses();
-				foreach($mailAddresses as $mailAddress) {
-					if($mailAddress === $filter) {
+				foreach ($mailAddresses as $mailAddress) {
+					if ($mailAddress === $filter) {
 						$filterUser = false;
 						break;
 					}
 				}
 
-				if($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
+				if ($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
 					$filterUser = false;
 				}
 
-				if($filterUser) {
+				if ($filterUser) {
 					return false;
 				}
 			}
@@ -172,7 +172,7 @@ 
 	 * @return IEntry|null
 	 */
 	public function findOne(IUser $user, $shareType, $shareWith) {
-		switch($shareType) {
+		switch ($shareType) {
 			case 0:
 			case 6:
 				$filter = ['UID'];

Indentation +216 added lines, -216 removed lines

@@ -37,221 +37,221 @@
 
 class ContactsStore implements IContactsStore {
 
-	/** @var IManager */
-	private $contactsManager;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/**
-	 * @param IManager $contactsManager
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IManager $contactsManager,
-								IConfig $config,
-								IUserManager $userManager,
-								IGroupManager $groupManager) {
-		$this->contactsManager = $contactsManager;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string|null $filter
-	 * @return IEntry[]
-	 */
-	public function getContacts(IUser $user, $filter) {
-		$allContacts = $this->contactsManager->search($filter ?: '', [
-			'FN',
-			'EMAIL'
-		]);
-
-		$entries = array_map(function(array $contact) {
-			return $this->contactArrayToEntry($contact);
-		}, $allContacts);
-		return $this->filterContacts(
-			$user,
-			$entries,
-			$filter
-		);
-	}
-
-	/**
-	 * Filters the contacts. Applies 3 filters:
-	 *  1. filter the current user
-	 *  2. if the `shareapi_allow_share_dialog_user_enumeration` config option is
-	 * enabled it will filter all local users
-	 *  3. if the `shareapi_exclude_groups` config option is enabled and the
-	 * current user is in an excluded group it will filter all local users.
-	 *  4. if the `shareapi_only_share_with_group_members` config option is
-	 * enabled it will filter all users which doens't have a common group
-	 * with the current user.
-	 *
-	 * @param IUser $self
-	 * @param Entry[] $entries
-	 * @param string $filter
-	 * @return Entry[] the filtered contacts
-	 */
-	private function filterContacts(IUser $self,
-									array $entries,
-									$filter) {
-		$disallowEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') !== 'yes';
-		$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes';
-
-		// whether to filter out local users
-		$skipLocal = false;
-		// whether to filter out all users which doesn't have the same group as the current user
-		$ownGroupsOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-
-		$selfGroups = $this->groupManager->getUserGroupIds($self);
-
-		if ($excludedGroups) {
-			$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
-			$decodedExcludeGroups = json_decode($excludedGroups, true);
-			$excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups :  [];
-
-			if (count(array_intersect($excludeGroupsList, $selfGroups)) !== 0) {
-				// a group of the current user is excluded -> filter all local users
-				$skipLocal = true;
-			}
-		}
-
-		$selfUID = $self->getUID();
-
-		return array_values(array_filter($entries, function(IEntry $entry) use ($self, $skipLocal, $ownGroupsOnly, $selfGroups, $selfUID, $disallowEnumeration, $filter) {
-			if ($skipLocal && $entry->getProperty('isLocalSystemBook') === true) {
-				return false;
-			}
-
-			// Prevent enumerating local users
-			if($disallowEnumeration && $entry->getProperty('isLocalSystemBook')) {
-				$filterUser = true;
-
-				$mailAddresses = $entry->getEMailAddresses();
-				foreach($mailAddresses as $mailAddress) {
-					if($mailAddress === $filter) {
-						$filterUser = false;
-						break;
-					}
-				}
-
-				if($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
-					$filterUser = false;
-				}
-
-				if($filterUser) {
-					return false;
-				}
-			}
-
-			if ($ownGroupsOnly && $entry->getProperty('isLocalSystemBook') === true) {
-				$contactGroups = $this->groupManager->getUserGroupIds($this->userManager->get($entry->getProperty('UID')));
-				if (count(array_intersect($contactGroups, $selfGroups)) === 0) {
-					// no groups in common, so shouldn't see the contact
-					return false;
-				}
-			}
-
-			return $entry->getProperty('UID') !== $selfUID;
-		}));
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param integer $shareType
-	 * @param string $shareWith
-	 * @return IEntry|null
-	 */
-	public function findOne(IUser $user, $shareType, $shareWith) {
-		switch($shareType) {
-			case 0:
-			case 6:
-				$filter = ['UID'];
-				break;
-			case 4:
-				$filter = ['EMAIL'];
-				break;
-			default:
-				return null;
-		}
-
-		$userId = $user->getUID();
-		$allContacts = $this->contactsManager->search($shareWith, $filter);
-		$contacts = array_filter($allContacts, function($contact) use ($userId) {
-			return $contact['UID'] !== $userId;
-		});
-		$match = null;
-
-		foreach ($contacts as $contact) {
-			if ($shareType === 4 && isset($contact['EMAIL'])) {
-				if (in_array($shareWith, $contact['EMAIL'])) {
-					$match = $contact;
-					break;
-				}
-			}
-			if ($shareType === 0 || $shareType === 6) {
-				$isLocal = $contact['isLocalSystemBook'] ?? false;
-				if ($contact['UID'] === $shareWith && $isLocal === true) {
-					$match = $contact;
-					break;
-				}
-			}
-		}
-
-		if ($match) {
-			$match = $this->filterContacts($user, [$this->contactArrayToEntry($match)], $shareWith);
-			if (count($match) === 1) {
-				$match = $match[0];
-			} else {
-				$match = null;
-			}
-
-		}
-
-		return $match;
-	}
-
-	/**
-	 * @param array $contact
-	 * @return Entry
-	 */
-	private function contactArrayToEntry(array $contact) {
-		$entry = new Entry();
-
-		if (isset($contact['id'])) {
-			$entry->setId($contact['id']);
-		}
-
-		if (isset($contact['FN'])) {
-			$entry->setFullName($contact['FN']);
-		}
-
-		$avatarPrefix = "VALUE=uri:";
-		if (isset($contact['PHOTO']) && strpos($contact['PHOTO'], $avatarPrefix) === 0) {
-			$entry->setAvatar(substr($contact['PHOTO'], strlen($avatarPrefix)));
-		}
-
-		if (isset($contact['EMAIL'])) {
-			foreach ($contact['EMAIL'] as $email) {
-				$entry->addEMailAddress($email);
-			}
-		}
-
-		// Attach all other properties to the entry too because some
-		// providers might make use of it.
-		$entry->setProperties($contact);
-
-		return $entry;
-	}
+    /** @var IManager */
+    private $contactsManager;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /**
+     * @param IManager $contactsManager
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IManager $contactsManager,
+                                IConfig $config,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager) {
+        $this->contactsManager = $contactsManager;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * @param IUser $user
+     * @param string|null $filter
+     * @return IEntry[]
+     */
+    public function getContacts(IUser $user, $filter) {
+        $allContacts = $this->contactsManager->search($filter ?: '', [
+            'FN',
+            'EMAIL'
+        ]);
+
+        $entries = array_map(function(array $contact) {
+            return $this->contactArrayToEntry($contact);
+        }, $allContacts);
+        return $this->filterContacts(
+            $user,
+            $entries,
+            $filter
+        );
+    }
+
+    /**
+     * Filters the contacts. Applies 3 filters:
+     *  1. filter the current user
+     *  2. if the `shareapi_allow_share_dialog_user_enumeration` config option is
+     * enabled it will filter all local users
+     *  3. if the `shareapi_exclude_groups` config option is enabled and the
+     * current user is in an excluded group it will filter all local users.
+     *  4. if the `shareapi_only_share_with_group_members` config option is
+     * enabled it will filter all users which doens't have a common group
+     * with the current user.
+     *
+     * @param IUser $self
+     * @param Entry[] $entries
+     * @param string $filter
+     * @return Entry[] the filtered contacts
+     */
+    private function filterContacts(IUser $self,
+                                    array $entries,
+                                    $filter) {
+        $disallowEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') !== 'yes';
+        $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes';
+
+        // whether to filter out local users
+        $skipLocal = false;
+        // whether to filter out all users which doesn't have the same group as the current user
+        $ownGroupsOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+
+        $selfGroups = $this->groupManager->getUserGroupIds($self);
+
+        if ($excludedGroups) {
+            $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+            $decodedExcludeGroups = json_decode($excludedGroups, true);
+            $excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups :  [];
+
+            if (count(array_intersect($excludeGroupsList, $selfGroups)) !== 0) {
+                // a group of the current user is excluded -> filter all local users
+                $skipLocal = true;
+            }
+        }
+
+        $selfUID = $self->getUID();
+
+        return array_values(array_filter($entries, function(IEntry $entry) use ($self, $skipLocal, $ownGroupsOnly, $selfGroups, $selfUID, $disallowEnumeration, $filter) {
+            if ($skipLocal && $entry->getProperty('isLocalSystemBook') === true) {
+                return false;
+            }
+
+            // Prevent enumerating local users
+            if($disallowEnumeration && $entry->getProperty('isLocalSystemBook')) {
+                $filterUser = true;
+
+                $mailAddresses = $entry->getEMailAddresses();
+                foreach($mailAddresses as $mailAddress) {
+                    if($mailAddress === $filter) {
+                        $filterUser = false;
+                        break;
+                    }
+                }
+
+                if($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
+                    $filterUser = false;
+                }
+
+                if($filterUser) {
+                    return false;
+                }
+            }
+
+            if ($ownGroupsOnly && $entry->getProperty('isLocalSystemBook') === true) {
+                $contactGroups = $this->groupManager->getUserGroupIds($this->userManager->get($entry->getProperty('UID')));
+                if (count(array_intersect($contactGroups, $selfGroups)) === 0) {
+                    // no groups in common, so shouldn't see the contact
+                    return false;
+                }
+            }
+
+            return $entry->getProperty('UID') !== $selfUID;
+        }));
+    }
+
+    /**
+     * @param IUser $user
+     * @param integer $shareType
+     * @param string $shareWith
+     * @return IEntry|null
+     */
+    public function findOne(IUser $user, $shareType, $shareWith) {
+        switch($shareType) {
+            case 0:
+            case 6:
+                $filter = ['UID'];
+                break;
+            case 4:
+                $filter = ['EMAIL'];
+                break;
+            default:
+                return null;
+        }
+
+        $userId = $user->getUID();
+        $allContacts = $this->contactsManager->search($shareWith, $filter);
+        $contacts = array_filter($allContacts, function($contact) use ($userId) {
+            return $contact['UID'] !== $userId;
+        });
+        $match = null;
+
+        foreach ($contacts as $contact) {
+            if ($shareType === 4 && isset($contact['EMAIL'])) {
+                if (in_array($shareWith, $contact['EMAIL'])) {
+                    $match = $contact;
+                    break;
+                }
+            }
+            if ($shareType === 0 || $shareType === 6) {
+                $isLocal = $contact['isLocalSystemBook'] ?? false;
+                if ($contact['UID'] === $shareWith && $isLocal === true) {
+                    $match = $contact;
+                    break;
+                }
+            }
+        }
+
+        if ($match) {
+            $match = $this->filterContacts($user, [$this->contactArrayToEntry($match)], $shareWith);
+            if (count($match) === 1) {
+                $match = $match[0];
+            } else {
+                $match = null;
+            }
+
+        }
+
+        return $match;
+    }
+
+    /**
+     * @param array $contact
+     * @return Entry
+     */
+    private function contactArrayToEntry(array $contact) {
+        $entry = new Entry();
+
+        if (isset($contact['id'])) {
+            $entry->setId($contact['id']);
+        }
+
+        if (isset($contact['FN'])) {
+            $entry->setFullName($contact['FN']);
+        }
+
+        $avatarPrefix = "VALUE=uri:";
+        if (isset($contact['PHOTO']) && strpos($contact['PHOTO'], $avatarPrefix) === 0) {
+            $entry->setAvatar(substr($contact['PHOTO'], strlen($avatarPrefix)));
+        }
+
+        if (isset($contact['EMAIL'])) {
+            foreach ($contact['EMAIL'] as $email) {
+                $entry->addEMailAddress($email);
+            }
+        }
+
+        // Attach all other properties to the entry too because some
+        // providers might make use of it.
+        $entry->setProperties($contact);
+
+        return $entry;
+    }
 
 }

apps/files_sharing/lib/ExpireSharesJob.php

Indentation +37 added lines, -37 removed lines

@@ -29,48 +29,48 @@
  */
 class ExpireSharesJob extends TimedJob {
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$connection = \OC::$server->getDatabaseConnection();
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $connection = \OC::$server->getDatabaseConnection();
 
-		//Current time
-		$now = new \DateTime();
-		$now = $now->format('Y-m-d H:i:s');
+        //Current time
+        $now = new \DateTime();
+        $now = $now->format('Y-m-d H:i:s');
 
-		/*
+        /*
 		 * Expire file link shares only (for now)
 		 */
-		$qb = $connection->getQueryBuilder();
-		$qb->select('id', 'file_source', 'uid_owner', 'item_type')
-			->from('share')
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
-					$qb->expr()->lte('expiration', $qb->expr()->literal($now)),
-					$qb->expr()->orX(
-						$qb->expr()->eq('item_type', $qb->expr()->literal('file')),
-						$qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
-					)
-				)
-			);
+        $qb = $connection->getQueryBuilder();
+        $qb->select('id', 'file_source', 'uid_owner', 'item_type')
+            ->from('share')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
+                    $qb->expr()->lte('expiration', $qb->expr()->literal($now)),
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('file')),
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
+                    )
+                )
+            );
 
-		$shares = $qb->execute();
-		while($share = $shares->fetch()) {
-			\OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
-		}
-		$shares->closeCursor();
-	}
+        $shares = $qb->execute();
+        while($share = $shares->fetch()) {
+            \OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
+        }
+        $shares->closeCursor();
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 			);
 
 		$shares = $qb->execute();
-		while($share = $shares->fetch()) {
+		while ($share = $shares->fetch()) {
 			\OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
 		}
 		$shares->closeCursor();

apps/files_external/lib/Lib/Auth/InvalidAuth.php

Indentation +13 added lines, -13 removed lines

@@ -27,18 +27,18 @@
  */
 class InvalidAuth extends AuthMechanism {
 
-	/**
-	 * Constructs a new InvalidAuth with the id of the invalid auth
-	 * for display purposes
-	 *
-	 * @param string $invalidId invalid id
-	 */
-	public function __construct($invalidId) {
-		$this
-			->setIdentifier($invalidId)
-			->setScheme(self::SCHEME_NULL)
-			->setText('Unknown auth mechanism backend ' . $invalidId)
-		;
-	}
+    /**
+     * Constructs a new InvalidAuth with the id of the invalid auth
+     * for display purposes
+     *
+     * @param string $invalidId invalid id
+     */
+    public function __construct($invalidId) {
+        $this
+            ->setIdentifier($invalidId)
+            ->setScheme(self::SCHEME_NULL)
+            ->setText('Unknown auth mechanism backend ' . $invalidId)
+        ;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 		$this
 			->setIdentifier($invalidId)
 			->setScheme(self::SCHEME_NULL)
-			->setText('Unknown auth mechanism backend ' . $invalidId)
+			->setText('Unknown auth mechanism backend '.$invalidId)
 		;
 	}