nextcloud / server

lib/private/Repair/Owncloud/CleanPreviews.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 	public function run(IOutput $output) {
 		if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
-			$this->userManager->callForSeenUsers(function (IUser $user) {
+			$this->userManager->callForSeenUsers(function(IUser $user) {
 				$this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
 			});
 			$this->config->setAppValue('core', 'previewsCleanedUp', '1');

Indentation +39 added lines, -39 removed lines

@@ -14,43 +14,43 @@
 use OCP\Migration\IRepairStep;
 
 class CleanPreviews implements IRepairStep {
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * MoveAvatars constructor.
-	 *
-	 * @param IJobList $jobList
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 */
-	public function __construct(IJobList $jobList,
-		IUserManager $userManager,
-		IConfig $config) {
-		$this->jobList = $jobList;
-		$this->userManager = $userManager;
-		$this->config = $config;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Add preview cleanup background jobs';
-	}
-
-	public function run(IOutput $output) {
-		if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
-			$this->userManager->callForSeenUsers(function (IUser $user) {
-				$this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
-			});
-			$this->config->setAppValue('core', 'previewsCleanedUp', '1');
-		}
-	}
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * MoveAvatars constructor.
+     *
+     * @param IJobList $jobList
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     */
+    public function __construct(IJobList $jobList,
+        IUserManager $userManager,
+        IConfig $config) {
+        $this->jobList = $jobList;
+        $this->userManager = $userManager;
+        $this->config = $config;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Add preview cleanup background jobs';
+    }
+
+    public function run(IOutput $output) {
+        if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
+            $this->userManager->callForSeenUsers(function (IUser $user) {
+                $this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
+            });
+            $this->config->setAppValue('core', 'previewsCleanedUp', '1');
+        }
+    }
 }

lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php

Spacing +4 added lines, -4 removed lines

@@ -72,17 +72,17 @@
 	public function run($arguments) {
 		$uid = $arguments['uid'];
 		if (!$this->userManager->userExists($uid)) {
-			$this->logger->info('User no longer exists, skip user ' . $uid);
+			$this->logger->info('User no longer exists, skip user '.$uid);
 			return;
 		}
-		$this->logger->info('Started preview cleanup for ' . $uid);
+		$this->logger->info('Started preview cleanup for '.$uid);
 		$empty = $this->cleanupPreviews($uid);
 
 		if (!$empty) {
 			$this->jobList->add(self::class, ['uid' => $uid]);
-			$this->logger->info('New preview cleanup scheduled for ' . $uid);
+			$this->logger->info('New preview cleanup scheduled for '.$uid);
 		} else {
-			$this->logger->info('Preview cleanup done for ' . $uid);
+			$this->logger->info('Preview cleanup done for '.$uid);
 		}
 	}
 

Indentation +59 added lines, -59 removed lines

@@ -19,73 +19,73 @@
 use Psr\Log\LoggerInterface;
 
 class CleanPreviewsBackgroundJob extends QueuedJob {
-	public function __construct(
-		private IRootFolder $rootFolder,
-		private LoggerInterface $logger,
-		private IJobList $jobList,
-		ITimeFactory $timeFactory,
-		private IUserManager $userManager,
-	) {
-		parent::__construct($timeFactory);
-	}
+    public function __construct(
+        private IRootFolder $rootFolder,
+        private LoggerInterface $logger,
+        private IJobList $jobList,
+        ITimeFactory $timeFactory,
+        private IUserManager $userManager,
+    ) {
+        parent::__construct($timeFactory);
+    }
 
-	public function run($arguments) {
-		$uid = $arguments['uid'];
-		if (!$this->userManager->userExists($uid)) {
-			$this->logger->info('User no longer exists, skip user ' . $uid);
-			return;
-		}
-		$this->logger->info('Started preview cleanup for ' . $uid);
-		$empty = $this->cleanupPreviews($uid);
+    public function run($arguments) {
+        $uid = $arguments['uid'];
+        if (!$this->userManager->userExists($uid)) {
+            $this->logger->info('User no longer exists, skip user ' . $uid);
+            return;
+        }
+        $this->logger->info('Started preview cleanup for ' . $uid);
+        $empty = $this->cleanupPreviews($uid);
 
-		if (!$empty) {
-			$this->jobList->add(self::class, ['uid' => $uid]);
-			$this->logger->info('New preview cleanup scheduled for ' . $uid);
-		} else {
-			$this->logger->info('Preview cleanup done for ' . $uid);
-		}
-	}
+        if (!$empty) {
+            $this->jobList->add(self::class, ['uid' => $uid]);
+            $this->logger->info('New preview cleanup scheduled for ' . $uid);
+        } else {
+            $this->logger->info('Preview cleanup done for ' . $uid);
+        }
+    }
 
-	/**
-	 * @param string $uid
-	 */
-	private function cleanupPreviews($uid): bool {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($uid);
-		} catch (NotFoundException $e) {
-			return true;
-		}
+    /**
+     * @param string $uid
+     */
+    private function cleanupPreviews($uid): bool {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($uid);
+        } catch (NotFoundException $e) {
+            return true;
+        }
 
-		$userRoot = $userFolder->getParent();
+        $userRoot = $userFolder->getParent();
 
-		try {
-			/** @var Folder $thumbnailFolder */
-			$thumbnailFolder = $userRoot->get('thumbnails');
-		} catch (NotFoundException $e) {
-			return true;
-		}
+        try {
+            /** @var Folder $thumbnailFolder */
+            $thumbnailFolder = $userRoot->get('thumbnails');
+        } catch (NotFoundException $e) {
+            return true;
+        }
 
-		$thumbnails = $thumbnailFolder->getDirectoryListing();
+        $thumbnails = $thumbnailFolder->getDirectoryListing();
 
-		$start = $this->time->getTime();
-		foreach ($thumbnails as $thumbnail) {
-			try {
-				$thumbnail->delete();
-			} catch (NotPermittedException $e) {
-				// Ignore
-			}
+        $start = $this->time->getTime();
+        foreach ($thumbnails as $thumbnail) {
+            try {
+                $thumbnail->delete();
+            } catch (NotPermittedException $e) {
+                // Ignore
+            }
 
-			if (($this->time->getTime() - $start) > 15) {
-				return false;
-			}
-		}
+            if (($this->time->getTime() - $start) > 15) {
+                return false;
+            }
+        }
 
-		try {
-			$thumbnailFolder->delete();
-		} catch (NotPermittedException $e) {
-			// Ignore
-		}
+        try {
+            $thumbnailFolder->delete();
+        } catch (NotPermittedException $e) {
+            // Ignore
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

lib/private/Repair/Owncloud/UpdateLanguageCodes.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 				->andWhere($qb->expr()->eq('configvalue', $qb->createNamedParameter($oldCode), IQueryBuilder::PARAM_STR))
 				->execute();
 
-			$output->info('Changed ' . $affectedRows . ' setting(s) from "' . $oldCode . '" to "' . $newCode . '" in preferences table.');
+			$output->info('Changed '.$affectedRows.' setting(s) from "'.$oldCode.'" to "'.$newCode.'" in preferences table.');
 		}
 	}
 }

Indentation +47 added lines, -47 removed lines

@@ -12,60 +12,60 @@
 use OCP\Migration\IRepairStep;
 
 class UpdateLanguageCodes implements IRepairStep {
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $connection,
-		IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
+    /**
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $connection,
+        IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getName() {
-		return 'Repair language codes';
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getName() {
+        return 'Repair language codes';
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function run(IOutput $output) {
-		$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
+    /**
+     * {@inheritdoc}
+     */
+    public function run(IOutput $output) {
+        $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
 
-		if (version_compare($versionFromBeforeUpdate, '12.0.0.13', '>')) {
-			return;
-		}
+        if (version_compare($versionFromBeforeUpdate, '12.0.0.13', '>')) {
+            return;
+        }
 
-		$languages = [
-			'bg_BG' => 'bg',
-			'cs_CZ' => 'cs',
-			'fi_FI' => 'fi',
-			'hu_HU' => 'hu',
-			'nb_NO' => 'nb',
-			'sk_SK' => 'sk',
-			'th_TH' => 'th',
-		];
+        $languages = [
+            'bg_BG' => 'bg',
+            'cs_CZ' => 'cs',
+            'fi_FI' => 'fi',
+            'hu_HU' => 'hu',
+            'nb_NO' => 'nb',
+            'sk_SK' => 'sk',
+            'th_TH' => 'th',
+        ];
 
-		foreach ($languages as $oldCode => $newCode) {
-			$qb = $this->connection->getQueryBuilder();
+        foreach ($languages as $oldCode => $newCode) {
+            $qb = $this->connection->getQueryBuilder();
 
-			$affectedRows = $qb->update('preferences')
-				->set('configvalue', $qb->createNamedParameter($newCode))
-				->where($qb->expr()->eq('appid', $qb->createNamedParameter('core')))
-				->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('lang')))
-				->andWhere($qb->expr()->eq('configvalue', $qb->createNamedParameter($oldCode), IQueryBuilder::PARAM_STR))
-				->execute();
+            $affectedRows = $qb->update('preferences')
+                ->set('configvalue', $qb->createNamedParameter($newCode))
+                ->where($qb->expr()->eq('appid', $qb->createNamedParameter('core')))
+                ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter('lang')))
+                ->andWhere($qb->expr()->eq('configvalue', $qb->createNamedParameter($oldCode), IQueryBuilder::PARAM_STR))
+                ->execute();
 
-			$output->info('Changed ' . $affectedRows . ' setting(s) from "' . $oldCode . '" to "' . $newCode . '" in preferences table.');
-		}
-	}
+            $output->info('Changed ' . $affectedRows . ' setting(s) from "' . $oldCode . '" to "' . $newCode . '" in preferences table.');
+        }
+    }
 }

apps/files_trashbin/lib/Migration/Version1010Date20200630192639.php

Indentation +50 added lines, -50 removed lines

@@ -33,55 +33,55 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1010Date20200630192639 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) {
-		/** @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) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('files_trash')) {
-			$table = $schema->createTable('files_trash');
-			$table->addColumn('auto_id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-			]);
-			$table->addColumn('id', Types::STRING, [
-				'notnull' => true,
-				'length' => 250,
-				'default' => '',
-			]);
-			$table->addColumn('user', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('timestamp', Types::STRING, [
-				'notnull' => true,
-				'length' => 12,
-				'default' => '',
-			]);
-			$table->addColumn('location', Types::STRING, [
-				'notnull' => true,
-				'length' => 512,
-				'default' => '',
-			]);
-			$table->addColumn('type', Types::STRING, [
-				'notnull' => false,
-				'length' => 4,
-			]);
-			$table->addColumn('mime', Types::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->setPrimaryKey(['auto_id']);
-			$table->addIndex(['id'], 'id_index');
-			$table->addIndex(['timestamp'], 'timestamp_index');
-			$table->addIndex(['user'], 'user_index');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('files_trash')) {
+            $table = $schema->createTable('files_trash');
+            $table->addColumn('auto_id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+            ]);
+            $table->addColumn('id', Types::STRING, [
+                'notnull' => true,
+                'length' => 250,
+                'default' => '',
+            ]);
+            $table->addColumn('user', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('timestamp', Types::STRING, [
+                'notnull' => true,
+                'length' => 12,
+                'default' => '',
+            ]);
+            $table->addColumn('location', Types::STRING, [
+                'notnull' => true,
+                'length' => 512,
+                'default' => '',
+            ]);
+            $table->addColumn('type', Types::STRING, [
+                'notnull' => false,
+                'length' => 4,
+            ]);
+            $table->addColumn('mime', Types::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->setPrimaryKey(['auto_id']);
+            $table->addIndex(['id'], 'id_index');
+            $table->addIndex(['timestamp'], 'timestamp_index');
+            $table->addIndex(['user'], 'user_index');
+        }
+        return $schema;
+    }
 }

apps/files_sharing/lib/Migration/Version21000Date20201223143245.php

Indentation +30 added lines, -30 removed lines

@@ -34,37 +34,37 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version21000Date20201223143245 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('share_external')) {
-			$table = $schema->getTable('share_external');
-			$changed = false;
-			if (!$table->hasColumn('parent')) {
-				$table->addColumn('parent', Types::BIGINT, [
-					'notnull' => false,
-					'default' => -1,
-				]);
-				$changed = true;
-			}
-			if (!$table->hasColumn('share_type')) {
-				$table->addColumn('share_type', Types::INTEGER, [
-					'notnull' => false,
-					'length' => 4,
-				]);
-				$changed = true;
-			}
-			if ($table->hasColumn('lastscan')) {
-				$table->dropColumn('lastscan');
-				$changed = true;
-			}
+        if ($schema->hasTable('share_external')) {
+            $table = $schema->getTable('share_external');
+            $changed = false;
+            if (!$table->hasColumn('parent')) {
+                $table->addColumn('parent', Types::BIGINT, [
+                    'notnull' => false,
+                    'default' => -1,
+                ]);
+                $changed = true;
+            }
+            if (!$table->hasColumn('share_type')) {
+                $table->addColumn('share_type', Types::INTEGER, [
+                    'notnull' => false,
+                    'length' => 4,
+                ]);
+                $changed = true;
+            }
+            if ($table->hasColumn('lastscan')) {
+                $table->dropColumn('lastscan');
+                $changed = true;
+            }
 
-			if ($changed) {
-				return $schema;
-			}
-		}
+            if ($changed) {
+                return $schema;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

apps/dav/lib/Migration/BuildSocialSearchIndex.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 		$query->select($query->func()->max('cardid'))
 			->from('cards_properties')
 			->where($query->expr()->eq('name', $query->createNamedParameter('X-SOCIALPROFILE')));
-		$maxId = (int)$query->execute()->fetchOne();
+		$maxId = (int) $query->execute()->fetchOne();
 
 		if ($maxId === 0) {
 			return;

Indentation +42 added lines, -42 removed lines

@@ -13,52 +13,52 @@
 
 class BuildSocialSearchIndex implements IRepairStep {
 
-	/**
-	 * @param IDBConnection $db
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		private IDBConnection $db,
-		private IJobList $jobList,
-		private IConfig $config,
-	) {
-	}
+    /**
+     * @param IDBConnection $db
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(
+        private IDBConnection $db,
+        private IJobList $jobList,
+        private IConfig $config,
+    ) {
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Register building of social profile search index as background job';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Register building of social profile search index as background job';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		// only run once
-		if ($this->config->getAppValue('dav', 'builtSocialSearchIndex') === 'yes') {
-			$output->info('Repair step already executed');
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        // only run once
+        if ($this->config->getAppValue('dav', 'builtSocialSearchIndex') === 'yes') {
+            $output->info('Repair step already executed');
+            return;
+        }
 
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->func()->max('cardid'))
-			->from('cards_properties')
-			->where($query->expr()->eq('name', $query->createNamedParameter('X-SOCIALPROFILE')));
-		$maxId = (int)$query->execute()->fetchOne();
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->func()->max('cardid'))
+            ->from('cards_properties')
+            ->where($query->expr()->eq('name', $query->createNamedParameter('X-SOCIALPROFILE')));
+        $maxId = (int)$query->execute()->fetchOne();
 
-		if ($maxId === 0) {
-			return;
-		}
+        if ($maxId === 0) {
+            return;
+        }
 
-		$output->info('Add background job');
-		$this->jobList->add(BuildSocialSearchIndexBackgroundJob::class, [
-			'offset' => 0,
-			'stopAt' => $maxId
-		]);
+        $output->info('Add background job');
+        $this->jobList->add(BuildSocialSearchIndexBackgroundJob::class, [
+            'offset' => 0,
+            'stopAt' => $maxId
+        ]);
 
-		// no need to redo the repair during next upgrade
-		$this->config->setAppValue('dav', 'builtSocialSearchIndex', 'yes');
-	}
+        // no need to redo the repair during next upgrade
+        $this->config->setAppValue('dav', 'builtSocialSearchIndex', 'yes');
+    }
 }

lib/private/DB/SQLiteSessionInit.php

Indentation +34 added lines, -34 removed lines

@@ -31,42 +31,42 @@
 use Doctrine\DBAL\Events;
 
 class SQLiteSessionInit implements EventSubscriber {
-	/**
-	 * @var bool
-	 */
-	private $caseSensitiveLike;
+    /**
+     * @var bool
+     */
+    private $caseSensitiveLike;
 
-	/**
-	 * @var string
-	 */
-	private $journalMode;
+    /**
+     * @var string
+     */
+    private $journalMode;
 
-	/**
-	 * Configure case sensitive like for each connection
-	 *
-	 * @param bool $caseSensitiveLike
-	 * @param string $journalMode
-	 */
-	public function __construct($caseSensitiveLike, $journalMode) {
-		$this->caseSensitiveLike = $caseSensitiveLike;
-		$this->journalMode = $journalMode;
-	}
+    /**
+     * Configure case sensitive like for each connection
+     *
+     * @param bool $caseSensitiveLike
+     * @param string $journalMode
+     */
+    public function __construct($caseSensitiveLike, $journalMode) {
+        $this->caseSensitiveLike = $caseSensitiveLike;
+        $this->journalMode = $journalMode;
+    }
 
-	/**
-	 * @param ConnectionEventArgs $args
-	 * @return void
-	 */
-	public function postConnect(ConnectionEventArgs $args) {
-		$sensitive = $this->caseSensitiveLike ? 'true' : 'false';
-		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
-		$args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
-		/** @var \Doctrine\DBAL\Driver\PDO\Connection $connection */
-		$connection = $args->getConnection()->getWrappedConnection();
-		$pdo = $connection->getWrappedConnection();
-		$pdo->sqliteCreateFunction('md5', 'md5', 1);
-	}
+    /**
+     * @param ConnectionEventArgs $args
+     * @return void
+     */
+    public function postConnect(ConnectionEventArgs $args) {
+        $sensitive = $this->caseSensitiveLike ? 'true' : 'false';
+        $args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
+        $args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
+        /** @var \Doctrine\DBAL\Driver\PDO\Connection $connection */
+        $connection = $args->getConnection()->getWrappedConnection();
+        $pdo = $connection->getWrappedConnection();
+        $pdo->sqliteCreateFunction('md5', 'md5', 1);
+    }
 
-	public function getSubscribedEvents() {
-		return [Events::postConnect];
-	}
+    public function getSubscribedEvents() {
+        return [Events::postConnect];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
 	 */
 	public function postConnect(ConnectionEventArgs $args) {
 		$sensitive = $this->caseSensitiveLike ? 'true' : 'false';
-		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
-		$args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
+		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = '.$sensitive);
+		$args->getConnection()->executeUpdate('PRAGMA journal_mode = '.$this->journalMode);
 		/** @var \Doctrine\DBAL\Driver\PDO\Connection $connection */
 		$connection = $args->getConnection()->getWrappedConnection();
 		$pdo = $connection->getWrappedConnection();

apps/encryption/lib/Crypto/EncryptAll.php

Spacing +5 added lines, -5 removed lines

@@ -134,7 +134,7 @@ 
 		$this->input = $input;
 		$this->output = $output;
 
-		$headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
+		$headline = 'Encrypt all files with the '.Encryption::DISPLAY_NAME;
 		$this->output->writeln("\n");
 		$this->output->writeln($headline);
 		$this->output->writeln(str_pad('', strlen($headline), '='));
@@ -190,7 +190,7 @@ 
 				$users = $backend->getUsers('', $limit, $offset);
 				foreach ($users as $user) {
 					if ($this->keyManager->userHasKeys($user) === false) {
-						$progress->setMessage('Create key-pair for ' . $user);
+						$progress->setMessage('Create key-pair for '.$user);
 						$progress->advance();
 						$this->setupUserFS($user);
 						$password = $this->generateOneTimePassword($user);
@@ -264,12 +264,12 @@ 
 	protected function encryptUsersFiles($uid, ProgressBar $progress, $userCount) {
 		$this->setupUserFS($uid);
 		$directories = [];
-		$directories[] = '/' . $uid . '/files';
+		$directories[] = '/'.$uid.'/files';
 
 		while ($root = array_pop($directories)) {
 			$content = $this->rootView->getDirectoryContent($root);
 			foreach ($content as $file) {
-				$path = $root . '/' . $file['name'];
+				$path = $root.'/'.$file['name'];
 				if ($this->rootView->is_dir($path)) {
 					$directories[] = $path;
 					continue;
@@ -300,7 +300,7 @@ 
 		}
 
 		$source = $path;
-		$target = $path . '.encrypted.' . time();
+		$target = $path.'.encrypted.'.time();
 
 		try {
 			$this->rootView->copy($source, $target);

Indentation +378 added lines, -378 removed lines

@@ -29,382 +29,382 @@
 
 class EncryptAll {
 
-	/** @var array */
-	protected $userPasswords;
-
-	/** @var OutputInterface */
-	protected $output;
-
-	/** @var InputInterface */
-	protected $input;
-
-	public function __construct(
-		protected Setup $userSetup,
-		protected IUserManager $userManager,
-		protected View $rootView,
-		protected KeyManager $keyManager,
-		protected Util $util,
-		protected IConfig $config,
-		protected IMailer $mailer,
-		protected IL10N $l,
-		protected IFactory $l10nFactory,
-		protected QuestionHelper $questionHelper,
-		protected ISecureRandom $secureRandom,
-	) {
-		// store one time passwords for the users
-		$this->userPasswords = [];
-	}
-
-	/**
-	 * start to encrypt all files
-	 *
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	public function encryptAll(InputInterface $input, OutputInterface $output) {
-		$this->input = $input;
-		$this->output = $output;
-
-		$headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
-		$this->output->writeln("\n");
-		$this->output->writeln($headline);
-		$this->output->writeln(str_pad('', strlen($headline), '='));
-		$this->output->writeln("\n");
-
-		if ($this->util->isMasterKeyEnabled()) {
-			$this->output->writeln('Use master key to encrypt all files.');
-			$this->keyManager->validateMasterKey();
-		} else {
-			//create private/public keys for each user and store the private key password
-			$this->output->writeln('Create key-pair for every user');
-			$this->output->writeln('------------------------------');
-			$this->output->writeln('');
-			$this->output->writeln('This module will encrypt all files in the users files folder initially.');
-			$this->output->writeln('Already existing versions and files in the trash bin will not be encrypted.');
-			$this->output->writeln('');
-			$this->createKeyPairs();
-		}
-
-
-		// output generated encryption key passwords
-		if ($this->util->isMasterKeyEnabled() === false) {
-			//send-out or display password list and write it to a file
-			$this->output->writeln("\n");
-			$this->output->writeln('Generated encryption key passwords');
-			$this->output->writeln('----------------------------------');
-			$this->output->writeln('');
-			$this->outputPasswords();
-		}
-
-		//setup users file system and encrypt all files one by one (take should encrypt setting of storage into account)
-		$this->output->writeln("\n");
-		$this->output->writeln('Start to encrypt users files');
-		$this->output->writeln('----------------------------');
-		$this->output->writeln('');
-		$this->encryptAllUsersFiles();
-		$this->output->writeln("\n");
-	}
-
-	/**
-	 * create key-pair for every user
-	 */
-	protected function createKeyPairs() {
-		$this->output->writeln("\n");
-		$progress = new ProgressBar($this->output);
-		$progress->setFormat(" %message% \n [%bar%]");
-		$progress->start();
-
-		foreach ($this->userManager->getBackends() as $backend) {
-			$limit = 500;
-			$offset = 0;
-			do {
-				$users = $backend->getUsers('', $limit, $offset);
-				foreach ($users as $user) {
-					if ($this->keyManager->userHasKeys($user) === false) {
-						$progress->setMessage('Create key-pair for ' . $user);
-						$progress->advance();
-						$this->setupUserFS($user);
-						$password = $this->generateOneTimePassword($user);
-						$this->userSetup->setupUser($user, $password);
-					} else {
-						// users which already have a key-pair will be stored with a
-						// empty password and filtered out later
-						$this->userPasswords[$user] = '';
-					}
-				}
-				$offset += $limit;
-			} while (count($users) >= $limit);
-		}
-
-		$progress->setMessage('Key-pair created for all users');
-		$progress->finish();
-	}
-
-	/**
-	 * iterate over all user and encrypt their files
-	 */
-	protected function encryptAllUsersFiles() {
-		$this->output->writeln("\n");
-		$progress = new ProgressBar($this->output);
-		$progress->setFormat(" %message% \n [%bar%]");
-		$progress->start();
-		$numberOfUsers = count($this->userPasswords);
-		$userNo = 1;
-		if ($this->util->isMasterKeyEnabled()) {
-			$this->encryptAllUserFilesWithMasterKey($progress);
-		} else {
-			foreach ($this->userPasswords as $uid => $password) {
-				$userCount = "$uid ($userNo of $numberOfUsers)";
-				$this->encryptUsersFiles($uid, $progress, $userCount);
-				$userNo++;
-			}
-		}
-		$progress->setMessage('all files encrypted');
-		$progress->finish();
-	}
-
-	/**
-	 * encrypt all user files with the master key
-	 *
-	 * @param ProgressBar $progress
-	 */
-	protected function encryptAllUserFilesWithMasterKey(ProgressBar $progress) {
-		$userNo = 1;
-		foreach ($this->userManager->getBackends() as $backend) {
-			$limit = 500;
-			$offset = 0;
-			do {
-				$users = $backend->getUsers('', $limit, $offset);
-				foreach ($users as $user) {
-					$userCount = "$user ($userNo)";
-					$this->encryptUsersFiles($user, $progress, $userCount);
-					$userNo++;
-				}
-				$offset += $limit;
-			} while (count($users) >= $limit);
-		}
-	}
-
-	/**
-	 * encrypt files from the given user
-	 *
-	 * @param string $uid
-	 * @param ProgressBar $progress
-	 * @param string $userCount
-	 */
-	protected function encryptUsersFiles($uid, ProgressBar $progress, $userCount) {
-		$this->setupUserFS($uid);
-		$directories = [];
-		$directories[] = '/' . $uid . '/files';
-
-		while ($root = array_pop($directories)) {
-			$content = $this->rootView->getDirectoryContent($root);
-			foreach ($content as $file) {
-				$path = $root . '/' . $file['name'];
-				if ($this->rootView->is_dir($path)) {
-					$directories[] = $path;
-					continue;
-				} else {
-					$progress->setMessage("encrypt files for user $userCount: $path");
-					$progress->advance();
-					if ($this->encryptFile($path) === false) {
-						$progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
-						$progress->advance();
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * encrypt file
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	protected function encryptFile($path) {
-
-		// skip already encrypted files
-		$fileInfo = $this->rootView->getFileInfo($path);
-		if ($fileInfo !== false && $fileInfo->isEncrypted()) {
-			return true;
-		}
-
-		$source = $path;
-		$target = $path . '.encrypted.' . time();
-
-		try {
-			$this->rootView->copy($source, $target);
-			$this->rootView->rename($target, $source);
-		} catch (DecryptionFailedException $e) {
-			if ($this->rootView->file_exists($target)) {
-				$this->rootView->unlink($target);
-			}
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * output one-time encryption passwords
-	 */
-	protected function outputPasswords() {
-		$table = new Table($this->output);
-		$table->setHeaders(['Username', 'Private key password']);
-
-		//create rows
-		$newPasswords = [];
-		$unchangedPasswords = [];
-		foreach ($this->userPasswords as $uid => $password) {
-			if (empty($password)) {
-				$unchangedPasswords[] = $uid;
-			} else {
-				$newPasswords[] = [$uid, $password];
-			}
-		}
-
-		if (empty($newPasswords)) {
-			$this->output->writeln("\nAll users already had a key-pair, no further action needed.\n");
-			return;
-		}
-
-		$table->setRows($newPasswords);
-		$table->render();
-
-		if (!empty($unchangedPasswords)) {
-			$this->output->writeln("\nThe following users already had a key-pair which was reused without setting a new password:\n");
-			foreach ($unchangedPasswords as $uid) {
-				$this->output->writeln("    $uid");
-			}
-		}
-
-		$this->writePasswordsToFile($newPasswords);
-
-		$this->output->writeln('');
-		$question = new ConfirmationQuestion('Do you want to send the passwords directly to the users by mail? (y/n) ', false);
-		if ($this->questionHelper->ask($this->input, $this->output, $question)) {
-			$this->sendPasswordsByMail();
-		}
-	}
-
-	/**
-	 * write one-time encryption passwords to a csv file
-	 *
-	 * @param array $passwords
-	 */
-	protected function writePasswordsToFile(array $passwords) {
-		$fp = $this->rootView->fopen('oneTimeEncryptionPasswords.csv', 'w');
-		foreach ($passwords as $pwd) {
-			fputcsv($fp, $pwd);
-		}
-		fclose($fp);
-		$this->output->writeln("\n");
-		$this->output->writeln('A list of all newly created passwords was written to data/oneTimeEncryptionPasswords.csv');
-		$this->output->writeln('');
-		$this->output->writeln('Each of these users need to login to the web interface, go to the');
-		$this->output->writeln('personal settings section "basic encryption module" and');
-		$this->output->writeln('update the private key password to match the login password again by');
-		$this->output->writeln('entering the one-time password into the "old log-in password" field');
-		$this->output->writeln('and their current login password');
-	}
-
-	/**
-	 * setup user file system
-	 *
-	 * @param string $uid
-	 */
-	protected function setupUserFS($uid) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($uid);
-	}
-
-	/**
-	 * generate one time password for the user and store it in a array
-	 *
-	 * @param string $uid
-	 * @return string password
-	 */
-	protected function generateOneTimePassword($uid) {
-		$password = $this->secureRandom->generate(16, ISecureRandom::CHAR_HUMAN_READABLE);
-		$this->userPasswords[$uid] = $password;
-		return $password;
-	}
-
-	/**
-	 * send encryption key passwords to the users by mail
-	 */
-	protected function sendPasswordsByMail() {
-		$noMail = [];
-
-		$this->output->writeln('');
-		$progress = new ProgressBar($this->output, count($this->userPasswords));
-		$progress->start();
-
-		foreach ($this->userPasswords as $uid => $password) {
-			$progress->advance();
-			if (!empty($password)) {
-				$recipient = $this->userManager->get($uid);
-				if (!$recipient instanceof IUser) {
-					continue;
-				}
-
-				$recipientDisplayName = $recipient->getDisplayName();
-				$to = $recipient->getEMailAddress();
-
-				if ($to === '' || $to === null) {
-					$noMail[] = $uid;
-					continue;
-				}
-
-				$l = $this->l10nFactory->get('encryption', $this->l10nFactory->getUserLanguage($recipient));
-
-				$template = $this->mailer->createEMailTemplate('encryption.encryptAllPassword', [
-					'user' => $recipient->getUID(),
-					'password' => $password,
-				]);
-
-				$template->setSubject($l->t('one-time password for server-side-encryption'));
-				// 'Hey there,<br><br>The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>
-				// Please login to the web interface, go to the section "Basic encryption module" of your personal settings and update your encryption password by entering this password into the "Old log-in password" field and your current login-password.<br><br>'
-				$template->addHeader();
-				$template->addHeading($l->t('Encryption password'));
-				$template->addBodyText(
-					$l->t('The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.', [htmlspecialchars($password)]),
-					$l->t('The administration enabled server-side-encryption. Your files were encrypted using the password "%s".', $password)
-				);
-				$template->addBodyText(
-					$l->t('Please login to the web interface, go to the "Security" section of your personal settings and update your encryption password by entering this password into the "Old login password" field and your current login password.')
-				);
-				$template->addFooter();
-
-				// send it out now
-				try {
-					$message = $this->mailer->createMessage();
-					$message->setTo([$to => $recipientDisplayName]);
-					$message->useTemplate($template);
-					$message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
-					$this->mailer->send($message);
-				} catch (\Exception $e) {
-					$noMail[] = $uid;
-				}
-			}
-		}
-
-		$progress->finish();
-
-		if (empty($noMail)) {
-			$this->output->writeln("\n\nPassword successfully send to all users");
-		} else {
-			$table = new Table($this->output);
-			$table->setHeaders(['Username', 'Private key password']);
-			$this->output->writeln("\n\nCould not send password to following users:\n");
-			$rows = [];
-			foreach ($noMail as $uid) {
-				$rows[] = [$uid, $this->userPasswords[$uid]];
-			}
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
+    /** @var array */
+    protected $userPasswords;
+
+    /** @var OutputInterface */
+    protected $output;
+
+    /** @var InputInterface */
+    protected $input;
+
+    public function __construct(
+        protected Setup $userSetup,
+        protected IUserManager $userManager,
+        protected View $rootView,
+        protected KeyManager $keyManager,
+        protected Util $util,
+        protected IConfig $config,
+        protected IMailer $mailer,
+        protected IL10N $l,
+        protected IFactory $l10nFactory,
+        protected QuestionHelper $questionHelper,
+        protected ISecureRandom $secureRandom,
+    ) {
+        // store one time passwords for the users
+        $this->userPasswords = [];
+    }
+
+    /**
+     * start to encrypt all files
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    public function encryptAll(InputInterface $input, OutputInterface $output) {
+        $this->input = $input;
+        $this->output = $output;
+
+        $headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
+        $this->output->writeln("\n");
+        $this->output->writeln($headline);
+        $this->output->writeln(str_pad('', strlen($headline), '='));
+        $this->output->writeln("\n");
+
+        if ($this->util->isMasterKeyEnabled()) {
+            $this->output->writeln('Use master key to encrypt all files.');
+            $this->keyManager->validateMasterKey();
+        } else {
+            //create private/public keys for each user and store the private key password
+            $this->output->writeln('Create key-pair for every user');
+            $this->output->writeln('------------------------------');
+            $this->output->writeln('');
+            $this->output->writeln('This module will encrypt all files in the users files folder initially.');
+            $this->output->writeln('Already existing versions and files in the trash bin will not be encrypted.');
+            $this->output->writeln('');
+            $this->createKeyPairs();
+        }
+
+
+        // output generated encryption key passwords
+        if ($this->util->isMasterKeyEnabled() === false) {
+            //send-out or display password list and write it to a file
+            $this->output->writeln("\n");
+            $this->output->writeln('Generated encryption key passwords');
+            $this->output->writeln('----------------------------------');
+            $this->output->writeln('');
+            $this->outputPasswords();
+        }
+
+        //setup users file system and encrypt all files one by one (take should encrypt setting of storage into account)
+        $this->output->writeln("\n");
+        $this->output->writeln('Start to encrypt users files');
+        $this->output->writeln('----------------------------');
+        $this->output->writeln('');
+        $this->encryptAllUsersFiles();
+        $this->output->writeln("\n");
+    }
+
+    /**
+     * create key-pair for every user
+     */
+    protected function createKeyPairs() {
+        $this->output->writeln("\n");
+        $progress = new ProgressBar($this->output);
+        $progress->setFormat(" %message% \n [%bar%]");
+        $progress->start();
+
+        foreach ($this->userManager->getBackends() as $backend) {
+            $limit = 500;
+            $offset = 0;
+            do {
+                $users = $backend->getUsers('', $limit, $offset);
+                foreach ($users as $user) {
+                    if ($this->keyManager->userHasKeys($user) === false) {
+                        $progress->setMessage('Create key-pair for ' . $user);
+                        $progress->advance();
+                        $this->setupUserFS($user);
+                        $password = $this->generateOneTimePassword($user);
+                        $this->userSetup->setupUser($user, $password);
+                    } else {
+                        // users which already have a key-pair will be stored with a
+                        // empty password and filtered out later
+                        $this->userPasswords[$user] = '';
+                    }
+                }
+                $offset += $limit;
+            } while (count($users) >= $limit);
+        }
+
+        $progress->setMessage('Key-pair created for all users');
+        $progress->finish();
+    }
+
+    /**
+     * iterate over all user and encrypt their files
+     */
+    protected function encryptAllUsersFiles() {
+        $this->output->writeln("\n");
+        $progress = new ProgressBar($this->output);
+        $progress->setFormat(" %message% \n [%bar%]");
+        $progress->start();
+        $numberOfUsers = count($this->userPasswords);
+        $userNo = 1;
+        if ($this->util->isMasterKeyEnabled()) {
+            $this->encryptAllUserFilesWithMasterKey($progress);
+        } else {
+            foreach ($this->userPasswords as $uid => $password) {
+                $userCount = "$uid ($userNo of $numberOfUsers)";
+                $this->encryptUsersFiles($uid, $progress, $userCount);
+                $userNo++;
+            }
+        }
+        $progress->setMessage('all files encrypted');
+        $progress->finish();
+    }
+
+    /**
+     * encrypt all user files with the master key
+     *
+     * @param ProgressBar $progress
+     */
+    protected function encryptAllUserFilesWithMasterKey(ProgressBar $progress) {
+        $userNo = 1;
+        foreach ($this->userManager->getBackends() as $backend) {
+            $limit = 500;
+            $offset = 0;
+            do {
+                $users = $backend->getUsers('', $limit, $offset);
+                foreach ($users as $user) {
+                    $userCount = "$user ($userNo)";
+                    $this->encryptUsersFiles($user, $progress, $userCount);
+                    $userNo++;
+                }
+                $offset += $limit;
+            } while (count($users) >= $limit);
+        }
+    }
+
+    /**
+     * encrypt files from the given user
+     *
+     * @param string $uid
+     * @param ProgressBar $progress
+     * @param string $userCount
+     */
+    protected function encryptUsersFiles($uid, ProgressBar $progress, $userCount) {
+        $this->setupUserFS($uid);
+        $directories = [];
+        $directories[] = '/' . $uid . '/files';
+
+        while ($root = array_pop($directories)) {
+            $content = $this->rootView->getDirectoryContent($root);
+            foreach ($content as $file) {
+                $path = $root . '/' . $file['name'];
+                if ($this->rootView->is_dir($path)) {
+                    $directories[] = $path;
+                    continue;
+                } else {
+                    $progress->setMessage("encrypt files for user $userCount: $path");
+                    $progress->advance();
+                    if ($this->encryptFile($path) === false) {
+                        $progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
+                        $progress->advance();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * encrypt file
+     *
+     * @param string $path
+     * @return bool
+     */
+    protected function encryptFile($path) {
+
+        // skip already encrypted files
+        $fileInfo = $this->rootView->getFileInfo($path);
+        if ($fileInfo !== false && $fileInfo->isEncrypted()) {
+            return true;
+        }
+
+        $source = $path;
+        $target = $path . '.encrypted.' . time();
+
+        try {
+            $this->rootView->copy($source, $target);
+            $this->rootView->rename($target, $source);
+        } catch (DecryptionFailedException $e) {
+            if ($this->rootView->file_exists($target)) {
+                $this->rootView->unlink($target);
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * output one-time encryption passwords
+     */
+    protected function outputPasswords() {
+        $table = new Table($this->output);
+        $table->setHeaders(['Username', 'Private key password']);
+
+        //create rows
+        $newPasswords = [];
+        $unchangedPasswords = [];
+        foreach ($this->userPasswords as $uid => $password) {
+            if (empty($password)) {
+                $unchangedPasswords[] = $uid;
+            } else {
+                $newPasswords[] = [$uid, $password];
+            }
+        }
+
+        if (empty($newPasswords)) {
+            $this->output->writeln("\nAll users already had a key-pair, no further action needed.\n");
+            return;
+        }
+
+        $table->setRows($newPasswords);
+        $table->render();
+
+        if (!empty($unchangedPasswords)) {
+            $this->output->writeln("\nThe following users already had a key-pair which was reused without setting a new password:\n");
+            foreach ($unchangedPasswords as $uid) {
+                $this->output->writeln("    $uid");
+            }
+        }
+
+        $this->writePasswordsToFile($newPasswords);
+
+        $this->output->writeln('');
+        $question = new ConfirmationQuestion('Do you want to send the passwords directly to the users by mail? (y/n) ', false);
+        if ($this->questionHelper->ask($this->input, $this->output, $question)) {
+            $this->sendPasswordsByMail();
+        }
+    }
+
+    /**
+     * write one-time encryption passwords to a csv file
+     *
+     * @param array $passwords
+     */
+    protected function writePasswordsToFile(array $passwords) {
+        $fp = $this->rootView->fopen('oneTimeEncryptionPasswords.csv', 'w');
+        foreach ($passwords as $pwd) {
+            fputcsv($fp, $pwd);
+        }
+        fclose($fp);
+        $this->output->writeln("\n");
+        $this->output->writeln('A list of all newly created passwords was written to data/oneTimeEncryptionPasswords.csv');
+        $this->output->writeln('');
+        $this->output->writeln('Each of these users need to login to the web interface, go to the');
+        $this->output->writeln('personal settings section "basic encryption module" and');
+        $this->output->writeln('update the private key password to match the login password again by');
+        $this->output->writeln('entering the one-time password into the "old log-in password" field');
+        $this->output->writeln('and their current login password');
+    }
+
+    /**
+     * setup user file system
+     *
+     * @param string $uid
+     */
+    protected function setupUserFS($uid) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($uid);
+    }
+
+    /**
+     * generate one time password for the user and store it in a array
+     *
+     * @param string $uid
+     * @return string password
+     */
+    protected function generateOneTimePassword($uid) {
+        $password = $this->secureRandom->generate(16, ISecureRandom::CHAR_HUMAN_READABLE);
+        $this->userPasswords[$uid] = $password;
+        return $password;
+    }
+
+    /**
+     * send encryption key passwords to the users by mail
+     */
+    protected function sendPasswordsByMail() {
+        $noMail = [];
+
+        $this->output->writeln('');
+        $progress = new ProgressBar($this->output, count($this->userPasswords));
+        $progress->start();
+
+        foreach ($this->userPasswords as $uid => $password) {
+            $progress->advance();
+            if (!empty($password)) {
+                $recipient = $this->userManager->get($uid);
+                if (!$recipient instanceof IUser) {
+                    continue;
+                }
+
+                $recipientDisplayName = $recipient->getDisplayName();
+                $to = $recipient->getEMailAddress();
+
+                if ($to === '' || $to === null) {
+                    $noMail[] = $uid;
+                    continue;
+                }
+
+                $l = $this->l10nFactory->get('encryption', $this->l10nFactory->getUserLanguage($recipient));
+
+                $template = $this->mailer->createEMailTemplate('encryption.encryptAllPassword', [
+                    'user' => $recipient->getUID(),
+                    'password' => $password,
+                ]);
+
+                $template->setSubject($l->t('one-time password for server-side-encryption'));
+                // 'Hey there,<br><br>The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>
+                // Please login to the web interface, go to the section "Basic encryption module" of your personal settings and update your encryption password by entering this password into the "Old log-in password" field and your current login-password.<br><br>'
+                $template->addHeader();
+                $template->addHeading($l->t('Encryption password'));
+                $template->addBodyText(
+                    $l->t('The administration enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.', [htmlspecialchars($password)]),
+                    $l->t('The administration enabled server-side-encryption. Your files were encrypted using the password "%s".', $password)
+                );
+                $template->addBodyText(
+                    $l->t('Please login to the web interface, go to the "Security" section of your personal settings and update your encryption password by entering this password into the "Old login password" field and your current login password.')
+                );
+                $template->addFooter();
+
+                // send it out now
+                try {
+                    $message = $this->mailer->createMessage();
+                    $message->setTo([$to => $recipientDisplayName]);
+                    $message->useTemplate($template);
+                    $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
+                    $this->mailer->send($message);
+                } catch (\Exception $e) {
+                    $noMail[] = $uid;
+                }
+            }
+        }
+
+        $progress->finish();
+
+        if (empty($noMail)) {
+            $this->output->writeln("\n\nPassword successfully send to all users");
+        } else {
+            $table = new Table($this->output);
+            $table->setHeaders(['Username', 'Private key password']);
+            $this->output->writeln("\n\nCould not send password to following users:\n");
+            $rows = [];
+            foreach ($noMail as $uid) {
+                $rows[] = [$uid, $this->userPasswords[$uid]];
+            }
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
 }

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