nextcloud / server

apps/encryption/lib/Hooks/Contracts/IHook.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 namespace OCA\Encryption\Hooks\Contracts;
 
 interface IHook {
-	/**
-	 * Connects Hooks
-	 *
-	 * @return null
-	 */
-	public function addHooks();
+    /**
+     * Connects Hooks
+     *
+     * @return null
+     */
+    public function addHooks();
 }

apps/encryption/templates/altmail.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 
 print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", [$_['password']]));
 if (isset($_['expiration'])) {
-	print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
-	print_unescaped("\n\n");
+    print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
+    print_unescaped("\n\n");
 }
 // TRANSLATORS term at the end of a mail
 p($l->t("Cheers!"));

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 ?>
 
 	--
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
 <?php print_unescaped("\n".$theme->getBaseUrl());

apps/encryption/templates/settings-admin.php

Indentation +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 		<p id="encryptHomeStorageSetting">
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
 				   value="1" <?php if ($_['encryptHomeStorage']) {
-	print_unescaped('checked="checked"');
+    print_unescaped('checked="checked"');
 } ?> />
 			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
 			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
@@ -45,7 +45,7 @@ 
 			<br/><br/>
 
 			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') {
-	print_unescaped('class="hidden"');
+    print_unescaped('class="hidden"');
 }?>>
 				<?php p($l->t("Change recovery key password:")); ?>
 				<span class="msg"></span>

Braces +3 added lines, -1 removed lines

@@ -9,11 +9,13 @@
 	<h3><?php p($l->t("Default encryption module")); ?></h3>
 	<?php if (!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?>
 		<?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
-	<?php else: ?>
+	<?php else {
+    : ?>
 		<p id="encryptHomeStorageSetting">
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
 				   value="1" <?php if ($_['encryptHomeStorage']) {
 	print_unescaped('checked="checked"');
+}
 } ?> />
 			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
 			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 				   value="1" <?php if ($_['encryptHomeStorage']) {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
+			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage')); ?></label></br>
 			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
 		</p>
 		<br />

apps/workflowengine/lib/Check/RequestURL.php

Indentation +55 added lines, -55 removed lines

@@ -26,66 +26,66 @@
 
 class RequestURL extends AbstractStringCheck {
 
-	/** @var string */
-	protected $url;
+    /** @var string */
+    protected $url;
 
-	/** @var IRequest */
-	protected $request;
+    /** @var IRequest */
+    protected $request;
 
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 */
-	public function __construct(IL10N $l, IRequest $request) {
-		parent::__construct($l);
-		$this->request = $request;
-	}
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     */
+    public function __construct(IL10N $l, IRequest $request) {
+        parent::__construct($l);
+        $this->request = $request;
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$actualValue = $this->getActualValue();
-		if (in_array($operator, ['is', '!is'])) {
-			switch ($value) {
-				case 'webdav':
-					if ($operator === 'is') {
-						return $this->isWebDAVRequest();
-					} else {
-						return !$this->isWebDAVRequest();
-					}
-			}
-		}
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $actualValue = $this->getActualValue();
+        if (in_array($operator, ['is', '!is'])) {
+            switch ($value) {
+                case 'webdav':
+                    if ($operator === 'is') {
+                        return $this->isWebDAVRequest();
+                    } else {
+                        return !$this->isWebDAVRequest();
+                    }
+            }
+        }
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		if ($this->url !== null) {
-			return $this->url;
-		}
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        if ($this->url !== null) {
+            return $this->url;
+        }
 
-		$this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
-		$this->url .= $this->request->getServerHost();// E.g. localhost
-		$this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
-		$this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
+        $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
+        $this->url .= $this->request->getServerHost();// E.g. localhost
+        $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
+        $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
 
-		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
-	}
+        return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
+    }
 
-	/**
-	 * @return bool
-	 */
-	protected function isWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
-			$this->request->getPathInfo() === '/dav/files' ||
-			strpos($this->request->getPathInfo(), '/dav/files/') === 0
-		);
-	}
+    /**
+     * @return bool
+     */
+    protected function isWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
+            $this->request->getPathInfo() === '/dav/files' ||
+            strpos($this->request->getPathInfo(), '/dav/files/') === 0
+        );
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -69,10 +69,10 @@
 			return $this->url;
 		}
 
-		$this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
-		$this->url .= $this->request->getServerHost();// E.g. localhost
-		$this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
-		$this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
+		$this->url = $this->request->getServerProtocol().'://'; // E.g. http(s) + ://
+		$this->url .= $this->request->getServerHost(); // E.g. localhost
+		$this->url .= $this->request->getScriptName(); // E.g. /nextcloud/index.php
+		$this->url .= $this->request->getPathInfo(); // E.g. /apps/files_texteditor/ajax/loadfile
 
 		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
 	}

apps/sharebymail/lib/Settings/Admin.php

Indentation +31 added lines, -31 removed lines

@@ -27,40 +27,40 @@
 
 class Admin implements ISettings {
 
-	/** @var SettingsManager */
-	private $settingsManager;
+    /** @var SettingsManager */
+    private $settingsManager;
 
-	public function __construct(SettingsManager $settingsManager) {
-		$this->settingsManager = $settingsManager;
-	}
+    public function __construct(SettingsManager $settingsManager) {
+        $this->settingsManager = $settingsManager;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(),
-			'enforcePasswordProtection' => $this->settingsManager->enforcePasswordProtection()
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'sendPasswordMail' => $this->settingsManager->sendPasswordByMail(),
+            'enforcePasswordProtection' => $this->settingsManager->enforcePasswordProtection()
+        ];
 
-		return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 40;
+    }
 }

apps/sharebymail/templates/settings-admin.php

Indentation +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 
 	<p>
 		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if ($_['sendPasswordMail']) {
-	p('checked');
+    p('checked');
 } ?> />
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label><br/>
 		<input id="enforcePasswordProtection" type="checkbox" class="checkbox" <?php if ($_['enforcePasswordProtection']) {
-	p('checked');
+    p('checked');
 } ?> />
 		<label for="enforcePasswordProtection"><?php p($l->t('Enforce password protection')); ?></label>
 	</p>

apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php

Indentation +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@
 use OCP\AppFramework\Http;
 
 class NotSubAdminException extends \Exception {
-	public function __construct() {
-		parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
-	}
+    public function __construct() {
+        parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
+    }
 }

apps/provisioning_api/lib/AppInfo/Application.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 		$container = $this->getContainer();
 		$server = $container->getServer();
 
-		$container->registerService(NewUserMailHelper::class, function (SimpleContainer $c) use ($server) {
+		$container->registerService(NewUserMailHelper::class, function(SimpleContainer $c) use ($server) {
 			return new NewUserMailHelper(
 				$server->query(Defaults::class),
 				$server->getURLGenerator(),
@@ -30,7 +30,7 @@ 
 				Util::getDefaultEmailAddress('no-reply')
 			);
 		});
-		$container->registerService('ProvisioningApiMiddleware', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ProvisioningApiMiddleware', function(SimpleContainer $c) use ($server) {
 			$user = $server->getUserManager()->get($c['UserId']);
 			$isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
 			$isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;

Indentation +29 added lines, -29 removed lines

@@ -37,35 +37,35 @@
 use OCP\Util;
 
 class Application extends App {
-	public function __construct(array $urlParams = []) {
-		parent::__construct('provisioning_api', $urlParams);
+    public function __construct(array $urlParams = []) {
+        parent::__construct('provisioning_api', $urlParams);
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		$container->registerService(NewUserMailHelper::class, function (SimpleContainer $c) use ($server) {
-			return new NewUserMailHelper(
-				$server->query(Defaults::class),
-				$server->getURLGenerator(),
-				$server->getL10NFactory(),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-		$container->registerService('ProvisioningApiMiddleware', function (SimpleContainer $c) use ($server) {
-			$user = $server->getUserManager()->get($c['UserId']);
-			$isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
-			$isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
-			return new ProvisioningApiMiddleware(
-				$c->query(IControllerMethodReflector::class),
-				$isAdmin,
-				$isSubAdmin
-			);
-		});
-		$container->registerMiddleWare('ProvisioningApiMiddleware');
-	}
+        $container->registerService(NewUserMailHelper::class, function (SimpleContainer $c) use ($server) {
+            return new NewUserMailHelper(
+                $server->query(Defaults::class),
+                $server->getURLGenerator(),
+                $server->getL10NFactory(),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $container->registerService('ProvisioningApiMiddleware', function (SimpleContainer $c) use ($server) {
+            $user = $server->getUserManager()->get($c['UserId']);
+            $isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
+            $isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
+            return new ProvisioningApiMiddleware(
+                $c->query(IControllerMethodReflector::class),
+                $isAdmin,
+                $isSubAdmin
+            );
+        });
+        $container->registerMiddleWare('ProvisioningApiMiddleware');
+    }
 }

apps/files_versions/lib/Command/ExpireVersions.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,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->expireVersionsForUser($user);
 			});
@@ -116,7 +116,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a version directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_versions')) {
 			return false;
 		}

Indentation +78 added lines, -78 removed lines

@@ -36,92 +36,92 @@
 
 class ExpireVersions extends Command {
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param Expiration $expiration
-	 */
-	public function __construct(IUserManager $userManager,
-								Expiration $expiration) {
-		parent::__construct();
+    /**
+     * @param IUserManager $userManager
+     * @param Expiration $expiration
+     */
+    public function __construct(IUserManager $userManager,
+                                Expiration $expiration) {
+        parent::__construct();
 
-		$this->userManager = $userManager;
-		$this->expiration = $expiration;
-	}
+        $this->userManager = $userManager;
+        $this->expiration = $expiration;
+    }
 
-	protected function configure() {
-		$this
-			->setName('versions:expire')
-			->setDescription('Expires the users file versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('versions:expire')
+            ->setDescription('Expires the users file versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			$output->writeln("No expiry configured.");
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            $output->writeln("No expiry configured.");
+            return;
+        }
 
-		$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->expireVersionsForUser($userObject);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$p = new ProgressBar($output);
-			$p->start();
-			$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
-				$p->advance();
-				$this->expireVersionsForUser($user);
-			});
-			$p->finish();
-			$output->writeln('');
-		}
-	}
+        $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->expireVersionsForUser($userObject);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $p = new ProgressBar($output);
+            $p->start();
+            $this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
+                $p->advance();
+                $this->expireVersionsForUser($user);
+            });
+            $p->finish();
+            $output->writeln('');
+        }
+    }
 
-	public function expireVersionsForUser(IUser $user) {
-		$uid = $user->getUID();
-		if (!$this->setupFS($uid)) {
-			return;
-		}
-		Storage::expireOlderThanMaxForUser($uid);
-	}
+    public function expireVersionsForUser(IUser $user) {
+        $uid = $user->getUID();
+        if (!$this->setupFS($uid)) {
+            return;
+        }
+        Storage::expireOlderThanMaxForUser($uid);
+    }
 
-	/**
-	 * Act on behalf on versions item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on versions item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a version directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a version directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }