nextcloud / server

apps/encryption/lib/Command/FixEncryptedVersion.php

Indentation +248 added lines, -248 removed lines

@@ -35,252 +35,252 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class FixEncryptedVersion extends Command {
-	/** @var IConfig */
-	private $config;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IRootFolder  */
-	private $rootFolder;
-
-	/** @var IUserManager  */
-	private $userManager;
-
-	/** @var Util */
-	private $util;
-
-	/** @var View  */
-	private $view;
-
-	public function __construct(
-		IConfig $config,
-		ILogger $logger,
-		IRootFolder $rootFolder,
-		IUserManager $userManager,
-		Util $util,
-		View $view
-	) {
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-		$this->util = $util;
-		$this->view = $view;
-		parent::__construct();
-	}
-
-	protected function configure(): void {
-		parent::configure();
-
-		$this
-			->setName('encryption:fix-encrypted-version')
-			->setDescription('Fix the encrypted version if the encrypted file(s) are not downloadable.')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'The id of the user whose files need fixing'
-			)->addOption(
-				'path',
-				'p',
-				InputArgument::OPTIONAL,
-				'Limit files to fix with path, e.g., --path="/Music/Artist". If path indicates a directory, all the files inside directory will be fixed.'
-			);
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$skipSignatureCheck = $this->config->getSystemValue('encryption_skip_signature_check', false);
-
-		if ($skipSignatureCheck) {
-			$output->writeln("<error>Repairing is not possible when \"encryption_skip_signature_check\" is set. Please disable this flag in the configuration.</error>\n");
-			return 1;
-		}
-
-		if (!$this->util->isMasterKeyEnabled()) {
-			$output->writeln("<error>Repairing only works with master key encryption.</error>\n");
-			return 1;
-		}
-
-		$user = (string)$input->getArgument('user');
-		$pathToWalk = "/$user/files";
-
-		/**
-		 * trim() returns an empty string when the argument is an unset/null
-		 */
-		$pathOption = \trim($input->getOption('path'), '/');
-		if ($pathOption !== "") {
-			$pathToWalk = "$pathToWalk/$pathOption";
-		}
-
-		if ($user === null) {
-			$output->writeln("<error>No user id provided.</error>\n");
-			return 1;
-		}
-
-		if ($this->userManager->get($user) === null) {
-			$output->writeln("<error>User id $user does not exist. Please provide a valid user id</error>");
-			return 1;
-		}
-		return $this->walkPathOfUser($user, $pathToWalk, $output);
-	}
-
-	/**
-	 * @param string $user
-	 * @param string $path
-	 * @param OutputInterface $output
-	 * @return int 0 for success, 1 for error
-	 */
-	private function walkPathOfUser($user, $path, OutputInterface $output): int {
-		$this->setupUserFs($user);
-		if (!$this->view->file_exists($path)) {
-			$output->writeln("<error>Path \"$path\" does not exist. Please provide a valid path.</error>");
-			return 1;
-		}
-
-		if ($this->view->is_file($path)) {
-			$output->writeln("Verifying the content of file \"$path\"");
-			$this->verifyFileContent($path, $output);
-			return 0;
-		}
-		$directories = [];
-		$directories[] = $path;
-		while ($root = \array_pop($directories)) {
-			$directoryContent = $this->view->getDirectoryContent($root);
-			foreach ($directoryContent as $file) {
-				$path = $root . '/' . $file['name'];
-				if ($this->view->is_dir($path)) {
-					$directories[] = $path;
-				} else {
-					$output->writeln("Verifying the content of file \"$path\"");
-					$this->verifyFileContent($path, $output);
-				}
-			}
-		}
-		return 0;
-	}
-
-	/**
-	 * @param string $path
-	 * @param OutputInterface $output
-	 * @param bool $ignoreCorrectEncVersionCall, setting this variable to false avoids recursion
-	 */
-	private function verifyFileContent($path, OutputInterface $output, $ignoreCorrectEncVersionCall = true): bool {
-		try {
-			/**
-			 * In encryption, the files are read in a block size of 8192 bytes
-			 * Read block size of 8192 and a bit more (808 bytes)
-			 * If there is any problem, the first block should throw the signature
-			 * mismatch error. Which as of now, is enough to proceed ahead to
-			 * correct the encrypted version.
-			 */
-			$handle = $this->view->fopen($path, 'rb');
-
-			if (\fread($handle, 9001) !== false) {
-				$output->writeln("<info>The file \"$path\" is: OK</info>");
-			}
-
-			\fclose($handle);
-
-			return true;
-		} catch (HintException $e) {
-			$this->logger->warning("Issue: " . $e->getMessage());
-			//If allowOnce is set to false, this becomes recursive.
-			if ($ignoreCorrectEncVersionCall === true) {
-				//Lets rectify the file by correcting encrypted version
-				$output->writeln("<info>Attempting to fix the path: \"$path\"</info>");
-				return $this->correctEncryptedVersion($path, $output);
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param OutputInterface $output
-	 * @return bool
-	 */
-	private function correctEncryptedVersion($path, OutputInterface $output): bool {
-		$fileInfo = $this->view->getFileInfo($path);
-		if (!$fileInfo) {
-			$output->writeln("<warning>File info not found for file: \"$path\"</warning>");
-			return true;
-		}
-		$fileId = $fileInfo->getId();
-		$encryptedVersion = $fileInfo->getEncryptedVersion();
-		$wrongEncryptedVersion = $encryptedVersion;
-
-		$storage = $fileInfo->getStorage();
-
-		$cache = $storage->getCache();
-		$fileCache = $cache->get($fileId);
-		if (!$fileCache) {
-			$output->writeln("<warning>File cache entry not found for file: \"$path\"</warning>");
-			return true;
-		}
-
-		if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
-			$output->writeln("<info>The file: \"$path\" is a share. Please also run the script for the owner of the share</info>");
-			return true;
-		}
-
-		// Save original encrypted version so we can restore it if decryption fails with all version
-		$originalEncryptedVersion = $encryptedVersion;
-		if ($encryptedVersion >= 0) {
-			//test by decrementing the value till 1 and if nothing works try incrementing
-			$encryptedVersion--;
-			while ($encryptedVersion > 0) {
-				$cacheInfo = ['encryptedVersion' => $encryptedVersion, 'encrypted' => $encryptedVersion];
-				$cache->put($fileCache->getPath(), $cacheInfo);
-				$output->writeln("<info>Decrement the encrypted version to $encryptedVersion</info>");
-				if ($this->verifyFileContent($path, $output, false) === true) {
-					$output->writeln("<info>Fixed the file: \"$path\" with version " . $encryptedVersion . "</info>");
-					return true;
-				}
-				$encryptedVersion--;
-			}
-
-			//So decrementing did not work. Now lets increment. Max increment is till 5
-			$increment = 1;
-			while ($increment <= 5) {
-				/**
-				 * The wrongEncryptedVersion would not be incremented so nothing to worry about here.
-				 * Only the newEncryptedVersion is incremented.
-				 * For example if the wrong encrypted version is 4 then
-				 * cycle1 -> newEncryptedVersion = 5 ( 4 + 1)
-				 * cycle2 -> newEncryptedVersion = 6 ( 4 + 2)
-				 * cycle3 -> newEncryptedVersion = 7 ( 4 + 3)
-				 */
-				$newEncryptedVersion = $wrongEncryptedVersion + $increment;
-
-				$cacheInfo = ['encryptedVersion' => $newEncryptedVersion, 'encrypted' => $newEncryptedVersion];
-				$cache->put($fileCache->getPath(), $cacheInfo);
-				$output->writeln("<info>Increment the encrypted version to $newEncryptedVersion</info>");
-				if ($this->verifyFileContent($path, $output, false) === true) {
-					$output->writeln("<info>Fixed the file: \"$path\" with version " . $newEncryptedVersion . "</info>");
-					return true;
-				}
-				$increment++;
-			}
-		}
-
-		$cacheInfo = ['encryptedVersion' => $originalEncryptedVersion, 'encrypted' => $originalEncryptedVersion];
-		$cache->put($fileCache->getPath(), $cacheInfo);
-		$output->writeln("<info>No fix found for \"$path\", restored version to original: $originalEncryptedVersion</info>");
-
-		return false;
-	}
-
-	/**
-	 * Setup user file system
-	 * @param string $uid
-	 */
-	private function setupUserFs($uid): void {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($uid);
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IRootFolder  */
+    private $rootFolder;
+
+    /** @var IUserManager  */
+    private $userManager;
+
+    /** @var Util */
+    private $util;
+
+    /** @var View  */
+    private $view;
+
+    public function __construct(
+        IConfig $config,
+        ILogger $logger,
+        IRootFolder $rootFolder,
+        IUserManager $userManager,
+        Util $util,
+        View $view
+    ) {
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+        $this->util = $util;
+        $this->view = $view;
+        parent::__construct();
+    }
+
+    protected function configure(): void {
+        parent::configure();
+
+        $this
+            ->setName('encryption:fix-encrypted-version')
+            ->setDescription('Fix the encrypted version if the encrypted file(s) are not downloadable.')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'The id of the user whose files need fixing'
+            )->addOption(
+                'path',
+                'p',
+                InputArgument::OPTIONAL,
+                'Limit files to fix with path, e.g., --path="/Music/Artist". If path indicates a directory, all the files inside directory will be fixed.'
+            );
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $skipSignatureCheck = $this->config->getSystemValue('encryption_skip_signature_check', false);
+
+        if ($skipSignatureCheck) {
+            $output->writeln("<error>Repairing is not possible when \"encryption_skip_signature_check\" is set. Please disable this flag in the configuration.</error>\n");
+            return 1;
+        }
+
+        if (!$this->util->isMasterKeyEnabled()) {
+            $output->writeln("<error>Repairing only works with master key encryption.</error>\n");
+            return 1;
+        }
+
+        $user = (string)$input->getArgument('user');
+        $pathToWalk = "/$user/files";
+
+        /**
+         * trim() returns an empty string when the argument is an unset/null
+         */
+        $pathOption = \trim($input->getOption('path'), '/');
+        if ($pathOption !== "") {
+            $pathToWalk = "$pathToWalk/$pathOption";
+        }
+
+        if ($user === null) {
+            $output->writeln("<error>No user id provided.</error>\n");
+            return 1;
+        }
+
+        if ($this->userManager->get($user) === null) {
+            $output->writeln("<error>User id $user does not exist. Please provide a valid user id</error>");
+            return 1;
+        }
+        return $this->walkPathOfUser($user, $pathToWalk, $output);
+    }
+
+    /**
+     * @param string $user
+     * @param string $path
+     * @param OutputInterface $output
+     * @return int 0 for success, 1 for error
+     */
+    private function walkPathOfUser($user, $path, OutputInterface $output): int {
+        $this->setupUserFs($user);
+        if (!$this->view->file_exists($path)) {
+            $output->writeln("<error>Path \"$path\" does not exist. Please provide a valid path.</error>");
+            return 1;
+        }
+
+        if ($this->view->is_file($path)) {
+            $output->writeln("Verifying the content of file \"$path\"");
+            $this->verifyFileContent($path, $output);
+            return 0;
+        }
+        $directories = [];
+        $directories[] = $path;
+        while ($root = \array_pop($directories)) {
+            $directoryContent = $this->view->getDirectoryContent($root);
+            foreach ($directoryContent as $file) {
+                $path = $root . '/' . $file['name'];
+                if ($this->view->is_dir($path)) {
+                    $directories[] = $path;
+                } else {
+                    $output->writeln("Verifying the content of file \"$path\"");
+                    $this->verifyFileContent($path, $output);
+                }
+            }
+        }
+        return 0;
+    }
+
+    /**
+     * @param string $path
+     * @param OutputInterface $output
+     * @param bool $ignoreCorrectEncVersionCall, setting this variable to false avoids recursion
+     */
+    private function verifyFileContent($path, OutputInterface $output, $ignoreCorrectEncVersionCall = true): bool {
+        try {
+            /**
+             * In encryption, the files are read in a block size of 8192 bytes
+             * Read block size of 8192 and a bit more (808 bytes)
+             * If there is any problem, the first block should throw the signature
+             * mismatch error. Which as of now, is enough to proceed ahead to
+             * correct the encrypted version.
+             */
+            $handle = $this->view->fopen($path, 'rb');
+
+            if (\fread($handle, 9001) !== false) {
+                $output->writeln("<info>The file \"$path\" is: OK</info>");
+            }
+
+            \fclose($handle);
+
+            return true;
+        } catch (HintException $e) {
+            $this->logger->warning("Issue: " . $e->getMessage());
+            //If allowOnce is set to false, this becomes recursive.
+            if ($ignoreCorrectEncVersionCall === true) {
+                //Lets rectify the file by correcting encrypted version
+                $output->writeln("<info>Attempting to fix the path: \"$path\"</info>");
+                return $this->correctEncryptedVersion($path, $output);
+            }
+            return false;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param OutputInterface $output
+     * @return bool
+     */
+    private function correctEncryptedVersion($path, OutputInterface $output): bool {
+        $fileInfo = $this->view->getFileInfo($path);
+        if (!$fileInfo) {
+            $output->writeln("<warning>File info not found for file: \"$path\"</warning>");
+            return true;
+        }
+        $fileId = $fileInfo->getId();
+        $encryptedVersion = $fileInfo->getEncryptedVersion();
+        $wrongEncryptedVersion = $encryptedVersion;
+
+        $storage = $fileInfo->getStorage();
+
+        $cache = $storage->getCache();
+        $fileCache = $cache->get($fileId);
+        if (!$fileCache) {
+            $output->writeln("<warning>File cache entry not found for file: \"$path\"</warning>");
+            return true;
+        }
+
+        if ($storage->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) {
+            $output->writeln("<info>The file: \"$path\" is a share. Please also run the script for the owner of the share</info>");
+            return true;
+        }
+
+        // Save original encrypted version so we can restore it if decryption fails with all version
+        $originalEncryptedVersion = $encryptedVersion;
+        if ($encryptedVersion >= 0) {
+            //test by decrementing the value till 1 and if nothing works try incrementing
+            $encryptedVersion--;
+            while ($encryptedVersion > 0) {
+                $cacheInfo = ['encryptedVersion' => $encryptedVersion, 'encrypted' => $encryptedVersion];
+                $cache->put($fileCache->getPath(), $cacheInfo);
+                $output->writeln("<info>Decrement the encrypted version to $encryptedVersion</info>");
+                if ($this->verifyFileContent($path, $output, false) === true) {
+                    $output->writeln("<info>Fixed the file: \"$path\" with version " . $encryptedVersion . "</info>");
+                    return true;
+                }
+                $encryptedVersion--;
+            }
+
+            //So decrementing did not work. Now lets increment. Max increment is till 5
+            $increment = 1;
+            while ($increment <= 5) {
+                /**
+                 * The wrongEncryptedVersion would not be incremented so nothing to worry about here.
+                 * Only the newEncryptedVersion is incremented.
+                 * For example if the wrong encrypted version is 4 then
+                 * cycle1 -> newEncryptedVersion = 5 ( 4 + 1)
+                 * cycle2 -> newEncryptedVersion = 6 ( 4 + 2)
+                 * cycle3 -> newEncryptedVersion = 7 ( 4 + 3)
+                 */
+                $newEncryptedVersion = $wrongEncryptedVersion + $increment;
+
+                $cacheInfo = ['encryptedVersion' => $newEncryptedVersion, 'encrypted' => $newEncryptedVersion];
+                $cache->put($fileCache->getPath(), $cacheInfo);
+                $output->writeln("<info>Increment the encrypted version to $newEncryptedVersion</info>");
+                if ($this->verifyFileContent($path, $output, false) === true) {
+                    $output->writeln("<info>Fixed the file: \"$path\" with version " . $newEncryptedVersion . "</info>");
+                    return true;
+                }
+                $increment++;
+            }
+        }
+
+        $cacheInfo = ['encryptedVersion' => $originalEncryptedVersion, 'encrypted' => $originalEncryptedVersion];
+        $cache->put($fileCache->getPath(), $cacheInfo);
+        $output->writeln("<info>No fix found for \"$path\", restored version to original: $originalEncryptedVersion</info>");
+
+        return false;
+    }
+
+    /**
+     * Setup user file system
+     * @param string $uid
+     */
+    private function setupUserFs($uid): void {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($uid);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -106,7 +106,7 @@ 
 			return 1;
 		}
 
-		$user = (string)$input->getArgument('user');
+		$user = (string) $input->getArgument('user');
 		$pathToWalk = "/$user/files";
 
 		/**
@@ -152,7 +152,7 @@ 
 		while ($root = \array_pop($directories)) {
 			$directoryContent = $this->view->getDirectoryContent($root);
 			foreach ($directoryContent as $file) {
-				$path = $root . '/' . $file['name'];
+				$path = $root.'/'.$file['name'];
 				if ($this->view->is_dir($path)) {
 					$directories[] = $path;
 				} else {
@@ -188,7 +188,7 @@ 
 
 			return true;
 		} catch (HintException $e) {
-			$this->logger->warning("Issue: " . $e->getMessage());
+			$this->logger->warning("Issue: ".$e->getMessage());
 			//If allowOnce is set to false, this becomes recursive.
 			if ($ignoreCorrectEncVersionCall === true) {
 				//Lets rectify the file by correcting encrypted version
@@ -238,7 +238,7 @@ 
 				$cache->put($fileCache->getPath(), $cacheInfo);
 				$output->writeln("<info>Decrement the encrypted version to $encryptedVersion</info>");
 				if ($this->verifyFileContent($path, $output, false) === true) {
-					$output->writeln("<info>Fixed the file: \"$path\" with version " . $encryptedVersion . "</info>");
+					$output->writeln("<info>Fixed the file: \"$path\" with version ".$encryptedVersion."</info>");
 					return true;
 				}
 				$encryptedVersion--;
@@ -261,7 +261,7 @@ 
 				$cache->put($fileCache->getPath(), $cacheInfo);
 				$output->writeln("<info>Increment the encrypted version to $newEncryptedVersion</info>");
 				if ($this->verifyFileContent($path, $output, false) === true) {
-					$output->writeln("<info>Fixed the file: \"$path\" with version " . $newEncryptedVersion . "</info>");
+					$output->writeln("<info>Fixed the file: \"$path\" with version ".$newEncryptedVersion."</info>");
 					return true;
 				}
 				$increment++;

apps/encryption/composer/composer/autoload_classmap.php

Spacing +29 added lines, -29 removed lines

@@ -6,33 +6,33 @@
 $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\\EnableMasterKey' => $baseDir . '/../lib/Command/EnableMasterKey.php',
-    'OCA\\Encryption\\Command\\FixEncryptedVersion' => $baseDir . '/../lib/Command/FixEncryptedVersion.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\\HookManager' => $baseDir . '/../lib/HookManager.php',
-    'OCA\\Encryption\\Hooks\\Contracts\\IHook' => $baseDir . '/../lib/Hooks/Contracts/IHook.php',
-    'OCA\\Encryption\\Hooks\\UserHooks' => $baseDir . '/../lib/Hooks/UserHooks.php',
-    'OCA\\Encryption\\KeyManager' => $baseDir . '/../lib/KeyManager.php',
-    'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir . '/../lib/Migration/SetMasterKeyStatus.php',
-    'OCA\\Encryption\\Recovery' => $baseDir . '/../lib/Recovery.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\\EnableMasterKey' => $baseDir.'/../lib/Command/EnableMasterKey.php',
+    'OCA\\Encryption\\Command\\FixEncryptedVersion' => $baseDir.'/../lib/Command/FixEncryptedVersion.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\\HookManager' => $baseDir.'/../lib/HookManager.php',
+    'OCA\\Encryption\\Hooks\\Contracts\\IHook' => $baseDir.'/../lib/Hooks/Contracts/IHook.php',
+    'OCA\\Encryption\\Hooks\\UserHooks' => $baseDir.'/../lib/Hooks/UserHooks.php',
+    'OCA\\Encryption\\KeyManager' => $baseDir.'/../lib/KeyManager.php',
+    'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => $baseDir.'/../lib/Migration/SetMasterKeyStatus.php',
+    'OCA\\Encryption\\Recovery' => $baseDir.'/../lib/Recovery.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/composer/composer/autoload_static.php

Spacing +36 added lines, -36 removed lines

@@ -6,55 +6,55 @@
 
 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\\EnableMasterKey' => __DIR__ . '/..' . '/../lib/Command/EnableMasterKey.php',
-        'OCA\\Encryption\\Command\\FixEncryptedVersion' => __DIR__ . '/..' . '/../lib/Command/FixEncryptedVersion.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\\HookManager' => __DIR__ . '/..' . '/../lib/HookManager.php',
-        'OCA\\Encryption\\Hooks\\Contracts\\IHook' => __DIR__ . '/..' . '/../lib/Hooks/Contracts/IHook.php',
-        'OCA\\Encryption\\Hooks\\UserHooks' => __DIR__ . '/..' . '/../lib/Hooks/UserHooks.php',
-        'OCA\\Encryption\\KeyManager' => __DIR__ . '/..' . '/../lib/KeyManager.php',
-        'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__ . '/..' . '/../lib/Migration/SetMasterKeyStatus.php',
-        'OCA\\Encryption\\Recovery' => __DIR__ . '/..' . '/../lib/Recovery.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\\EnableMasterKey' => __DIR__.'/..'.'/../lib/Command/EnableMasterKey.php',
+        'OCA\\Encryption\\Command\\FixEncryptedVersion' => __DIR__.'/..'.'/../lib/Command/FixEncryptedVersion.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\\HookManager' => __DIR__.'/..'.'/../lib/HookManager.php',
+        'OCA\\Encryption\\Hooks\\Contracts\\IHook' => __DIR__.'/..'.'/../lib/Hooks/Contracts/IHook.php',
+        'OCA\\Encryption\\Hooks\\UserHooks' => __DIR__.'/..'.'/../lib/Hooks/UserHooks.php',
+        'OCA\\Encryption\\KeyManager' => __DIR__.'/..'.'/../lib/KeyManager.php',
+        'OCA\\Encryption\\Migration\\SetMasterKeyStatus' => __DIR__.'/..'.'/../lib/Migration/SetMasterKeyStatus.php',
+        'OCA\\Encryption\\Recovery' => __DIR__.'/..'.'/../lib/Recovery.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;