nextcloud / server

lib/private/Session/CryptoWrapper.php

Indentation +60 added lines, -60 removed lines

@@ -49,70 +49,70 @@
  * @package OC\Session
  */
 class CryptoWrapper {
-	public const COOKIE_NAME = 'oc_sessionPassphrase';
+    public const COOKIE_NAME = 'oc_sessionPassphrase';
 
-	/** @var IConfig */
-	protected $config;
-	/** @var ISession */
-	protected $session;
-	/** @var ICrypto */
-	protected $crypto;
-	/** @var ISecureRandom */
-	protected $random;
-	/** @var string */
-	protected $passphrase;
+    /** @var IConfig */
+    protected $config;
+    /** @var ISession */
+    protected $session;
+    /** @var ICrypto */
+    protected $crypto;
+    /** @var ISecureRandom */
+    protected $random;
+    /** @var string */
+    protected $passphrase;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICrypto $crypto
-	 * @param ISecureRandom $random
-	 * @param IRequest $request
-	 */
-	public function __construct(IConfig $config,
-								ICrypto $crypto,
-								ISecureRandom $random,
-								IRequest $request) {
-		$this->crypto = $crypto;
-		$this->config = $config;
-		$this->random = $random;
+    /**
+     * @param IConfig $config
+     * @param ICrypto $crypto
+     * @param ISecureRandom $random
+     * @param IRequest $request
+     */
+    public function __construct(IConfig $config,
+                                ICrypto $crypto,
+                                ISecureRandom $random,
+                                IRequest $request) {
+        $this->crypto = $crypto;
+        $this->config = $config;
+        $this->random = $random;
 
-		if (!is_null($request->getCookie(self::COOKIE_NAME))) {
-			$this->passphrase = $request->getCookie(self::COOKIE_NAME);
-		} else {
-			$this->passphrase = $this->random->generate(128);
-			$secureCookie = $request->getServerProtocol() === 'https';
-			// FIXME: Required for CI
-			if (!defined('PHPUNIT_RUN')) {
-				$webRoot = \OC::$WEBROOT;
-				if ($webRoot === '') {
-					$webRoot = '/';
-				}
+        if (!is_null($request->getCookie(self::COOKIE_NAME))) {
+            $this->passphrase = $request->getCookie(self::COOKIE_NAME);
+        } else {
+            $this->passphrase = $this->random->generate(128);
+            $secureCookie = $request->getServerProtocol() === 'https';
+            // FIXME: Required for CI
+            if (!defined('PHPUNIT_RUN')) {
+                $webRoot = \OC::$WEBROOT;
+                if ($webRoot === '') {
+                    $webRoot = '/';
+                }
 
-				setcookie(
-					self::COOKIE_NAME,
-					$this->passphrase,
-					[
-						'expires' => 0,
-						'path' => $webRoot,
-						'domain' => '',
-						'secure' => $secureCookie,
-						'httponly' => true,
-						'samesite' => 'Lax',
-					]
-				);
-			}
-		}
-	}
+                setcookie(
+                    self::COOKIE_NAME,
+                    $this->passphrase,
+                    [
+                        'expires' => 0,
+                        'path' => $webRoot,
+                        'domain' => '',
+                        'secure' => $secureCookie,
+                        'httponly' => true,
+                        'samesite' => 'Lax',
+                    ]
+                );
+            }
+        }
+    }
 
-	/**
-	 * @param ISession $session
-	 * @return ISession
-	 */
-	public function wrapSession(ISession $session) {
-		if (!($session instanceof CryptoSessionData)) {
-			return new CryptoSessionData($session, $this->crypto, $this->passphrase);
-		}
+    /**
+     * @param ISession $session
+     * @return ISession
+     */
+    public function wrapSession(ISession $session) {
+        if (!($session instanceof CryptoSessionData)) {
+            return new CryptoSessionData($session, $this->crypto, $this->passphrase);
+        }
 
-		return $session;
-	}
+        return $session;
+    }
 }

lib/private/AppFramework/Http/Output.php

Indentation +65 added lines, -65 removed lines

@@ -32,77 +32,77 @@
  * Very thin wrapper class to make output testable
  */
 class Output implements IOutput {
-	/** @var string */
-	private $webRoot;
+    /** @var string */
+    private $webRoot;
 
-	/**
-	 * @param $webRoot
-	 */
-	public function __construct($webRoot) {
-		$this->webRoot = $webRoot;
-	}
+    /**
+     * @param $webRoot
+     */
+    public function __construct($webRoot) {
+        $this->webRoot = $webRoot;
+    }
 
-	/**
-	 * @param string $out
-	 */
-	public function setOutput($out) {
-		print($out);
-	}
+    /**
+     * @param string $out
+     */
+    public function setOutput($out) {
+        print($out);
+    }
 
-	/**
-	 * @param string|resource $path or file handle
-	 *
-	 * @return bool false if an error occurred
-	 */
-	public function setReadfile($path) {
-		if (is_resource($path)) {
-			$output = fopen('php://output', 'w');
-			return stream_copy_to_stream($path, $output) > 0;
-		} else {
-			return @readfile($path);
-		}
-	}
+    /**
+     * @param string|resource $path or file handle
+     *
+     * @return bool false if an error occurred
+     */
+    public function setReadfile($path) {
+        if (is_resource($path)) {
+            $output = fopen('php://output', 'w');
+            return stream_copy_to_stream($path, $output) > 0;
+        } else {
+            return @readfile($path);
+        }
+    }
 
-	/**
-	 * @param string $header
-	 */
-	public function setHeader($header) {
-		header($header);
-	}
+    /**
+     * @param string $header
+     */
+    public function setHeader($header) {
+        header($header);
+    }
 
-	/**
-	 * @param int $code sets the http status code
-	 */
-	public function setHttpResponseCode($code) {
-		http_response_code($code);
-	}
+    /**
+     * @param int $code sets the http status code
+     */
+    public function setHttpResponseCode($code) {
+        http_response_code($code);
+    }
 
-	/**
-	 * @return int returns the current http response code
-	 */
-	public function getHttpResponseCode() {
-		return http_response_code();
-	}
+    /**
+     * @return int returns the current http response code
+     */
+    public function getHttpResponseCode() {
+        return http_response_code();
+    }
 
-	/**
-	 * @param string $name
-	 * @param string $value
-	 * @param int $expire
-	 * @param string $path
-	 * @param string $domain
-	 * @param bool $secure
-	 * @param bool $httpOnly
-	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
-		$path = $this->webRoot ? : '/';
+    /**
+     * @param string $name
+     * @param string $value
+     * @param int $expire
+     * @param string $path
+     * @param string $domain
+     * @param bool $secure
+     * @param bool $httpOnly
+     */
+    public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
+        $path = $this->webRoot ? : '/';
 
-		setcookie($name, $value, [
-			'expires' => $expire,
-			'path' => $path,
-			'domain' => $domain,
-			'secure' => $secure,
-			'httponly' => $httpOnly,
-			'samesite' => $sameSite
-		]);
-	}
+        setcookie($name, $value, [
+            'expires' => $expire,
+            'path' => $path,
+            'domain' => $domain,
+            'secure' => $secure,
+            'httponly' => $httpOnly,
+            'samesite' => $sameSite
+        ]);
+    }
 }

apps/user_ldap/ajax/deleteConfiguration.php

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@
 $prefix = (string)$_POST['ldap_serverconfig_chooser'];
 $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
 if ($helper->deleteServerConfiguration($prefix)) {
-	\OC_JSON::success();
+    \OC_JSON::success();
 } else {
-	$l = \OC::$server->getL10N('user_ldap');
-	\OC_JSON::error(['message' => $l->t('Failed to delete the server configuration')]);
+    $l = \OC::$server->getL10N('user_ldap');
+    \OC_JSON::error(['message' => $l->t('Failed to delete the server configuration')]);
 }

apps/user_ldap/lib/Command/SetConfig.php

Indentation +49 added lines, -49 removed lines

@@ -37,57 +37,57 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Command {
-	protected function configure() {
-		$this
-			->setName('ldap:set-config')
-			->setDescription('modifies an LDAP configuration')
-			->addArgument(
-					'configID',
-					InputArgument::REQUIRED,
-					'the configuration ID'
-					 )
-			->addArgument(
-					'configKey',
-					InputArgument::REQUIRED,
-					'the configuration key'
-					 )
-			->addArgument(
-					'configValue',
-					InputArgument::REQUIRED,
-					'the new configuration value'
-					 )
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:set-config')
+            ->setDescription('modifies an LDAP configuration')
+            ->addArgument(
+                    'configID',
+                    InputArgument::REQUIRED,
+                    'the configuration ID'
+                        )
+            ->addArgument(
+                    'configKey',
+                    InputArgument::REQUIRED,
+                    'the configuration key'
+                        )
+            ->addArgument(
+                    'configValue',
+                    InputArgument::REQUIRED,
+                    'the new configuration value'
+                        )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
-		$availableConfigs = $helper->getServerConfigurationPrefixes();
-		$configID = $input->getArgument('configID');
-		if (!in_array($configID, $availableConfigs)) {
-			$output->writeln("Invalid configID");
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
+        $availableConfigs = $helper->getServerConfigurationPrefixes();
+        $configID = $input->getArgument('configID');
+        if (!in_array($configID, $availableConfigs)) {
+            $output->writeln("Invalid configID");
+            return 1;
+        }
 
-		$this->setValue(
-			$configID,
-			$input->getArgument('configKey'),
-			$input->getArgument('configValue')
-		);
-		return 0;
-	}
+        $this->setValue(
+            $configID,
+            $input->getArgument('configKey'),
+            $input->getArgument('configValue')
+        );
+        return 0;
+    }
 
-	/**
-	 * save the configuration value as provided
-	 * @param string $configID
-	 * @param string $configKey
-	 * @param string $configValue
-	 */
-	protected function setValue($configID, $key, $value) {
-		$configHolder = new Configuration($configID);
-		$configHolder->$key = $value;
-		$configHolder->saveConfiguration();
+    /**
+     * save the configuration value as provided
+     * @param string $configID
+     * @param string $configKey
+     * @param string $configValue
+     */
+    protected function setValue($configID, $key, $value) {
+        $configHolder = new Configuration($configID);
+        $configHolder->$key = $value;
+        $configHolder->saveConfiguration();
 
-		$connectionFactory = new ConnectionFactory(new LDAP());
-		$connectionFactory->get($configID)->clearCache();
-	}
+        $connectionFactory = new ConnectionFactory(new LDAP());
+        $connectionFactory->get($configID)->clearCache();
+    }
 }

core/templates/exception.php

Indentation +10 added lines, -10 removed lines

@@ -5,18 +5,18 @@
 style('core', ['styles', 'header']);
 
 function print_exception(Throwable $e, \OCP\IL10N $l): void {
-	print_unescaped('<pre>');
-	p($e->getTraceAsString());
-	print_unescaped('</pre>');
+    print_unescaped('<pre>');
+    p($e->getTraceAsString());
+    print_unescaped('</pre>');
 
-	if ($e->getPrevious() !== null) {
-		print_unescaped('<br />');
-		print_unescaped('<h4>');
-		p($l->t('Previous'));
-		print_unescaped('</h4>');
+    if ($e->getPrevious() !== null) {
+        print_unescaped('<br />');
+        print_unescaped('<h4>');
+        p($l->t('Previous'));
+        print_unescaped('</h4>');
 
-		print_exception($e->getPrevious(), $l);
-	}
+        print_exception($e->getPrevious(), $l);
+    }
 }
 
 ?>

core/Migrations/Version20000Date20201109081915.php

Indentation +24 added lines, -24 removed lines

@@ -32,34 +32,34 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version20000Date20201109081915 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();
 
-		$result = $this->ensureColumnIsNullable($schema, 'share', 'password_by_talk');
-		$result = $this->ensureColumnIsNullable($schema, 'share', 'hide_download') || $result;
+        $result = $this->ensureColumnIsNullable($schema, 'share', 'password_by_talk');
+        $result = $this->ensureColumnIsNullable($schema, 'share', 'hide_download') || $result;
 //		$result = $this->ensureColumnIsNullable($schema, 'credentials', 'user') || $result;
-		$result = $this->ensureColumnIsNullable($schema, 'authtoken', 'password_invalid') || $result;
-		$result = $this->ensureColumnIsNullable($schema, 'collres_accesscache', 'access') || $result;
+        $result = $this->ensureColumnIsNullable($schema, 'authtoken', 'password_invalid') || $result;
+        $result = $this->ensureColumnIsNullable($schema, 'collres_accesscache', 'access') || $result;
 
