nextcloud / server

apps/workflowengine/lib/Check/RequestUserAgent.php

Indentation +51 added lines, -51 removed lines

@@ -26,60 +26,60 @@
 
 class RequestUserAgent extends AbstractStringCheck {
 
-	/** @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'], true)) {
-			switch ($value) {
-				case 'android':
-					$operator = $operator === 'is' ? 'matches' : '!matches';
-					$value = IRequest::USER_AGENT_CLIENT_ANDROID;
-					break;
-				case 'ios':
-					$operator = $operator === 'is' ? 'matches' : '!matches';
-					$value = IRequest::USER_AGENT_CLIENT_IOS;
-					break;
-				case 'desktop':
-					$operator = $operator === 'is' ? 'matches' : '!matches';
-					$value = IRequest::USER_AGENT_CLIENT_DESKTOP;
-					break;
-				case 'mail':
-					if ($operator === 'is') {
-						return $this->executeStringCheck('matches', IRequest::USER_AGENT_OUTLOOK_ADDON, $actualValue)
-							|| $this->executeStringCheck('matches', IRequest::USER_AGENT_THUNDERBIRD_ADDON, $actualValue);
-					}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $actualValue = $this->getActualValue();
+        if (in_array($operator, ['is', '!is'], true)) {
+            switch ($value) {
+                case 'android':
+                    $operator = $operator === 'is' ? 'matches' : '!matches';
+                    $value = IRequest::USER_AGENT_CLIENT_ANDROID;
+                    break;
+                case 'ios':
+                    $operator = $operator === 'is' ? 'matches' : '!matches';
+                    $value = IRequest::USER_AGENT_CLIENT_IOS;
+                    break;
+                case 'desktop':
+                    $operator = $operator === 'is' ? 'matches' : '!matches';
+                    $value = IRequest::USER_AGENT_CLIENT_DESKTOP;
+                    break;
+                case 'mail':
+                    if ($operator === 'is') {
+                        return $this->executeStringCheck('matches', IRequest::USER_AGENT_OUTLOOK_ADDON, $actualValue)
+                            || $this->executeStringCheck('matches', IRequest::USER_AGENT_THUNDERBIRD_ADDON, $actualValue);
+                    }
 
-					return $this->executeStringCheck('!matches', IRequest::USER_AGENT_OUTLOOK_ADDON, $actualValue)
-						&& $this->executeStringCheck('!matches', IRequest::USER_AGENT_THUNDERBIRD_ADDON, $actualValue);
-			}
-		}
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+                    return $this->executeStringCheck('!matches', IRequest::USER_AGENT_OUTLOOK_ADDON, $actualValue)
+                        && $this->executeStringCheck('!matches', IRequest::USER_AGENT_THUNDERBIRD_ADDON, $actualValue);
+            }
+        }
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		return $this->request->getHeader('User-Agent');
-	}
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        return $this->request->getHeader('User-Agent');
+    }
 
-	public function isAvailableForScope(int $scope): bool {
-		return true;
-	}
+    public function isAvailableForScope(int $scope): bool {
+        return true;
+    }
 }

apps/encryption/lib/Controller/SettingsController.php

Indentation +123 added lines, -123 removed lines

@@ -38,128 +38,128 @@
 
 class SettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var KeyManager */
-	private $keyManager;
-
-	/** @var Crypt */
-	private $crypt;
-
-	/** @var Session */
-	private $session;
-
-	/** @var ISession  */
-	private $ocSession;
-
-	/** @var  Util */
-	private $util;
-
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param KeyManager $keyManager
-	 * @param Crypt $crypt
-	 * @param Session $session
-	 * @param ISession $ocSession
-	 * @param Util $util
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IL10N $l10n,
-								IUserManager $userManager,
-								IUserSession $userSession,
-								KeyManager $keyManager,
-								Crypt $crypt,
-								Session $session,
-								ISession $ocSession,
-								Util $util
+    /** @var IL10N */
+    private $l;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var KeyManager */
+    private $keyManager;
+
+    /** @var Crypt */
+    private $crypt;
+
+    /** @var Session */
+    private $session;
+
+    /** @var ISession  */
+    private $ocSession;
+
+    /** @var  Util */
+    private $util;
+
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param KeyManager $keyManager
+     * @param Crypt $crypt
+     * @param Session $session
+     * @param ISession $ocSession
+     * @param Util $util
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IUserManager $userManager,
+                                IUserSession $userSession,
+                                KeyManager $keyManager,
+                                Crypt $crypt,
+                                Session $session,
+                                ISession $ocSession,
+                                Util $util
 ) {
-		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->keyManager = $keyManager;
-		$this->crypt = $crypt;
-		$this->session = $session;
-		$this->ocSession = $ocSession;
-		$this->util = $util;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 * @UseSession
-	 *
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 * @return DataResponse
-	 */
-	public function updatePrivateKeyPassword($oldPassword, $newPassword) {
-		$result = false;
-		$uid = $this->userSession->getUser()->getUID();
-		$errorMessage = $this->l->t('Could not update the private key password.');
-
-		//check if password is correct
-		$passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
-		if ($passwordCorrect === false) {
-			// if check with uid fails we need to check the password with the login name
-			// e.g. in the ldap case. For local user we need to check the password with
-			// the uid because in this case the login name is case insensitive
-			$loginName = $this->ocSession->get('loginname');
-			$passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
-		}
-
-		if ($passwordCorrect !== false) {
-			$encryptedKey = $this->keyManager->getPrivateKey($uid);
-			$decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid);
-
-			if ($decryptedKey) {
-				$encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
-				$header = $this->crypt->generateHeader();
-				if ($encryptedKey) {
-					$this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
-					$this->session->setPrivateKey($decryptedKey);
-					$result = true;
-				}
-			} else {
-				$errorMessage = $this->l->t('The old password was not correct, please try again.');
-			}
-		} else {
-			$errorMessage = $this->l->t('The current log-in password was not correct, please try again.');
-		}
-
-		if ($result === true) {
-			$this->session->setStatus(Session::INIT_SUCCESSFUL);
-			return new DataResponse(
-				['message' => $this->l->t('Private key password successfully updated.')]
-			);
-		} else {
-			return new DataResponse(
-				['message' => $errorMessage],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-	}
-
-	/**
-	 * @UseSession
-	 *
-	 * @param bool $encryptHomeStorage
-	 * @return DataResponse
-	 */
-	public function setEncryptHomeStorage($encryptHomeStorage) {
-		$this->util->setEncryptHomeStorage($encryptHomeStorage);
-		return new DataResponse();
-	}
+        parent::__construct($AppName, $request);
+        $this->l = $l10n;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->keyManager = $keyManager;
+        $this->crypt = $crypt;
+        $this->session = $session;
+        $this->ocSession = $ocSession;
+        $this->util = $util;
+    }
+
+
+    /**
+     * @NoAdminRequired
+     * @UseSession
+     *
+     * @param string $oldPassword
+     * @param string $newPassword
+     * @return DataResponse
+     */
+    public function updatePrivateKeyPassword($oldPassword, $newPassword) {
+        $result = false;
+        $uid = $this->userSession->getUser()->getUID();
+        $errorMessage = $this->l->t('Could not update the private key password.');
+
+        //check if password is correct
+        $passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
+        if ($passwordCorrect === false) {
+            // if check with uid fails we need to check the password with the login name
+            // e.g. in the ldap case. For local user we need to check the password with
+            // the uid because in this case the login name is case insensitive
+            $loginName = $this->ocSession->get('loginname');
+            $passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
+        }
+
+        if ($passwordCorrect !== false) {
+            $encryptedKey = $this->keyManager->getPrivateKey($uid);
+            $decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid);
+
+            if ($decryptedKey) {
+                $encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
+                $header = $this->crypt->generateHeader();
+                if ($encryptedKey) {
+                    $this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
+                    $this->session->setPrivateKey($decryptedKey);
+                    $result = true;
+                }
+            } else {
+                $errorMessage = $this->l->t('The old password was not correct, please try again.');
+            }
+        } else {
+            $errorMessage = $this->l->t('The current log-in password was not correct, please try again.');
+        }
+
+        if ($result === true) {
+            $this->session->setStatus(Session::INIT_SUCCESSFUL);
+            return new DataResponse(
+                ['message' => $this->l->t('Private key password successfully updated.')]
+            );
+        } else {
+            return new DataResponse(
+                ['message' => $errorMessage],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
+    }
+
+    /**
+     * @UseSession
+     *
+     * @param bool $encryptHomeStorage
+     * @return DataResponse
+     */
+    public function setEncryptHomeStorage($encryptHomeStorage) {
+        $this->util->setEncryptHomeStorage($encryptHomeStorage);
+        return new DataResponse();
+    }
 }

apps/encryption/lib/Controller/StatusController.php

Indentation +62 added lines, -62 removed lines

@@ -35,71 +35,71 @@
 
 class StatusController extends Controller {
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var Session */
-	private $session;
+    /** @var Session */
+    private $session;
 
-	/** @var IManager */
-	private $encryptionManager;
+    /** @var IManager */
+    private $encryptionManager;
 
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param Session $session
-	 * @param IManager $encryptionManager
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IL10N $l10n,
-								Session $session,
-								IManager $encryptionManager
-								) {
-		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->session = $session;
-		$this->encryptionManager = $encryptionManager;
-	}
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param Session $session
+     * @param IManager $encryptionManager
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                Session $session,
+                                IManager $encryptionManager
+                                ) {
+        parent::__construct($AppName, $request);
+        $this->l = $l10n;
+        $this->session = $session;
+        $this->encryptionManager = $encryptionManager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @return DataResponse
-	 */
-	public function getStatus() {
-		$status = 'error';
-		$message = 'no valid init status';
-		switch ($this->session->getStatus()) {
-			case Session::INIT_EXECUTED:
-				$status = 'interactionNeeded';
-				$message = $this->l->t(
-					'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.'
-				);
-				break;
-			case Session::NOT_INITIALIZED:
-				$status = 'interactionNeeded';
-				if ($this->encryptionManager->isEnabled()) {
-					$message = $this->l->t(
-						'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
-					);
-				} else {
-					$message = $this->l->t(
-						'Please enable server side encryption in the admin settings in order to use the encryption module.'
-					);
-				}
-				break;
-			case Session::INIT_SUCCESSFUL:
-				$status = 'success';
-				$message = $this->l->t('Encryption app is enabled and ready');
-		}
+    /**
+     * @NoAdminRequired
+     * @return DataResponse
+     */
+    public function getStatus() {
+        $status = 'error';
+        $message = 'no valid init status';
+        switch ($this->session->getStatus()) {
+            case Session::INIT_EXECUTED:
+                $status = 'interactionNeeded';
+                $message = $this->l->t(
+                    'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.'
+                );
+                break;
+            case Session::NOT_INITIALIZED:
+                $status = 'interactionNeeded';
+                if ($this->encryptionManager->isEnabled()) {
+                    $message = $this->l->t(
+                        'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
+                    );
+                } else {
+                    $message = $this->l->t(
+                        'Please enable server side encryption in the admin settings in order to use the encryption module.'
+                    );
+                }
+                break;
+            case Session::INIT_SUCCESSFUL:
+                $status = 'success';
+                $message = $this->l->t('Encryption app is enabled and ready');
+        }
 
-		return new DataResponse(
-			[
-				'status' => $status,
-				'data' => [
-					'message' => $message]
-			]
-		);
-	}
+        return new DataResponse(
+            [
+                'status' => $status,
+                'data' => [
+                    'message' => $message]
+            ]
+        );
+    }
 }

apps/dav/lib/Migration/Version1004Date20170924124212.php

Indentation +17 added lines, -17 removed lines

@@ -30,24 +30,24 @@
 
 class Version1004Date20170924124212 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('cards');
-		$table->addIndex(['addressbookid'], 'cards_abid');
-		$table->addIndex(['addressbookid', 'uri'], 'cards_abiduri');
+        $table = $schema->getTable('cards');
+        $table->addIndex(['addressbookid'], 'cards_abid');
+        $table->addIndex(['addressbookid', 'uri'], 'cards_abiduri');
 
-		$table = $schema->getTable('cards_properties');
-		$table->addIndex(['addressbookid'], 'cards_prop_abid');
+        $table = $schema->getTable('cards_properties');
+        $table->addIndex(['addressbookid'], 'cards_prop_abid');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Migrations/Version21000Date20210119195004.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version21000Date20210119195004 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('authtoken');
-		if ($table->hasIndex('authtoken_version_index')) {
-			$table->dropIndex('authtoken_version_index');
-		}
+        $table = $schema->getTable('authtoken');
+        if ($table->hasIndex('authtoken_version_index')) {
+            $table->dropIndex('authtoken_version_index');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Migrations/Version14000Date20180518120534.php

Indentation +18 added lines, -18 removed lines

@@ -31,24 +31,24 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180518120534 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('authtoken');
-		$table->addColumn('private_key', 'text', [
-			'notnull' => false,
-		]);
-		$table->addColumn('public_key', 'text', [
-			'notnull' => false,
-		]);
-		$table->addColumn('version', 'smallint', [
-			'notnull' => true,
-			'default' => 1,
-			'unsigned' => true,
-		]);
-		$table->addIndex(['uid'], 'authtoken_uid_index');
+        $table = $schema->getTable('authtoken');
+        $table->addColumn('private_key', 'text', [
+            'notnull' => false,
+        ]);
+        $table->addColumn('public_key', 'text', [
+            'notnull' => false,
+        ]);
+        $table->addColumn('version', 'smallint', [
+            'notnull' => true,
+            'default' => 1,
+            'unsigned' => true,
+        ]);
+        $table->addIndex(['uid'], 'authtoken_uid_index');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/public/IInitialStateService.php

Indentation +32 added lines, -32 removed lines

@@ -35,37 +35,37 @@
  * @see \OCP\AppFramework\Services\IInitialState
  */
 interface IInitialStateService {
-	/**
-	 * Allows an app to provide its initial state to the template system.
-	 * Use this if you know your initial state sill be used for example if
-	 * you are in the render function of you controller.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $appName
-	 * @param string $key
-	 * @param bool|int|float|string|array|\JsonSerializable $data
-	 *
-	 * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider
-	 * @see \OCP\AppFramework\Services\IInitialState::provideInitialState()
-	 */
-	public function provideInitialState(string $appName, string $key, $data): void;
+    /**
+     * Allows an app to provide its initial state to the template system.
+     * Use this if you know your initial state sill be used for example if
+     * you are in the render function of you controller.
+     *
+     * @since 16.0.0
+     *
+     * @param string $appName
+     * @param string $key
+     * @param bool|int|float|string|array|\JsonSerializable $data
+     *
+     * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider
+     * @see \OCP\AppFramework\Services\IInitialState::provideInitialState()
+     */
+    public function provideInitialState(string $appName, string $key, $data): void;
 
-	/**
-	 * Allows an app to provide its initial state via a lazy method.
-	 * This will call the closure when the template is being generated.
-	 * Use this if your app is injected into pages. Since then the render method
-	 * is not called explicitly. But we do not want to load the state on webdav
-	 * requests for example.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $appName
-	 * @param string $key
-	 * @param Closure $closure returns a primitive or an object that implements JsonSerializable
-	 *
-	 * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider
-	 * @see \OCP\AppFramework\Services\IInitialState::provideLazyInitialState()
-	 */
-	public function provideLazyInitialState(string $appName, string $key, Closure $closure): void;
+    /**
+     * Allows an app to provide its initial state via a lazy method.
+     * This will call the closure when the template is being generated.
+     * Use this if your app is injected into pages. Since then the render method
+     * is not called explicitly. But we do not want to load the state on webdav
+     * requests for example.
+     *
+     * @since 16.0.0
+     *
+     * @param string $appName
+     * @param string $key
+     * @param Closure $closure returns a primitive or an object that implements JsonSerializable
+     *
+     * @deprecated 21 Use OCP\AppFramework\Services\IInitialState or OCP\AppFramework\Services\InitialStateProvider
+     * @see \OCP\AppFramework\Services\IInitialState::provideLazyInitialState()
+     */
+    public function provideLazyInitialState(string $appName, string $key, Closure $closure): void;
 }

lib/private/Preview/SGI.php

Indentation +6 added lines, -6 removed lines

@@ -24,10 +24,10 @@
 
 //.sgi
 class SGI extends Bitmap {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/sgi/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/sgi/';
+    }
 }

lib/private/Preview/TGA.php

Indentation +6 added lines, -6 removed lines

@@ -24,10 +24,10 @@
 
 //.tga
 class TGA extends Bitmap {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/t(ar)?ga/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/t(ar)?ga/';
+    }
 }