nextcloud / server

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

Indentation +28 added lines, -28 removed lines

@@ -38,36 +38,36 @@
  */
 class SMB_OC extends Backend {
 
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
-		$this
-			->setIdentifier('\OC\Files\Storage\SMB_OC')
-			->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
-			->setText($l->t('SMB / CIFS using OC login'))
-			->addParameters([
-				(new DefinitionParameter('host', $l->t('Host'))),
-				(new DefinitionParameter('username_as_share', $l->t('Username as share')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN),
-				(new DefinitionParameter('share', $l->t('Share')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-			])
-			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->setLegacyAuthMechanism($legacyAuth)
-			->deprecateTo($smbBackend)
-		;
-	}
+    public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
+        $this
+            ->setIdentifier('\OC\Files\Storage\SMB_OC')
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
+            ->setText($l->t('SMB / CIFS using OC login'))
+            ->addParameters([
+                (new DefinitionParameter('host', $l->t('Host'))),
+                (new DefinitionParameter('username_as_share', $l->t('Username as share')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN),
+                (new DefinitionParameter('share', $l->t('Share')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+            ])
+            ->setPriority(BackendService::PRIORITY_DEFAULT - 10)
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->setLegacyAuthMechanism($legacyAuth)
+            ->deprecateTo($smbBackend)
+        ;
+    }
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        $username_as_share = ($storage->getBackendOption('username_as_share') === true);
 
-		if ($username_as_share) {
-			$share = '/' . $storage->getBackendOption('user');
-			$storage->setBackendOption('share', $share);
-		}
-	}
+        if ($username_as_share) {
+            $share = '/' . $storage->getBackendOption('user');
+            $storage->setBackendOption('share', $share);
+        }
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
 
 		if ($username_as_share) {
-			$share = '/' . $storage->getBackendOption('user');
+			$share = '/'.$storage->getBackendOption('user');
 			$storage->setBackendOption('share', $share);
 		}
 	}

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/files_external/lib/Lib/Api.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 			'path' => $path,
 			'type' => 'dir',
 			'backend' => $mountConfig['backend'],
-			'scope' => ( $isSystemMount ? 'system' : 'personal' ),
+			'scope' => ($isSystemMount ? 'system' : 'personal'),
 			'permissions' => $permissions,
 			'id' => $mountConfig['id'],
 			'class' => $mountConfig['class']
@@ -79,7 +79,7 @@ 
 		$user = \OC::$server->getUserSession()->getUser()->getUID();
 
 		$mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
-		foreach($mounts as $mountPoint => $mount) {
+		foreach ($mounts as $mountPoint => $mount) {
 			$entries[] = self::formatMount($mountPoint, $mount);
 		}
 

Indentation +50 added lines, -50 removed lines

@@ -28,61 +28,61 @@
 
 class Api {
 
-	/**
-	 * Formats the given mount config to a mount entry.
-	 *
-	 * @param string $mountPoint mount point name, relative to the data dir
-	 * @param array $mountConfig mount config to format
-	 *
-	 * @return array entry
-	 */
-	private static function formatMount($mountPoint, $mountConfig) {
-		// strip "/$user/files" from mount point
-		$mountPoint = explode('/', trim($mountPoint, '/'), 3);
-		$mountPoint = isset($mountPoint[2]) ? $mountPoint[2] : '';
+    /**
+     * Formats the given mount config to a mount entry.
+     *
+     * @param string $mountPoint mount point name, relative to the data dir
+     * @param array $mountConfig mount config to format
+     *
+     * @return array entry
+     */
+    private static function formatMount($mountPoint, $mountConfig) {
+        // strip "/$user/files" from mount point
+        $mountPoint = explode('/', trim($mountPoint, '/'), 3);
+        $mountPoint = isset($mountPoint[2]) ? $mountPoint[2] : '';
 
-		// split path from mount point
-		$path = dirname($mountPoint);
-		if ($path === '.') {
-			$path = '';
-		}
+        // split path from mount point
+        $path = dirname($mountPoint);
+        if ($path === '.') {
+            $path = '';
+        }
 
-		$isSystemMount = !$mountConfig['personal'];
+        $isSystemMount = !$mountConfig['personal'];
 
-		$permissions = \OCP\Constants::PERMISSION_READ;
-		// personal mounts can be deleted
-		if (!$isSystemMount) {
-			$permissions |= \OCP\Constants::PERMISSION_DELETE;
-		}
+        $permissions = \OCP\Constants::PERMISSION_READ;
+        // personal mounts can be deleted
+        if (!$isSystemMount) {
+            $permissions |= \OCP\Constants::PERMISSION_DELETE;
+        }
 
-		$entry = array(
-			'name' => basename($mountPoint),
-			'path' => $path,
-			'type' => 'dir',
-			'backend' => $mountConfig['backend'],
-			'scope' => ( $isSystemMount ? 'system' : 'personal' ),
-			'permissions' => $permissions,
-			'id' => $mountConfig['id'],
-			'class' => $mountConfig['class']
-		);
-		return $entry;
-	}
+        $entry = array(
+            'name' => basename($mountPoint),
+            'path' => $path,
+            'type' => 'dir',
+            'backend' => $mountConfig['backend'],
+            'scope' => ( $isSystemMount ? 'system' : 'personal' ),
+            'permissions' => $permissions,
+            'id' => $mountConfig['id'],
+            'class' => $mountConfig['class']
+        );
+        return $entry;
+    }
 
-	/**
-	 * Returns the mount points visible for this user.
-	 *
-	 * @param array $params
-	 * @return \OC\OCS\Result share information
-	 */
-	public static function getUserMounts($params) {
-		$entries = array();
-		$user = \OC::$server->getUserSession()->getUser()->getUID();
+    /**
+     * Returns the mount points visible for this user.
+     *
+     * @param array $params
+     * @return \OC\OCS\Result share information
+     */
+    public static function getUserMounts($params) {
+        $entries = array();
+        $user = \OC::$server->getUserSession()->getUser()->getUID();
 
-		$mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
-		foreach($mounts as $mountPoint => $mount) {
-			$entries[] = self::formatMount($mountPoint, $mount);
-		}
+        $mounts = \OC_Mount_Config::getAbsoluteMountPoints($user);
+        foreach($mounts as $mountPoint => $mount) {
+            $entries[] = self::formatMount($mountPoint, $mount);
+        }
 
-		return new \OC\OCS\Result($entries);
-	}
+        return new \OC\OCS\Result($entries);
+    }
 }

apps/files_external/appinfo/routes.php

Indentation +27 added lines, -27 removed lines

@@ -30,40 +30,40 @@
  * @var $this \OCP\Route\IRouter
  **/
 \OC_Mount_Config::$app->registerRoutes(
-	$this,
-	array(
-		'resources' => array(
-			'global_storages' => array('url' => '/globalstorages'),
-			'user_storages' => array('url' => '/userstorages'),
-			'user_global_storages' => array('url' => '/userglobalstorages'),
-		),
-		'routes' => array(
-			array(
-				'name' => 'Ajax#getSshKeys',
-				'url' => '/ajax/public_key.php',
-				'verb' => 'POST',
-				'requirements' => array()
-			),
-			[
-				'name' => 'Ajax#saveGlobalCredentials',
-				'url' => '/globalcredentials',
-				'verb' => 'POST',
-			],
-		)
-	)
+    $this,
+    array(
+        'resources' => array(
+            'global_storages' => array('url' => '/globalstorages'),
+            'user_storages' => array('url' => '/userstorages'),
+            'user_global_storages' => array('url' => '/userglobalstorages'),
+        ),
+        'routes' => array(
+            array(
+                'name' => 'Ajax#getSshKeys',
+                'url' => '/ajax/public_key.php',
+                'verb' => 'POST',
+                'requirements' => array()
+            ),
+            [
+                'name' => 'Ajax#saveGlobalCredentials',
+                'url' => '/globalcredentials',
+                'verb' => 'POST',
+            ],
+        )
+    )
 );
 
 $this->create('files_external_oauth1', 'ajax/oauth1.php')
-	->actionInclude('files_external/ajax/oauth1.php');
+    ->actionInclude('files_external/ajax/oauth1.php');
 $this->create('files_external_oauth2', 'ajax/oauth2.php')
-	->actionInclude('files_external/ajax/oauth2.php');
+    ->actionInclude('files_external/ajax/oauth2.php');
 
 
 $this->create('files_external_list_applicable', '/applicable')
-	->actionInclude('files_external/ajax/applicable.php');
+    ->actionInclude('files_external/ajax/applicable.php');
 
 \OCP\API::register('get',
-		'/apps/files_external/api/v1/mounts',
-		array('\OCA\Files_External\Lib\Api', 'getUserMounts'),
-		'files_external');
+        '/apps/files_external/api/v1/mounts',
+        array('\OCA\Files_External\Lib\Api', 'getUserMounts'),
+        'files_external');
 

apps/systemtags/templates/admin.php

Indentation +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@
  */
 
 script('core', [
-	'oc-backbone-webdav',
-	'systemtags/systemtags',
-	'systemtags/systemtagmodel',
-	'systemtags/systemtagscollection',
+    'oc-backbone-webdav',
+    'systemtags/systemtags',
+    'systemtags/systemtagmodel',
+    'systemtags/systemtagscollection',
 ]);
 
 script('systemtags', 'admin');

apps/systemtags/templates/list.php

Spacing +2 added lines, -2 removed lines

@@ -18,14 +18,14 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerSize" class="hidden column-size">
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
 	</thead>

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 +307 added lines, -307 removed lines

@@ -32,311 +32,311 @@
 
 class Provider implements IProvider {
 
-	const CREATE_TAG = 'create_tag';
-	const UPDATE_TAG = 'update_tag';
-	const DELETE_TAG = 'delete_tag';
-
-	const ASSIGN_TAG = 'assign_tag';
-	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'] === $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'],
-					]);
-			}
-		} else if ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($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);
-			}
-		} else if ($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);
-			}
-		} else if ($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);
-			}
-		} else if ($event->getSubject() === self::ASSIGN_TAG) {
-			if ($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);
-			}
-		} else if ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($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($parameters[0]),
-					'systemtag' => $this->getSystemTagParameter($parameters[1]),
-				];
-			case self::UPDATE_TAG:
-				return [
-					'actor' => $this->getUserParameter($parameters[0]),
-					'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
-					'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
-				];
-			case self::ASSIGN_TAG:
-			case self::UNASSIGN_TAG:
-				return [
-					'actor' => $this->getUserParameter($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'];
-		} else if ($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;
-		}
-	}
+    const CREATE_TAG = 'create_tag';
+    const UPDATE_TAG = 'update_tag';
+    const DELETE_TAG = 'delete_tag';
+
+    const ASSIGN_TAG = 'assign_tag';
+    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'] === $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'],
+                    ]);
+            }
+        } else if ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($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);
+            }
+        } else if ($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);
+            }
+        } else if ($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);
+            }
+        } else if ($event->getSubject() === self::ASSIGN_TAG) {
+            if ($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);
+            }
+        } else if ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($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($parameters[0]),
+                    'systemtag' => $this->getSystemTagParameter($parameters[1]),
+                ];
+            case self::UPDATE_TAG:
+                return [
+                    'actor' => $this->getUserParameter($parameters[0]),
+                    'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
+                    'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
+                ];
+            case self::ASSIGN_TAG:
+            case self::UNASSIGN_TAG:
+                return [
+                    'actor' => $this->getUserParameter($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'];
+        } else if ($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;
+    }
 }