nextcloud / server

apps/files/templates/admin.php

Spacing +6 added lines, -6 removed lines

@@ -2,17 +2,17 @@
 
 	<div class="section">
 		<h2><?php p($l->t('File handling')); ?></h2>
-		<label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label>
+		<label for="maxUploadSize"><?php p($l->t('Maximum upload size')); ?> </label>
 		<span id="maxUploadSizeSettingsMsg" class="msg"></span>
 		<br />
-		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> />
-		<?php if($_['displayMaxPossibleUploadSize']):?>
+		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if (!$_['uploadChangable']) { p('disabled'); } ?> />
+		<?php if ($_['displayMaxPossibleUploadSize']):?>
 			(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>)
-		<?php endif;?>
+		<?php endif; ?>
 		<input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />
-		<?php if($_['uploadChangable']): ?>
+		<?php if ($_['uploadChangable']): ?>
 			<input type="submit" id="submitMaxUpload"
-				   value="<?php p($l->t( 'Save' )); ?>"/>
+				   value="<?php p($l->t('Save')); ?>"/>
 			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p>
 		<?php else: ?>
 			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p>

apps/files/templates/list.php

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 		<div class="actions creatable hidden">
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar">
-					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...'));?></span><span class="mobile"><?php p($l->t('...'));?></span></em>
+					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...')); ?></span><span class="mobile"><?php p($l->t('...')); ?></span></em>
 				</div>
 				<input type="button" class="stop icon-close" style="display:none" value="" />
 			</div>
@@ -16,10 +16,10 @@ 
 	*/ ?>
 	<input type="hidden" name="permissions" value="" id="permissions">
 	<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
-	<?php if(isset($_['dirToken'])):?>
+	<?php if (isset($_['dirToken'])):?>
 	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
 	<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
-	<?php endif;?>
+	<?php endif; ?>
 	<input type="hidden" class="max_human_file_size"
 		   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
 </div>
@@ -45,7 +45,7 @@ 
 					<label for="select_all_files">
 						<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
 					</label>
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 					<span id="selectedActionsList" class="selectedActions">
 						<a href="" class="download">
 							<span class="icon icon-download"></span>
@@ -58,7 +58,7 @@ 
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 					<span class="selectedActions"><a href="" class="delete-selected">
 						<span><?php p($l->t('Delete'))?></span>
 						<span class="icon icon-delete"></span>
@@ -78,6 +78,6 @@ 
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
 	<p>
-	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
+	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.')); ?>
 	</p>
 </div>

apps/files/templates/simplelist.php

Spacing +2 added lines, -2 removed lines

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

apps/files/templates/appnavigation.php

Spacing +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
 		<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>">
 			<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
 				class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
-				<?php p($item['name']);?>
+				<?php p($item['name']); ?>
 			</a>
 		</li>
 		<?php } ?>
@@ -12,7 +12,7 @@ 
 	<div id="app-settings">
 		<div id="app-settings-header">
 			<button class="settings-button" data-apps-slide-toggle="#app-settings-content">
-				<?php p($l->t('Settings'));?>
+				<?php p($l->t('Settings')); ?>
 			</button>
 		</div>
 		<div id="app-settings-content">
@@ -20,9 +20,9 @@ 
 				<input class="checkbox" id="showhiddenfilesToggle" checked="checked" type="checkbox">
 				<label for="showhiddenfilesToggle"><?php p($l->t('Show hidden files')); ?></label>
 			</div>
-			<label for="webdavurl"><?php p($l->t('WebDAV'));?></label>
+			<label for="webdavurl"><?php p($l->t('WebDAV')); ?></label>
 			<input id="webdavurl" type="text" readonly="readonly" value="<?php p(\OCP\Util::linkToRemote('webdav')); ?>" />
-			<em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank" rel="noreferrer">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em>
+			<em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank" rel="noreferrer">access your Files via WebDAV</a>', array(link_to_docs('user-webdav')))); ?></em>
 		</div>
 	</div>
 </div>

apps/files/ajax/getstoragestats.php

Indentation +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 $dir = '/';
 
 if (isset($_GET['dir'])) {
-	$dir = (string)$_GET['dir'];
+    $dir = (string)$_GET['dir'];
 }
 
 OCP\JSON::checkLoggedIn();
@@ -34,7 +34,7 @@ 
 
 // send back json
 try {
-	OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir)));
+    OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir)));
 } catch (\OCP\Files\NotFoundException $e) {
-	OCP\JSON::error(['data' => ['message' => 'Folder not found']]);
+    OCP\JSON::error(['data' => ['message' => 'Folder not found']]);
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 $dir = '/';
 
 if (isset($_GET['dir'])) {
-	$dir = (string)$_GET['dir'];
+	$dir = (string) $_GET['dir'];
 }
 
 OCP\JSON::checkLoggedIn();

apps/files/ajax/list.php

Indentation +57 added lines, -57 removed lines

@@ -32,73 +32,73 @@
 $dir = \OC\Files\Filesystem::normalizePath($dir);
 
 try {
-	$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
-	if (!$dirInfo || !$dirInfo->getType() === 'dir') {
-		header("HTTP/1.0 404 Not Found");
-		exit();
-	}
+    $dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
+    if (!$dirInfo || !$dirInfo->getType() === 'dir') {
+        header("HTTP/1.0 404 Not Found");
+        exit();
+    }
 
-	$data = array();
-	$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
+    $data = array();
+    $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
 
-	$permissions = $dirInfo->getPermissions();
+    $permissions = $dirInfo->getPermissions();
 
-	$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
-	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
-	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
+    $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
+    $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
+    $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
 
-	$files = [];
-	// Clean up duplicates from array
-	if (is_array($mimetypeFilters) && count($mimetypeFilters)) {
-		$mimetypeFilters = array_unique($mimetypeFilters);
+    $files = [];
+    // Clean up duplicates from array
+    if (is_array($mimetypeFilters) && count($mimetypeFilters)) {
+        $mimetypeFilters = array_unique($mimetypeFilters);
 
-		if (!in_array('httpd/unix-directory', $mimetypeFilters)) {
-			// append folder filter to be able to browse folders
-			$mimetypeFilters[] = 'httpd/unix-directory';
-		}
+        if (!in_array('httpd/unix-directory', $mimetypeFilters)) {
+            // append folder filter to be able to browse folders
+            $mimetypeFilters[] = 'httpd/unix-directory';
+        }
 
-		// create filelist with mimetype filter - as getFiles only supports on
-		// mimetype filter at once we will filter this folder for each
-		// mimetypeFilter
-		foreach ($mimetypeFilters as $mimetypeFilter) {
-			$files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter));
-		}
+        // create filelist with mimetype filter - as getFiles only supports on
+        // mimetype filter at once we will filter this folder for each
+        // mimetypeFilter
+        foreach ($mimetypeFilters as $mimetypeFilter) {
+            $files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter));
+        }
 
-		// sort the files accordingly
-		$files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection);
-	} else {
-		// create file list without mimetype filter
-		$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
-	}
+        // sort the files accordingly
+        $files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection);
+    } else {
+        // create file list without mimetype filter
+        $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
+    }
 
-	$files = \OCA\Files\Helper::populateTags($files);
-	$data['directory'] = $dir;
-	$data['files'] = \OCA\Files\Helper::formatFileInfos($files);
-	$data['permissions'] = $permissions;
+    $files = \OCA\Files\Helper::populateTags($files);
+    $data['directory'] = $dir;
+    $data['files'] = \OCA\Files\Helper::formatFileInfos($files);
+    $data['permissions'] = $permissions;
 
-	OCP\JSON::success(array('data' => $data));
+    OCP\JSON::success(array('data' => $data));
 } catch (\OCP\Files\StorageNotAvailableException $e) {
-	\OCP\Util::logException('files', $e);
-	OCP\JSON::error([
-		'data' => [
-			'exception' => '\OCP\Files\StorageNotAvailableException',
-			'message' => $l->t('Storage is temporarily not available')
-		]
-	]);
+    \OCP\Util::logException('files', $e);
+    OCP\JSON::error([
+        'data' => [
+            'exception' => '\OCP\Files\StorageNotAvailableException',
+            'message' => $l->t('Storage is temporarily not available')
+        ]
+    ]);
 } catch (\OCP\Files\StorageInvalidException $e) {
-	\OCP\Util::logException('files', $e);
-	OCP\JSON::error(array(
-		'data' => array(
-			'exception' => '\OCP\Files\StorageInvalidException',
-			'message' => $l->t('Storage invalid')
-		)
-	));
+    \OCP\Util::logException('files', $e);
+    OCP\JSON::error(array(
+        'data' => array(
+            'exception' => '\OCP\Files\StorageInvalidException',
+            'message' => $l->t('Storage invalid')
+        )
+    ));
 } catch (\Exception $e) {
-	\OCP\Util::logException('files', $e);
-	OCP\JSON::error(array(
-		'data' => array(
-			'exception' => '\Exception',
-			'message' => $l->t('Unknown error')
-		)
-	));
+    \OCP\Util::logException('files', $e);
+    OCP\JSON::error(array(
+        'data' => array(
+            'exception' => '\Exception',
+            'message' => $l->t('Unknown error')
+        )
+    ));
 }

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 $l = \OC::$server->getL10N('files');
 
 // Load the files
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
 $dir = \OC\Files\Filesystem::normalizePath($dir);
 
 try {
@@ -39,11 +39,11 @@ 
 	}
 
 	$data = array();
-	$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
+	$baseUrl = OCP\Util::linkTo('files', 'index.php').'?dir=';
 
 	$permissions = $dirInfo->getPermissions();
 
-	$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
+	$sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name';
 	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
 	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
 

apps/files/ajax/download.php

Indentation +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
 $files_list = json_decode($files);
 // in case we get only a single file
 if (!is_array($files_list)) {
-	$files_list = array($files);
+    $files_list = array($files);
 }
 
 /**
@@ -46,9 +46,9 @@ 
  * alphanumeric characters
  */
 if(isset($_GET['downloadStartSecret'])
-	&& !isset($_GET['downloadStartSecret'][32])
-	&& preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
-	setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
+    && !isset($_GET['downloadStartSecret'][32])
+    && preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
+    setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
 }
 
 $server_params = array( 'head' => \OC::$server->getRequest()->getMethod() == 'HEAD' );
@@ -57,7 +57,7 @@ 
  * Http range requests support
  */
 if (isset($_SERVER['HTTP_RANGE'])) {
-	$server_params['range'] = \OC::$server->getRequest()->getHeader('Range');
+    $server_params['range'] = \OC::$server->getRequest()->getHeader('Range');
 }
 
 OC_Files::get($dir, $files_list, $server_params);

Spacing +4 added lines, -4 removed lines

@@ -31,8 +31,8 @@ 
 OCP\User::checkLoggedIn();
 \OC::$server->getSession()->close();
 
-$files = isset($_GET['files']) ? (string)$_GET['files'] : '';
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
+$files = isset($_GET['files']) ? (string) $_GET['files'] : '';
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
 
 $files_list = json_decode($files);
 // in case we get only a single file
@@ -45,13 +45,13 @@ 
  * the content must not be longer than 32 characters and must only contain
  * alphanumeric characters
  */
-if(isset($_GET['downloadStartSecret'])
+if (isset($_GET['downloadStartSecret'])
 	&& !isset($_GET['downloadStartSecret'][32])
 	&& preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
 	setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
 }
 
-$server_params = array( 'head' => \OC::$server->getRequest()->getMethod() == 'HEAD' );
+$server_params = array('head' => \OC::$server->getRequest()->getMethod() == 'HEAD');
 
 /**
  * Http range requests support

apps/files/lib/Activity/Provider.php

Indentation +272 added lines, -272 removed lines

@@ -33,276 +33,276 @@
 
 class Provider implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/** @var string[] cached displayNames - key is the UID and value the displayname */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IEventMerger $eventMerger
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @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() !== 'files') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('files', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event, $previousEvent);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event, $previousEvent);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($event->getSubject() === 'created_by') {
-			$subject = $this->l->t('Created by {user}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
-		} else if ($event->getSubject() === 'changed_by') {
-			$subject = $this->l->t('Changed by {user}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
-		} else if ($event->getSubject() === 'deleted_by') {
-			$subject = $this->l->t('Deleted by {user}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
-		} else if ($event->getSubject() === 'restored_by') {
-			$subject = $this->l->t('Restored by {user}');
-		} else if ($event->getSubject() === 'renamed_by') {
-			$subject = $this->l->t('Renamed by {user}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
-		} else if ($event->getSubject() === 'moved_by') {
-			$subject = $this->l->t('Moved by {user}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $this->eventMerger->mergeEvents('user', $event, $previousEvent);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($event->getSubject() === 'created_self') {
-			$subject = $this->l->t('You created {file}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
-		} else if ($event->getSubject() === 'created_by') {
-			$subject = $this->l->t('{user} created {file}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
-		} else if ($event->getSubject() === 'created_public') {
-			$subject = $this->l->t('{file} was created in a public folder');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
-		} else if ($event->getSubject() === 'changed_self') {
-			$subject = $this->l->t('You changed {file}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
-		} else if ($event->getSubject() === 'changed_by') {
-			$subject = $this->l->t('{user} changed {file}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
-		} else if ($event->getSubject() === 'deleted_self') {
-			$subject = $this->l->t('You deleted {file}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
-		} else if ($event->getSubject() === 'deleted_by') {
-			$subject = $this->l->t('{user} deleted {file}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
-		} else if ($event->getSubject() === 'restored_self') {
-			$subject = $this->l->t('You restored {file}');
-		} else if ($event->getSubject() === 'restored_by') {
-			$subject = $this->l->t('{user} restored {file}');
-		} else if ($event->getSubject() === 'renamed_self') {
-			$subject = $this->l->t('You renamed {oldfile} to {newfile}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
-		} else if ($event->getSubject() === 'renamed_by') {
-			$subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
-		} else if ($event->getSubject() === 'moved_self') {
-			$subject = $this->l->t('You moved {oldfile} to {newfile}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
-		} else if ($event->getSubject() === 'moved_by') {
-			$subject = $this->l->t('{user} moved {oldfile} to {newfile}');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
-
-		if ($event->getChildEvent() === null) {
-			// Couldn't group by file, maybe we can group by user
-			$event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
-		}
-
-		return $event;
-	}
-
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = $parameter['path'];
-			} else {
-				$replacements[] = $parameter['name'];
-			}
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParameters(IEvent $event) {
-		$parameters = $event->getSubjectParameters();
-		switch ($event->getSubject()) {
-			case 'created_self':
-			case 'created_public':
-			case 'changed_self':
-			case 'deleted_self':
-			case 'restored_self':
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-				];
-			case 'created_by':
-			case 'changed_by':
-			case 'deleted_by':
-			case 'restored_by':
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'user' => $this->getUser($parameters[1]),
-				];
-			case 'renamed_self':
-			case 'moved_self':
-				return [
-					'newfile' => $this->getFile($parameters[0]),
-					'oldfile' => $this->getFile($parameters[1]),
-				];
-			case 'renamed_by':
-			case 'moved_by':
-				return [
-					'newfile' => $this->getFile($parameters[0]),
-					'user' => $this->getUser($parameters[1]),
-					'oldfile' => $this->getFile($parameters[2]),
-				];
-		}
-		return [];
-	}
-
-	/**
-	 * @param array|string $parameter
-	 * @param IEvent|null $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getFile($parameter, IEvent $event = null) {
-		if (is_array($parameter)) {
-			$path = reset($parameter);
-			$id = (string) key($parameter);
-		} else if ($event !== null) {
-			// Legacy from before ownCloud 8.2
-			$path = $parameter;
-			$id = $event->getObjectId();
-		} else {
-			throw new \InvalidArgumentException('Could not generate file parameter');
-		}
-
-		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 getUser($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 IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /** @var string[] cached displayNames - key is the UID and value the displayname */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IEventMerger $eventMerger
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @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() !== 'files') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('files', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event, $previousEvent);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event, $previousEvent);
+    }
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event, IEvent $previousEvent = null) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($event->getSubject() === 'created_by') {
+            $subject = $this->l->t('Created by {user}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
+        } else if ($event->getSubject() === 'changed_by') {
+            $subject = $this->l->t('Changed by {user}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
+        } else if ($event->getSubject() === 'deleted_by') {
+            $subject = $this->l->t('Deleted by {user}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
+        } else if ($event->getSubject() === 'restored_by') {
+            $subject = $this->l->t('Restored by {user}');
+        } else if ($event->getSubject() === 'renamed_by') {
+            $subject = $this->l->t('Renamed by {user}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
+        } else if ($event->getSubject() === 'moved_by') {
+            $subject = $this->l->t('Moved by {user}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $this->eventMerger->mergeEvents('user', $event, $previousEvent);
+    }
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($event->getSubject() === 'created_self') {
+            $subject = $this->l->t('You created {file}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
+        } else if ($event->getSubject() === 'created_by') {
+            $subject = $this->l->t('{user} created {file}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
+        } else if ($event->getSubject() === 'created_public') {
+            $subject = $this->l->t('{file} was created in a public folder');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg')));
+        } else if ($event->getSubject() === 'changed_self') {
+            $subject = $this->l->t('You changed {file}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
+        } else if ($event->getSubject() === 'changed_by') {
+            $subject = $this->l->t('{user} changed {file}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
+        } else if ($event->getSubject() === 'deleted_self') {
+            $subject = $this->l->t('You deleted {file}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
+        } else if ($event->getSubject() === 'deleted_by') {
+            $subject = $this->l->t('{user} deleted {file}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg')));
+        } else if ($event->getSubject() === 'restored_self') {
+            $subject = $this->l->t('You restored {file}');
+        } else if ($event->getSubject() === 'restored_by') {
+            $subject = $this->l->t('{user} restored {file}');
+        } else if ($event->getSubject() === 'renamed_self') {
+            $subject = $this->l->t('You renamed {oldfile} to {newfile}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
+        } else if ($event->getSubject() === 'renamed_by') {
+            $subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
+        } else if ($event->getSubject() === 'moved_self') {
+            $subject = $this->l->t('You moved {oldfile} to {newfile}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
+        } else if ($event->getSubject() === 'moved_by') {
+            $subject = $this->l->t('{user} moved {oldfile} to {newfile}');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg')));
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        $event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
+
+        if ($event->getChildEvent() === null) {
+            // Couldn't group by file, maybe we can group by user
+            $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
+        }
+
+        return $event;
+    }
+
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = $parameter['path'];
+            } else {
+                $replacements[] = $parameter['name'];
+            }
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParameters(IEvent $event) {
+        $parameters = $event->getSubjectParameters();
+        switch ($event->getSubject()) {
+            case 'created_self':
+            case 'created_public':
+            case 'changed_self':
+            case 'deleted_self':
+            case 'restored_self':
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                ];
+            case 'created_by':
+            case 'changed_by':
+            case 'deleted_by':
+            case 'restored_by':
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'user' => $this->getUser($parameters[1]),
+                ];
+            case 'renamed_self':
+            case 'moved_self':
+                return [
+                    'newfile' => $this->getFile($parameters[0]),
+                    'oldfile' => $this->getFile($parameters[1]),
+                ];
+            case 'renamed_by':
+            case 'moved_by':
+                return [
+                    'newfile' => $this->getFile($parameters[0]),
+                    'user' => $this->getUser($parameters[1]),
+                    'oldfile' => $this->getFile($parameters[2]),
+                ];
+        }
+        return [];
+    }
+
+    /**
+     * @param array|string $parameter
+     * @param IEvent|null $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getFile($parameter, IEvent $event = null) {
+        if (is_array($parameter)) {
+            $path = reset($parameter);
+            $id = (string) key($parameter);
+        } else if ($event !== null) {
+            // Legacy from before ownCloud 8.2
+            $path = $parameter;
+            $id = $event->getObjectId();
+        } else {
+            throw new \InvalidArgumentException('Could not generate file parameter');
+        }
+
+        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 getUser($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;
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
 	protected function setSubjects(IEvent $event, $subject, array $parameters) {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			if ($parameter['type'] === 'file') {
 				$replacements[] = $parameter['path'];
 			} else {

apps/files/lib/Activity/FavoriteProvider.php

Indentation +127 added lines, -127 removed lines

@@ -31,131 +31,131 @@
 
 class FavoriteProvider implements IProvider {
 
-	const SUBJECT_ADDED = 'added_favorite';
-	const SUBJECT_REMOVED = 'removed_favorite';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IEventMerger $eventMerger
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IEventMerger $eventMerger) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @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() !== 'files' || $event->getType() !== 'favorite') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('files', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event, $previousEvent);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-
-		if ($event->getSubject() === self::SUBJECT_ADDED) {
-			$event->setParsedSubject($this->l->t('Added to favorites'))
-				->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
-		} else if ($event->getSubject() === self::SUBJECT_REMOVED) {
-			$event->setParsedSubject($this->l->t('Removed from favorites'))
-				->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
-
-		if ($event->getSubject() === self::SUBJECT_ADDED) {
-			$subject = $this->l->t('You added {file} to your favorites');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
-		} else if ($event->getSubject() === self::SUBJECT_REMOVED) {
-			$subject = $this->l->t('You removed {file} from your favorites');
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->setSubjects($event, $subject);
-		$event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 */
-	protected function setSubjects(IEvent $event, $subject) {
-		$subjectParams = $event->getSubjectParameters();
-		if (empty($subjectParams)) {
-			// Try to fall back to the old way, but this does not work for emails.
-			// But at least old activities still work.
-			$subjectParams = [
-				'id' => $event->getObjectId(),
-				'path' => $event->getObjectName(),
-			];
-		}
-		$parameter = [
-			'type' => 'file',
-			'id' => $subjectParams['id'],
-			'name' => basename($subjectParams['path']),
-			'path' => trim($subjectParams['path'], '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $subjectParams['id']]),
-		];
-
-		$event->setParsedSubject(str_replace('{file}', $parameter['path'], $subject))
-			->setRichSubject($subject, ['file' => $parameter]);
-	}
+    const SUBJECT_ADDED = 'added_favorite';
+    const SUBJECT_REMOVED = 'removed_favorite';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IEventMerger $eventMerger
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IEventMerger $eventMerger) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @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() !== 'files' || $event->getType() !== 'favorite') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('files', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event, $previousEvent);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+
+        if ($event->getSubject() === self::SUBJECT_ADDED) {
+            $event->setParsedSubject($this->l->t('Added to favorites'))
+                ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
+        } else if ($event->getSubject() === self::SUBJECT_REMOVED) {
+            $event->setParsedSubject($this->l->t('Removed from favorites'))
+                ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
+
+        if ($event->getSubject() === self::SUBJECT_ADDED) {
+            $subject = $this->l->t('You added {file} to your favorites');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/starred.svg')));
+        } else if ($event->getSubject() === self::SUBJECT_REMOVED) {
+            $subject = $this->l->t('You removed {file} from your favorites');
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star.svg')));
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->setSubjects($event, $subject);
+        $event = $this->eventMerger->mergeEvents('file', $event, $previousEvent);
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     */
+    protected function setSubjects(IEvent $event, $subject) {
+        $subjectParams = $event->getSubjectParameters();
+        if (empty($subjectParams)) {
+            // Try to fall back to the old way, but this does not work for emails.
+            // But at least old activities still work.
+            $subjectParams = [
+                'id' => $event->getObjectId(),
+                'path' => $event->getObjectName(),
+            ];
+        }
+        $parameter = [
+            'type' => 'file',
+            'id' => $subjectParams['id'],
+            'name' => basename($subjectParams['path']),
+            'path' => trim($subjectParams['path'], '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $subjectParams['id']]),
+        ];
+
+        $event->setParsedSubject(str_replace('{file}', $parameter['path'], $subject))
+            ->setRichSubject($subject, ['file' => $parameter]);
+    }
 }