nextcloud / server

settings/ajax/setquota.php

Indentation +16 added lines, -16 removed lines

@@ -34,9 +34,9 @@ 
 
 $lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
 if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay
-	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Password confirmation is required'))));
-	exit();
+    $l = \OC::$server->getL10N('core');
+    OC_JSON::error(array( 'data' => array( 'message' => $l->t('Password confirmation is required'))));
+    exit();
 }
 
 $username = isset($_POST["username"]) ? (string)$_POST["username"] : '';
@@ -45,32 +45,32 @@ 
 $currentUserObject = \OC::$server->getUserSession()->getUser();
 $targetUserObject = \OC::$server->getUserManager()->get($username);
 if($targetUserObject !== null && $currentUserObject !== null) {
-	$isUserAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isUserAccessible($currentUserObject, $targetUserObject);
+    $isUserAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isUserAccessible($currentUserObject, $targetUserObject);
 }
 
 if(($username === '' && !OC_User::isAdminUser(OC_User::getUser()))
-	|| (!OC_User::isAdminUser(OC_User::getUser())
-		&& !$isUserAccessible)) {
-	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
-	exit();
+    || (!OC_User::isAdminUser(OC_User::getUser())
+        && !$isUserAccessible)) {
+    $l = \OC::$server->getL10N('core');
+    OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+    exit();
 }
 
 //make sure the quota is in the expected format
 $quota= (string)$_POST["quota"];
 if($quota !== 'none' and $quota !== 'default') {
-	$quota= OC_Helper::computerFileSize($quota);
-	$quota=OC_Helper::humanFileSize($quota);
+    $quota= OC_Helper::computerFileSize($quota);
+    $quota=OC_Helper::humanFileSize($quota);
 }
 
 // Return Success story
 if($username) {
-	$targetUserObject->setQuota($quota);
+    $targetUserObject->setQuota($quota);
 }else{//set the default quota when no username is specified
-	if($quota === 'default') {//'default' as default quota makes no sense
-		$quota='none';
-	}
-	\OC::$server->getAppConfig()->setValue('files', 'default_quota', $quota);
+    if($quota === 'default') {//'default' as default quota makes no sense
+        $quota='none';
+    }
+    \OC::$server->getAppConfig()->setValue('files', 'default_quota', $quota);
 }
 OC_JSON::success(array("data" => array( "username" => $username , 'quota' => $quota)));
 

Spacing +14 added lines, -14 removed lines

@@ -35,42 +35,42 @@
 $lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
 if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay
 	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Password confirmation is required'))));
+	OC_JSON::error(array('data' => array('message' => $l->t('Password confirmation is required'))));
 	exit();
 }
 
-$username = isset($_POST["username"]) ? (string)$_POST["username"] : '';
+$username = isset($_POST["username"]) ? (string) $_POST["username"] : '';
 
 $isUserAccessible = false;
 $currentUserObject = \OC::$server->getUserSession()->getUser();
 $targetUserObject = \OC::$server->getUserManager()->get($username);
-if($targetUserObject !== null && $currentUserObject !== null) {
+if ($targetUserObject !== null && $currentUserObject !== null) {
 	$isUserAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isUserAccessible($currentUserObject, $targetUserObject);
 }
 
-if(($username === '' && !OC_User::isAdminUser(OC_User::getUser()))
+if (($username === '' && !OC_User::isAdminUser(OC_User::getUser()))
 	|| (!OC_User::isAdminUser(OC_User::getUser())
 		&& !$isUserAccessible)) {
 	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	OC_JSON::error(array('data' => array('message' => $l->t('Authentication error'))));
 	exit();
 }
 
 //make sure the quota is in the expected format
-$quota= (string)$_POST["quota"];
-if($quota !== 'none' and $quota !== 'default') {
-	$quota= OC_Helper::computerFileSize($quota);
-	$quota=OC_Helper::humanFileSize($quota);
+$quota = (string) $_POST["quota"];
+if ($quota !== 'none' and $quota !== 'default') {
+	$quota = OC_Helper::computerFileSize($quota);
+	$quota = OC_Helper::humanFileSize($quota);
 }
 
 // Return Success story
-if($username) {
+if ($username) {
 	$targetUserObject->setQuota($quota);
-}else{//set the default quota when no username is specified
-	if($quota === 'default') {//'default' as default quota makes no sense
-		$quota='none';
+} else {//set the default quota when no username is specified
+	if ($quota === 'default') {//'default' as default quota makes no sense
+		$quota = 'none';
 	}
 	\OC::$server->getAppConfig()->setValue('files', 'default_quota', $quota);
 }
-OC_JSON::success(array("data" => array( "username" => $username , 'quota' => $quota)));
+OC_JSON::success(array("data" => array("username" => $username, 'quota' => $quota)));
 

Braces +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 // Return Success story
 if($username) {
 	$targetUserObject->setQuota($quota);
-}else{//set the default quota when no username is specified
+} else{//set the default quota when no username is specified
 	if($quota === 'default') {//'default' as default quota makes no sense
 		$quota='none';
 	}

settings/Controller/LogSettingsController.php

Indentation +13 added lines, -13 removed lines

@@ -41,17 +41,17 @@
  * @package OC\Settings\Controller
  */
 class LogSettingsController extends Controller {
-	/**
-	 * download logfile
-	 *
-	 * @NoCSRFRequired
-	 *
-	 * @return StreamResponse
-	 */
-	public function download() {
-		$resp = new StreamResponse(\OC\Log\File::getLogFilePath());
-		$resp->addHeader('Content-Type', 'application/octet-stream');
-		$resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
-		return $resp;
-	}
+    /**
+     * download logfile
+     *
+     * @NoCSRFRequired
+     *
+     * @return StreamResponse
+     */
+    public function download() {
+        $resp = new StreamResponse(\OC\Log\File::getLogFilePath());
+        $resp->addHeader('Content-Type', 'application/octet-stream');
+        $resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
+        return $resp;
+    }
 }

settings/Controller/SecuritySettingsController.php

Indentation +32 added lines, -32 removed lines

@@ -31,41 +31,41 @@
  * @package OC\Settings\Controller
  */
 class SecuritySettingsController extends Controller {
-	/** @var \OCP\IConfig */
-	private $config;
+    /** @var \OCP\IConfig */
+    private $config;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IConfig $config) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IConfig $config) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+    }
 
-	/**
-	 * @return array
-	 */
-	protected function returnSuccess() {
-		return array(
-			'status' => 'success'
-		);
-	}
+    /**
+     * @return array
+     */
+    protected function returnSuccess() {
+        return array(
+            'status' => 'success'
+        );
+    }
 
-	/**
-	 * Add a new trusted domain
-	 * @param string $newTrustedDomain The newly to add trusted domain
-	 * @return array
-	 */
-	public function trustedDomains($newTrustedDomain) {
-		$trustedDomains = $this->config->getSystemValue('trusted_domains', []);
-		$trustedDomains[] = $newTrustedDomain;
-		$this->config->setSystemValue('trusted_domains', $trustedDomains);
+    /**
+     * Add a new trusted domain
+     * @param string $newTrustedDomain The newly to add trusted domain
+     * @return array
+     */
+    public function trustedDomains($newTrustedDomain) {
+        $trustedDomains = $this->config->getSystemValue('trusted_domains', []);
+        $trustedDomains[] = $newTrustedDomain;
+        $this->config->setSystemValue('trusted_domains', $trustedDomains);
 
-		return $this->returnSuccess();
-	}
+        return $this->returnSuccess();
+    }
 
 }

settings/Controller/EncryptionController.php

Spacing +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
 		} catch (\Exception $e) {
 			return [
 				'data' => [
-					'message' => (string)$this->l10n->t('A problem occurred, please check your log files (Error: %s)', [$e->getMessage()]),
+					'message' => (string) $this->l10n->t('A problem occurred, please check your log files (Error: %s)', [$e->getMessage()]),
 				],
 				'status' => 'error',
 			];

Indentation +113 added lines, -113 removed lines

@@ -40,119 +40,119 @@
  */
 class EncryptionController extends Controller {
 
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var View */
-	private $view;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 * @param View $view
-	 * @param ILogger $logger
-	 * @param IAppManager $appManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IL10N $l10n,
-								IConfig $config,
-								IDBConnection $connection,
-								IUserManager $userManager,
-								View $view,
-								ILogger $logger,
-								IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->view = $view;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * @param IConfig $config
-	 * @param View $view
-	 * @param IDBConnection $connection
-	 * @param ILogger $logger
-	 * @param IAppManager $appManager
-	 * @return Migration
-	 */
-	protected function getMigration(IConfig $config,
-								 View $view,
-								 IDBConnection $connection,
-								 ILogger $logger,
-								 IAppManager $appManager) {
-		return new Migration($config, $view, $connection, $logger, $appManager);
-	}
-
-	/**
-	 * start migration
-	 *
-	 * @return array
-	 */
-	public function startMigration() {
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var View */
+    private $view;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     * @param View $view
+     * @param ILogger $logger
+     * @param IAppManager $appManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IConfig $config,
+                                IDBConnection $connection,
+                                IUserManager $userManager,
+                                View $view,
+                                ILogger $logger,
+                                IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->view = $view;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * @param IConfig $config
+     * @param View $view
+     * @param IDBConnection $connection
+     * @param ILogger $logger
+     * @param IAppManager $appManager
+     * @return Migration
+     */
+    protected function getMigration(IConfig $config,
+                                    View $view,
+                                    IDBConnection $connection,
+                                    ILogger $logger,
+                                    IAppManager $appManager) {
+        return new Migration($config, $view, $connection, $logger, $appManager);
+    }
+
+    /**
+     * start migration
+     *
+     * @return array
+     */
+    public function startMigration() {
         // allow as long execution on the web server as possible
-		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			@set_time_limit(0);
-		}
-
-		try {
-
-			$migration = $this->getMigration($this->config, $this->view, $this->connection, $this->logger, $this->appManager);
-			$migration->reorganizeSystemFolderStructure();
-			$migration->updateDB();
-
-			foreach ($this->userManager->getBackends() as $backend) {
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers('', $limit, $offset);
-					foreach ($users as $user) {
-						$migration->reorganizeFolderStructureForUser($user);
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-
-			$migration->finalCleanUp();
-
-		} catch (\Exception $e) {
-			return [
-				'data' => [
-					'message' => (string)$this->l10n->t('A problem occurred, please check your log files (Error: %s)', [$e->getMessage()]),
-				],
-				'status' => 'error',
-			];
-		}
-
-		return [
-			'data' => [
-				'message' => (string) $this->l10n->t('Migration Completed'),
-				],
-			'status' => 'success',
-		];
-	}
+        if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            @set_time_limit(0);
+        }
+
+        try {
+
+            $migration = $this->getMigration($this->config, $this->view, $this->connection, $this->logger, $this->appManager);
+            $migration->reorganizeSystemFolderStructure();
+            $migration->updateDB();
+
+            foreach ($this->userManager->getBackends() as $backend) {
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers('', $limit, $offset);
+                    foreach ($users as $user) {
+                        $migration->reorganizeFolderStructureForUser($user);
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+
+            $migration->finalCleanUp();
+
+        } catch (\Exception $e) {
+            return [
+                'data' => [
+                    'message' => (string)$this->l10n->t('A problem occurred, please check your log files (Error: %s)', [$e->getMessage()]),
+                ],
+                'status' => 'error',
+            ];
+        }
+
+        return [
+            'data' => [
+                'message' => (string) $this->l10n->t('Migration Completed'),
+                ],
+            'status' => 'success',
+        ];
+    }
 
 }

settings/Controller/MailSettingsController.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 
 		$params = get_defined_vars();
 		$configs = [];
-		foreach($params as $key => $value) {
+		foreach ($params as $key => $value) {
 			$configs[$key] = (empty($value)) ? null : $value;
 		}
 

Indentation +133 added lines, -133 removed lines

@@ -39,138 +39,138 @@
  */
 class MailSettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l10n;
-	/** @var IConfig */
-	private $config;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IMailer */
-	private $mailer;
-	/** @var string */
-	private $defaultMailAddress;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param IMailer $mailer
-	 * @param string $fromMailAddress
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IL10N $l10n,
-								IConfig $config,
-								IUserSession $userSession,
-								IMailer $mailer,
-								$fromMailAddress) {
-		parent::__construct($appName, $request);
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->mailer = $mailer;
-		$this->defaultMailAddress = $fromMailAddress;
-	}
-
-	/**
-	 * Sets the email settings
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $mail_domain
-	 * @param string $mail_from_address
-	 * @param string $mail_smtpmode
-	 * @param string $mail_smtpsecure
-	 * @param string $mail_smtphost
-	 * @param string $mail_smtpauthtype
-	 * @param int $mail_smtpauth
-	 * @param string $mail_smtpport
-	 * @return DataResponse
-	 */
-	public function setMailSettings($mail_domain,
-									$mail_from_address,
-									$mail_smtpmode,
-									$mail_smtpsecure,
-									$mail_smtphost,
-									$mail_smtpauthtype,
-									$mail_smtpauth,
-									$mail_smtpport) {
-
-		$params = get_defined_vars();
-		$configs = [];
-		foreach($params as $key => $value) {
-			$configs[$key] = (empty($value)) ? null : $value;
-		}
-
-		// Delete passwords from config in case no auth is specified
-		if ($params['mail_smtpauth'] !== 1) {
-			$configs['mail_smtpname'] = null;
-			$configs['mail_smtppassword'] = null;
-		}
-
-		$this->config->setSystemValues($configs);
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Store the credentials used for SMTP in the config
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $mail_smtpname
-	 * @param string $mail_smtppassword
-	 * @return DataResponse
-	 */
-	public function storeCredentials($mail_smtpname, $mail_smtppassword) {
-		if ($mail_smtppassword === '********') {
-			return new DataResponse($this->l10n->t('Invalid SMTP password.'), Http::STATUS_BAD_REQUEST);
-		}
-
-		$this->config->setSystemValues([
-			'mail_smtpname'		=> $mail_smtpname,
-			'mail_smtppassword'	=> $mail_smtppassword,
-		]);
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Send a mail to test the settings
-	 * @return DataResponse
-	 */
-	public function sendTestMail() {
-		$email = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'email', '');
-		if (!empty($email)) {
-			try {
-				$displayName = $this->userSession->getUser()->getDisplayName();
-
-				$template = $this->mailer->createEMailTemplate('settings.TestEmail', [
-					'displayname' => $displayName,
-				]);
-
-				$template->setSubject($this->l10n->t('Email setting test'));
-				$template->addHeader();
-				$template->addHeading($this->l10n->t('Well done, %s!', [$displayName]));
-				$template->addBodyText($this->l10n->t('If you received this email, the email configuration seems to be correct.'));
-				$template->addFooter();
-
-				$message = $this->mailer->createMessage();
-				$message->setTo([$email => $displayName]);
-				$message->useTemplate($template);
-				$errors = $this->mailer->send($message);
-				if (!empty($errors)) {
-					throw new \RuntimeException($this->l10n->t('Email could not be sent. Check your mail server log'));
-				}
-				return new DataResponse();
-			} catch (\Exception $e) {
-				return new DataResponse($this->l10n->t('A problem occurred while sending the email. Please revise your settings. (Error: %s)', [$e->getMessage()]), Http::STATUS_BAD_REQUEST);
-			}
-		}
-
-		return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails.'), Http::STATUS_BAD_REQUEST);
-	}
+    /** @var IL10N */
+    private $l10n;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IMailer */
+    private $mailer;
+    /** @var string */
+    private $defaultMailAddress;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param IMailer $mailer
+     * @param string $fromMailAddress
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                IMailer $mailer,
+                                $fromMailAddress) {
+        parent::__construct($appName, $request);
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->mailer = $mailer;
+        $this->defaultMailAddress = $fromMailAddress;
+    }
+
+    /**
+     * Sets the email settings
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $mail_domain
+     * @param string $mail_from_address
+     * @param string $mail_smtpmode
+     * @param string $mail_smtpsecure
+     * @param string $mail_smtphost
+     * @param string $mail_smtpauthtype
+     * @param int $mail_smtpauth
+     * @param string $mail_smtpport
+     * @return DataResponse
+     */
+    public function setMailSettings($mail_domain,
+                                    $mail_from_address,
+                                    $mail_smtpmode,
+                                    $mail_smtpsecure,
+                                    $mail_smtphost,
+                                    $mail_smtpauthtype,
+                                    $mail_smtpauth,
+                                    $mail_smtpport) {
+
+        $params = get_defined_vars();
+        $configs = [];
+        foreach($params as $key => $value) {
+            $configs[$key] = (empty($value)) ? null : $value;
+        }
+
+        // Delete passwords from config in case no auth is specified
+        if ($params['mail_smtpauth'] !== 1) {
+            $configs['mail_smtpname'] = null;
+            $configs['mail_smtppassword'] = null;
+        }
+
+        $this->config->setSystemValues($configs);
+
+        return new DataResponse();
+    }
+
+    /**
+     * Store the credentials used for SMTP in the config
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $mail_smtpname
+     * @param string $mail_smtppassword
+     * @return DataResponse
+     */
+    public function storeCredentials($mail_smtpname, $mail_smtppassword) {
+        if ($mail_smtppassword === '********') {
+            return new DataResponse($this->l10n->t('Invalid SMTP password.'), Http::STATUS_BAD_REQUEST);
+        }
+
+        $this->config->setSystemValues([
+            'mail_smtpname'		=> $mail_smtpname,
+            'mail_smtppassword'	=> $mail_smtppassword,
+        ]);
+
+        return new DataResponse();
+    }
+
+    /**
+     * Send a mail to test the settings
+     * @return DataResponse
+     */
+    public function sendTestMail() {
+        $email = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'email', '');
+        if (!empty($email)) {
+            try {
+                $displayName = $this->userSession->getUser()->getDisplayName();
+
+                $template = $this->mailer->createEMailTemplate('settings.TestEmail', [
+                    'displayname' => $displayName,
+                ]);
+
+                $template->setSubject($this->l10n->t('Email setting test'));
+                $template->addHeader();
+                $template->addHeading($this->l10n->t('Well done, %s!', [$displayName]));
+                $template->addBodyText($this->l10n->t('If you received this email, the email configuration seems to be correct.'));
+                $template->addFooter();
+
+                $message = $this->mailer->createMessage();
+                $message->setTo([$email => $displayName]);
+                $message->useTemplate($template);
+                $errors = $this->mailer->send($message);
+                if (!empty($errors)) {
+                    throw new \RuntimeException($this->l10n->t('Email could not be sent. Check your mail server log'));
+                }
+                return new DataResponse();
+            } catch (\Exception $e) {
+                return new DataResponse($this->l10n->t('A problem occurred while sending the email. Please revise your settings. (Error: %s)', [$e->getMessage()]), Http::STATUS_BAD_REQUEST);
+            }
+        }
+
+        return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails.'), Http::STATUS_BAD_REQUEST);
+    }
 
 }

settings/Middleware/SubadminMiddleware.php

Spacing +3 added lines, -3 removed lines

@@ -59,8 +59,8 @@ 
 	 * @throws \Exception
 	 */
 	public function beforeController($controller, $methodName) {
-		if(!$this->reflector->hasAnnotation('NoSubadminRequired')) {
-			if(!$this->isSubAdmin) {
+		if (!$this->reflector->hasAnnotation('NoSubadminRequired')) {
+			if (!$this->isSubAdmin) {
 				throw new NotAdminException('Logged in user must be a subadmin');
 			}
 		}
@@ -75,7 +75,7 @@ 
 	 * @throws \Exception
 	 */
 	public function afterException($controller, $methodName, \Exception $exception) {
-		if($exception instanceof NotAdminException) {
+		if ($exception instanceof NotAdminException) {
 			$response = new TemplateResponse('core', '403', array(), 'guest');
 			$response->setStatus(Http::STATUS_FORBIDDEN);
 			return $response;

Indentation +42 added lines, -42 removed lines

@@ -38,51 +38,51 @@
  * @package OC\Settings\Middleware
  */
 class SubadminMiddleware extends Middleware {
-	/** @var bool */
-	protected $isSubAdmin;
-	/** @var ControllerMethodReflector */
-	protected $reflector;
+    /** @var bool */
+    protected $isSubAdmin;
+    /** @var ControllerMethodReflector */
+    protected $reflector;
 
-	/**
-	 * @param ControllerMethodReflector $reflector
-	 * @param bool $isSubAdmin
-	 */
-	public function __construct(ControllerMethodReflector $reflector,
-								$isSubAdmin) {
-		$this->reflector = $reflector;
-		$this->isSubAdmin = $isSubAdmin;
-	}
+    /**
+     * @param ControllerMethodReflector $reflector
+     * @param bool $isSubAdmin
+     */
+    public function __construct(ControllerMethodReflector $reflector,
+                                $isSubAdmin) {
+        $this->reflector = $reflector;
+        $this->isSubAdmin = $isSubAdmin;
+    }
 
-	/**
-	 * Check if sharing is enabled before the controllers is executed
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws \Exception
-	 */
-	public function beforeController($controller, $methodName) {
-		if(!$this->reflector->hasAnnotation('NoSubadminRequired')) {
-			if(!$this->isSubAdmin) {
-				throw new NotAdminException('Logged in user must be a subadmin');
-			}
-		}
-	}
+    /**
+     * Check if sharing is enabled before the controllers is executed
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws \Exception
+     */
+    public function beforeController($controller, $methodName) {
+        if(!$this->reflector->hasAnnotation('NoSubadminRequired')) {
+            if(!$this->isSubAdmin) {
+                throw new NotAdminException('Logged in user must be a subadmin');
+            }
+        }
+    }
 
-	/**
-	 * Return 403 page in case of an exception
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @return TemplateResponse
-	 * @throws \Exception
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if($exception instanceof NotAdminException) {
-			$response = new TemplateResponse('core', '403', array(), 'guest');
-			$response->setStatus(Http::STATUS_FORBIDDEN);
-			return $response;
-		}
+    /**
+     * Return 403 page in case of an exception
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @return TemplateResponse
+     * @throws \Exception
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if($exception instanceof NotAdminException) {
+            $response = new TemplateResponse('core', '403', array(), 'guest');
+            $response->setStatus(Http::STATUS_FORBIDDEN);
+            return $response;
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 
 }

settings/users.php

Braces +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 		];
 	}
 	$subAdmins = $result;
-}else{
+} else{
 	/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
 	$gids = array();
 	foreach($groups as $group) {

Indentation +39 added lines, -39 removed lines

@@ -49,18 +49,18 @@ 
 $config = \OC::$server->getConfig();
 
 if ($config->getSystemValue('sort_groups_by_name', false)) {
-	$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
+    $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
 } else {
-	$isLDAPUsed = false;
-	if ($appManager->isEnabledForUser('user_ldap')) {
-		$isLDAPUsed =
-			$groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP')
-			|| $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
-		if ($isLDAPUsed) {
-			// LDAP user count can be slow, so we sort by group name here
-			$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
-		}
-	}
+    $isLDAPUsed = false;
+    if ($appManager->isEnabledForUser('user_ldap')) {
+        $isLDAPUsed =
+            $groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP')
+            || $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
+        if ($isLDAPUsed) {
+            // LDAP user count can be slow, so we sort by group name here
+            $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
+        }
+    }
 }
 
 $isAdmin = OC_User::isAdminUser(OC_User::getUser());
@@ -68,58 +68,58 @@ 
 $isDisabled = !OC_User::isEnabled(OC_User::getUser());
 
 $groupsInfo = new \OC\Group\MetaData(
-	OC_User::getUser(),
-	$isAdmin,
-	$groupManager,
-	\OC::$server->getUserSession()
+    OC_User::getUser(),
+    $isAdmin,
+    $groupManager,
+    \OC::$server->getUserSession()
 );
 
 $groupsInfo->setSorting($sortGroupsBy);
 list($adminGroup, $groups) = $groupsInfo->get();
 
 $recoveryAdminEnabled = $appManager->isEnabledForUser('encryption') &&
-					    $config->getAppValue( 'encryption', 'recoveryAdminEnabled', '0');
+                        $config->getAppValue( 'encryption', 'recoveryAdminEnabled', '0');
 
 if($isAdmin) {
-	$subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins();
-	// New class returns IUser[] so convert back
-	$result = [];
-	foreach ($subAdmins as $subAdmin) {
-		$result[] = [
-			'gid' => $subAdmin['group']->getGID(),
-			'uid' => $subAdmin['user']->getUID(),
-		];
-	}
-	$subAdmins = $result;
+    $subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins();
+    // New class returns IUser[] so convert back
+    $result = [];
+    foreach ($subAdmins as $subAdmin) {
+        $result[] = [
+            'gid' => $subAdmin['group']->getGID(),
+            'uid' => $subAdmin['user']->getUID(),
+        ];
+    }
+    $subAdmins = $result;
 }else{
-	/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
-	$gids = array();
-	foreach($groups as $group) {
-		if (isset($group['id'])) {
-			$gids[] = $group['id'];
-		}
-	}
-	$subAdmins = false;
+    /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
+    $gids = array();
+    foreach($groups as $group) {
+        if (isset($group['id'])) {
+            $gids[] = $group['id'];
+        }
+    }
+    $subAdmins = false;
 }
 
 $disabledUsers = $isLDAPUsed ? 0 : $userManager->countDisabledUsers();
 $disabledUsersGroup = [
-	'id' => '_disabledUsers',
-	'name' => '_disabledUsers',
-	'usercount' => $disabledUsers
+    'id' => '_disabledUsers',
+    'name' => '_disabledUsers',
+    'usercount' => $disabledUsers
 ];
 
 // load preset quotas
 $quotaPreset=$config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
 $quotaPreset=explode(',', $quotaPreset);
 foreach($quotaPreset as &$preset) {
-	$preset=trim($preset);
+    $preset=trim($preset);
 }
 $quotaPreset=array_diff($quotaPreset, array('default', 'none'));
 
 $defaultQuota=$config->getAppValue('files', 'default_quota', 'none');
 $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false
-	&& array_search($defaultQuota, array('none', 'default'))===false;
+    && array_search($defaultQuota, array('none', 'default'))===false;
 
 \OC::$server->getEventDispatcher()->dispatch('OC\Settings\Users::loadAdditionalScripts');
 

Spacing +13 added lines, -13 removed lines

@@ -78,9 +78,9 @@ 
 list($adminGroup, $groups) = $groupsInfo->get();
 
 $recoveryAdminEnabled = $appManager->isEnabledForUser('encryption') &&
-					    $config->getAppValue( 'encryption', 'recoveryAdminEnabled', '0');
+					    $config->getAppValue('encryption', 'recoveryAdminEnabled', '0');
 
-if($isAdmin) {
+if ($isAdmin) {
 	$subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins();
 	// New class returns IUser[] so convert back
 	$result = [];
@@ -91,10 +91,10 @@ 
 		];
 	}
 	$subAdmins = $result;
-}else{
+} else {
 	/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
 	$gids = array();
-	foreach($groups as $group) {
+	foreach ($groups as $group) {
 		if (isset($group['id'])) {
 			$gids[] = $group['id'];
 		}
@@ -110,16 +110,16 @@ 
 ];
 
 // load preset quotas
-$quotaPreset=$config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
-$quotaPreset=explode(',', $quotaPreset);
-foreach($quotaPreset as &$preset) {
-	$preset=trim($preset);
+$quotaPreset = $config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
+$quotaPreset = explode(',', $quotaPreset);
+foreach ($quotaPreset as &$preset) {
+	$preset = trim($preset);
 }
-$quotaPreset=array_diff($quotaPreset, array('default', 'none'));
+$quotaPreset = array_diff($quotaPreset, array('default', 'none'));
 
-$defaultQuota=$config->getAppValue('files', 'default_quota', 'none');
-$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false
-	&& array_search($defaultQuota, array('none', 'default'))===false;
+$defaultQuota = $config->getAppValue('files', 'default_quota', 'none');
+$defaultQuotaIsUserDefined = array_search($defaultQuota, $quotaPreset) === false
+	&& array_search($defaultQuota, array('none', 'default')) === false;
 
 \OC::$server->getEventDispatcher()->dispatch('OC\Settings\Users::loadAdditionalScripts');
 
@@ -128,7 +128,7 @@ 
 $tmpl->assign('sortGroups', $sortGroupsBy);
 $tmpl->assign('adminGroup', $adminGroup);
 $tmpl->assign('disabledUsersGroup', $disabledUsersGroup);
-$tmpl->assign('isAdmin', (int)$isAdmin);
+$tmpl->assign('isAdmin', (int) $isAdmin);
 $tmpl->assign('subadmins', $subAdmins);
 $tmpl->assign('numofgroups', count($groups) + count($adminGroup));
 $tmpl->assign('quota_preset', $quotaPreset);

settings/help.php

Indentation +6 added lines, -6 removed lines

@@ -36,13 +36,13 @@
 
 
 if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
-	$style1='';
-	$style2=' active';
+    $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
+    $style1='';
+    $style2=' active';
 }else{
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
-	$style1=' active';
-	$style2='';
+    $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
+    $style1=' active';
+    $style2='';
 }
 
 $url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';

Spacing +18 added lines, -18 removed lines

@@ -31,28 +31,28 @@
 OC_Util::checkLoggedIn();
 
 // Load the files we need
-OC_Util::addStyle( "settings", "settings" );
+OC_Util::addStyle("settings", "settings");
 \OC::$server->getNavigationManager()->setActiveEntry('help');
 
 
-if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
-	$style1='';
-	$style2=' active';
-}else{
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
-	$style1=' active';
-	$style2='';
+if (isset($_GET['mode']) and $_GET['mode'] === 'admin') {
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/admin/index.html');
+	$style1 = '';
+	$style2 = ' active';
+} else {
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/user/index.html');
+	$style1 = ' active';
+	$style2 = '';
 }
 
-$url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
-$url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
+$url1 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
+$url2 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
 
-$tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser()));
-$tmpl->assign( "url", $url );
-$tmpl->assign( "url1", $url1 );
-$tmpl->assign( "url2", $url2 );
-$tmpl->assign( "style1", $style1 );
-$tmpl->assign( "style2", $style2 );
+$tmpl = new OC_Template("settings", "help", "user");
+$tmpl->assign("admin", OC_User::isAdminUser(OC_User::getUser()));
+$tmpl->assign("url", $url);
+$tmpl->assign("url1", $url1);
+$tmpl->assign("url2", $url2);
+$tmpl->assign("style1", $style1);
+$tmpl->assign("style2", $style2);
 $tmpl->printPage();

Braces +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
 	$style1='';
 	$style2=' active';
-}else{
+} else{
 	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
 	$style1=' active';
 	$style2='';

apps/files_external/lib/Command/Delete.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
 			return 404;
 		}
 

Indentation +61 added lines, -61 removed lines

@@ -37,76 +37,76 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Delete extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	/**
-	 * @var UserStoragesService
-	 */
-	protected $userService;
+    /**
+     * @var UserStoragesService
+     */
+    protected $userService;
 
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
 
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-	}
+    function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:delete')
-			->setDescription('Delete an external mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addOption(
-				'yes',
-				'y',
-				InputOption::VALUE_NONE,
-				'Skip confirmation'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:delete')
+            ->setDescription('Delete an external mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addOption(
+                'yes',
+                'y',
+                InputOption::VALUE_NONE,
+                'Skip confirmation'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mountId = $input->getArgument('mount_id');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mountId = $input->getArgument('mount_id');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$noConfirm = $input->getOption('yes');
+        $noConfirm = $input->getOption('yes');
 
-		if (!$noConfirm) {
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listCommand->listMounts(null, [$mount], $listInput, $output);
+        if (!$noConfirm) {
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listCommand->listMounts(null, [$mount], $listInput, $output);
 
-			$questionHelper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
+            $questionHelper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
 
-			if (!$questionHelper->ask($input, $output, $question)) {
-				return null;
-			}
-		}
+            if (!$questionHelper->ask($input, $output, $question)) {
+                return null;
+            }
+        }
 
-		$this->globalService->removeStorage($mountId);
-	}
+        $this->globalService->removeStorage($mountId);
+    }
 }