nextcloud / server

cron.php

Indentation +127 added lines, -127 removed lines

@@ -32,138 +32,138 @@
 
 // Show warning if a PHP version below 5.6.0 is used
 if (version_compare(PHP_VERSION, '5.6.0') === -1) {
-	echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';
-	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
-	return;
+    echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';
+    echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
+    return;
 }
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
-
-	if (\OCP\Util::needUpgrade()) {
-		\OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG);
-		exit;
-	}
-	if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) {
-		\OCP\Util::writeLog('cron', 'We are in maintenance mode, skipping cron', \OCP\Util::DEBUG);
-		exit;
-	}
-
-	if (\OC::$server->getSystemConfig()->getValue('singleuser', false)) {
-		\OCP\Util::writeLog('cron', 'We are in admin only mode, skipping cron', \OCP\Util::DEBUG);
-		exit;
-	}
-
-	// load all apps to get all api routes properly setup
-	OC_App::loadApps();
-
-	\OC::$server->getSession()->close();
-
-	// initialize a dummy memory session
-	$session = new \OC\Session\Memory('');
-	$cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
-	$session = $cryptoWrapper->wrapSession($session);
-	\OC::$server->setSession($session);
-
-	$logger = \OC::$server->getLogger();
-	$config = \OC::$server->getConfig();
-
-	// Don't do anything if ownCloud has not been installed
-	if (!$config->getSystemValue('installed', false)) {
-		exit(0);
-	}
-
-	\OC::$server->getTempManager()->cleanOld();
-
-	// Exit if background jobs are disabled!
-	$appMode = \OCP\BackgroundJob::getExecutionType();
-	if ($appMode == 'none') {
-		if (OC::$CLI) {
-			echo 'Background Jobs are disabled!' . PHP_EOL;
-		} else {
-			OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
-		}
-		exit(1);
-	}
-
-	if (OC::$CLI) {
-		// set to run indefinitely if needed
-		set_time_limit(0);
-
-		// the cron job must be executed with the right user
-		if (!function_exists('posix_getuid')) {
-			echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
-			exit(0);
-		}
-		$user = posix_getpwuid(posix_getuid());
-		$configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
-		if ($user['name'] !== $configUser['name']) {
-			echo "Console has to be executed with the same user as the web server is operated" . PHP_EOL;
-			echo "Current user: " . $user['name'] . PHP_EOL;
-			echo "Web server user: " . $configUser['name'] . PHP_EOL;
-			exit(0);
-		}
-
-		// We call ownCloud from the CLI (aka cron)
-		if ($appMode != 'cron') {
-			\OCP\BackgroundJob::setExecutionType('cron');
-		}
-
-		// Work
-		$jobList = \OC::$server->getJobList();
-
-		// We only ask for jobs for 14 minutes, because after 15 minutes the next
-		// system cron task should spawn.
-		$endTime = time() + 14 * 60;
-
-		$executedJobs = [];
-		while ($job = $jobList->getNext()) {
-			if (isset($executedJobs[$job->getId()])) {
-				$jobList->unlockJob($job);
-				break;
-			}
-
-			$logger->debug('Run ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
-			$job->execute($jobList, $logger);
-			// clean up after unclean jobs
-			\OC_Util::tearDownFS();
-			$logger->debug('Finished ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
-
-			$jobList->setLastJob($job);
-			$executedJobs[$job->getId()] = true;
-			unset($job);
-
-			if (time() > $endTime) {
-				break;
-			}
-		}
-
-	} else {
-		// We call cron.php from some website
-		if ($appMode == 'cron') {
-			// Cron is cron :-P
-			OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
-		} else {
-			// Work and success :-)
-			$jobList = \OC::$server->getJobList();
-			$job = $jobList->getNext();
-			if ($job != null) {
-				$job->execute($jobList, $logger);
-				$jobList->setLastJob($job);
-			}
-			OC_JSON::success();
-		}
-	}
-
-	// Log the successful cron execution
-	if (\OC::$server->getConfig()->getSystemValue('cron_log', true)) {
-		\OC::$server->getConfig()->setAppValue('core', 'lastcron', time());
-	}
-	exit();
+    require_once __DIR__ . '/lib/base.php';
+
+    if (\OCP\Util::needUpgrade()) {
+        \OCP\Util::writeLog('cron', 'Update required, skipping cron', \OCP\Util::DEBUG);
+        exit;
+    }
+    if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) {
+        \OCP\Util::writeLog('cron', 'We are in maintenance mode, skipping cron', \OCP\Util::DEBUG);
+        exit;
+    }
+
+    if (\OC::$server->getSystemConfig()->getValue('singleuser', false)) {
+        \OCP\Util::writeLog('cron', 'We are in admin only mode, skipping cron', \OCP\Util::DEBUG);
+        exit;
+    }
+
+    // load all apps to get all api routes properly setup
+    OC_App::loadApps();
+
+    \OC::$server->getSession()->close();
+
+    // initialize a dummy memory session
+    $session = new \OC\Session\Memory('');
+    $cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
+    $session = $cryptoWrapper->wrapSession($session);
+    \OC::$server->setSession($session);
+
+    $logger = \OC::$server->getLogger();
+    $config = \OC::$server->getConfig();
+
+    // Don't do anything if ownCloud has not been installed
+    if (!$config->getSystemValue('installed', false)) {
+        exit(0);
+    }
+
+    \OC::$server->getTempManager()->cleanOld();
+
+    // Exit if background jobs are disabled!
+    $appMode = \OCP\BackgroundJob::getExecutionType();
+    if ($appMode == 'none') {
+        if (OC::$CLI) {
+            echo 'Background Jobs are disabled!' . PHP_EOL;
+        } else {
+            OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
+        }
+        exit(1);
+    }
+
+    if (OC::$CLI) {
+        // set to run indefinitely if needed
+        set_time_limit(0);
+
+        // the cron job must be executed with the right user
+        if (!function_exists('posix_getuid')) {
+            echo "The posix extensions are required - see http://php.net/manual/en/book.posix.php" . PHP_EOL;
+            exit(0);
+        }
+        $user = posix_getpwuid(posix_getuid());
+        $configUser = posix_getpwuid(fileowner(OC::$configDir . 'config.php'));
+        if ($user['name'] !== $configUser['name']) {
+            echo "Console has to be executed with the same user as the web server is operated" . PHP_EOL;
+            echo "Current user: " . $user['name'] . PHP_EOL;
+            echo "Web server user: " . $configUser['name'] . PHP_EOL;
+            exit(0);
+        }
+
+        // We call ownCloud from the CLI (aka cron)
+        if ($appMode != 'cron') {
+            \OCP\BackgroundJob::setExecutionType('cron');
+        }
+
+        // Work
+        $jobList = \OC::$server->getJobList();
+
+        // We only ask for jobs for 14 minutes, because after 15 minutes the next
+        // system cron task should spawn.
+        $endTime = time() + 14 * 60;
+
+        $executedJobs = [];
+        while ($job = $jobList->getNext()) {
+            if (isset($executedJobs[$job->getId()])) {
+                $jobList->unlockJob($job);
+                break;
+            }
+
+            $logger->debug('Run ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
+            $job->execute($jobList, $logger);
+            // clean up after unclean jobs
+            \OC_Util::tearDownFS();
+            $logger->debug('Finished ' . get_class($job) . ' job with ID ' . $job->getId(), ['app' => 'cron']);
+
+            $jobList->setLastJob($job);
+            $executedJobs[$job->getId()] = true;
+            unset($job);
+
+            if (time() > $endTime) {
+                break;
+            }
+        }
+
+    } else {
+        // We call cron.php from some website
+        if ($appMode == 'cron') {
+            // Cron is cron :-P
+            OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
+        } else {
+            // Work and success :-)
+            $jobList = \OC::$server->getJobList();
+            $job = $jobList->getNext();
+            if ($job != null) {
+                $job->execute($jobList, $logger);
+                $jobList->setLastJob($job);
+            }
+            OC_JSON::success();
+        }
+    }
+
+    // Log the successful cron execution
+    if (\OC::$server->getConfig()->getSystemValue('cron_log', true)) {
+        \OC::$server->getConfig()->setAppValue('core', 'lastcron', time());
+    }
+    exit();
 
 } catch (Exception $ex) {
-	\OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
+    \OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
 } catch (Error $ex) {
-	\OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
+    \OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
 }

apps/files/templates/admin.php

Braces +5 added lines, -2 removed lines

@@ -14,7 +14,10 @@
 			<input type="submit" id="submitMaxUpload"
 				   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>
+		<?php else {
+    : ?>
+			<p><em><?php p($l->t('Missing permissions to edit from here.'));
+}
+?></em></p>
 		<?php endif; ?>
 	</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']]);
 }

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')
+        )
+    ));
 }

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);

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;
+        }
+    }
 }

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]);
+    }
 }

apps/files/lib/Activity/Filter/Favorites.php

Indentation +118 added lines, -118 removed lines

@@ -32,129 +32,129 @@
 
 class Favorites implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var Helper */
-	protected $helper;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/**
-	 * @param IL10N $l
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param Helper $helper
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) {
-		$this->l = $l;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->helper = $helper;
-		$this->db = $db;
-	}
-
-	/**
-	 * @return string Lowercase a-z only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'files_favorites';
-	}
-
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Favorites');
-	}
-
-	/**
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 10;
-	}
-
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg'));
-	}
-
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect([
-			'file_created',
-			'file_changed',
-			'file_deleted',
-			'file_restored',
-		], $types);
-	}
-
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return ['files'];
-	}
-
-	/**
-	 * @param IQueryBuilder $query
-	 */
-	public function filterFavorites(IQueryBuilder $query) {
-		try {
-			$user = $this->activityManager->getCurrentUserId();
-		} catch (\UnexpectedValueException $e) {
-			return;
-		}
-
-		try {
-			$favorites = $this->helper->getFavoriteFilePaths($user);
-		} catch (\RuntimeException $e) {
-			return;
-		}
-
-		$limitations = [];
-		if (!empty($favorites['items'])) {
-			$limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY));
-		}
-		foreach ($favorites['folders'] as $favorite) {
-			$limitations[] = $query->expr()->like('file', $query->createNamedParameter(
-				$this->db->escapeLikeParameter($favorite . '/') . '%'
-			));
-		}
-
-		if (empty($limitations)) {
-			return;
-		}
-
-		$function = $query->createFunction('
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var Helper */
+    protected $helper;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /**
+     * @param IL10N $l
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param Helper $helper
+     * @param IDBConnection $db
+     */
+    public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) {
+        $this->l = $l;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->helper = $helper;
+        $this->db = $db;
+    }
+
+    /**
+     * @return string Lowercase a-z only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'files_favorites';
+    }
+
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Favorites');
+    }
+
+    /**
+     * @return int
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 10;
+    }
+
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg'));
+    }
+
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect([
+            'file_created',
+            'file_changed',
+            'file_deleted',
+            'file_restored',
+        ], $types);
+    }
+
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return ['files'];
+    }
+
+    /**
+     * @param IQueryBuilder $query
+     */
+    public function filterFavorites(IQueryBuilder $query) {
+        try {
+            $user = $this->activityManager->getCurrentUserId();
+        } catch (\UnexpectedValueException $e) {
+            return;
+        }
+
+        try {
+            $favorites = $this->helper->getFavoriteFilePaths($user);
+        } catch (\RuntimeException $e) {
+            return;
+        }
+
+        $limitations = [];
+        if (!empty($favorites['items'])) {
+            $limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY));
+        }
+        foreach ($favorites['folders'] as $favorite) {
+            $limitations[] = $query->expr()->like('file', $query->createNamedParameter(
+                $this->db->escapeLikeParameter($favorite . '/') . '%'
+            ));
+        }
+
+        if (empty($limitations)) {
+            return;
+        }
+
+        $function = $query->createFunction('
 			CASE 
 				WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1
 				WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . '
 					AND (' . implode(' OR ', $limitations) . ')
 					THEN 1 
 			END = 1'
-		);
+        );
 
-		$query->andWhere($function);
-	}
+        $query->andWhere($function);
+    }
 }

apps/files/lib/Activity/Filter/FileChanges.php

Indentation +60 added lines, -60 removed lines

@@ -28,72 +28,72 @@
 
 class FileChanges implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	/**
-	 * @param IL10N $l
-	 * @param IURLGenerator $url
-	 */
-	public function __construct(IL10N $l, IURLGenerator $url) {
-		$this->l = $l;
-		$this->url = $url;
-	}
+    /**
+     * @param IL10N $l
+     * @param IURLGenerator $url
+     */
+    public function __construct(IL10N $l, IURLGenerator $url) {
+        $this->l = $l;
+        $this->url = $url;
+    }
 
-	/**
-	 * @return string Lowercase a-z only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'files';
-	}
+    /**
+     * @return string Lowercase a-z only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'files';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('File changes');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('File changes');
+    }
 
-	/**
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 30;
-	}
+    /**
+     * @return int
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 30;
+    }
 
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files-dark.svg'));
-	}
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files-dark.svg'));
+    }
 
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect([
-			'file_created',
-			'file_changed',
-			'file_deleted',
-			'file_restored',
-		], $types);
-	}
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect([
+            'file_created',
+            'file_changed',
+            'file_deleted',
+            'file_restored',
+        ], $types);
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return ['files'];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return ['files'];
+    }
 }