nextcloud / server

lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 				$this->manager->invalidateTokenById($uid, $token->getId());
 			}
 		} catch (Throwable $e) {
-			$this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
+			$this->logger->error('Could not clean up auth tokens after user deletion: '.$e->getMessage(), [
 				'exception' => $e,
 			]);
 		}

Indentation +34 added lines, -34 removed lines

@@ -19,38 +19,38 @@
  * @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent>
  */
 class UserDeletedTokenCleanupListener implements IEventListener {
-	/** @var Manager */
-	private $manager;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(Manager $manager,
-		LoggerInterface $logger) {
-		$this->manager = $manager;
-		$this->logger = $logger;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof UserDeletedEvent)) {
-			// Unrelated
-			return;
-		}
-
-		/**
-		 * Catch any exception during this process as any failure here shouldn't block the
-		 * user deletion.
-		 */
-		try {
-			$uid = $event->getUser()->getUID();
-			$tokens = $this->manager->getTokenByUser($uid);
-			foreach ($tokens as $token) {
-				$this->manager->invalidateTokenById($uid, $token->getId());
-			}
-		} catch (Throwable $e) {
-			$this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
-				'exception' => $e,
-			]);
-		}
-	}
+    /** @var Manager */
+    private $manager;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    public function __construct(Manager $manager,
+        LoggerInterface $logger) {
+        $this->manager = $manager;
+        $this->logger = $logger;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof UserDeletedEvent)) {
+            // Unrelated
+            return;
+        }
+
+        /**
+         * Catch any exception during this process as any failure here shouldn't block the
+         * user deletion.
+         */
+        try {
+            $uid = $event->getUser()->getUID();
+            $tokens = $this->manager->getTokenByUser($uid);
+            foreach ($tokens as $token) {
+                $this->manager->invalidateTokenById($uid, $token->getId());
+            }
+        } catch (Throwable $e) {
+            $this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
+                'exception' => $e,
+            ]);
+        }
+    }
 }

apps/settings/templates/settings/personal/security/twofactor.php

Spacing +4 added lines, -4 removed lines

@@ -25,12 +25,12 @@
 ?>
 
 <div id="two-factor-auth" class="section">
-	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
+	<h2><?php p($l->t('Two-Factor Authentication')); ?></h2>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('user-2fa')); ?>"></a>
-	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.'));?></p>
-	<p class="settings-hint"><?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.'));?></p>
+	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.')); ?></p>
+	<p class="settings-hint"><?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.')); ?></p>
 	<ul>
 	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
 		<li>

Indentation +12 added lines, -12 removed lines

@@ -19,18 +19,18 @@
 		<li>
 			<?php
 
-			/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
-			$provider = $data['provider'];
-		//Handle 2FA provider icons and theme
-		if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-			$icon = $provider->getDarkIcon();
-			//fallback icon if the 2factor provider doesn't provide an icon.
-		} else {
-			$icon = image_path('core', 'actions/password.svg');
-		}
-		/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
-		$settings = $data['settings'];
-		?>
+            /** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
+            $provider = $data['provider'];
+        //Handle 2FA provider icons and theme
+        if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
+            $icon = $provider->getDarkIcon();
+            //fallback icon if the 2factor provider doesn't provide an icon.
+        } else {
+            $icon = image_path('core', 'actions/password.svg');
+        }
+        /** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
+        $settings = $data['settings'];
+        ?>
 			<h3>
 				<img class="two-factor-provider-settings-icon" src="<?php p($icon) ?>" alt="">
 				<?php p($provider->getDisplayName()) ?>

lib/private/Hooks/PublicEmitter.php

Indentation +11 added lines, -11 removed lines

@@ -29,15 +29,15 @@
  * @deprecated 18.0.0 use events and the \OCP\EventDispatcher\IEventDispatcher service
  */
 class PublicEmitter extends BasicEmitter {
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments optional
-	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
-	 *
-	 * @suppress PhanAccessMethodProtected
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		parent::emit($scope, $method, $arguments);
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments optional
+     * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
+     *
+     * @suppress PhanAccessMethodProtected
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        parent::emit($scope, $method, $arguments);
+    }
 }

apps/files_sharing/lib/External/MountProvider.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 		$managerProvider = $this->managerProvider;
 		$manager = $managerProvider();
 		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+		$mountPoint = '/'.$user->getUID().'/files/'.ltrim($data['mountpoint'], '/');
 		$data['mountpoint'] = $mountPoint;
 		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
 		$data['certificateManager'] = \OC::$server->getCertificateManager();

Indentation +44 added lines, -44 removed lines

@@ -17,52 +17,52 @@
 use OCP\Server;
 
 class MountProvider implements IMountProvider {
-	public const STORAGE = '\OCA\Files_Sharing\External\Storage';
+    public const STORAGE = '\OCA\Files_Sharing\External\Storage';
 
-	/**
-	 * @var callable
-	 */
-	private $managerProvider;
+    /**
+     * @var callable
+     */
+    private $managerProvider;
 
-	/**
-	 * @param IDBConnection $connection
-	 * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(
-		private IDBConnection $connection,
-		callable $managerProvider,
-		private ICloudIdManager $cloudIdManager,
-	) {
-		$this->managerProvider = $managerProvider;
-	}
+    /**
+     * @param IDBConnection $connection
+     * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(
+        private IDBConnection $connection,
+        callable $managerProvider,
+        private ICloudIdManager $cloudIdManager,
+    ) {
+        $this->managerProvider = $managerProvider;
+    }
 
-	public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
-		$managerProvider = $this->managerProvider;
-		$manager = $managerProvider();
-		$data['manager'] = $manager;
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
-		$data['mountpoint'] = $mountPoint;
-		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
-		$data['certificateManager'] = \OC::$server->getCertificateManager();
-		$data['HttpClientService'] = Server::get(IClientService::class);
-		return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
-	}
+    public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
+        $managerProvider = $this->managerProvider;
+        $manager = $managerProvider();
+        $data['manager'] = $manager;
+        $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
+        $data['mountpoint'] = $mountPoint;
+        $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
+        $data['certificateManager'] = \OC::$server->getCertificateManager();
+        $data['HttpClientService'] = Server::get(IClientService::class);
+        return new Mount(self::STORAGE, $mountPoint, $data, $manager, $storageFactory);
+    }
 
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('remote', 'share_token', 'password', 'mountpoint', 'owner')
-			->from('share_external')
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
-			->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
-		$result = $qb->executeQuery();
-		$mounts = [];
-		while ($row = $result->fetchAssociative()) {
-			$row['manager'] = $this;
-			$row['token'] = $row['share_token'];
-			$mounts[] = $this->getMount($user, $row, $loader);
-		}
-		$result->closeCursor();
-		return $mounts;
-	}
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('remote', 'share_token', 'password', 'mountpoint', 'owner')
+            ->from('share_external')
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($user->getUID())))
+            ->andWhere($qb->expr()->eq('accepted', $qb->createNamedParameter(1, IQueryBuilder::PARAM_INT)));
+        $result = $qb->executeQuery();
+        $mounts = [];
+        while ($row = $result->fetchAssociative()) {
+            $row['manager'] = $this;
+            $row['token'] = $row['share_token'];
+            $mounts[] = $this->getMount($user, $row, $loader);
+        }
+        $result->closeCursor();
+        return $mounts;
+    }
 }

lib/private/AppFramework/Http/Output.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 	 * @param bool $httpOnly
 	 */
 	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
-		$path = $this->webRoot ? : '/';
+		$path = $this->webRoot ?: '/';
 
 		setcookie($name, $value, [
 			'expires' => $expire,

Indentation +61 added lines, -61 removed lines

@@ -13,72 +13,72 @@
  * Very thin wrapper class to make output testable
  */
 class Output implements IOutput {
-	public function __construct(
-		private string $webRoot,
-	) {
-	}
+    public function __construct(
+        private string $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
+        ]);
+    }
 }

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;
+    }
 }

core/Migrations/Version20000Date20201111081915.php

Indentation +26 added lines, -26 removed lines

@@ -32,30 +32,30 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version20000Date20201111081915 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, 'direct_edit', 'accessed');
-
-		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, 'direct_edit', 'accessed');
+
+        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/user_status/lib/Migration/Version0001Date20200602134824.php

Indentation +54 added lines, -54 removed lines

@@ -37,61 +37,61 @@
  */
 class Version0001Date20200602134824 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 20.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 20.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$statusTable = $schema->createTable('user_status');
-		$statusTable->addColumn('id', Types::BIGINT, [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$statusTable->addColumn('user_id', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('status', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('status_timestamp', Types::INTEGER, [
-			'notnull' => true,
-			'length' => 11,
-			'unsigned' => true,
-		]);
-		$statusTable->addColumn('is_user_defined', Types::BOOLEAN, [
-			'notnull' => false,
-		]);
-		$statusTable->addColumn('message_id', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('custom_icon', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$statusTable->addColumn('custom_message', Types::TEXT, [
-			'notnull' => false,
-		]);
-		$statusTable->addColumn('clear_at', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 11,
-			'unsigned' => true,
-		]);
+        $statusTable = $schema->createTable('user_status');
+        $statusTable->addColumn('id', Types::BIGINT, [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $statusTable->addColumn('user_id', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('status', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('status_timestamp', Types::INTEGER, [
+            'notnull' => true,
+            'length' => 11,
+            'unsigned' => true,
+        ]);
+        $statusTable->addColumn('is_user_defined', Types::BOOLEAN, [
+            'notnull' => false,
+        ]);
+        $statusTable->addColumn('message_id', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('custom_icon', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $statusTable->addColumn('custom_message', Types::TEXT, [
+            'notnull' => false,
+        ]);
+        $statusTable->addColumn('clear_at', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 11,
+            'unsigned' => true,
+        ]);
 
-		$statusTable->setPrimaryKey(['id']);
-		$statusTable->addUniqueIndex(['user_id'], 'user_status_uid_ix');
-		$statusTable->addIndex(['clear_at'], 'user_status_clr_ix');
+        $statusTable->setPrimaryKey(['id']);
+        $statusTable->addUniqueIndex(['user_id'], 'user_status_uid_ix');
+        $statusTable->addIndex(['clear_at'], 'user_status_clr_ix');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }