nextcloud / server

apps/files_external/lib/Lib/Notify/SMBNotifyHandler.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 	public function listen(callable $callback) {
 		$oldRenamePath = null;
-		$this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
+		$this->shareNotifyHandler->listen(function(\Icewind\SMB\Change $shareChange) use ($callback) {
 			$change = $this->mapChange($shareChange);
 			if (!is_null($change)) {
 				return $callback($change);

Indentation +109 added lines, -109 removed lines

@@ -29,122 +29,122 @@
 use OCP\Files\Notify\INotifyHandler;
 
 class SMBNotifyHandler implements INotifyHandler {
-	/**
-	 * @var \Icewind\SMB\INotifyHandler
-	 */
-	private $shareNotifyHandler;
+    /**
+     * @var \Icewind\SMB\INotifyHandler
+     */
+    private $shareNotifyHandler;
 
-	/**
-	 * @var string
-	 */
-	private $root;
+    /**
+     * @var string
+     */
+    private $root;
 
-	private $oldRenamePath = null;
+    private $oldRenamePath = null;
 
-	/**
-	 * SMBNotifyHandler constructor.
-	 *
-	 * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler
-	 * @param string $root
-	 */
-	public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) {
-		$this->shareNotifyHandler = $shareNotifyHandler;
-		$this->root = $root;
-	}
+    /**
+     * SMBNotifyHandler constructor.
+     *
+     * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler
+     * @param string $root
+     */
+    public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) {
+        $this->shareNotifyHandler = $shareNotifyHandler;
+        $this->root = $root;
+    }
 
-	private function relativePath($fullPath) {
-		if ($fullPath === $this->root) {
-			return '';
-		} elseif (substr($fullPath, 0, strlen($this->root)) === $this->root) {
-			return substr($fullPath, strlen($this->root));
-		} else {
-			return null;
-		}
-	}
+    private function relativePath($fullPath) {
+        if ($fullPath === $this->root) {
+            return '';
+        } elseif (substr($fullPath, 0, strlen($this->root)) === $this->root) {
+            return substr($fullPath, strlen($this->root));
+        } else {
+            return null;
+        }
+    }
 
-	public function listen(callable $callback) {
-		$oldRenamePath = null;
-		$this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
-			$change = $this->mapChange($shareChange);
-			if (!is_null($change)) {
-				return $callback($change);
-			} else {
-				return true;
-			}
-		});
-	}
+    public function listen(callable $callback) {
+        $oldRenamePath = null;
+        $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
+            $change = $this->mapChange($shareChange);
+            if (!is_null($change)) {
+                return $callback($change);
+            } else {
+                return true;
+            }
+        });
+    }
 
-	/**
-	 * Get all changes detected since the start of the notify process or the last call to getChanges
-	 *
-	 * @return IChange[]
-	 */
-	public function getChanges() {
-		$shareChanges = $this->shareNotifyHandler->getChanges();
-		$changes = [];
-		foreach ($shareChanges as $shareChange) {
-			$change = $this->mapChange($shareChange);
-			if ($change) {
-				$changes[] = $change;
-			}
-		}
-		return $changes;
-	}
+    /**
+     * Get all changes detected since the start of the notify process or the last call to getChanges
+     *
+     * @return IChange[]
+     */
+    public function getChanges() {
+        $shareChanges = $this->shareNotifyHandler->getChanges();
+        $changes = [];
+        foreach ($shareChanges as $shareChange) {
+            $change = $this->mapChange($shareChange);
+            if ($change) {
+                $changes[] = $change;
+            }
+        }
+        return $changes;
+    }
 
-	/**
-	 * Stop listening for changes
-	 *
-	 * Note that any pending changes will be discarded
-	 */
-	public function stop() {
-		$this->shareNotifyHandler->stop();
-	}
+    /**
+     * Stop listening for changes
+     *
+     * Note that any pending changes will be discarded
+     */
+    public function stop() {
+        $this->shareNotifyHandler->stop();
+    }
 
-	/**
-	 * @param \Icewind\SMB\Change $change
-	 * @return IChange|null
-	 */
-	private function mapChange(\Icewind\SMB\Change $change) {
-		$path = $this->relativePath($change->getPath());
-		if (is_null($path)) {
-			return null;
-		}
-		if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) {
-			$this->oldRenamePath = $path;
-			return null;
-		}
-		$type = $this->mapNotifyType($change->getCode());
-		if (is_null($type)) {
-			return null;
-		}
-		if ($type === IChange::RENAMED) {
-			if (!is_null($this->oldRenamePath)) {
-				$result = new RenameChange($type, $this->oldRenamePath, $path);
-				$this->oldRenamePath = null;
-			} else {
-				$result = null;
-			}
-		} else {
-			$result = new Change($type, $path);
-		}
-		return $result;
-	}
+    /**
+     * @param \Icewind\SMB\Change $change
+     * @return IChange|null
+     */
+    private function mapChange(\Icewind\SMB\Change $change) {
+        $path = $this->relativePath($change->getPath());
+        if (is_null($path)) {
+            return null;
+        }
+        if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) {
+            $this->oldRenamePath = $path;
+            return null;
+        }
+        $type = $this->mapNotifyType($change->getCode());
+        if (is_null($type)) {
+            return null;
+        }
+        if ($type === IChange::RENAMED) {
+            if (!is_null($this->oldRenamePath)) {
+                $result = new RenameChange($type, $this->oldRenamePath, $path);
+                $this->oldRenamePath = null;
+            } else {
+                $result = null;
+            }
+        } else {
+            $result = new Change($type, $path);
+        }
+        return $result;
+    }
 
-	private function mapNotifyType($smbType) {
-		switch ($smbType) {
-			case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED:
-				return IChange::ADDED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED:
-				return IChange::REMOVED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM:
-				return IChange::MODIFIED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW:
-				return IChange::RENAMED;
-			default:
-				return null;
-		}
-	}
+    private function mapNotifyType($smbType) {
+        switch ($smbType) {
+            case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED:
+                return IChange::ADDED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED:
+                return IChange::REMOVED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM:
+                return IChange::MODIFIED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW:
+                return IChange::RENAMED;
+            default:
+                return null;
+        }
+    }
 }

apps/files_external/lib/Lib/Backend/LegacyBackend.php

Switch Indentation +12 added lines, -12 removed lines

@@ -62,18 +62,18 @@
 				$placeholder = substr($placeholder, 1);
 			}
 			switch ($placeholder[0]) {
-			case '!':
-				$type = DefinitionParameter::VALUE_BOOLEAN;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '*':
-				$type = DefinitionParameter::VALUE_PASSWORD;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '#':
-				$type = DefinitionParameter::VALUE_HIDDEN;
-				$placeholder = substr($placeholder, 1);
-				break;
+			    case '!':
+				    $type = DefinitionParameter::VALUE_BOOLEAN;
+				    $placeholder = substr($placeholder, 1);
+				    break;
+			    case '*':
+				    $type = DefinitionParameter::VALUE_PASSWORD;
+				    $placeholder = substr($placeholder, 1);
+				    break;
+			    case '#':
+				    $type = DefinitionParameter::VALUE_HIDDEN;
+				    $placeholder = substr($placeholder, 1);
+				    break;
 			}
 			$this->addParameter((new DefinitionParameter($name, $placeholder))
 				->setType($type)

Indentation +63 added lines, -63 removed lines

@@ -32,72 +32,72 @@
  * Legacy compatibility for OCA\Files_External\MountConfig::registerBackend()
  */
 class LegacyBackend extends Backend {
-	use LegacyDependencyCheckPolyfill {
-		LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
-	}
+    use LegacyDependencyCheckPolyfill {
+        LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
+    }
 
-	/** @var bool */
-	protected $hasDependencies = false;
+    /** @var bool */
+    protected $hasDependencies = false;
 
-	/**
-	 * @param string $class
-	 * @param array $definition
-	 * @param Builtin $authMechanism
-	 */
-	public function __construct($class, array $definition, Builtin $authMechanism) {
-		$this
-			->setIdentifier($class)
-			->setStorageClass($class)
-			->setText($definition['backend'])
-			->addAuthScheme(Builtin::SCHEME_BUILTIN)
-			->setLegacyAuthMechanism($authMechanism)
-		;
+    /**
+     * @param string $class
+     * @param array $definition
+     * @param Builtin $authMechanism
+     */
+    public function __construct($class, array $definition, Builtin $authMechanism) {
+        $this
+            ->setIdentifier($class)
+            ->setStorageClass($class)
+            ->setText($definition['backend'])
+            ->addAuthScheme(Builtin::SCHEME_BUILTIN)
+            ->setLegacyAuthMechanism($authMechanism)
+        ;
 
-		foreach ($definition['configuration'] as $name => $placeholder) {
-			$flags = DefinitionParameter::FLAG_NONE;
-			$type = DefinitionParameter::VALUE_TEXT;
-			if ($placeholder[0] === '&') {
-				$flags = DefinitionParameter::FLAG_OPTIONAL;
-				$placeholder = substr($placeholder, 1);
-			}
-			switch ($placeholder[0]) {
-			case '!':
-				$type = DefinitionParameter::VALUE_BOOLEAN;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '*':
-				$type = DefinitionParameter::VALUE_PASSWORD;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '#':
-				$type = DefinitionParameter::VALUE_HIDDEN;
-				$placeholder = substr($placeholder, 1);
-				break;
-			}
-			$this->addParameter((new DefinitionParameter($name, $placeholder))
-				->setType($type)
-				->setFlags($flags)
-			);
-		}
+        foreach ($definition['configuration'] as $name => $placeholder) {
+            $flags = DefinitionParameter::FLAG_NONE;
+            $type = DefinitionParameter::VALUE_TEXT;
+            if ($placeholder[0] === '&') {
+                $flags = DefinitionParameter::FLAG_OPTIONAL;
+                $placeholder = substr($placeholder, 1);
+            }
+            switch ($placeholder[0]) {
+            case '!':
+                $type = DefinitionParameter::VALUE_BOOLEAN;
+                $placeholder = substr($placeholder, 1);
+                break;
+            case '*':
+                $type = DefinitionParameter::VALUE_PASSWORD;
+                $placeholder = substr($placeholder, 1);
+                break;
+            case '#':
+                $type = DefinitionParameter::VALUE_HIDDEN;
+                $placeholder = substr($placeholder, 1);
+                break;
+            }
+            $this->addParameter((new DefinitionParameter($name, $placeholder))
+                ->setType($type)
+                ->setFlags($flags)
+            );
+        }
 
-		if (isset($definition['priority'])) {
-			$this->setPriority($definition['priority']);
-		}
-		if (isset($definition['custom'])) {
-			$this->addCustomJs($definition['custom']);
-		}
-		if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
-			$this->hasDependencies = true;
-		}
-	}
+        if (isset($definition['priority'])) {
+            $this->setPriority($definition['priority']);
+        }
+        if (isset($definition['custom'])) {
+            $this->addCustomJs($definition['custom']);
+        }
+        if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
+            $this->hasDependencies = true;
+        }
+    }
 
-	/**
-	 * @return MissingDependency[]
-	 */
-	public function checkDependencies() {
-		if ($this->hasDependencies) {
-			return $this->doCheckDependencies();
-		}
-		return [];
-	}
+    /**
+     * @return MissingDependency[]
+     */
+    public function checkDependencies() {
+        if ($this->hasDependencies) {
+            return $this->doCheckDependencies();
+        }
+        return [];
+    }
 }

apps/files_external/lib/Lib/MissingDependency.php

Indentation +30 added lines, -30 removed lines

@@ -27,39 +27,39 @@
  */
 class MissingDependency {
 
-	/** @var string */
-	private $dependency;
+    /** @var string */
+    private $dependency;
 
-	/** @var string|null Custom message */
-	private $message = null;
+    /** @var string|null Custom message */
+    private $message = null;
 
-	/**
-	 * @param string $dependency
-	 */
-	public function __construct($dependency) {
-		$this->dependency = $dependency;
-	}
+    /**
+     * @param string $dependency
+     */
+    public function __construct($dependency) {
+        $this->dependency = $dependency;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getDependency() {
-		return $this->dependency;
-	}
+    /**
+     * @return string
+     */
+    public function getDependency() {
+        return $this->dependency;
+    }
 
-	/**
-	 * @return string|null
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
+    /**
+     * @return string|null
+     */
+    public function getMessage() {
+        return $this->message;
+    }
 
-	/**
-	 * @param string $message
-	 * @return self
-	 */
-	public function setMessage($message) {
-		$this->message = $message;
-		return $this;
-	}
+    /**
+     * @param string $message
+     * @return self
+     */
+    public function setMessage($message) {
+        $this->message = $message;
+        return $this;
+    }
 }

apps/files_external/lib/Lib/DependencyTrait.php

Indentation +8 added lines, -8 removed lines

@@ -29,14 +29,14 @@
  */
 trait DependencyTrait {
 
-	/**
-	 * Check if object is valid for use
-	 *
-	 * @return MissingDependency[] Unsatisfied dependencies
-	 */
-	public function checkDependencies() {
-		return []; // no dependencies by default
-	}
+    /**
+     * Check if object is valid for use
+     *
+     * @return MissingDependency[] Unsatisfied dependencies
+     */
+    public function checkDependencies() {
+        return []; // no dependencies by default
+    }
 
 }
 

apps/systemtags/lib/Activity/Provider.php

Spacing +1 added lines, -1 removed lines

@@ -279,7 +279,7 @@
 		if ($tagData === null) {
 			list($name, $status) = explode('|||', substr($parameter, 3, -3));
 			$tagData = [
-				'id' => 0,// No way to recover the ID
+				'id' => 0, // No way to recover the ID
 				'name' => $name,
 				'assignable' => $status === 'assignable',
 				'visible' => $status !== 'invisible',

Indentation +335 added lines, -335 removed lines

@@ -33,339 +33,339 @@
 use OCP\L10N\IFactory;
 
 class Provider implements IProvider {
-	public const CREATE_TAG = 'create_tag';
-	public const UPDATE_TAG = 'update_tag';
-	public const DELETE_TAG = 'delete_tag';
-
-	public const ASSIGN_TAG = 'assign_tag';
-	public const UNASSIGN_TAG = 'unassign_tag';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var string[] */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'systemtags') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('systemtags', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
-		}
-
-		if ($event->getSubject() === self::ASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				$event->setParsedSubject($this->l->t('System tag %1$s added by the system', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Added system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('Added system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Added system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [
-						'actor' => $parsedParameters['actor'],
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			}
-		} elseif ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				$event->setParsedSubject($this->l->t('System tag %1$s removed by the system', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('Removed system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [
-						'actor' => $parsedParameters['actor'],
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
-		}
-
-		if ($event->getSubject() === self::CREATE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You created system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters);
-			}
-		} elseif ($event->getSubject() === self::DELETE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You deleted system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters);
-			}
-		} elseif ($event->getSubject() === self::UPDATE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['newsystemtag']),
-					$this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
-				]))
-					->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['newsystemtag']),
-					$this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
-			}
-		} elseif ($event->getSubject() === self::ASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				unset($parsedParameters['actor']);
-				$event->setParsedSubject($this->l->t('System tag %2$s was added to %1$s by the system', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('System tag {systemtag} was added to {file} by the system'), $parsedParameters);
-			} elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [
-					$parsedParameters['actor']['name'],
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters);
-			}
-		} elseif ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				unset($parsedParameters['actor']);
-				$event->setParsedSubject($this->l->t('System tag %2$s was removed from %1$s by the system', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('System tag {systemtag} was removed from {file} by the system'), $parsedParameters);
-			} elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [
-					$parsedParameters['actor']['name'],
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::CREATE_TAG:
-			case self::DELETE_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'systemtag' => $this->getSystemTagParameter($parameters[1]),
-				];
-			case self::UPDATE_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
-					'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
-				];
-			case self::ASSIGN_TAG:
-			case self::UNASSIGN_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]),
-					'systemtag' => $this->getSystemTagParameter($parameters[2]),
-				];
-		}
-		return [];
-	}
-
-	protected function getFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-		];
-	}
-
-	protected function getSystemTagParameter($parameter) {
-		$tagData = json_decode($parameter, true);
-		if ($tagData === null) {
-			list($name, $status) = explode('|||', substr($parameter, 3, -3));
-			$tagData = [
-				'id' => 0,// No way to recover the ID
-				'name' => $name,
-				'assignable' => $status === 'assignable',
-				'visible' => $status !== 'invisible',
-			];
-		}
-
-		return [
-			'type' => 'systemtag',
-			'id' => (int) $tagData['id'],
-			'name' => $tagData['name'],
-			'assignable' => $tagData['assignable'] ? '1' : '0',
-			'visibility' => $tagData['visible'] ? '1' : '0',
-		];
-	}
-
-	protected function getUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	protected function generatePlainSystemTag(array $parameter) {
-		if ($parameter['assignable'] === '1') {
-			return $parameter['name'];
-		} elseif ($parameter['visibility'] === '1') {
-			return $this->l->t('%s (restricted)', $parameter['name']);
-		} else {
-			return $this->l->t('%s (invisible)', $parameter['name']);
-		}
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    public const CREATE_TAG = 'create_tag';
+    public const UPDATE_TAG = 'update_tag';
+    public const DELETE_TAG = 'delete_tag';
+
+    public const ASSIGN_TAG = 'assign_tag';
+    public const UNASSIGN_TAG = 'unassign_tag';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var string[] */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'systemtags') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('systemtags', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
+        }
+
+        if ($event->getSubject() === self::ASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                $event->setParsedSubject($this->l->t('System tag %1$s added by the system', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Added system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('Added system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Added system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [
+                        'actor' => $parsedParameters['actor'],
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            }
+        } elseif ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                $event->setParsedSubject($this->l->t('System tag %1$s removed by the system', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('Removed system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [
+                        'actor' => $parsedParameters['actor'],
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
+        }
+
+        if ($event->getSubject() === self::CREATE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You created system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters);
+            }
+        } elseif ($event->getSubject() === self::DELETE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You deleted system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters);
+            }
+        } elseif ($event->getSubject() === self::UPDATE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['newsystemtag']),
+                    $this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['newsystemtag']),
+                    $this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
+            }
+        } elseif ($event->getSubject() === self::ASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                unset($parsedParameters['actor']);
+                $event->setParsedSubject($this->l->t('System tag %2$s was added to %1$s by the system', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('System tag {systemtag} was added to {file} by the system'), $parsedParameters);
+            } elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters);
+            }
+        } elseif ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                unset($parsedParameters['actor']);
+                $event->setParsedSubject($this->l->t('System tag %2$s was removed from %1$s by the system', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('System tag {systemtag} was removed from {file} by the system'), $parsedParameters);
+            } elseif ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::CREATE_TAG:
+            case self::DELETE_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'systemtag' => $this->getSystemTagParameter($parameters[1]),
+                ];
+            case self::UPDATE_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
+                    'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
+                ];
+            case self::ASSIGN_TAG:
+            case self::UNASSIGN_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]),
+                    'systemtag' => $this->getSystemTagParameter($parameters[2]),
+                ];
+        }
+        return [];
+    }
+
+    protected function getFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+        ];
+    }
+
+    protected function getSystemTagParameter($parameter) {
+        $tagData = json_decode($parameter, true);
+        if ($tagData === null) {
+            list($name, $status) = explode('|||', substr($parameter, 3, -3));
+            $tagData = [
+                'id' => 0,// No way to recover the ID
+                'name' => $name,
+                'assignable' => $status === 'assignable',
+                'visible' => $status !== 'invisible',
+            ];
+        }
+
+        return [
+            'type' => 'systemtag',
+            'id' => (int) $tagData['id'],
+            'name' => $tagData['name'],
+            'assignable' => $tagData['assignable'] ? '1' : '0',
+            'visibility' => $tagData['visible'] ? '1' : '0',
+        ];
+    }
+
+    protected function getUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    protected function generatePlainSystemTag(array $parameter) {
+        if ($parameter['assignable'] === '1') {
+            return $parameter['name'];
+        } elseif ($parameter['visibility'] === '1') {
+            return $this->l->t('%s (restricted)', $parameter['name']);
+        } else {
+            return $this->l->t('%s (invisible)', $parameter['name']);
+        }
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

apps/systemtags/lib/Activity/Setting.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class Setting implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'systemtags';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'systemtags';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('<strong>System tags</strong> for a file have been modified');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('<strong>System tags</strong> for a file have been modified');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 50;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 50;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/systemtags/appinfo/routes.php

Indentation +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
+    ]
 ];

apps/files_sharing/lib/Activity/Settings/PublicLinks.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class PublicLinks implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'public_links';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'public_links';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 20;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 20;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/files_sharing/lib/External/Cache.php

Indentation +37 added lines, -37 removed lines

@@ -27,44 +27,44 @@
 use OCP\Federation\ICloudId;
 
 class Cache extends \OC\Files\Cache\Cache {
-	/** @var ICloudId */
-	private $cloudId;
-	private $remote;
-	private $remoteUser;
-	private $storage;
+    /** @var ICloudId */
+    private $cloudId;
+    private $remote;
+    private $remoteUser;
+    private $storage;
 
-	/**
-	 * @param \OCA\Files_Sharing\External\Storage $storage
-	 * @param ICloudId $cloudId
-	 */
-	public function __construct($storage, ICloudId $cloudId) {
-		$this->cloudId = $cloudId;
-		$this->storage = $storage;
-		list(, $remote) = explode('://', $cloudId->getRemote(), 2);
-		$this->remote = $remote;
-		$this->remoteUser = $cloudId->getUser();
-		parent::__construct($storage);
-	}
+    /**
+     * @param \OCA\Files_Sharing\External\Storage $storage
+     * @param ICloudId $cloudId
+     */
+    public function __construct($storage, ICloudId $cloudId) {
+        $this->cloudId = $cloudId;
+        $this->storage = $storage;
+        list(, $remote) = explode('://', $cloudId->getRemote(), 2);
+        $this->remote = $remote;
+        $this->remoteUser = $cloudId->getUser();
+        parent::__construct($storage);
+    }
 
-	public function get($file) {
-		$result = parent::get($file);
-		if (!$result) {
-			return false;
-		}
-		$result['displayname_owner'] = $this->cloudId->getDisplayId();
-		if (!$file || $file === '') {
-			$result['is_share_mount_point'] = true;
-			$mountPoint = rtrim($this->storage->getMountPoint());
-			$result['name'] = basename($mountPoint);
-		}
-		return $result;
-	}
+    public function get($file) {
+        $result = parent::get($file);
+        if (!$result) {
+            return false;
+        }
+        $result['displayname_owner'] = $this->cloudId->getDisplayId();
+        if (!$file || $file === '') {
+            $result['is_share_mount_point'] = true;
+            $mountPoint = rtrim($this->storage->getMountPoint());
+            $result['name'] = basename($mountPoint);
+        }
+        return $result;
+    }
 
-	public function getFolderContentsById($id) {
-		$results = parent::getFolderContentsById($id);
-		foreach ($results as &$file) {
-			$file['displayname_owner'] = $this->cloudId->getDisplayId();
-		}
-		return $results;
-	}
+    public function getFolderContentsById($id) {
+        $results = parent::getFolderContentsById($id);
+        foreach ($results as &$file) {
+            $file['displayname_owner'] = $this->cloudId->getDisplayId();
+        }
+        return $results;
+    }
 }