nextcloud / server

lib/private/Files/Cache/Wrapper/CacheJail.php

Indentation +262 added lines, -262 removed lines

@@ -34,294 +34,294 @@
  * Jail to a subdirectory of the wrapped cache
  */
 class CacheJail extends CacheWrapper {
-	/**
-	 * @var string
-	 */
-	protected $root;
+    /**
+     * @var string
+     */
+    protected $root;
 
-	/**
-	 * @param \OCP\Files\Cache\ICache $cache
-	 * @param string $root
-	 */
-	public function __construct($cache, $root) {
-		parent::__construct($cache);
-		$this->root = $root;
-	}
+    /**
+     * @param \OCP\Files\Cache\ICache $cache
+     * @param string $root
+     */
+    public function __construct($cache, $root) {
+        parent::__construct($cache);
+        $this->root = $root;
+    }
 
-	protected function getSourcePath($path) {
-		if ($path === '') {
-			return $this->root;
-		} else {
-			return $this->root . '/' . ltrim($path, '/');
-		}
-	}
+    protected function getSourcePath($path) {
+        if ($path === '') {
+            return $this->root;
+        } else {
+            return $this->root . '/' . ltrim($path, '/');
+        }
+    }
 
-	/**
-	 * @param string $path
-	 * @return null|string the jailed path or null if the path is outside the jail
-	 */
-	protected function getJailedPath($path) {
-		if ($this->root === '') {
-			return $path;
-		}
-		$rootLength = strlen($this->root) + 1;
-		if ($path === $this->root) {
-			return '';
-		} else if (substr($path, 0, $rootLength) === $this->root . '/') {
-			return substr($path, $rootLength);
-		} else {
-			return null;
-		}
-	}
+    /**
+     * @param string $path
+     * @return null|string the jailed path or null if the path is outside the jail
+     */
+    protected function getJailedPath($path) {
+        if ($this->root === '') {
+            return $path;
+        }
+        $rootLength = strlen($this->root) + 1;
+        if ($path === $this->root) {
+            return '';
+        } else if (substr($path, 0, $rootLength) === $this->root . '/') {
+            return substr($path, $rootLength);
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * @param ICacheEntry|array $entry
-	 * @return array
-	 */
-	protected function formatCacheEntry($entry) {
-		if (isset($entry['path'])) {
-			$entry['path'] = $this->getJailedPath($entry['path']);
-		}
-		return $entry;
-	}
+    /**
+     * @param ICacheEntry|array $entry
+     * @return array
+     */
+    protected function formatCacheEntry($entry) {
+        if (isset($entry['path'])) {
+            $entry['path'] = $this->getJailedPath($entry['path']);
+        }
+        return $entry;
+    }
 
-	protected function filterCacheEntry($entry) {
-		$rootLength = strlen($this->root) + 1;
-		return ($entry['path'] === $this->root) or (substr($entry['path'], 0, $rootLength) === $this->root . '/');
-	}
+    protected function filterCacheEntry($entry) {
+        $rootLength = strlen($this->root) + 1;
+        return ($entry['path'] === $this->root) or (substr($entry['path'], 0, $rootLength) === $this->root . '/');
+    }
 
-	/**
-	 * get the stored metadata of a file or folder
-	 *
-	 * @param string /int $file
-	 * @return ICacheEntry|false
-	 */
-	public function get($file) {
-		if (is_string($file) or $file == '') {
-			$file = $this->getSourcePath($file);
-		}
-		return parent::get($file);
-	}
+    /**
+     * get the stored metadata of a file or folder
+     *
+     * @param string /int $file
+     * @return ICacheEntry|false
+     */
+    public function get($file) {
+        if (is_string($file) or $file == '') {
+            $file = $this->getSourcePath($file);
+        }
+        return parent::get($file);
+    }
 
-	/**
-	 * insert meta data for a new file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	public function insert($file, array $data) {
-		return $this->getCache()->insert($this->getSourcePath($file), $data);
-	}
+    /**
+     * insert meta data for a new file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    public function insert($file, array $data) {
+        return $this->getCache()->insert($this->getSourcePath($file), $data);
+    }
 
-	/**
-	 * update the metadata in the cache
-	 *
-	 * @param int $id
-	 * @param array $data
-	 */
-	public function update($id, array $data) {
-		$this->getCache()->update($id, $data);
-	}
+    /**
+     * update the metadata in the cache
+     *
+     * @param int $id
+     * @param array $data
+     */
+    public function update($id, array $data) {
+        $this->getCache()->update($id, $data);
+    }
 
-	/**
-	 * get the file id for a file
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getId($file) {
-		return $this->getCache()->getId($this->getSourcePath($file));
-	}
+    /**
+     * get the file id for a file
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getId($file) {
+        return $this->getCache()->getId($this->getSourcePath($file));
+    }
 
-	/**
-	 * get the id of the parent folder of a file
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getParentId($file) {
-		return $this->getCache()->getParentId($this->getSourcePath($file));
-	}
+    /**
+     * get the id of the parent folder of a file
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getParentId($file) {
+        return $this->getCache()->getParentId($this->getSourcePath($file));
+    }
 
-	/**
-	 * check if a file is available in the cache
-	 *
-	 * @param string $file
-	 * @return bool
-	 */
-	public function inCache($file) {
-		return $this->getCache()->inCache($this->getSourcePath($file));
-	}
+    /**
+     * check if a file is available in the cache
+     *
+     * @param string $file
+     * @return bool
+     */
+    public function inCache($file) {
+        return $this->getCache()->inCache($this->getSourcePath($file));
+    }
 
-	/**
-	 * remove a file or folder from the cache
-	 *
-	 * @param string $file
-	 */
-	public function remove($file) {
-		$this->getCache()->remove($this->getSourcePath($file));
-	}
+    /**
+     * remove a file or folder from the cache
+     *
+     * @param string $file
+     */
+    public function remove($file) {
+        $this->getCache()->remove($this->getSourcePath($file));
+    }
 
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * @param string $source
-	 * @param string $target
-	 */
-	public function move($source, $target) {
-		$this->getCache()->move($this->getSourcePath($source), $this->getSourcePath($target));
-	}
+    /**
+     * Move a file or folder in the cache
+     *
+     * @param string $source
+     * @param string $target
+     */
+    public function move($source, $target) {
+        $this->getCache()->move($this->getSourcePath($source), $this->getSourcePath($target));
+    }
 
-	/**
-	 * Get the storage id and path needed for a move
-	 *
-	 * @param string $path
-	 * @return array [$storageId, $internalPath]
-	 */
-	protected function getMoveInfo($path) {
-		return [$this->getNumericStorageId(), $this->getSourcePath($path)];
-	}
+    /**
+     * Get the storage id and path needed for a move
+     *
+     * @param string $path
+     * @return array [$storageId, $internalPath]
+     */
+    protected function getMoveInfo($path) {
+        return [$this->getNumericStorageId(), $this->getSourcePath($path)];
+    }
 
-	/**
-	 * remove all entries for files that are stored on the storage from the cache
-	 */
-	public function clear() {
-		$this->getCache()->remove($this->root);
-	}
+    /**
+     * remove all entries for files that are stored on the storage from the cache
+     */
+    public function clear() {
+        $this->getCache()->remove($this->root);
+    }
 
-	/**
-	 * @param string $file
-	 *
-	 * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
-	 */
-	public function getStatus($file) {
-		return $this->getCache()->getStatus($this->getSourcePath($file));
-	}
+    /**
+     * @param string $file
+     *
+     * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
+     */
+    public function getStatus($file) {
+        return $this->getCache()->getStatus($this->getSourcePath($file));
+    }
 
-	private function formatSearchResults($results) {
-		$results = array_filter($results, array($this, 'filterCacheEntry'));
-		$results = array_values($results);
-		return array_map(array($this, 'formatCacheEntry'), $results);
-	}
+    private function formatSearchResults($results) {
+        $results = array_filter($results, array($this, 'filterCacheEntry'));
+        $results = array_values($results);
+        return array_map(array($this, 'formatCacheEntry'), $results);
+    }
 
-	/**
-	 * search for files matching $pattern
-	 *
-	 * @param string $pattern
-	 * @return array an array of file data
-	 */
-	public function search($pattern) {
-		$results = $this->getCache()->search($pattern);
-		return $this->formatSearchResults($results);
-	}
+    /**
+     * search for files matching $pattern
+     *
+     * @param string $pattern
+     * @return array an array of file data
+     */
+    public function search($pattern) {
+        $results = $this->getCache()->search($pattern);
+        return $this->formatSearchResults($results);
+    }
 
-	/**
-	 * search for files by mimetype
-	 *
-	 * @param string $mimetype
-	 * @return array
-	 */
-	public function searchByMime($mimetype) {
-		$results = $this->getCache()->searchByMime($mimetype);
-		return $this->formatSearchResults($results);
-	}
+    /**
+     * search for files by mimetype
+     *
+     * @param string $mimetype
+     * @return array
+     */
+    public function searchByMime($mimetype) {
+        $results = $this->getCache()->searchByMime($mimetype);
+        return $this->formatSearchResults($results);
+    }
 
-	public function searchQuery(ISearchQuery $query) {
-		$results = $this->getCache()->searchQuery($query);
-		return $this->formatSearchResults($results);
-	}
+    public function searchQuery(ISearchQuery $query) {
+        $results = $this->getCache()->searchQuery($query);
+        return $this->formatSearchResults($results);
+    }
 
-	/**
-	 * search for files by mimetype
-	 *
-	 * @param string|int $tag name or tag id
-	 * @param string $userId owner of the tags
-	 * @return array
-	 */
-	public function searchByTag($tag, $userId) {
-		$results = $this->getCache()->searchByTag($tag, $userId);
-		return $this->formatSearchResults($results);
-	}
+    /**
+     * search for files by mimetype
+     *
+     * @param string|int $tag name or tag id
+     * @param string $userId owner of the tags
+     * @return array
+     */
+    public function searchByTag($tag, $userId) {
+        $results = $this->getCache()->searchByTag($tag, $userId);
+        return $this->formatSearchResults($results);
+    }
 
-	/**
-	 * update the folder size and the size of all parent folders
-	 *
-	 * @param string|boolean $path
-	 * @param array $data (optional) meta data of the folder
-	 */
-	public function correctFolderSize($path, $data = null) {
-		if ($this->getCache() instanceof Cache) {
-			$this->getCache()->correctFolderSize($this->getSourcePath($path), $data);
-		}
-	}
+    /**
+     * update the folder size and the size of all parent folders
+     *
+     * @param string|boolean $path
+     * @param array $data (optional) meta data of the folder
+     */
+    public function correctFolderSize($path, $data = null) {
+        if ($this->getCache() instanceof Cache) {
+            $this->getCache()->correctFolderSize($this->getSourcePath($path), $data);
+        }
+    }
 
-	/**
-	 * get the size of a folder and set it in the cache
-	 *
-	 * @param string $path
-	 * @param array $entry (optional) meta data of the folder
-	 * @return int
-	 */
-	public function calculateFolderSize($path, $entry = null) {
-		if ($this->getCache() instanceof Cache) {
-			return $this->getCache()->calculateFolderSize($this->getSourcePath($path), $entry);
-		} else {
-			return 0;
-		}
+    /**
+     * get the size of a folder and set it in the cache
+     *
+     * @param string $path
+     * @param array $entry (optional) meta data of the folder
+     * @return int
+     */
+    public function calculateFolderSize($path, $entry = null) {
+        if ($this->getCache() instanceof Cache) {
+            return $this->getCache()->calculateFolderSize($this->getSourcePath($path), $entry);
+        } else {
+            return 0;
+        }
 
-	}
+    }
 
-	/**
-	 * get all file ids on the files on the storage
-	 *
-	 * @return int[]
-	 */
-	public function getAll() {
-		// not supported
-		return array();
-	}
+    /**
+     * get all file ids on the files on the storage
+     *
+     * @return int[]
+     */
+    public function getAll() {
+        // not supported
+        return array();
+    }
 
-	/**
-	 * find a folder in the cache which has not been fully scanned
-	 *
-	 * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
-	 * use the one with the highest id gives the best result with the background scanner, since that is most
-	 * likely the folder where we stopped scanning previously
-	 *
-	 * @return string|bool the path of the folder or false when no folder matched
-	 */
-	public function getIncomplete() {
-		// not supported
-		return false;
-	}
+    /**
+     * find a folder in the cache which has not been fully scanned
+     *
+     * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
+     * use the one with the highest id gives the best result with the background scanner, since that is most
+     * likely the folder where we stopped scanning previously
+     *
+     * @return string|bool the path of the folder or false when no folder matched
+     */
+    public function getIncomplete() {
+        // not supported
+        return false;
+    }
 
-	/**
-	 * get the path of a file on this storage by it's id
-	 *
-	 * @param int $id
-	 * @return string|null
-	 */
-	public function getPathById($id) {
-		$path = $this->getCache()->getPathById($id);
-		return $this->getJailedPath($path);
-	}
+    /**
+     * get the path of a file on this storage by it's id
+     *
+     * @param int $id
+     * @return string|null
+     */
+    public function getPathById($id) {
+        $path = $this->getCache()->getPathById($id);
+        return $this->getJailedPath($path);
+    }
 
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * Note that this should make sure the entries are removed from the source cache
-	 *
-	 * @param \OCP\Files\Cache\ICache $sourceCache
-	 * @param string $sourcePath
-	 * @param string $targetPath
-	 */
-	public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
-		if ($sourceCache === $this) {
-			return $this->move($sourcePath, $targetPath);
-		}
-		return $this->getCache()->moveFromCache($sourceCache, $sourcePath, $this->getSourcePath($targetPath));
-	}
+    /**
+     * Move a file or folder in the cache
+     *
+     * Note that this should make sure the entries are removed from the source cache
+     *
+     * @param \OCP\Files\Cache\ICache $sourceCache
+     * @param string $sourcePath
+     * @param string $targetPath
+     */
+    public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
+        if ($sourceCache === $this) {
+            return $this->move($sourcePath, $targetPath);
+        }
+        return $this->getCache()->moveFromCache($sourceCache, $sourcePath, $this->getSourcePath($targetPath));
+    }
 }

apps/sharebymail/lib/Activity.php

Indentation +300 added lines, -300 removed lines

@@ -33,304 +33,304 @@
 
 class Activity implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IContactsManager */
-	protected $contactsManager;
-
-	/** @var array */
-	protected $displayNames = [];
-
-	/** @var array */
-	protected $contactNames = [];
-
-	const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
-	const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
-	const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send';
-	const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self';
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IContactsManager $contactsManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->contactsManager = $contactsManager;
-	}
-
-	/**
-	 * @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() !== 'sharebymail') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('sharebymail', $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->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('Shared with %1$s', [
-					$parsedParameters['email']['name'],
-				]))
-				->setRichSubject($this->l->t('Shared with {email}'), [
-					'email' => $parsedParameters['email'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
-					'email' => $parsedParameters['email'],
-					'actor' => $parsedParameters['actor'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
-			$event->setParsedSubject($this->l->t('Password for mail share sent to %1$s', [
-				$parsedParameters['email']['name']
-			]))
-				->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
-					'email' => $parsedParameters['email']
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
-			$event->setParsedSubject($this->l->t('Password for mail share sent to you'))
-				->setRichSubject($this->l->t('Password for mail share sent to you'));
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
-					$parsedParameters['file']['path'],
-					$parsedParameters['email']['name'],
-				]))
-				->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
-			$event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name']
-			]))
-				->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
-			$event->setParsedSubject(
-				$this->l->t('Password to access %1$s was sent to you',
-					[$parsedParameters['file']['path']]))
-				->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_SHARED_EMAIL_SELF:
-				return [
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_BY:
-				return [
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND:
-				return [
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF:
-				return [
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
-				];
-		}
-		throw new \InvalidArgumentException();
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $path
-	 * @return array
-	 */
-	protected function generateFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $email
-	 * @return array
-	 */
-	protected function generateEmailParameter($email) {
-		if (!isset($this->contactNames[$email])) {
-			$this->contactNames[$email] = $this->getContactName($email);
-		}
-
-		return [
-			'type' => 'email',
-			'id' => $email,
-			'name' => $this->contactNames[$email],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $email
-	 * @return string
-	 */
-	protected function getContactName($email) {
-		$addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
-
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-
-			if (in_array($email, $contact['EMAIL'])) {
-				return $contact['FN'];
-			}
-		}
-
-		return $email;
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IContactsManager */
+    protected $contactsManager;
+
+    /** @var array */
+    protected $displayNames = [];
+
+    /** @var array */
+    protected $contactNames = [];
+
+    const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
+    const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
+    const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send';
+    const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self';
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IContactsManager $contactsManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->contactsManager = $contactsManager;
+    }
+
+    /**
+     * @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() !== 'sharebymail') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('sharebymail', $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->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('Shared with %1$s', [
+                    $parsedParameters['email']['name'],
+                ]))
+                ->setRichSubject($this->l->t('Shared with {email}'), [
+                    'email' => $parsedParameters['email'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
+                    'email' => $parsedParameters['email'],
+                    'actor' => $parsedParameters['actor'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
+            $event->setParsedSubject($this->l->t('Password for mail share sent to %1$s', [
+                $parsedParameters['email']['name']
+            ]))
+                ->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
+                    'email' => $parsedParameters['email']
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
+            $event->setParsedSubject($this->l->t('Password for mail share sent to you'))
+                ->setRichSubject($this->l->t('Password for mail share sent to you'));
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
+                    $parsedParameters['file']['path'],
+                    $parsedParameters['email']['name'],
+                ]))
+                ->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
+            $event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name']
+            ]))
+                ->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
+            $event->setParsedSubject(
+                $this->l->t('Password to access %1$s was sent to you',
+                    [$parsedParameters['file']['path']]))
+                ->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_SHARED_EMAIL_SELF:
+                return [
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_BY:
+                return [
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND:
+                return [
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF:
+                return [
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
+                ];
+        }
+        throw new \InvalidArgumentException();
+    }
+
+    /**
+     * @param int $id
+     * @param string $path
+     * @return array
+     */
+    protected function generateFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $email
+     * @return array
+     */
+    protected function generateEmailParameter($email) {
+        if (!isset($this->contactNames[$email])) {
+            $this->contactNames[$email] = $this->getContactName($email);
+        }
+
+        return [
+            'type' => 'email',
+            'id' => $email,
+            'name' => $this->contactNames[$email],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $email
+     * @return string
+     */
+    protected function getContactName($email) {
+        $addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
+
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+
+            if (in_array($email, $contact['EMAIL'])) {
+                return $contact['FN'];
+            }
+        }
+
+        return $email;
+    }
+
+    /**
+     * @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/comments/lib/Activity/Provider.php

Indentation +209 added lines, -209 removed lines

@@ -34,213 +34,213 @@
 
 class Provider implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var ICommentsManager */
-	protected $commentsManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var string[] */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param ICommentsManager $commentsManager
-	 * @param IUserManager $userManager
-	 * @param IManager $activityManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, ICommentsManager $commentsManager, IUserManager $userManager, IManager $activityManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->commentsManager = $commentsManager;
-		$this->userManager = $userManager;
-		$this->activityManager = $activityManager;
-	}
-
-	/**
-	 * @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() !== 'comments') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('comments', $language);
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			$this->parseMessage($event);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
-			}
-
-			if ($this->activityManager->isFormattingFilteredObject()) {
-				try {
-					return $this->parseShortVersion($event);
-				} catch (\InvalidArgumentException $e) {
-					// Ignore and simply use the long version...
-				}
-			}
-
-			return $this->parseLongVersion($event);
-		} else {
-			throw new \InvalidArgumentException();
-		}
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 */
-	protected function parseShortVersion(IEvent $event) {
-		$subjectParameters = $event->getSubjectParameters();
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			if ($subjectParameters[0] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You commented'))
-					->setRichSubject($this->l->t('You commented'), []);
-			} else {
-				$author = $this->generateUserParameter($subjectParameters[0]);
-				$event->setParsedSubject($this->l->t('%1$s commented', [$author['name']]))
-					->setRichSubject($this->l->t('{author} commented'), [
-						'author' => $author,
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 */
-	protected function parseLongVersion(IEvent $event) {
-		$subjectParameters = $event->getSubjectParameters();
-
-		if ($event->getSubject() === 'add_comment_subject') {
-			if ($subjectParameters[0] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You commented on %1$s', [
-						trim($subjectParameters[1], '/'),
-					]))
-					->setRichSubject($this->l->t('You commented on {file}'), [
-						'file' => $this->generateFileParameter($event->getObjectId(), $subjectParameters[1]),
-					]);
-			} else {
-				$author = $this->generateUserParameter($subjectParameters[0]);
-				$event->setParsedSubject($this->l->t('%1$s commented on %2$s', [
-						$author['name'],
-						trim($subjectParameters[1], '/'),
-					]))
-					->setRichSubject($this->l->t('{author} commented on {file}'), [
-						'author' => $author,
-						'file' => $this->generateFileParameter($event->getObjectId(), $subjectParameters[1]),
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 */
-	protected function parseMessage(IEvent $event) {
-		$messageParameters = $event->getMessageParameters();
-		try {
-			$comment = $this->commentsManager->get((int) $messageParameters[0]);
-			$message = $comment->getMessage();
-			$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
-
-			$mentionCount = 1;
-			$mentions = [];
-			foreach ($comment->getMentions() as $mention) {
-				if ($mention['type'] !== 'user') {
-					continue;
-				}
-
-				$message = preg_replace(
-					'/(^|\s)(' . '@' . $mention['id'] . ')(\b)/',
-					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
-					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
-					$message
-				);
-				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
-				$mentionCount++;
-			}
-
-			$event->setParsedMessage($comment->getMessage())
-				->setRichMessage($message, $mentions);
-		} catch (NotFoundException $e) {
-		}
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $path
-	 * @return array
-	 */
-	protected function generateFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var ICommentsManager */
+    protected $commentsManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var string[] */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param ICommentsManager $commentsManager
+     * @param IUserManager $userManager
+     * @param IManager $activityManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, ICommentsManager $commentsManager, IUserManager $userManager, IManager $activityManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->commentsManager = $commentsManager;
+        $this->userManager = $userManager;
+        $this->activityManager = $activityManager;
+    }
+
+    /**
+     * @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() !== 'comments') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('comments', $language);
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            $this->parseMessage($event);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
+            }
+
+            if ($this->activityManager->isFormattingFilteredObject()) {
+                try {
+                    return $this->parseShortVersion($event);
+                } catch (\InvalidArgumentException $e) {
+                    // Ignore and simply use the long version...
+                }
+            }
+
+            return $this->parseLongVersion($event);
+        } else {
+            throw new \InvalidArgumentException();
+        }
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     */
+    protected function parseShortVersion(IEvent $event) {
+        $subjectParameters = $event->getSubjectParameters();
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            if ($subjectParameters[0] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You commented'))
+                    ->setRichSubject($this->l->t('You commented'), []);
+            } else {
+                $author = $this->generateUserParameter($subjectParameters[0]);
+                $event->setParsedSubject($this->l->t('%1$s commented', [$author['name']]))
+                    ->setRichSubject($this->l->t('{author} commented'), [
+                        'author' => $author,
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     */
+    protected function parseLongVersion(IEvent $event) {
+        $subjectParameters = $event->getSubjectParameters();
+
+        if ($event->getSubject() === 'add_comment_subject') {
+            if ($subjectParameters[0] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You commented on %1$s', [
+                        trim($subjectParameters[1], '/'),
+                    ]))
+                    ->setRichSubject($this->l->t('You commented on {file}'), [
+                        'file' => $this->generateFileParameter($event->getObjectId(), $subjectParameters[1]),
+                    ]);
+            } else {
+                $author = $this->generateUserParameter($subjectParameters[0]);
+                $event->setParsedSubject($this->l->t('%1$s commented on %2$s', [
+                        $author['name'],
+                        trim($subjectParameters[1], '/'),
+                    ]))
+                    ->setRichSubject($this->l->t('{author} commented on {file}'), [
+                        'author' => $author,
+                        'file' => $this->generateFileParameter($event->getObjectId(), $subjectParameters[1]),
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     */
+    protected function parseMessage(IEvent $event) {
+        $messageParameters = $event->getMessageParameters();
+        try {
+            $comment = $this->commentsManager->get((int) $messageParameters[0]);
+            $message = $comment->getMessage();
+            $message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
+
+            $mentionCount = 1;
+            $mentions = [];
+            foreach ($comment->getMentions() as $mention) {
+                if ($mention['type'] !== 'user') {
+                    continue;
+                }
+
+                $message = preg_replace(
+                    '/(^|\s)(' . '@' . $mention['id'] . ')(\b)/',
+                    //'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
+                    '${1}' . '{mention' . $mentionCount . '}' . '${3}',
+                    $message
+                );
+                $mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
+                $mentionCount++;
+            }
+
+            $event->setParsedMessage($comment->getMessage())
+                ->setRichMessage($message, $mentions);
+        } catch (NotFoundException $e) {
+        }
+    }
+
+    /**
+     * @param int $id
+     * @param string $path
+     * @return array
+     */
+    protected function generateFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @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/twofactor_backupcodes/lib/Activity/Provider.php

Indentation +35 added lines, -35 removed lines

@@ -31,47 +31,47 @@
 
 class Provider implements IProvider {
 
-	/** @var L10nFactory */
-	private $l10n;
+    /** @var L10nFactory */
+    private $l10n;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var IManager */
-	private $activityManager;
+    /** @var IManager */
+    private $activityManager;
 
-	/**
-	 * @param L10nFactory $l10n
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $activityManager
-	 */
-	public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, IManager $activityManager) {
-		$this->urlGenerator = $urlGenerator;
-		$this->activityManager = $activityManager;
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param L10nFactory $l10n
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $activityManager
+     */
+    public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, IManager $activityManager) {
+        $this->urlGenerator = $urlGenerator;
+        $this->activityManager = $activityManager;
+        $this->l10n = $l10n;
+    }
 
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'twofactor_backupcodes') {
-			throw new InvalidArgumentException();
-		}
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'twofactor_backupcodes') {
+            throw new InvalidArgumentException();
+        }
 
-		$l = $this->l10n->get('twofactor_backupcodes', $language);
+        $l = $this->l10n->get('twofactor_backupcodes', $language);
 
-		switch ($event->getSubject()) {
-			case 'codes_generated':
-				$event->setParsedSubject($l->t('You created two-factor backup codes for your account'));
+        switch ($event->getSubject()) {
+            case 'codes_generated':
+                $event->setParsedSubject($l->t('You created two-factor backup codes for your account'));
 
-				if ($this->activityManager->getRequirePNG()) {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.png')));
-				} else {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
-				}
-				break;
-			default:
-				throw new InvalidArgumentException();
-		}
-		return $event;
-	}
+                if ($this->activityManager->getRequirePNG()) {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.png')));
+                } else {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
+                }
+                break;
+            default:
+                throw new InvalidArgumentException();
+        }
+        return $event;
+    }
 
 }

apps/systemtags/lib/Activity/Provider.php

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/files_sharing/lib/Activity/Providers/Groups.php

Indentation +86 added lines, -86 removed lines

@@ -25,100 +25,100 @@
 
 class Groups extends Base {
 
-	const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
-	const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
-	const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self';
-	const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by';
+    const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
+    const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
+    const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self';
+    const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by';
 
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
 
-		if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
-			$subject = $this->l->t('Shared with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
-			$subject = $this->l->t('Removed share for group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
-			$subject = $this->l->t('{actor} shared with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
-			$subject = $this->l->t('{actor} removed share for group {group}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
+            $subject = $this->l->t('Shared with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
+            $subject = $this->l->t('Removed share for group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
+            $subject = $this->l->t('{actor} shared with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
+            $subject = $this->l->t('{actor} removed share for group {group}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
 
-		if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
-			$subject = $this->l->t('You shared {file} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
-			$subject = $this->l->t('You removed group {group} from {file}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
-			$subject = $this->l->t('{actor} shared {file} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
-			$subject = $this->l->t('{actor} removed group {group} from {file}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
+            $subject = $this->l->t('You shared {file} with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
+            $subject = $this->l->t('You removed group {group} from {file}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
+            $subject = $this->l->t('{actor} shared {file} with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
+            $subject = $this->l->t('{actor} removed group {group} from {file}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
 
-		return $event;
-	}
+        return $event;
+    }
 
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
 
-		switch ($subject) {
-			case self::SUBJECT_RESHARED_GROUP_BY:
-			case self::SUBJECT_UNSHARED_GROUP_BY:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'group' => [
-						'type' => 'group',
-						'id' => $parameters[2],
-						'name' => $parameters[2],
-					],
-					'actor' => $this->getUser($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_GROUP_SELF:
-			case self::SUBJECT_UNSHARED_GROUP_SELF:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'group' => [
-						'type' => 'group',
-						'id' => $parameters[1],
-						'name' => $parameters[1],
-					],
-				];
-		}
-		return [];
-	}
+        switch ($subject) {
+            case self::SUBJECT_RESHARED_GROUP_BY:
+            case self::SUBJECT_UNSHARED_GROUP_BY:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'group' => [
+                        'type' => 'group',
+                        'id' => $parameters[2],
+                        'name' => $parameters[2],
+                    ],
+                    'actor' => $this->getUser($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_GROUP_SELF:
+            case self::SUBJECT_UNSHARED_GROUP_SELF:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'group' => [
+                        'type' => 'group',
+                        'id' => $parameters[1],
+                        'name' => $parameters[1],
+                    ],
+                ];
+        }
+        return [];
+    }
 }

apps/files_sharing/lib/Activity/Providers/Users.php

Indentation +107 added lines, -107 removed lines

@@ -26,111 +26,111 @@
 class Users extends Base {
 
 
-	const SUBJECT_SHARED_USER_SELF = 'shared_user_self';
-	const SUBJECT_RESHARED_USER_BY = 'reshared_user_by';
-	const SUBJECT_UNSHARED_USER_SELF = 'unshared_user_self';
-	const SUBJECT_UNSHARED_USER_BY = 'unshared_user_by';
-
-	const SUBJECT_SHARED_WITH_BY = 'shared_with_by';
-	const SUBJECT_UNSHARED_BY = 'unshared_by';
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
-			$subject = $this->l->t('Shared with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
-			$subject = $this->l->t('Removed share for {user}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
-			$subject = $this->l->t('{actor} shared with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
-			$subject = $this->l->t('{actor} removed share for {user}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
-			$subject = $this->l->t('Shared by {actor}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
-			$subject = $this->l->t('{actor} removed share');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
-			$subject = $this->l->t('You shared {file} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
-			$subject = $this->l->t('You removed {user} from {file}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
-			$subject = $this->l->t('{actor} shared {file} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
-			$subject = $this->l->t('{actor} removed {user} from {file}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
-			$subject = $this->l->t('{actor} shared {file} with you');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
-			$subject = $this->l->t('{actor} removed you from {file}');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_SHARED_USER_SELF:
-			case self::SUBJECT_UNSHARED_USER_SELF:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'user' => $this->getUser($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_WITH_BY:
-			case self::SUBJECT_UNSHARED_BY:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'actor' => $this->getUser($parameters[1]),
-				];
-			case self::SUBJECT_RESHARED_USER_BY:
-			case self::SUBJECT_UNSHARED_USER_BY:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'user' => $this->getUser($parameters[2]),
-					'actor' => $this->getUser($parameters[1]),
-				];
-		}
-		return [];
-	}
+    const SUBJECT_SHARED_USER_SELF = 'shared_user_self';
+    const SUBJECT_RESHARED_USER_BY = 'reshared_user_by';
+    const SUBJECT_UNSHARED_USER_SELF = 'unshared_user_self';
+    const SUBJECT_UNSHARED_USER_BY = 'unshared_user_by';
+
+    const SUBJECT_SHARED_WITH_BY = 'shared_with_by';
+    const SUBJECT_UNSHARED_BY = 'unshared_by';
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
+            $subject = $this->l->t('Shared with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
+            $subject = $this->l->t('Removed share for {user}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
+            $subject = $this->l->t('{actor} shared with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
+            $subject = $this->l->t('{actor} removed share for {user}');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
+            $subject = $this->l->t('Shared by {actor}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
+            $subject = $this->l->t('{actor} removed share');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_USER_SELF) {
+            $subject = $this->l->t('You shared {file} with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
+            $subject = $this->l->t('You removed {user} from {file}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
+            $subject = $this->l->t('{actor} shared {file} with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
+            $subject = $this->l->t('{actor} removed {user} from {file}');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_WITH_BY) {
+            $subject = $this->l->t('{actor} shared {file} with you');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
+            $subject = $this->l->t('{actor} removed you from {file}');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_SHARED_USER_SELF:
+            case self::SUBJECT_UNSHARED_USER_SELF:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'user' => $this->getUser($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_WITH_BY:
+            case self::SUBJECT_UNSHARED_BY:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'actor' => $this->getUser($parameters[1]),
+                ];
+            case self::SUBJECT_RESHARED_USER_BY:
+            case self::SUBJECT_UNSHARED_USER_BY:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'user' => $this->getUser($parameters[2]),
+                    'actor' => $this->getUser($parameters[1]),
+                ];
+        }
+        return [];
+    }
 }

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

Indentation +100 added lines, -100 removed lines

@@ -25,105 +25,105 @@
 
 class PublicLinks extends Base {
 
-	const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
-	const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
-	const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
-	const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
-	const SUBJECT_LINK_EXPIRED = 'link_expired';
-	const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
-			$subject = $this->l->t('Shared as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
-			$subject = $this->l->t('Removed public link');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
-			$subject = $this->l->t('Public link expired');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} shared as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} removed public link');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
-			$subject = $this->l->t('Public link of {actor} expired');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
-			$subject = $this->l->t('You shared {file} as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
-			$subject = $this->l->t('You removed public link for {file}');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
-			$subject = $this->l->t('Public link expired for {file}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} shared {file} as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} removed public link for {file}');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
-			$subject = $this->l->t('Public link of {actor} for {file} expired');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_SHARED_LINK_SELF:
-			case self::SUBJECT_UNSHARED_LINK_SELF:
-			case self::SUBJECT_LINK_EXPIRED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-				];
-			case self::SUBJECT_RESHARED_LINK_BY:
-			case self::SUBJECT_UNSHARED_LINK_BY:
-			case self::SUBJECT_LINK_BY_EXPIRED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'actor' => $this->getUser($parameters[1]),
-				];
-		}
-		return [];
-	}
+    const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
+    const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
+    const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
+    const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
+    const SUBJECT_LINK_EXPIRED = 'link_expired';
+    const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
+            $subject = $this->l->t('Shared as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
+            $subject = $this->l->t('Removed public link');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
+            $subject = $this->l->t('Public link expired');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} shared as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} removed public link');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
+            $subject = $this->l->t('Public link of {actor} expired');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
+            $subject = $this->l->t('You shared {file} as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
+            $subject = $this->l->t('You removed public link for {file}');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
+            $subject = $this->l->t('Public link expired for {file}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} shared {file} as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} removed public link for {file}');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
+            $subject = $this->l->t('Public link of {actor} for {file} expired');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_SHARED_LINK_SELF:
+            case self::SUBJECT_UNSHARED_LINK_SELF:
+            case self::SUBJECT_LINK_EXPIRED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                ];
+            case self::SUBJECT_RESHARED_LINK_BY:
+            case self::SUBJECT_UNSHARED_LINK_BY:
+            case self::SUBJECT_LINK_BY_EXPIRED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'actor' => $this->getUser($parameters[1]),
+                ];
+        }
+        return [];
+    }
 
 }

apps/files_sharing/lib/Activity/Providers/Downloads.php

Indentation +93 added lines, -93 removed lines

@@ -26,97 +26,97 @@
 class Downloads extends Base {
 
 
-	const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded';
-	const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded';
-
-	const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded';
-	const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded';
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
-			$subject = $this->l->t('Downloaded via public link');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
-			$subject = $this->l->t('Downloaded by {email}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
-			$subject = $this->l->t('{file} downloaded via public link');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
-			$subject = $this->l->t('{email} downloaded {file}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
-		}
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
-			case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-				];
-			case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED:
-			case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'email' => [
-						'type' => 'email',
-						'id' => $parameters[1],
-						'name' => $parameters[1],
-					],
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
+    const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded';
+    const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded';
+
+    const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded';
+    const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded';
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
+            $subject = $this->l->t('Downloaded via public link');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
+            $subject = $this->l->t('Downloaded by {email}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
+            $subject = $this->l->t('{file} downloaded via public link');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
+            $subject = $this->l->t('{email} downloaded {file}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
+        }
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
+            case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                ];
+            case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED:
+            case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'email' => [
+                        'type' => 'email',
+                        'id' => $parameters[1],
+                        'name' => $parameters[1],
+                    ],
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
 }