nextcloud / server

lib/public/DirectEditing/ACreateEmpty.php

Indentation +40 added lines, -40 removed lines

@@ -30,48 +30,48 @@
  */
 abstract class ACreateEmpty {
 
-	/**
-	 * Unique id for the creator to filter templates
-	 *
-	 * e.g. document/spreadsheet/presentation
-	 *
-	 * @since 18.0.0
-	 * @return string
-	 */
-	abstract public function getId(): string;
+    /**
+     * Unique id for the creator to filter templates
+     *
+     * e.g. document/spreadsheet/presentation
+     *
+     * @since 18.0.0
+     * @return string
+     */
+    abstract public function getId(): string;
 
-	/**
-	 * Descriptive name for the create action
-	 *
-	 * e.g Create a new document
-	 *
-	 * @since 18.0.0
-	 * @return string
-	 */
-	abstract public function getName(): string;
+    /**
+     * Descriptive name for the create action
+     *
+     * e.g Create a new document
+     *
+     * @since 18.0.0
+     * @return string
+     */
+    abstract public function getName(): string;
 
-	/**
-	 * Default file extension for the new file
-	 *
-	 * @since 18.0.0
-	 * @return string
-	 */
-	abstract public function getExtension(): string;
+    /**
+     * Default file extension for the new file
+     *
+     * @since 18.0.0
+     * @return string
+     */
+    abstract public function getExtension(): string;
 
-	/**
-	 * Mimetype of the resulting created file
-	 *
-	 * @since 18.0.0
-	 * @return string
-	 */
-	abstract public function getMimetype(): string;
+    /**
+     * Mimetype of the resulting created file
+     *
+     * @since 18.0.0
+     * @return string
+     */
+    abstract public function getMimetype(): string;
 
-	/**
-	 * Add content when creating empty files
-	 *
-	 * @since 18.0.0
-	 * @param File $file
-	 */
-	public function create(File $file, string $creatorId = null, string $templateId = null): void {
-	}
+    /**
+     * Add content when creating empty files
+     *
+     * @since 18.0.0
+     * @param File $file
+     */
+    public function create(File $file, string $creatorId = null, string $templateId = null): void {
+    }
 }

lib/public/AppFramework/Http/RedirectResponse.php

Indentation +19 added lines, -19 removed lines

@@ -33,27 +33,27 @@
  * @since 7.0.0
  */
 class RedirectResponse extends Response {
-	private $redirectURL;
+    private $redirectURL;
 
-	/**
-	 * Creates a response that redirects to a url
-	 * @param string $redirectURL the url to redirect to
-	 * @since 7.0.0
-	 */
-	public function __construct($redirectURL) {
-		parent::__construct();
+    /**
+     * Creates a response that redirects to a url
+     * @param string $redirectURL the url to redirect to
+     * @since 7.0.0
+     */
+    public function __construct($redirectURL) {
+        parent::__construct();
 
-		$this->redirectURL = $redirectURL;
-		$this->setStatus(Http::STATUS_SEE_OTHER);
-		$this->addHeader('Location', $redirectURL);
-	}
+        $this->redirectURL = $redirectURL;
+        $this->setStatus(Http::STATUS_SEE_OTHER);
+        $this->addHeader('Location', $redirectURL);
+    }
 
 
-	/**
-	 * @return string the url to redirect
-	 * @since 7.0.0
-	 */
-	public function getRedirectURL() {
-		return $this->redirectURL;
-	}
+    /**
+     * @return string the url to redirect
+     * @since 7.0.0
+     */
+    public function getRedirectURL() {
+        return $this->redirectURL;
+    }
 }

lib/private/IntegrityCheck/Helpers/FileAccessHelper.php

Indentation +49 added lines, -49 removed lines

@@ -34,57 +34,57 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class FileAccessHelper {
-	/**
-	 * Wrapper around file_get_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @return string|false
-	 */
-	public function file_get_contents(string $filename) {
-		return file_get_contents($filename);
-	}
+    /**
+     * Wrapper around file_get_contents($filename, $data)
+     *
+     * @param string $filename
+     * @return string|false
+     */
+    public function file_get_contents(string $filename) {
+        return file_get_contents($filename);
+    }
 
-	/**
-	 * Wrapper around file_exists($filename)
-	 *
-	 * @param string $filename
-	 * @return bool
-	 */
-	public function file_exists(string $filename): bool {
-		return file_exists($filename);
-	}
+    /**
+     * Wrapper around file_exists($filename)
+     *
+     * @param string $filename
+     * @return bool
+     */
+    public function file_exists(string $filename): bool {
+        return file_exists($filename);
+    }
 
-	/**
-	 * Wrapper around file_put_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @param string $data
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function file_put_contents(string $filename, string $data): int {
-		$bytesWritten = @file_put_contents($filename, $data);
-		if ($bytesWritten === false || $bytesWritten !== \strlen($data)) {
-			throw new \Exception('Failed to write into ' . $filename);
-		}
-		return $bytesWritten;
-	}
+    /**
+     * Wrapper around file_put_contents($filename, $data)
+     *
+     * @param string $filename
+     * @param string $data
+     * @return int
+     * @throws \Exception
+     */
+    public function file_put_contents(string $filename, string $data): int {
+        $bytesWritten = @file_put_contents($filename, $data);
+        if ($bytesWritten === false || $bytesWritten !== \strlen($data)) {
+            throw new \Exception('Failed to write into ' . $filename);
+        }
+        return $bytesWritten;
+    }
 
-	/**
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_writable(string $path): bool {
-		return is_writable($path);
-	}
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function is_writable(string $path): bool {
+        return is_writable($path);
+    }
 
-	/**
-	 * @param string $path
-	 * @throws \Exception
-	 */
-	public function assertDirectoryExists(string $path) {
-		if (!is_dir($path)) {
-			throw new \Exception('Directory ' . $path . ' does not exist.');
-		}
-	}
+    /**
+     * @param string $path
+     * @throws \Exception
+     */
+    public function assertDirectoryExists(string $path) {
+        if (!is_dir($path)) {
+            throw new \Exception('Directory ' . $path . ' does not exist.');
+        }
+    }
 }

lib/private/IntegrityCheck/Helpers/AppLocator.php

Indentation +22 added lines, -22 removed lines

@@ -34,27 +34,27 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class AppLocator {
-	/**
-	 * Provides \OC_App::getAppPath($appId)
-	 *
-	 * @param string $appId
-	 * @return string
-	 * @throws \Exception If the app cannot be found
-	 */
-	public function getAppPath(string $appId): string {
-		$path = \OC_App::getAppPath($appId);
-		if ($path === false) {
-			throw new \Exception('App not found');
-		}
-		return $path;
-	}
+    /**
+     * Provides \OC_App::getAppPath($appId)
+     *
+     * @param string $appId
+     * @return string
+     * @throws \Exception If the app cannot be found
+     */
+    public function getAppPath(string $appId): string {
+        $path = \OC_App::getAppPath($appId);
+        if ($path === false) {
+            throw new \Exception('App not found');
+        }
+        return $path;
+    }
 
-	/**
-	 * Providers \OC_App::getAllApps()
-	 *
-	 * @return array
-	 */
-	public function getAllApps(): array {
-		return \OC_App::getAllApps();
-	}
+    /**
+     * Providers \OC_App::getAllApps()
+     *
+     * @return array
+     */
+    public function getAllApps(): array {
+        return \OC_App::getAllApps();
+    }
 }

lib/private/Encryption/DecryptAll.php

Indentation +255 added lines, -255 removed lines

@@ -39,259 +39,259 @@
 
 class DecryptAll {
 
-	/** @var  OutputInterface */
-	protected $output;
-
-	/** @var  InputInterface */
-	protected $input;
-
-	/** @var  Manager */
-	protected $encryptionManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var View */
-	protected $rootView;
-
-	/** @var  array files which couldn't be decrypted */
-	protected $failed;
-
-	/**
-	 * @param Manager $encryptionManager
-	 * @param IUserManager $userManager
-	 * @param View $rootView
-	 */
-	public function __construct(
-		Manager $encryptionManager,
-		IUserManager $userManager,
-		View $rootView
-	) {
-		$this->encryptionManager = $encryptionManager;
-		$this->userManager = $userManager;
-		$this->rootView = $rootView;
-		$this->failed = [];
-	}
-
-	/**
-	 * start to decrypt all files
-	 *
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param string $user which users data folder should be decrypted, default = all users
-	 * @return bool
-	 * @throws \Exception
-	 */
-	public function decryptAll(InputInterface $input, OutputInterface $output, $user = '') {
-		$this->input = $input;
-		$this->output = $output;
-
-		if ($user !== '' && $this->userManager->userExists($user) === false) {
-			$this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
-			return false;
-		}
-
-		$this->output->writeln('prepare encryption modules...');
-		if ($this->prepareEncryptionModules($user) === false) {
-			return false;
-		}
-		$this->output->writeln(' done.');
-
-		$this->decryptAllUsersFiles($user);
-
-		if (empty($this->failed)) {
-			$this->output->writeln('all files could be decrypted successfully!');
-		} else {
-			$this->output->writeln('Files for following users couldn\'t be decrypted, ');
-			$this->output->writeln('maybe the user is not set up in a way that supports this operation: ');
-			foreach ($this->failed as $uid => $paths) {
-				$this->output->writeln('    ' . $uid);
-				foreach ($paths as $path) {
-					$this->output->writeln('        ' . $path);
-				}
-			}
-			$this->output->writeln('');
-		}
-
-		return true;
-	}
-
-	/**
-	 * prepare encryption modules to perform the decrypt all function
-	 *
-	 * @param $user
-	 * @return bool
-	 */
-	protected function prepareEncryptionModules($user) {
-		// prepare all encryption modules for decrypt all
-		$encryptionModules = $this->encryptionManager->getEncryptionModules();
-		foreach ($encryptionModules as $moduleDesc) {
-			/** @var IEncryptionModule $module */
-			$module = call_user_func($moduleDesc['callback']);
-			$this->output->writeln('');
-			$this->output->writeln('Prepare "' . $module->getDisplayName() . '"');
-			$this->output->writeln('');
-			if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) {
-				$this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!');
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * iterate over all user and encrypt their files
-	 *
-	 * @param string $user which users files should be decrypted, default = all users
-	 */
-	protected function decryptAllUsersFiles($user = '') {
-		$this->output->writeln("\n");
-
-		$userList = [];
-		if ($user === '') {
-			$fetchUsersProgress = new ProgressBar($this->output);
-			$fetchUsersProgress->setFormat(" %message% \n [%bar%]");
-			$fetchUsersProgress->start();
-			$fetchUsersProgress->setMessage("Fetch list of users...");
-			$fetchUsersProgress->advance();
-
-			foreach ($this->userManager->getBackends() as $backend) {
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers('', $limit, $offset);
-					foreach ($users as $user) {
-						$userList[] = $user;
-					}
-					$offset += $limit;
-					$fetchUsersProgress->advance();
-				} while (count($users) >= $limit);
-				$fetchUsersProgress->setMessage("Fetch list of users... finished");
-				$fetchUsersProgress->finish();
-			}
-		} else {
-			$userList[] = $user;
-		}
-
-		$this->output->writeln("\n\n");
-
-		$progress = new ProgressBar($this->output);
-		$progress->setFormat(" %message% \n [%bar%]");
-		$progress->start();
-		$progress->setMessage("starting to decrypt files...");
-		$progress->advance();
-
-		$numberOfUsers = count($userList);
-		$userNo = 1;
-		foreach ($userList as $uid) {
-			$userCount = "$uid ($userNo of $numberOfUsers)";
-			$this->decryptUsersFiles($uid, $progress, $userCount);
-			$userNo++;
-		}
-
-		$progress->setMessage("starting to decrypt files... finished");
-		$progress->finish();
-
-		$this->output->writeln("\n\n");
-	}
-
-	/**
-	 * encrypt files from the given user
-	 *
-	 * @param string $uid
-	 * @param ProgressBar $progress
-	 * @param string $userCount
-	 */
-	protected function decryptUsersFiles($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) {
-				// only decrypt files owned by the user
-				if ($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) {
-					continue;
-				}
-				$path = $root . '/' . $file['name'];
-				if ($this->rootView->is_dir($path)) {
-					$directories[] = $path;
-					continue;
-				} else {
-					try {
-						$progress->setMessage("decrypt files for user $userCount: $path");
-						$progress->advance();
-						if ($file->isEncrypted() === false) {
-							$progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
-							$progress->advance();
-						} else {
-							if ($this->decryptFile($path) === false) {
-								$progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
-								$progress->advance();
-							}
-						}
-					} catch (\Exception $e) {
-						if (isset($this->failed[$uid])) {
-							$this->failed[$uid][] = $path;
-						} else {
-							$this->failed[$uid] = [$path];
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * encrypt file
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	protected function decryptFile($path) {
-
-		// skip already decrypted files
-		$fileInfo = $this->rootView->getFileInfo($path);
-		if ($fileInfo !== false && !$fileInfo->isEncrypted()) {
-			return true;
-		}
-
-		$source = $path;
-		$target = $path . '.decrypted.' . $this->getTimestamp();
-
-		try {
-			$this->rootView->copy($source, $target);
-			$this->rootView->touch($target, $fileInfo->getMTime());
-			$this->rootView->rename($target, $source);
-		} catch (DecryptionFailedException $e) {
-			if ($this->rootView->file_exists($target)) {
-				$this->rootView->unlink($target);
-			}
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * get current timestamp
-	 *
-	 * @return int
-	 */
-	protected function getTimestamp() {
-		return time();
-	}
-
-
-	/**
-	 * setup user file system
-	 *
-	 * @param string $uid
-	 */
-	protected function setupUserFS($uid) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($uid);
-	}
+    /** @var  OutputInterface */
+    protected $output;
+
+    /** @var  InputInterface */
+    protected $input;
+
+    /** @var  Manager */
+    protected $encryptionManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var View */
+    protected $rootView;
+
+    /** @var  array files which couldn't be decrypted */
+    protected $failed;
+
+    /**
+     * @param Manager $encryptionManager
+     * @param IUserManager $userManager
+     * @param View $rootView
+     */
+    public function __construct(
+        Manager $encryptionManager,
+        IUserManager $userManager,
+        View $rootView
+    ) {
+        $this->encryptionManager = $encryptionManager;
+        $this->userManager = $userManager;
+        $this->rootView = $rootView;
+        $this->failed = [];
+    }
+
+    /**
+     * start to decrypt all files
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param string $user which users data folder should be decrypted, default = all users
+     * @return bool
+     * @throws \Exception
+     */
+    public function decryptAll(InputInterface $input, OutputInterface $output, $user = '') {
+        $this->input = $input;
+        $this->output = $output;
+
+        if ($user !== '' && $this->userManager->userExists($user) === false) {
+            $this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
+            return false;
+        }
+
+        $this->output->writeln('prepare encryption modules...');
+        if ($this->prepareEncryptionModules($user) === false) {
+            return false;
+        }
+        $this->output->writeln(' done.');
+
+        $this->decryptAllUsersFiles($user);
+
+        if (empty($this->failed)) {
+            $this->output->writeln('all files could be decrypted successfully!');
+        } else {
+            $this->output->writeln('Files for following users couldn\'t be decrypted, ');
+            $this->output->writeln('maybe the user is not set up in a way that supports this operation: ');
+            foreach ($this->failed as $uid => $paths) {
+                $this->output->writeln('    ' . $uid);
+                foreach ($paths as $path) {
+                    $this->output->writeln('        ' . $path);
+                }
+            }
+            $this->output->writeln('');
+        }
+
+        return true;
+    }
+
+    /**
+     * prepare encryption modules to perform the decrypt all function
+     *
+     * @param $user
+     * @return bool
+     */
+    protected function prepareEncryptionModules($user) {
+        // prepare all encryption modules for decrypt all
+        $encryptionModules = $this->encryptionManager->getEncryptionModules();
+        foreach ($encryptionModules as $moduleDesc) {
+            /** @var IEncryptionModule $module */
+            $module = call_user_func($moduleDesc['callback']);
+            $this->output->writeln('');
+            $this->output->writeln('Prepare "' . $module->getDisplayName() . '"');
+            $this->output->writeln('');
+            if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) {
+                $this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!');
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * iterate over all user and encrypt their files
+     *
+     * @param string $user which users files should be decrypted, default = all users
+     */
+    protected function decryptAllUsersFiles($user = '') {
+        $this->output->writeln("\n");
+
+        $userList = [];
+        if ($user === '') {
+            $fetchUsersProgress = new ProgressBar($this->output);
+            $fetchUsersProgress->setFormat(" %message% \n [%bar%]");
+            $fetchUsersProgress->start();
+            $fetchUsersProgress->setMessage("Fetch list of users...");
+            $fetchUsersProgress->advance();
+
+            foreach ($this->userManager->getBackends() as $backend) {
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers('', $limit, $offset);
+                    foreach ($users as $user) {
+                        $userList[] = $user;
+                    }
+                    $offset += $limit;
+                    $fetchUsersProgress->advance();
+                } while (count($users) >= $limit);
+                $fetchUsersProgress->setMessage("Fetch list of users... finished");
+                $fetchUsersProgress->finish();
+            }
+        } else {
+            $userList[] = $user;
+        }
+
+        $this->output->writeln("\n\n");
+
+        $progress = new ProgressBar($this->output);
+        $progress->setFormat(" %message% \n [%bar%]");
+        $progress->start();
+        $progress->setMessage("starting to decrypt files...");
+        $progress->advance();
+
+        $numberOfUsers = count($userList);
+        $userNo = 1;
+        foreach ($userList as $uid) {
+            $userCount = "$uid ($userNo of $numberOfUsers)";
+            $this->decryptUsersFiles($uid, $progress, $userCount);
+            $userNo++;
+        }
+
+        $progress->setMessage("starting to decrypt files... finished");
+        $progress->finish();
+
+        $this->output->writeln("\n\n");
+    }
+
+    /**
+     * encrypt files from the given user
+     *
+     * @param string $uid
+     * @param ProgressBar $progress
+     * @param string $userCount
+     */
+    protected function decryptUsersFiles($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) {
+                // only decrypt files owned by the user
+                if ($file->getStorage()->instanceOfStorage('OCA\Files_Sharing\SharedStorage')) {
+                    continue;
+                }
+                $path = $root . '/' . $file['name'];
+                if ($this->rootView->is_dir($path)) {
+                    $directories[] = $path;
+                    continue;
+                } else {
+                    try {
+                        $progress->setMessage("decrypt files for user $userCount: $path");
+                        $progress->advance();
+                        if ($file->isEncrypted() === false) {
+                            $progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
+                            $progress->advance();
+                        } else {
+                            if ($this->decryptFile($path) === false) {
+                                $progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
+                                $progress->advance();
+                            }
+                        }
+                    } catch (\Exception $e) {
+                        if (isset($this->failed[$uid])) {
+                            $this->failed[$uid][] = $path;
+                        } else {
+                            $this->failed[$uid] = [$path];
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * encrypt file
+     *
+     * @param string $path
+     * @return bool
+     */
+    protected function decryptFile($path) {
+
+        // skip already decrypted files
+        $fileInfo = $this->rootView->getFileInfo($path);
+        if ($fileInfo !== false && !$fileInfo->isEncrypted()) {
+            return true;
+        }
+
+        $source = $path;
+        $target = $path . '.decrypted.' . $this->getTimestamp();
+
+        try {
+            $this->rootView->copy($source, $target);
+            $this->rootView->touch($target, $fileInfo->getMTime());
+            $this->rootView->rename($target, $source);
+        } catch (DecryptionFailedException $e) {
+            if ($this->rootView->file_exists($target)) {
+                $this->rootView->unlink($target);
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * get current timestamp
+     *
+     * @return int
+     */
+    protected function getTimestamp() {
+        return time();
+    }
+
+
+    /**
+     * setup user file system
+     *
+     * @param string $uid
+     */
+    protected function setupUserFS($uid) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($uid);
+    }
 }

lib/private/Federation/CloudFederationNotification.php

Indentation +29 added lines, -29 removed lines

@@ -33,35 +33,35 @@
  * @since 14.0.0
  */
 class CloudFederationNotification implements ICloudFederationNotification {
-	private $message = [];
+    private $message = [];
 
-	/**
-	 * add a message to the notification
-	 *
-	 * @param string $notificationType (e.g. SHARE_ACCEPTED)
-	 * @param string $resourceType (e.g. file, calendar, contact,...)
-	 * @param string $providerId id of the share
-	 * @param array $notification payload of the notification
-	 *
-	 * @since 14.0.0
-	 */
-	public function setMessage($notificationType, $resourceType, $providerId, array $notification) {
-		$this->message = [
-			'notificationType' => $notificationType,
-			'resourceType' => $resourceType,
-			'providerId' => $providerId,
-			'notification' => $notification,
-		];
-	}
+    /**
+     * add a message to the notification
+     *
+     * @param string $notificationType (e.g. SHARE_ACCEPTED)
+     * @param string $resourceType (e.g. file, calendar, contact,...)
+     * @param string $providerId id of the share
+     * @param array $notification payload of the notification
+     *
+     * @since 14.0.0
+     */
+    public function setMessage($notificationType, $resourceType, $providerId, array $notification) {
+        $this->message = [
+            'notificationType' => $notificationType,
+            'resourceType' => $resourceType,
+            'providerId' => $providerId,
+            'notification' => $notification,
+        ];
+    }
 
-	/**
-	 * get message, ready to send out
-	 *
-	 * @return array
-	 *
-	 * @since 14.0.0
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
+    /**
+     * get message, ready to send out
+     *
+     * @return array
+     *
+     * @since 14.0.0
+     */
+    public function getMessage() {
+        return $this->message;
+    }
 }

lib/private/App/AppStore/Version/VersionParser.php

Indentation +48 added lines, -48 removed lines

@@ -30,56 +30,56 @@
  * @package OC\App\AppStore
  */
 class VersionParser {
-	/**
-	 * @param string $versionString
-	 * @return bool
-	 */
-	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
-	}
+    /**
+     * @param string $versionString
+     * @return bool
+     */
+    private function isValidVersionString($versionString) {
+        return (bool)preg_match('/^[0-9.]+$/', $versionString);
+    }
 
-	/**
-	 * Returns the version for a version string
-	 *
-	 * @param string $versionSpec
-	 * @return Version
-	 * @throws \Exception If the version cannot be parsed
-	 */
-	public function getVersion($versionSpec) {
-		// * indicates that the version is compatible with all versions
-		if ($versionSpec === '*') {
-			return new Version('', '');
-		}
+    /**
+     * Returns the version for a version string
+     *
+     * @param string $versionSpec
+     * @return Version
+     * @throws \Exception If the version cannot be parsed
+     */
+    public function getVersion($versionSpec) {
+        // * indicates that the version is compatible with all versions
+        if ($versionSpec === '*') {
+            return new Version('', '');
+        }
 
-		// Count the amount of =, if it is one then it's either maximum or minimum
-		// version. If it is two then it is maximum and minimum.
-		$versionElements = explode(' ', $versionSpec);
-		$firstVersion = isset($versionElements[0]) ? $versionElements[0] : '';
-		$firstVersionNumber = substr($firstVersion, 2);
-		$secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
-		$secondVersionNumber = substr($secondVersion, 2);
+        // Count the amount of =, if it is one then it's either maximum or minimum
+        // version. If it is two then it is maximum and minimum.
+        $versionElements = explode(' ', $versionSpec);
+        $firstVersion = isset($versionElements[0]) ? $versionElements[0] : '';
+        $firstVersionNumber = substr($firstVersion, 2);
+        $secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
+        $secondVersionNumber = substr($secondVersion, 2);
 
-		switch (count($versionElements)) {
-			case 1:
-				if (!$this->isValidVersionString($firstVersionNumber)) {
-					break;
-				}
-				if (strpos($firstVersion, '>') === 0) {
-					return new Version($firstVersionNumber, '');
-				}
-				return new Version('', $firstVersionNumber);
-			case 2:
-				if (!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
-					break;
-				}
-				return new Version($firstVersionNumber, $secondVersionNumber);
-		}
+        switch (count($versionElements)) {
+            case 1:
+                if (!$this->isValidVersionString($firstVersionNumber)) {
+                    break;
+                }
+                if (strpos($firstVersion, '>') === 0) {
+                    return new Version($firstVersionNumber, '');
+                }
+                return new Version('', $firstVersionNumber);
+            case 2:
+                if (!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
+                    break;
+                }
+                return new Version($firstVersionNumber, $secondVersionNumber);
+        }
 
-		throw new \Exception(
-			sprintf(
-				'Version cannot be parsed: %s',
-				$versionSpec
-			)
-		);
-	}
+        throw new \Exception(
+            sprintf(
+                'Version cannot be parsed: %s',
+                $versionSpec
+            )
+        );
+    }
 }

lib/private/Security/FeaturePolicy/FeaturePolicy.php

Indentation +36 added lines, -36 removed lines

@@ -27,51 +27,51 @@
 namespace OC\Security\FeaturePolicy;
 
 class FeaturePolicy extends \OCP\AppFramework\Http\FeaturePolicy {
-	public function getAutoplayDomains(): array {
-		return $this->autoplayDomains;
-	}
+    public function getAutoplayDomains(): array {
+        return $this->autoplayDomains;
+    }
 
-	public function setAutoplayDomains(array $autoplayDomains): void {
-		$this->autoplayDomains = $autoplayDomains;
-	}
+    public function setAutoplayDomains(array $autoplayDomains): void {
+        $this->autoplayDomains = $autoplayDomains;
+    }
 
-	public function getCameraDomains(): array {
-		return $this->cameraDomains;
-	}
+    public function getCameraDomains(): array {
+        return $this->cameraDomains;
+    }
 
-	public function setCameraDomains(array $cameraDomains): void {
-		$this->cameraDomains = $cameraDomains;
-	}
+    public function setCameraDomains(array $cameraDomains): void {
+        $this->cameraDomains = $cameraDomains;
+    }
 
-	public function getFullscreenDomains(): array {
-		return $this->fullscreenDomains;
-	}
+    public function getFullscreenDomains(): array {
+        return $this->fullscreenDomains;
+    }
 
-	public function setFullscreenDomains(array $fullscreenDomains): void {
-		$this->fullscreenDomains = $fullscreenDomains;
-	}
+    public function setFullscreenDomains(array $fullscreenDomains): void {
+        $this->fullscreenDomains = $fullscreenDomains;
+    }
 
-	public function getGeolocationDomains(): array {
-		return $this->geolocationDomains;
-	}
+    public function getGeolocationDomains(): array {
+        return $this->geolocationDomains;
+    }
 
-	public function setGeolocationDomains(array $geolocationDomains): void {
-		$this->geolocationDomains = $geolocationDomains;
-	}
+    public function setGeolocationDomains(array $geolocationDomains): void {
+        $this->geolocationDomains = $geolocationDomains;
+    }
 
-	public function getMicrophoneDomains(): array {
-		return $this->microphoneDomains;
-	}
+    public function getMicrophoneDomains(): array {
+        return $this->microphoneDomains;
+    }
 
-	public function setMicrophoneDomains(array $microphoneDomains): void {
-		$this->microphoneDomains = $microphoneDomains;
-	}
+    public function setMicrophoneDomains(array $microphoneDomains): void {
+        $this->microphoneDomains = $microphoneDomains;
+    }
 
-	public function getPaymentDomains(): array {
-		return $this->paymentDomains;
-	}
+    public function getPaymentDomains(): array {
+        return $this->paymentDomains;
+    }
 
-	public function setPaymentDomains(array $paymentDomains): void {
-		$this->paymentDomains = $paymentDomains;
-	}
+    public function setPaymentDomains(array $paymentDomains): void {
+        $this->paymentDomains = $paymentDomains;
+    }
 }

lib/private/Security/IdentityProof/Signer.php

Indentation +66 added lines, -66 removed lines

@@ -32,76 +32,76 @@
 use OCP\IUserManager;
 
 class Signer {
-	/** @var Manager */
-	private $keyManager;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IUserManager */
-	private $userManager;
+    /** @var Manager */
+    private $keyManager;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IUserManager */
+    private $userManager;
 
-	/**
-	 * @param Manager $keyManager
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(Manager $keyManager,
-								ITimeFactory $timeFactory,
-								IUserManager $userManager) {
-		$this->keyManager = $keyManager;
-		$this->timeFactory = $timeFactory;
-		$this->userManager = $userManager;
-	}
+    /**
+     * @param Manager $keyManager
+     * @param ITimeFactory $timeFactory
+     * @param IUserManager $userManager
+     */
+    public function __construct(Manager $keyManager,
+                                ITimeFactory $timeFactory,
+                                IUserManager $userManager) {
+        $this->keyManager = $keyManager;
+        $this->timeFactory = $timeFactory;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * Returns a signed blob for $data
-	 *
-	 * @param string $type
-	 * @param array $data
-	 * @param IUser $user
-	 * @return array ['message', 'signature']
-	 */
-	public function sign(string $type, array $data, IUser $user): array {
-		$privateKey = $this->keyManager->getKey($user)->getPrivate();
-		$data = [
-			'data' => $data,
-			'type' => $type,
-			'signer' => $user->getCloudId(),
-			'timestamp' => $this->timeFactory->getTime(),
-		];
-		openssl_sign(json_encode($data), $signature, $privateKey, OPENSSL_ALGO_SHA512);
+    /**
+     * Returns a signed blob for $data
+     *
+     * @param string $type
+     * @param array $data
+     * @param IUser $user
+     * @return array ['message', 'signature']
+     */
+    public function sign(string $type, array $data, IUser $user): array {
+        $privateKey = $this->keyManager->getKey($user)->getPrivate();
+        $data = [
+            'data' => $data,
+            'type' => $type,
+            'signer' => $user->getCloudId(),
+            'timestamp' => $this->timeFactory->getTime(),
+        ];
+        openssl_sign(json_encode($data), $signature, $privateKey, OPENSSL_ALGO_SHA512);
 
-		return [
-			'message' => $data,
-			'signature' => base64_encode($signature),
-		];
-	}
+        return [
+            'message' => $data,
+            'signature' => base64_encode($signature),
+        ];
+    }
 
-	/**
-	 * Whether the data is signed properly
-	 *
-	 * @param array $data
-	 * @return bool
-	 */
-	public function verify(array $data): bool {
-		if (isset($data['message'])
-			&& isset($data['signature'])
-			&& isset($data['message']['signer'])
-		) {
-			$location = strrpos($data['message']['signer'], '@');
-			$userId = substr($data['message']['signer'], 0, $location);
+    /**
+     * Whether the data is signed properly
+     *
+     * @param array $data
+     * @return bool
+     */
+    public function verify(array $data): bool {
+        if (isset($data['message'])
+            && isset($data['signature'])
+            && isset($data['message']['signer'])
+        ) {
+            $location = strrpos($data['message']['signer'], '@');
+            $userId = substr($data['message']['signer'], 0, $location);
 
-			$user = $this->userManager->get($userId);
-			if ($user !== null) {
-				$key = $this->keyManager->getKey($user);
-				return (bool)openssl_verify(
-					json_encode($data['message']),
-					base64_decode($data['signature']),
-					$key->getPublic(),
-					OPENSSL_ALGO_SHA512
-				);
-			}
-		}
+            $user = $this->userManager->get($userId);
+            if ($user !== null) {
+                $key = $this->keyManager->getKey($user);
+                return (bool)openssl_verify(
+                    json_encode($data['message']),
+                    base64_decode($data['signature']),
+                    $key->getPublic(),
+                    OPENSSL_ALGO_SHA512
+                );
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }