nextcloud / server

apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php

Spacing +13 added lines, -13 removed lines

@@ -29,8 +29,8 @@ 
 
 	use TMigratorBasicVersionHandling;
 
-	protected const PATH_FILES_FOLDER = Application::APP_ID . '/files';
-	protected const PATH_LOCATIONS_FILE = Application::APP_ID . '/locations.json';
+	protected const PATH_FILES_FOLDER = Application::APP_ID.'/files';
+	protected const PATH_LOCATIONS_FILE = Application::APP_ID.'/locations.json';
 
 	public function __construct(
 		protected IRootFolder $root,
@@ -42,11 +42,11 @@ 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getEstimatedExportSize(IUser $user): int|float {
+	public function getEstimatedExportSize(IUser $user): int | float {
 		$uid = $user->getUID();
 
 		try {
-			$trashbinFolder = $this->root->get('/' . $uid . '/files_trashbin');
+			$trashbinFolder = $this->root->get('/'.$uid.'/files_trashbin');
 			if (!$trashbinFolder instanceof Folder) {
 				return 0;
 			}
@@ -60,14 +60,14 @@ 
 	 * {@inheritDoc}
 	 */
 	public function export(IUser $user, IExportDestination $exportDestination, OutputInterface $output): void {
-		$output->writeln('Exporting trashbin into ' . Application::APP_ID . '…');
+		$output->writeln('Exporting trashbin into '.Application::APP_ID.'…');
 
 		$uid = $user->getUID();
 
 		try {
-			$trashbinFolder = $this->root->get('/' . $uid . '/files_trashbin');
+			$trashbinFolder = $this->root->get('/'.$uid.'/files_trashbin');
 			if (!$trashbinFolder instanceof Folder) {
-				throw new UserMigrationException('/' . $uid . '/files_trashbin is not a folder');
+				throw new UserMigrationException('/'.$uid.'/files_trashbin is not a folder');
 			}
 			$output->writeln('Exporting trashbin files…');
 			$exportDestination->copyFolder($trashbinFolder, static::PATH_FILES_FOLDER);
@@ -84,7 +84,7 @@ 
 		} catch (NotFoundException $e) {
 			$output->writeln('No trashbin to export…');
 		} catch (\Throwable $e) {
-			throw new UserMigrationException('Could not export trashbin: ' . $e->getMessage(), 0, $e);
+			throw new UserMigrationException('Could not export trashbin: '.$e->getMessage(), 0, $e);
 		}
 	}
 
@@ -93,22 +93,22 @@ 
 	 */
 	public function import(IUser $user, IImportSource $importSource, OutputInterface $output): void {
 		if ($importSource->getMigratorVersion($this->getId()) === null) {
-			$output->writeln('No version for ' . static::class . ', skipping import…');
+			$output->writeln('No version for '.static::class.', skipping import…');
 			return;
 		}
 
-		$output->writeln('Importing trashbin from ' . Application::APP_ID . '…');
+		$output->writeln('Importing trashbin from '.Application::APP_ID.'…');
 
 		$uid = $user->getUID();
 
 		if ($importSource->pathExists(static::PATH_FILES_FOLDER)) {
 			try {
-				$trashbinFolder = $this->root->get('/' . $uid . '/files_trashbin');
+				$trashbinFolder = $this->root->get('/'.$uid.'/files_trashbin');
 				if (!$trashbinFolder instanceof Folder) {
-					throw new UserMigrationException('Could not import trashbin, /' . $uid . '/files_trashbin is not a folder');
+					throw new UserMigrationException('Could not import trashbin, /'.$uid.'/files_trashbin is not a folder');
 				}
 			} catch (NotFoundException $e) {
-				$trashbinFolder = $this->root->newFolder('/' . $uid . '/files_trashbin');
+				$trashbinFolder = $this->root->newFolder('/'.$uid.'/files_trashbin');
 			}
 			$output->writeln('Importing trashbin files…');
 			try {

apps/files_trashbin/lib/Trash/LegacyTrashBackend.php

Spacing +5 added lines, -5 removed lines

@@ -37,8 +37,8 @@ 
 	private function mapTrashItems(array $items, IUser $user, ?ITrashItem $parent = null): array {
 		$parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
 		$isRoot = $parent === null;
-		return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
-			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
+		return array_map(function(FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
+			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation().'/'.$file->getName();
 			if (!$originalLocation) {
 				$originalLocation = $file->getName();
 			}
@@ -49,7 +49,7 @@ 
 				$this,
 				$originalLocation,
 				$file->getMTime(),
-				$parentTrashPath . '/' . ($isRoot ? $trashFilename : $file->getName()),
+				$parentTrashPath.'/'.($isRoot ? $trashFilename : $file->getName()),
 				$file,
 				$user,
 				$deletedBy,
@@ -75,7 +75,7 @@ 
 	public function removeItem(ITrashItem $item) {
 		$user = $item->getUser();
 		if ($item->isRootItem()) {
-			$path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
+			$path = substr($item->getTrashPath(), 0, -strlen('.d'.$item->getDeletedTime()));
 			Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
 		} else {
 			Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
@@ -86,7 +86,7 @@ 
 		if (!$storage instanceof Storage) {
 			return false;
 		}
-		$normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
+		$normalized = Filesystem::normalizePath($storage->getMountPoint().'/'.$internalPath, true, false, true);
 		$view = Filesystem::getView();
 		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
 			$this->deletedFiles[$normalized] = $normalized;

apps/encryption/tests/Controller/SettingsControllerTest.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 
 		$this->l10nMock->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($message) {
+			->willReturnCallback(function($message) {
 				return $message;
 			});
 

apps/encryption/tests/Controller/StatusControllerTest.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 			->disableOriginalConstructor()->getMock();
 		$this->l10nMock->expects($this->any())
 			->method('t')
-			->willReturnCallback(function ($message) {
+			->willReturnCallback(function($message) {
 				return $message;
 			});
 		$this->encryptionManagerMock = $this->createMock(IManager::class);

apps/encryption/tests/Crypto/EncryptionTest.php

Spacing +5 added lines, -5 removed lines

@@ -293,7 +293,7 @@ 
 
 		$this->keyManagerMock->expects($this->any())
 			->method('addSystemKeys')
-			->willReturnCallback(function ($accessList, $publicKeys) {
+			->willReturnCallback(function($accessList, $publicKeys) {
 				return $publicKeys;
 			});
 
@@ -319,7 +319,7 @@ 
 		$this->keyManagerMock->expects($this->never())->method('getPublicKey');
 		$this->keyManagerMock->expects($this->never())->method('addSystemKeys');
 		$this->keyManagerMock->expects($this->once())->method('setVersion')
-			->willReturnCallback(function ($path, $version, $view): void {
+			->willReturnCallback(function($path, $version, $view): void {
 				$this->assertSame('path', $path);
 				$this->assertSame(2, $version);
 				$this->assertTrue($view instanceof View);
@@ -337,20 +337,20 @@ 
 
 		$this->keyManagerMock->expects($this->any())
 			->method('getPublicKey')->willReturnCallback(
-				function ($user): void {
+				function($user): void {
 					throw new PublicKeyMissingException($user);
 				}
 			);
 
 		$this->keyManagerMock->expects($this->any())
 			->method('addSystemKeys')
-			->willReturnCallback(function ($accessList, $publicKeys) {
+			->willReturnCallback(function($accessList, $publicKeys) {
 				return $publicKeys;
 			});
 
 		$this->cryptMock->expects($this->once())->method('multiKeyEncrypt')
 			->willReturnCallback(
-				function ($fileKey, $publicKeys) {
+				function($fileKey, $publicKeys) {
 					$this->assertEmpty($publicKeys);
 					$this->assertSame('fileKey', $fileKey);
 					return [];

apps/encryption/tests/Command/FixEncryptedVersionTest.php

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
 
 		$this->createUser($this->userId, 'foo12345678');
 		$tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
-		$this->registerMount($this->userId, '\OC\Files\Storage\Local', '/' . $this->userId, ['datadir' => $tmpFolder]);
+		$this->registerMount($this->userId, '\OC\Files\Storage\Local', '/'.$this->userId, ['datadir' => $tmpFolder]);
 		$this->setupForUser($this->userId, 'foo12345678');
 		$this->loginWithEncryption($this->userId);
 
@@ -84,7 +84,7 @@ 
 		$this->util->expects($this->once())->method('isMasterKeyEnabled')
 			->willReturn(true);
 
-		$view = new View('/' . $this->userId . '/files');
+		$view = new View('/'.$this->userId.'/files');
 
 		$view->touch('hello.txt');
 		$view->touch('world.txt');
@@ -152,7 +152,7 @@ 
 		$this->util->expects($this->once())->method('isMasterKeyEnabled')
 			->willReturn(true);
 
-		$view = new View('/' . $this->userId . '/files');
+		$view = new View('/'.$this->userId.'/files');
 
 		$view->touch('hello.txt');
 		$view->touch('world.txt');
@@ -211,11 +211,11 @@ 
 		$this->util->expects($this->once())->method('isMasterKeyEnabled')
 			->willReturn(true);
 
-		$view = new View('/' . $this->userId . '/files');
+		$view = new View('/'.$this->userId.'/files');
 
 		$view->touch('bar.txt');
 		for ($i = 0; $i < 40; $i++) {
-			$view->file_put_contents('bar.txt', 'a test string for hello ' . $i);
+			$view->file_put_contents('bar.txt', 'a test string for hello '.$i);
 		}
 
 		$fileInfo = $view->getFileInfo('bar.txt');
@@ -241,7 +241,7 @@ 
 		$this->util->expects($this->once())->method('isMasterKeyEnabled')
 			->willReturn(true);
 
-		$view = new View('/' . $this->userId . '/files');
+		$view = new View('/'.$this->userId.'/files');
 
 		// create a file, it's encrypted and also the version is set in the database
 		$view->touch('hello.txt');
@@ -256,7 +256,7 @@ 
 		$cacheInfo = ['encryptedVersion' => 1, 'encrypted' => 1];
 		$cache1->put($fileCache1->getPath(), $cacheInfo);
 
-		$absPath = $storage1->getSourcePath('') . $fileInfo1->getInternalPath();
+		$absPath = $storage1->getSourcePath('').$fileInfo1->getInternalPath();
 
 		// create unencrypted file on disk, the version stays
 		file_put_contents($absPath, 'hello contents');
@@ -284,7 +284,7 @@ 
 		$this->util->expects($this->once())->method('isMasterKeyEnabled')
 			->willReturn(true);
 
-		$view = new View('/' . $this->userId . '/files');
+		$view = new View('/'.$this->userId.'/files');
 
 		$view->touch('hello.txt');
 		$view->touch('world.txt');
@@ -308,7 +308,7 @@ 
 		$this->util->expects($this->once())->method('isMasterKeyEnabled')
 			->willReturn(true);
 
-		$view = new View('/' . $this->userId . '/files');
+		$view = new View('/'.$this->userId.'/files');
 
 		$view->mkdir('sub');
 		$view->touch('sub/hello.txt');

apps/encryption/composer/composer/autoload_static.php

Spacing +37 added lines, -37 removed lines

@@ -6,56 +6,56 @@
 
 class ComposerStaticInitEncryption
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Encryption\\' => 15,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Encryption\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Encryption\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__ . '/..' . '/../lib/Command/DisableMasterKey.php',
-        'OCA\\Encryption\\Command\\DropLegacyFileKey' => __DIR__ . '/..' . '/../lib/Command/DropLegacyFileKey.php',
-        'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__ . '/..' . '/../lib/Command/EnableMasterKey.php',
-        'OCA\\Encryption\\Command\\FixEncryptedVersion' => __DIR__ . '/..' . '/../lib/Command/FixEncryptedVersion.php',
-        'OCA\\Encryption\\Command\\FixKeyLocation' => __DIR__ . '/..' . '/../lib/Command/FixKeyLocation.php',
-        'OCA\\Encryption\\Command\\RecoverUser' => __DIR__ . '/..' . '/../lib/Command/RecoverUser.php',
-        'OCA\\Encryption\\Command\\ScanLegacyFormat' => __DIR__ . '/..' . '/../lib/Command/ScanLegacyFormat.php',
-        'OCA\\Encryption\\Controller\\RecoveryController' => __DIR__ . '/..' . '/../lib/Controller/RecoveryController.php',
-        'OCA\\Encryption\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
-        'OCA\\Encryption\\Controller\\StatusController' => __DIR__ . '/..' . '/../lib/Controller/StatusController.php',
-        'OCA\\Encryption\\Crypto\\Crypt' => __DIR__ . '/..' . '/../lib/Crypto/Crypt.php',
-        'OCA\\Encryption\\Crypto\\DecryptAll' => __DIR__ . '/..' . '/../lib/Crypto/DecryptAll.php',
-        'OCA\\Encryption\\Crypto\\EncryptAll' => __DIR__ . '/..' . '/../lib/Crypto/EncryptAll.php',
-        'OCA\\Encryption\\Crypto\\Encryption' => __DIR__ . '/..' . '/../lib/Crypto/Encryption.php',
-        'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => __DIR__ . '/..' . '/../lib/Exceptions/MultiKeyDecryptException.php',
-        'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => __DIR__ . '/..' . '/../lib/Exceptions/MultiKeyEncryptException.php',
-        'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PrivateKeyMissingException.php',
-        'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => __DIR__ . '/..' . '/../lib/Exceptions/PublicKeyMissingException.php',
-        'OCA\\Encryption\\KeyManager' => __DIR__ . '/..' . '/../lib/KeyManager.php',
-        'OCA\\Encryption\\Listeners\\UserEventsListener' => __DIR__ . '/..' . '/../lib/Listeners/UserEventsListener.php',
-        'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__ . '/..' . '/../lib/Migration/SetMasterKeyStatus.php',
-        'OCA\\Encryption\\Recovery' => __DIR__ . '/..' . '/../lib/Recovery.php',
-        'OCA\\Encryption\\Services\\PassphraseService' => __DIR__ . '/..' . '/../lib/Services/PassphraseService.php',
-        'OCA\\Encryption\\Session' => __DIR__ . '/..' . '/../lib/Session.php',
-        'OCA\\Encryption\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\Encryption\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
-        'OCA\\Encryption\\Users\\Setup' => __DIR__ . '/..' . '/../lib/Users/Setup.php',
-        'OCA\\Encryption\\Util' => __DIR__ . '/..' . '/../lib/Util.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Encryption\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__.'/..'.'/../lib/Command/DisableMasterKey.php',
+        'OCA\\Encryption\\Command\\DropLegacyFileKey' => __DIR__.'/..'.'/../lib/Command/DropLegacyFileKey.php',
+        'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__.'/..'.'/../lib/Command/EnableMasterKey.php',
+        'OCA\\Encryption\\Command\\FixEncryptedVersion' => __DIR__.'/..'.'/../lib/Command/FixEncryptedVersion.php',
+        'OCA\\Encryption\\Command\\FixKeyLocation' => __DIR__.'/..'.'/../lib/Command/FixKeyLocation.php',
+        'OCA\\Encryption\\Command\\RecoverUser' => __DIR__.'/..'.'/../lib/Command/RecoverUser.php',
+        'OCA\\Encryption\\Command\\ScanLegacyFormat' => __DIR__.'/..'.'/../lib/Command/ScanLegacyFormat.php',
+        'OCA\\Encryption\\Controller\\RecoveryController' => __DIR__.'/..'.'/../lib/Controller/RecoveryController.php',
+        'OCA\\Encryption\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
+        'OCA\\Encryption\\Controller\\StatusController' => __DIR__.'/..'.'/../lib/Controller/StatusController.php',
+        'OCA\\Encryption\\Crypto\\Crypt' => __DIR__.'/..'.'/../lib/Crypto/Crypt.php',
+        'OCA\\Encryption\\Crypto\\DecryptAll' => __DIR__.'/..'.'/../lib/Crypto/DecryptAll.php',
+        'OCA\\Encryption\\Crypto\\EncryptAll' => __DIR__.'/..'.'/../lib/Crypto/EncryptAll.php',
+        'OCA\\Encryption\\Crypto\\Encryption' => __DIR__.'/..'.'/../lib/Crypto/Encryption.php',
+        'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => __DIR__.'/..'.'/../lib/Exceptions/MultiKeyDecryptException.php',
+        'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => __DIR__.'/..'.'/../lib/Exceptions/MultiKeyEncryptException.php',
+        'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => __DIR__.'/..'.'/../lib/Exceptions/PrivateKeyMissingException.php',
+        'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => __DIR__.'/..'.'/../lib/Exceptions/PublicKeyMissingException.php',
+        'OCA\\Encryption\\KeyManager' => __DIR__.'/..'.'/../lib/KeyManager.php',
+        'OCA\\Encryption\\Listeners\\UserEventsListener' => __DIR__.'/..'.'/../lib/Listeners/UserEventsListener.php',
+        'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__.'/..'.'/../lib/Migration/SetMasterKeyStatus.php',
+        'OCA\\Encryption\\Recovery' => __DIR__.'/..'.'/../lib/Recovery.php',
+        'OCA\\Encryption\\Services\\PassphraseService' => __DIR__.'/..'.'/../lib/Services/PassphraseService.php',
+        'OCA\\Encryption\\Session' => __DIR__.'/..'.'/../lib/Session.php',
+        'OCA\\Encryption\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\Encryption\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
+        'OCA\\Encryption\\Users\\Setup' => __DIR__.'/..'.'/../lib/Users/Setup.php',
+        'OCA\\Encryption\\Util' => __DIR__.'/..'.'/../lib/Util.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitEncryption::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitEncryption::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitEncryption::$classMap;

apps/encryption/composer/composer/autoload_classmap.php

Spacing +30 added lines, -30 removed lines

@@ -6,34 +6,34 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Encryption\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir . '/../lib/Command/DisableMasterKey.php',
-    'OCA\\Encryption\\Command\\DropLegacyFileKey' => $baseDir . '/../lib/Command/DropLegacyFileKey.php',
-    'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir . '/../lib/Command/EnableMasterKey.php',
-    'OCA\\Encryption\\Command\\FixEncryptedVersion' => $baseDir . '/../lib/Command/FixEncryptedVersion.php',
-    'OCA\\Encryption\\Command\\FixKeyLocation' => $baseDir . '/../lib/Command/FixKeyLocation.php',
-    'OCA\\Encryption\\Command\\RecoverUser' => $baseDir . '/../lib/Command/RecoverUser.php',
-    'OCA\\Encryption\\Command\\ScanLegacyFormat' => $baseDir . '/../lib/Command/ScanLegacyFormat.php',
-    'OCA\\Encryption\\Controller\\RecoveryController' => $baseDir . '/../lib/Controller/RecoveryController.php',
-    'OCA\\Encryption\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
-    'OCA\\Encryption\\Controller\\StatusController' => $baseDir . '/../lib/Controller/StatusController.php',
-    'OCA\\Encryption\\Crypto\\Crypt' => $baseDir . '/../lib/Crypto/Crypt.php',
-    'OCA\\Encryption\\Crypto\\DecryptAll' => $baseDir . '/../lib/Crypto/DecryptAll.php',
-    'OCA\\Encryption\\Crypto\\EncryptAll' => $baseDir . '/../lib/Crypto/EncryptAll.php',
-    'OCA\\Encryption\\Crypto\\Encryption' => $baseDir . '/../lib/Crypto/Encryption.php',
-    'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => $baseDir . '/../lib/Exceptions/MultiKeyDecryptException.php',
-    'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => $baseDir . '/../lib/Exceptions/MultiKeyEncryptException.php',
-    'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => $baseDir . '/../lib/Exceptions/PrivateKeyMissingException.php',
-    'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => $baseDir . '/../lib/Exceptions/PublicKeyMissingException.php',
-    'OCA\\Encryption\\KeyManager' => $baseDir . '/../lib/KeyManager.php',
-    'OCA\\Encryption\\Listeners\\UserEventsListener' => $baseDir . '/../lib/Listeners/UserEventsListener.php',
-    'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir . '/../lib/Migration/SetMasterKeyStatus.php',
-    'OCA\\Encryption\\Recovery' => $baseDir . '/../lib/Recovery.php',
-    'OCA\\Encryption\\Services\\PassphraseService' => $baseDir . '/../lib/Services/PassphraseService.php',
-    'OCA\\Encryption\\Session' => $baseDir . '/../lib/Session.php',
-    'OCA\\Encryption\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\Encryption\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
-    'OCA\\Encryption\\Users\\Setup' => $baseDir . '/../lib/Users/Setup.php',
-    'OCA\\Encryption\\Util' => $baseDir . '/../lib/Util.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Encryption\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir.'/../lib/Command/DisableMasterKey.php',
+    'OCA\\Encryption\\Command\\DropLegacyFileKey' => $baseDir.'/../lib/Command/DropLegacyFileKey.php',
+    'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir.'/../lib/Command/EnableMasterKey.php',
+    'OCA\\Encryption\\Command\\FixEncryptedVersion' => $baseDir.'/../lib/Command/FixEncryptedVersion.php',
+    'OCA\\Encryption\\Command\\FixKeyLocation' => $baseDir.'/../lib/Command/FixKeyLocation.php',
+    'OCA\\Encryption\\Command\\RecoverUser' => $baseDir.'/../lib/Command/RecoverUser.php',
+    'OCA\\Encryption\\Command\\ScanLegacyFormat' => $baseDir.'/../lib/Command/ScanLegacyFormat.php',
+    'OCA\\Encryption\\Controller\\RecoveryController' => $baseDir.'/../lib/Controller/RecoveryController.php',
+    'OCA\\Encryption\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
+    'OCA\\Encryption\\Controller\\StatusController' => $baseDir.'/../lib/Controller/StatusController.php',
+    'OCA\\Encryption\\Crypto\\Crypt' => $baseDir.'/../lib/Crypto/Crypt.php',
+    'OCA\\Encryption\\Crypto\\DecryptAll' => $baseDir.'/../lib/Crypto/DecryptAll.php',
+    'OCA\\Encryption\\Crypto\\EncryptAll' => $baseDir.'/../lib/Crypto/EncryptAll.php',
+    'OCA\\Encryption\\Crypto\\Encryption' => $baseDir.'/../lib/Crypto/Encryption.php',
+    'OCA\\Encryption\\Exceptions\\MultiKeyDecryptException' => $baseDir.'/../lib/Exceptions/MultiKeyDecryptException.php',
+    'OCA\\Encryption\\Exceptions\\MultiKeyEncryptException' => $baseDir.'/../lib/Exceptions/MultiKeyEncryptException.php',
+    'OCA\\Encryption\\Exceptions\\PrivateKeyMissingException' => $baseDir.'/../lib/Exceptions/PrivateKeyMissingException.php',
+    'OCA\\Encryption\\Exceptions\\PublicKeyMissingException' => $baseDir.'/../lib/Exceptions/PublicKeyMissingException.php',
+    'OCA\\Encryption\\KeyManager' => $baseDir.'/../lib/KeyManager.php',
+    'OCA\\Encryption\\Listeners\\UserEventsListener' => $baseDir.'/../lib/Listeners/UserEventsListener.php',
+    'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir.'/../lib/Migration/SetMasterKeyStatus.php',
+    'OCA\\Encryption\\Recovery' => $baseDir.'/../lib/Recovery.php',
+    'OCA\\Encryption\\Services\\PassphraseService' => $baseDir.'/../lib/Services/PassphraseService.php',
+    'OCA\\Encryption\\Session' => $baseDir.'/../lib/Session.php',
+    'OCA\\Encryption\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\Encryption\\Settings\\Personal' => $baseDir.'/../lib/Settings/Personal.php',
+    'OCA\\Encryption\\Users\\Setup' => $baseDir.'/../lib/Users/Setup.php',
+    'OCA\\Encryption\\Util' => $baseDir.'/../lib/Util.php',
 );

apps/encryption/templates/settings-personal.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 			<br />
 			<?php p($l->t('Set your old private key password to your current log-in password:')); ?>
 			<?php if ($_['recoveryEnabledForUser']):
-				p(' ' . $l->t('If you do not remember your old password you can ask your administrator to recover your files.'));
+				p(' '.$l->t('If you do not remember your old password you can ask your administrator to recover your files.'));
 			endif; ?>
 			<br />
 			<input