nextcloud / server

apps/files_external/templates/settings.php

Switch Indentation +22 added lines, -22 removed lines

@@ -41,48 +41,48 @@
 		$is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
 
 		switch ($parameter->getType()) {
-		case DefinitionParameter::VALUE_PASSWORD: ?>
-			<?php if ($is_optional) {
-			$classes[] = 'optional';
-		} ?>
-			<input type="password"
+		    case DefinitionParameter::VALUE_PASSWORD: ?>
+    			<?php if ($is_optional) {
+			    $classes[] = 'optional';
+		    } ?>
+    			<input type="password"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_BOOLEAN: ?>
-			<?php $checkboxId = uniqid("checkbox_"); ?>
+			    break;
+		    case DefinitionParameter::VALUE_BOOLEAN: ?>
+    			<?php $checkboxId = uniqid("checkbox_"); ?>
 			<div>
 			<label>
 			<input type="checkbox"
 				id="<?php p($checkboxId); ?>"
 				<?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				<?php if ($value === true): ?> checked="checked"<?php endif; ?>
-			/>
+    			/>
 			<?php p($placeholder); ?>
 			</label>
 			</div>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_HIDDEN: ?>
-			<input type="hidden"
+			    break;
+		    case DefinitionParameter::VALUE_HIDDEN: ?>
+    			<input type="hidden"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 			/>
 			<?php
-			break;
-		default: ?>
-			<?php if ($is_optional) {
-			$classes[] = 'optional';
-		} ?>
-			<input type="text"
+			    break;
+		    default: ?>
+    			<?php if ($is_optional) {
+			    $classes[] = 'optional';
+		    } ?>
+    			<input type="text"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 				placeholder="<?php p($placeholder); ?>"
 			/>

Braces +5 added lines, -2 removed lines

@@ -194,8 +194,11 @@
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
-				<?php else: ?>
-					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
+				<?php else {
+    : ?>
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i);
+}
+?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
 				print_unescaped(' checked="checked"');
 			} ?> />
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />

Spacing +5 added lines, -5 removed lines

@@ -103,9 +103,9 @@ 
 <?php
 	$canCreateNewLocalStorage = \OC::$server->getConfig()->getSystemValue('files_external_allow_create_new_local', true);
 ?>
-<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" data-can-create-local="<?php echo $canCreateNewLocalStorage?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
+<form data-can-create="<?php echo $canCreateMounts ? 'true' : 'false' ?>" data-can-create-local="<?php echo $canCreateNewLocalStorage ? 'true' : 'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled'] ? 'true' : 'false'; ?>">
 	<h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storage')); ?></h2>
-	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a>
+	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation')); ?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a>
 	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
 	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
 	print_unescaped(''.$_['dependencies'].'');
@@ -150,10 +150,10 @@ 
 							<?php p($l->t('Add storage')); ?>
 						</option>
 						<?php
-							$sortedBackends = array_filter($_['backends'], function ($backend) use ($_) {
+							$sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
 								return $backend->isVisibleFor($_['visibilityType']);
 							});
-							uasort($sortedBackends, function ($a, $b) {
+							uasort($sortedBackends, function($a, $b) {
 								return strcasecmp($a->getText(), $b->getText());
 							});
 						?>
@@ -192,7 +192,7 @@ 
 
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
 			<?php
-				$userBackends = array_filter($_['backends'], function ($backend) {
+				$userBackends = array_filter($_['backends'], function($backend) {
 					return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
 				});
 			?>

Indentation +68 added lines, -68 removed lines

@@ -8,49 +8,49 @@ 
 
 $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
 
-	$l->t("Enable encryption");
-	$l->t("Enable previews");
-	$l->t("Enable sharing");
-	$l->t("Check for changes");
-	$l->t("Never");
-	$l->t("Once every direct access");
-	$l->t('Read only');
+    $l->t("Enable encryption");
+    $l->t("Enable previews");
+    $l->t("Enable sharing");
+    $l->t("Check for changes");
+    $l->t("Never");
+    $l->t("Once every direct access");
+    $l->t('Read only');
 
-	script('files_external', [
-		'settings',
-		'templates'
-	]);
-	style('files_external', 'settings');
+    script('files_external', [
+        'settings',
+        'templates'
+    ]);
+    style('files_external', 'settings');
 
-	// load custom JS
-	foreach ($_['backends'] as $backend) {
-		/** @var Backend $backend */
-		$scripts = $backend->getCustomJs();
-		foreach ($scripts as $script) {
-			script('files_external', $script);
-		}
-	}
-	foreach ($_['authMechanisms'] as $authMechanism) {
-		/** @var AuthMechanism $authMechanism */
-		$scripts = $authMechanism->getCustomJs();
-		foreach ($scripts as $script) {
-			script('files_external', $script);
-		}
-	}
+    // load custom JS
+    foreach ($_['backends'] as $backend) {
+        /** @var Backend $backend */
+        $scripts = $backend->getCustomJs();
+        foreach ($scripts as $script) {
+            script('files_external', $script);
+        }
+    }
+    foreach ($_['authMechanisms'] as $authMechanism) {
+        /** @var AuthMechanism $authMechanism */
+        $scripts = $authMechanism->getCustomJs();
+        foreach ($scripts as $script) {
+            script('files_external', $script);
+        }
+    }
 
-	function writeParameterInput($parameter, $options, $classes = []) {
-		$value = '';
-		if (isset($options[$parameter->getName()])) {
-			$value = $options[$parameter->getName()];
-		}
-		$placeholder = $parameter->getText();
-		$is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
+    function writeParameterInput($parameter, $options, $classes = []) {
+        $value = '';
+        if (isset($options[$parameter->getName()])) {
+            $value = $options[$parameter->getName()];
+        }
+        $placeholder = $parameter->getText();
+        $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
 
-		switch ($parameter->getType()) {
-		case DefinitionParameter::VALUE_PASSWORD: ?>
+        switch ($parameter->getType()) {
+        case DefinitionParameter::VALUE_PASSWORD: ?>
 			<?php if ($is_optional) {
-			$classes[] = 'optional';
-		} ?>
+            $classes[] = 'optional';
+        } ?>
 			<input type="password"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
 				data-parameter="<?php p($parameter->getName()); ?>"
@@ -58,8 +58,8 @@ 
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_BOOLEAN: ?>
+            break;
+        case DefinitionParameter::VALUE_BOOLEAN: ?>
 			<?php $checkboxId = uniqid("checkbox_"); ?>
 			<div>
 			<label>
@@ -73,19 +73,19 @@ 
 			</label>
 			</div>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_HIDDEN: ?>
+            break;
+        case DefinitionParameter::VALUE_HIDDEN: ?>
 			<input type="hidden"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
 				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 			/>
 			<?php
-			break;
-		default: ?>
+            break;
+        default: ?>
 			<?php if ($is_optional) {
-			$classes[] = 'optional';
-		} ?>
+            $classes[] = 'optional';
+        } ?>
 			<input type="text"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
 				data-parameter="<?php p($parameter->getName()); ?>"
@@ -93,8 +93,8 @@ 
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-		}
-	}
+        }
+    }
 ?>
 
 <div class="emptyfilelist emptycontent hidden">
@@ -103,14 +103,14 @@ 
 </div>
 
 <?php
-	$canCreateNewLocalStorage = \OC::$server->getConfig()->getSystemValue('files_external_allow_create_new_local', true);
+    $canCreateNewLocalStorage = \OC::$server->getConfig()->getSystemValue('files_external_allow_create_new_local', true);
 ?>
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" data-can-create-local="<?php echo $canCreateNewLocalStorage?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
 	<h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storage')); ?></h2>
 	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a>
 	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
 	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
-	print_unescaped(''.$_['dependencies'].'');
+    print_unescaped(''.$_['dependencies'].'');
 } ?>
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
 		<thead>
@@ -121,7 +121,7 @@ 
 				<th><?php p($l->t('Authentication')); ?></th>
 				<th><?php p($l->t('Configuration')); ?></th>
 				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) {
-	print_unescaped('<th>'.$l->t('Available for').'</th>');
+    print_unescaped('<th>'.$l->t('Available for').'</th>');
 } ?>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
@@ -152,17 +152,17 @@ 
 							<?php p($l->t('Add storage')); ?>
 						</option>
 						<?php
-							$sortedBackends = array_filter($_['backends'], function ($backend) use ($_) {
-								return $backend->isVisibleFor($_['visibilityType']);
-							});
-							uasort($sortedBackends, function ($a, $b) {
-								return strcasecmp($a->getText(), $b->getText());
-							});
-						?>
+                            $sortedBackends = array_filter($_['backends'], function ($backend) use ($_) {
+                                return $backend->isVisibleFor($_['visibilityType']);
+                            });
+                            uasort($sortedBackends, function ($a, $b) {
+                                return strcasecmp($a->getText(), $b->getText());
+                            });
+                        ?>
 						<?php foreach ($sortedBackends as $backend): ?>
 							<?php if ($backend->getDeprecateTo() || (!$canCreateNewLocalStorage && $backend->getIdentifier() == "local")) {
-							continue;
-						} // ignore deprecated backends?>
+                            continue;
+                        } // ignore deprecated backends?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
 						<?php endforeach; ?>
 					</select>
@@ -188,23 +188,23 @@ 
 	<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
 		<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
 			value="1" <?php if ($_['allowUserMounting']) {
-							print_unescaped(' checked="checked"');
-						} ?> />
+                            print_unescaped(' checked="checked"');
+                        } ?> />
 		<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
 
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
 			<?php
-				$userBackends = array_filter($_['backends'], function ($backend) {
-					return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
-				});
-			?>
+                $userBackends = array_filter($_['backends'], function ($backend) {
+                    return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
+                });
+            ?>
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
 				<?php else: ?>
 					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
-				print_unescaped(' checked="checked"');
-			} ?> />
+                print_unescaped(' checked="checked"');
+            } ?> />
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php endif; ?>
 				<?php $i++; ?>

apps/federation/lib/DAV/FedAuth.php

Indentation +32 added lines, -32 removed lines

@@ -29,40 +29,40 @@
 
 class FedAuth extends AbstractBasic {
 
-	/** @var DbHandler */
-	private $db;
+    /** @var DbHandler */
+    private $db;
 
-	/**
-	 * FedAuth constructor.
-	 *
-	 * @param DbHandler $db
-	 */
-	public function __construct(DbHandler $db) {
-		$this->db = $db;
-		$this->principalPrefix = 'principals/system/';
+    /**
+     * FedAuth constructor.
+     *
+     * @param DbHandler $db
+     */
+    public function __construct(DbHandler $db) {
+        $this->db = $db;
+        $this->principalPrefix = 'principals/system/';
 
-		// setup realm
-		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
-	}
+        // setup realm
+        $defaults = new \OCP\Defaults();
+        $this->realm = $defaults->getName();
+    }
 
-	/**
-	 * Validates a username and password
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @return bool
-	 */
-	protected function validateUserPass($username, $password) {
-		return $this->db->auth($username, $password);
-	}
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     */
+    protected function validateUserPass($username, $password) {
+        return $this->db->auth($username, $password);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function challenge(RequestInterface $request, ResponseInterface $response) {
-	}
+    /**
+     * @inheritdoc
+     */
+    public function challenge(RequestInterface $request, ResponseInterface $response) {
+    }
 }

apps/systemtags/lib/Controller/LastUsedController.php

Indentation +25 added lines, -25 removed lines

@@ -29,32 +29,32 @@
 
 class LastUsedController extends Controller {
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var IUserSession */
-	protected $userSession;
+    /** @var IUserSession */
+    protected $userSession;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 */
-	public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->userSession = $userSession;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     */
+    public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 */
-	public function getLastUsedTagIds() {
-		$lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
-		$tagIds = json_decode($lastUsed, true);
-		return new DataResponse(array_map(function ($id) {
-			return (string) $id;
-		}, $tagIds));
-	}
+    /**
+     * @NoAdminRequired
+     */
+    public function getLastUsedTagIds() {
+        $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
+        $tagIds = json_decode($lastUsed, true);
+        return new DataResponse(array_map(function ($id) {
+            return (string) $id;
+        }, $tagIds));
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 	public function getLastUsedTagIds() {
 		$lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
 		$tagIds = json_decode($lastUsed, true);
-		return new DataResponse(array_map(function ($id) {
+		return new DataResponse(array_map(function($id) {
 			return (string) $id;
 		}, $tagIds));
 	}

apps/files_trashbin/lib/Command/Expire.php

Indentation +22 added lines, -22 removed lines

@@ -31,30 +31,30 @@
 use OCP\Command\ICommand;
 
 class Expire implements ICommand {
-	use FileAccess;
+    use FileAccess;
 
-	/**
-	 * @var string
-	 */
-	private $user;
+    /**
+     * @var string
+     */
+    private $user;
 
-	/**
-	 * @param string $user
-	 */
-	public function __construct($user) {
-		$this->user = $user;
-	}
+    /**
+     * @param string $user
+     */
+    public function __construct($user) {
+        $this->user = $user;
+    }
 
-	public function handle() {
-		$userManager = \OC::$server->getUserManager();
-		if (!$userManager->userExists($this->user)) {
-			// User has been deleted already
-			return;
-		}
+    public function handle() {
+        $userManager = \OC::$server->getUserManager();
+        if (!$userManager->userExists($this->user)) {
+            // User has been deleted already
+            return;
+        }
 
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($this->user);
-		Trashbin::expire($this->user);
-		\OC_Util::tearDownFS();
-	}
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($this->user);
+        Trashbin::expire($this->user);
+        \OC_Util::tearDownFS();
+    }
 }

apps/files_trashbin/lib/Command/ExpireTrash.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 		} else {
 			$p = new ProgressBar($output);
 			$p->start();
-			$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
+			$this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
 				$p->advance();
 				$this->expireTrashForUser($user);
 			});
@@ -118,7 +118,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_trashbin/files')) {
 			return false;
 		}

Indentation +81 added lines, -81 removed lines

@@ -38,95 +38,95 @@
 
 class ExpireTrash extends Command {
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @param IUserManager|null $userManager
-	 * @param Expiration|null $expiration
-	 */
-	public function __construct(IUserManager $userManager = null,
-								Expiration $expiration = null) {
-		parent::__construct();
+    /**
+     * @param IUserManager|null $userManager
+     * @param Expiration|null $expiration
+     */
+    public function __construct(IUserManager $userManager = null,
+                                Expiration $expiration = null) {
+        parent::__construct();
 
-		$this->userManager = $userManager;
-		$this->expiration = $expiration;
-	}
+        $this->userManager = $userManager;
+        $this->expiration = $expiration;
+    }
 
-	protected function configure() {
-		$this
-			->setName('trashbin:expire')
-			->setDescription('Expires the users trashbin')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('trashbin:expire')
+            ->setDescription('Expires the users trashbin')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			$output->writeln("Auto expiration is configured - keeps files and folders in the trash bin for 30 days and automatically deletes anytime after that if space is needed (note: files may not be deleted if space is not needed)");
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            $output->writeln("Auto expiration is configured - keeps files and folders in the trash bin for 30 days and automatically deletes anytime after that if space is needed (note: files may not be deleted if space is not needed)");
+            return 1;
+        }
 
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Remove deleted files of   <info>$user</info>");
-					$userObject = $this->userManager->get($user);
-					$this->expireTrashForUser($userObject);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-					return 1;
-				}
-			}
-		} else {
-			$p = new ProgressBar($output);
-			$p->start();
-			$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
-				$p->advance();
-				$this->expireTrashForUser($user);
-			});
-			$p->finish();
-			$output->writeln('');
-		}
-		return 0;
-	}
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Remove deleted files of   <info>$user</info>");
+                    $userObject = $this->userManager->get($user);
+                    $this->expireTrashForUser($userObject);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                    return 1;
+                }
+            }
+        } else {
+            $p = new ProgressBar($output);
+            $p->start();
+            $this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
+                $p->advance();
+                $this->expireTrashForUser($user);
+            });
+            $p->finish();
+            $output->writeln('');
+        }
+        return 0;
+    }
 
-	public function expireTrashForUser(IUser $user) {
-		$uid = $user->getUID();
-		if (!$this->setupFS($uid)) {
-			return;
-		}
-		$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
-		Trashbin::deleteExpiredFiles($dirContent, $uid);
-	}
+    public function expireTrashForUser(IUser $user) {
+        $uid = $user->getUID();
+        if (!$this->setupFS($uid)) {
+            return;
+        }
+        $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+        Trashbin::deleteExpiredFiles($dirContent, $uid);
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_trashbin/files')) {
-			return false;
-		}
+        // Check if this user has a trashbin directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_trashbin/files')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 			return;
 		}
 
-		$this->userManager->callForSeenUsers(function (IUser $user) {
+		$this->userManager->callForSeenUsers(function(IUser $user) {
 			$uid = $user->getUID();
 			if (!$this->setupFS($uid)) {
 				return;
@@ -100,7 +100,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_trashbin/files')) {
 			return false;
 		}

Indentation +52 added lines, -52 removed lines

@@ -37,65 +37,65 @@
 use OCP\IUserManager;
 
 class ExpireTrash extends TimedJob {
-	private IConfig $config;
-	private Expiration $expiration;
-	private IUserManager $userManager;
+    private IConfig $config;
+    private Expiration $expiration;
+    private IUserManager $userManager;
 
-	public function __construct(
-		IConfig $config,
-		IUserManager $userManager,
-		Expiration $expiration,
-		ITimeFactory $time
-	) {
-		parent::__construct($time);
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
+    public function __construct(
+        IConfig $config,
+        IUserManager $userManager,
+        Expiration $expiration,
+        ITimeFactory $time
+    ) {
+        parent::__construct($time);
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
 
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->expiration = $expiration;
-	}
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->expiration = $expiration;
+    }
 
-	/**
-	 * @param $argument
-	 * @throws \Exception
-	 */
-	protected function run($argument) {
-		$backgroundJob = $this->config->getAppValue('files_trashbin', 'background_job_expire_trash', 'yes');
-		if ($backgroundJob === 'no') {
-			return;
-		}
+    /**
+     * @param $argument
+     * @throws \Exception
+     */
+    protected function run($argument) {
+        $backgroundJob = $this->config->getAppValue('files_trashbin', 'background_job_expire_trash', 'yes');
+        if ($backgroundJob === 'no') {
+            return;
+        }
 
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$this->userManager->callForSeenUsers(function (IUser $user) {
-			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
-				return;
-			}
-			$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
-			Trashbin::deleteExpiredFiles($dirContent, $uid);
-		});
+        $this->userManager->callForSeenUsers(function (IUser $user) {
+            $uid = $user->getUID();
+            if (!$this->setupFS($uid)) {
+                return;
+            }
+            $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+            Trashbin::deleteExpiredFiles($dirContent, $uid);
+        });
 
-		\OC_Util::tearDownFS();
-	}
+        \OC_Util::tearDownFS();
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 */
-	protected function setupFS(string $user): bool {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     */
+    protected function setupFS(string $user): bool {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_trashbin/files')) {
-			return false;
-		}
+        // Check if this user has a trashbin directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_trashbin/files')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/files_trashbin/lib/Helper.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 		$result = [];
 		$timestamp = null;
 
-		$view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
+		$view = new \OC\Files\View('/'.$user.'/files_trashbin/files');
 
 		if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
 			throw new \Exception('Directory does not exists');
@@ -91,12 +91,12 @@ 
 			];
 			if ($originalPath) {
 				if ($originalPath !== '.') {
-					$i['extraData'] = $originalPath . '/' . $originalName;
+					$i['extraData'] = $originalPath.'/'.$originalName;
 				} else {
 					$i['extraData'] = $originalName;
 				}
 			}
-			$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
+			$result[] = new FileInfo($absoluteDir.'/'.$i['name'], $storage, $internalPath.'/'.$i['name'], $i, $mount);
 		}
 
 		if ($sortAttribute !== '') {

Indentation +85 added lines, -85 removed lines

@@ -36,95 +36,95 @@
 use OCP\Files\Cache\ICacheEntry;
 
 class Helper {
-	/**
-	 * Retrieves the contents of a trash bin directory.
-	 *
-	 * @param string $dir path to the directory inside the trashbin
-	 * or empty to retrieve the root of the trashbin
-	 * @param string $user
-	 * @param string $sortAttribute attribute to sort on or empty to disable sorting
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @return \OCP\Files\FileInfo[]
-	 */
-	public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false) {
-		$result = [];
-		$timestamp = null;
+    /**
+     * Retrieves the contents of a trash bin directory.
+     *
+     * @param string $dir path to the directory inside the trashbin
+     * or empty to retrieve the root of the trashbin
+     * @param string $user
+     * @param string $sortAttribute attribute to sort on or empty to disable sorting
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @return \OCP\Files\FileInfo[]
+     */
+    public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false) {
+        $result = [];
+        $timestamp = null;
 
-		$view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
+        $view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
 
-		if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
-			throw new \Exception('Directory does not exists');
-		}
+        if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
+            throw new \Exception('Directory does not exists');
+        }
 
-		$mount = $view->getMount($dir);
-		$storage = $mount->getStorage();
-		$absoluteDir = $view->getAbsolutePath($dir);
-		$internalPath = $mount->getInternalPath($absoluteDir);
+        $mount = $view->getMount($dir);
+        $storage = $mount->getStorage();
+        $absoluteDir = $view->getAbsolutePath($dir);
+        $internalPath = $mount->getInternalPath($absoluteDir);
 
-		$originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user);
-		$dirContent = $storage->getCache()->getFolderContents($mount->getInternalPath($view->getAbsolutePath($dir)));
-		foreach ($dirContent as $entry) {
-			$entryName = $entry->getName();
-			$name = $entryName;
-			if ($dir === '' || $dir === '/') {
-				$pathparts = pathinfo($entryName);
-				$timestamp = substr($pathparts['extension'], 1);
-				$name = $pathparts['filename'];
-			} elseif ($timestamp === null) {
-				// for subfolders we need to calculate the timestamp only once
-				$parts = explode('/', ltrim($dir, '/'));
-				$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
-			}
-			$originalPath = '';
-			$originalName = substr($entryName, 0, -strlen($timestamp) - 2);
-			if (isset($originalLocations[$originalName][$timestamp])) {
-				$originalPath = $originalLocations[$originalName][$timestamp];
-				if (substr($originalPath, -1) === '/') {
-					$originalPath = substr($originalPath, 0, -1);
-				}
-			}
-			$type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
-			$i = [
-				'name' => $name,
-				'mtime' => $timestamp,
-				'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
-				'type' => $type,
-				'directory' => ($dir === '/') ? '' : $dir,
-				'size' => $entry->getSize(),
-				'etag' => '',
-				'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE,
-				'fileid' => $entry->getId(),
-			];
-			if ($originalPath) {
-				if ($originalPath !== '.') {
-					$i['extraData'] = $originalPath . '/' . $originalName;
-				} else {
-					$i['extraData'] = $originalName;
-				}
-			}
-			$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
-		}
+        $originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user);
+        $dirContent = $storage->getCache()->getFolderContents($mount->getInternalPath($view->getAbsolutePath($dir)));
+        foreach ($dirContent as $entry) {
+            $entryName = $entry->getName();
+            $name = $entryName;
+            if ($dir === '' || $dir === '/') {
+                $pathparts = pathinfo($entryName);
+                $timestamp = substr($pathparts['extension'], 1);
+                $name = $pathparts['filename'];
+            } elseif ($timestamp === null) {
+                // for subfolders we need to calculate the timestamp only once
+                $parts = explode('/', ltrim($dir, '/'));
+                $timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
+            }
+            $originalPath = '';
+            $originalName = substr($entryName, 0, -strlen($timestamp) - 2);
+            if (isset($originalLocations[$originalName][$timestamp])) {
+                $originalPath = $originalLocations[$originalName][$timestamp];
+                if (substr($originalPath, -1) === '/') {
+                    $originalPath = substr($originalPath, 0, -1);
+                }
+            }
+            $type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
+            $i = [
+                'name' => $name,
+                'mtime' => $timestamp,
+                'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
+                'type' => $type,
+                'directory' => ($dir === '/') ? '' : $dir,
+                'size' => $entry->getSize(),
+                'etag' => '',
+                'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE,
+                'fileid' => $entry->getId(),
+            ];
+            if ($originalPath) {
+                if ($originalPath !== '.') {
+                    $i['extraData'] = $originalPath . '/' . $originalName;
+                } else {
+                    $i['extraData'] = $originalName;
+                }
+            }
+            $result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
+        }
 
-		if ($sortAttribute !== '') {
-			return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
-		}
-		return $result;
-	}
+        if ($sortAttribute !== '') {
+            return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
+        }
+        return $result;
+    }
 
-	/**
-	 * Format file infos for JSON
-	 *
-	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
-	 */
-	public static function formatFileInfos($fileInfos) {
-		$files = [];
-		foreach ($fileInfos as $i) {
-			$entry = \OCA\Files\Helper::formatFileInfo($i);
-			$entry['id'] = $i->getId();
-			$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
-			$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
-			$files[] = $entry;
-		}
-		return $files;
-	}
+    /**
+     * Format file infos for JSON
+     *
+     * @param \OCP\Files\FileInfo[] $fileInfos file infos
+     */
+    public static function formatFileInfos($fileInfos) {
+        $files = [];
+        foreach ($fileInfos as $i) {
+            $entry = \OCA\Files\Helper::formatFileInfo($i);
+            $entry['id'] = $i->getId();
+            $entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
+            $entry['permissions'] = \OCP\Constants::PERMISSION_READ;
+            $files[] = $entry;
+        }
+        return $files;
+    }
 }

apps/comments/lib/Notification/Listener.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		$notification
 			->setApp('comments')
 			->setObject('comment', $comment->getId())
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
+			->setSubject('mention', [$comment->getObjectType(), $comment->getObjectId()])
 			->setDateTime($comment->getCreationDateTime());
 
 		return $notification;

Indentation +72 added lines, -72 removed lines

@@ -30,85 +30,85 @@
 
 class Listener {
 
-	protected IManager $notificationManager;
-	protected IUserManager $userManager;
+    protected IManager $notificationManager;
+    protected IUserManager $userManager;
 
-	/**
-	 * Listener constructor.
-	 */
-	public function __construct(
-		IManager $notificationManager,
-		IUserManager $userManager
-	) {
-		$this->notificationManager = $notificationManager;
-		$this->userManager = $userManager;
-	}
+    /**
+     * Listener constructor.
+     */
+    public function __construct(
+        IManager $notificationManager,
+        IUserManager $userManager
+    ) {
+        $this->notificationManager = $notificationManager;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function evaluate(CommentsEvent $event) {
-		$comment = $event->getComment();
+    /**
+     * @param CommentsEvent $event
+     */
+    public function evaluate(CommentsEvent $event) {
+        $comment = $event->getComment();
 
-		$mentions = $this->extractMentions($comment->getMentions());
-		if (empty($mentions)) {
-			// no one to notify
-			return;
-		}
+        $mentions = $this->extractMentions($comment->getMentions());
+        if (empty($mentions)) {
+            // no one to notify
+            return;
+        }
 
-		$notification = $this->instantiateNotification($comment);
+        $notification = $this->instantiateNotification($comment);
 
-		foreach ($mentions as $uid) {
-			if (($comment->getActorType() === 'users' && $uid === $comment->getActorId())
-				|| !$this->userManager->userExists($uid)
-			) {
-				// do not notify unknown users or yourself
-				continue;
-			}
+        foreach ($mentions as $uid) {
+            if (($comment->getActorType() === 'users' && $uid === $comment->getActorId())
+                || !$this->userManager->userExists($uid)
+            ) {
+                // do not notify unknown users or yourself
+                continue;
+            }
 
-			$notification->setUser($uid);
-			if ($event->getEvent() === CommentsEvent::EVENT_DELETE
-				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE) {
-				$this->notificationManager->markProcessed($notification);
-			} else {
-				$this->notificationManager->notify($notification);
-			}
-		}
-	}
+            $notification->setUser($uid);
+            if ($event->getEvent() === CommentsEvent::EVENT_DELETE
+                || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE) {
+                $this->notificationManager->markProcessed($notification);
+            } else {
+                $this->notificationManager->notify($notification);
+            }
+        }
+    }
 
-	/**
-	 * creates a notification instance and fills it with comment data
-	 *
-	 * @param IComment $comment
-	 * @return \OCP\Notification\INotification
-	 */
-	public function instantiateNotification(IComment $comment) {
-		$notification = $this->notificationManager->createNotification();
-		$notification
-			->setApp('comments')
-			->setObject('comment', $comment->getId())
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
-			->setDateTime($comment->getCreationDateTime());
+    /**
+     * creates a notification instance and fills it with comment data
+     *
+     * @param IComment $comment
+     * @return \OCP\Notification\INotification
+     */
+    public function instantiateNotification(IComment $comment) {
+        $notification = $this->notificationManager->createNotification();
+        $notification
+            ->setApp('comments')
+            ->setObject('comment', $comment->getId())
+            ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
+            ->setDateTime($comment->getCreationDateTime());
 
-		return $notification;
-	}
+        return $notification;
+    }
 
-	/**
-	 * flattens the mention array returned from comments to a list of user ids.
-	 *
-	 * @param array $mentions
-	 * @return string[] containing the mentions, e.g. ['alice', 'bob']
-	 */
-	public function extractMentions(array $mentions) {
-		if (empty($mentions)) {
-			return [];
-		}
-		$uids = [];
-		foreach ($mentions as $mention) {
-			if ($mention['type'] === 'user') {
-				$uids[] = $mention['id'];
-			}
-		}
-		return $uids;
-	}
+    /**
+     * flattens the mention array returned from comments to a list of user ids.
+     *
+     * @param array $mentions
+     * @return string[] containing the mentions, e.g. ['alice', 'bob']
+     */
+    public function extractMentions(array $mentions) {
+        if (empty($mentions)) {
+            return [];
+        }
+        $uids = [];
+        foreach ($mentions as $mention) {
+            if ($mention['type'] === 'user') {
+                $uids[] = $mention['id'];
+            }
+        }
+        return $uids;
+    }
 }

apps/comments/lib/EventHandler.php

Indentation +45 added lines, -45 removed lines

@@ -36,56 +36,56 @@
  * @package OCA\Comments
  */
 class EventHandler implements ICommentsEventHandler {
-	/** @var ActivityListener */
-	private $activityListener;
+    /** @var ActivityListener */
+    private $activityListener;
 
-	/** @var NotificationListener */
-	private $notificationListener;
+    /** @var NotificationListener */
+    private $notificationListener;
 
-	public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
-		$this->activityListener = $activityListener;
-		$this->notificationListener = $notificationListener;
-	}
+    public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
+        $this->activityListener = $activityListener;
+        $this->notificationListener = $notificationListener;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function handle(CommentsEvent $event) {
-		if ($event->getComment()->getObjectType() !== 'files') {
-			// this is a 'files'-specific Handler
-			return;
-		}
+    /**
+     * @param CommentsEvent $event
+     */
+    public function handle(CommentsEvent $event) {
+        if ($event->getComment()->getObjectType() !== 'files') {
+            // this is a 'files'-specific Handler
+            return;
+        }
 
-		$eventType = $event->getEvent();
-		if ($eventType === CommentsEvent::EVENT_ADD
-		) {
-			$this->notificationHandler($event);
-			$this->activityHandler($event);
-			return;
-		}
+        $eventType = $event->getEvent();
+        if ($eventType === CommentsEvent::EVENT_ADD
+        ) {
+            $this->notificationHandler($event);
+            $this->activityHandler($event);
+            return;
+        }
 
-		$applicableEvents = [
-			CommentsEvent::EVENT_PRE_UPDATE,
-			CommentsEvent::EVENT_UPDATE,
-			CommentsEvent::EVENT_DELETE,
-		];
-		if (in_array($eventType, $applicableEvents)) {
-			$this->notificationHandler($event);
-			return;
-		}
-	}
+        $applicableEvents = [
+            CommentsEvent::EVENT_PRE_UPDATE,
+            CommentsEvent::EVENT_UPDATE,
+            CommentsEvent::EVENT_DELETE,
+        ];
+        if (in_array($eventType, $applicableEvents)) {
+            $this->notificationHandler($event);
+            return;
+        }
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	private function activityHandler(CommentsEvent $event) {
-		$this->activityListener->commentEvent($event);
-	}
+    /**
+     * @param CommentsEvent $event
+     */
+    private function activityHandler(CommentsEvent $event) {
+        $this->activityListener->commentEvent($event);
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	private function notificationHandler(CommentsEvent $event) {
-		$this->notificationListener->evaluate($event);
-	}
+    /**
+     * @param CommentsEvent $event
+     */
+    private function notificationHandler(CommentsEvent $event) {
+        $this->notificationListener->evaluate($event);
+    }
 }