-		return $result ? $schema : null;
-	}
+        return $result ? $schema : null;
+    }
 
-	protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
-		$table = $schema->getTable($tableName);
-		$column = $table->getColumn($columnName);
+    protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
+        $table = $schema->getTable($tableName);
+        $column = $table->getColumn($columnName);
 
-		if ($column->getNotnull()) {
-			$column->setNotnull(false);
-			return true;
-		}
+        if ($column->getNotnull()) {
+            $column->setNotnull(false);
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

core/Migrations/Version14000Date20180710092004.php

Indentation +12 added lines, -12 removed lines

@@ -34,19 +34,19 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180710092004 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('share');
+        $table = $schema->getTable('share');
 
-		if (!$table->hasColumn('password_by_talk')) {
-			$table->addColumn('password_by_talk', Types::BOOLEAN, [
-				'default' => 0,
-				'notnull' => false,
-			]);
-		}
+        if (!$table->hasColumn('password_by_talk')) {
+            $table->addColumn('password_by_talk', Types::BOOLEAN, [
+                'default' => 0,
+                'notnull' => false,
+            ]);
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1016Date20201109085907.php

Indentation +26 added lines, -26 removed lines

@@ -32,30 +32,30 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1016Date20201109085907 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();
-
-		$result = $this->ensureColumnIsNullable($schema, 'calendar_reminders', 'is_recurring');
-
-		return $result ? $schema : null;
-	}
-
-	protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
-		$table = $schema->getTable($tableName);
-		$column = $table->getColumn($columnName);
-
-		if ($column->getNotnull()) {
-			$column->setNotnull(false);
-			return true;
-		}
-
-		return false;
-	}
+    /**
+     * @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();
+
+        $result = $this->ensureColumnIsNullable($schema, 'calendar_reminders', 'is_recurring');
+
+        return $result ? $schema : null;
+    }
+
+    protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
+        $table = $schema->getTable($tableName);
+        $column = $table->getColumn($columnName);
+
+        if ($column->getNotnull()) {
+            $column->setNotnull(false);
+            return true;
+        }
+
+        return false;
+    }
 }

apps/dav/lib/Migration/Version1012Date20190808122342.php

Indentation +77 added lines, -77 removed lines

@@ -38,86 +38,86 @@
  */
 class Version1012Date20190808122342 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 17.0.0
-	 */
-	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
+     * @since 17.0.0
+     */
+    public function changeSchema(IOutput $output,
+                                    \Closure $schemaClosure,
+                                    array $options):?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('calendar_reminders')) {
-			$table = $schema->createTable('calendar_reminders');
+        if (!$schema->hasTable('calendar_reminders')) {
+            $table = $schema->createTable('calendar_reminders');
 
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendar_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-			]);
-			$table->addColumn('object_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-			]);
-			$table->addColumn('is_recurring', Types::SMALLINT, [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('uid', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('recurrence_id', Types::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('is_recurrence_exception', Types::SMALLINT, [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->addColumn('event_hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('alarm_hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('type', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('is_relative', Types::SMALLINT, [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->addColumn('notification_date', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('is_repeat_based', Types::SMALLINT, [
-				'notnull' => true,
-				'length' => 1,
-			]);
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendar_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+            ]);
+            $table->addColumn('object_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+            ]);
+            $table->addColumn('is_recurring', Types::SMALLINT, [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('uid', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('recurrence_id', Types::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('is_recurrence_exception', Types::SMALLINT, [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->addColumn('event_hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('alarm_hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('type', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('is_relative', Types::SMALLINT, [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->addColumn('notification_date', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('is_repeat_based', Types::SMALLINT, [
+                'notnull' => true,
+                'length' => 1,
+            ]);
 
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['object_id'], 'calendar_reminder_objid');
-			$table->addIndex(['uid', 'recurrence_id'], 'calendar_reminder_uidrec');
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['object_id'], 'calendar_reminder_objid');
+            $table->addIndex(['uid', 'recurrence_id'], 'calendar_reminder_uidrec');
 
-			return $schema;
-		}
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }