nextcloud / server

lib/private/Security/Certificate.php

Indentation +100 added lines, -100 removed lines

@@ -27,104 +27,104 @@
 use OCP\ICertificate;
 
 class Certificate implements ICertificate {
-	protected $name;
-
-	protected $commonName;
-
-	protected $organization;
-
-	protected $serial;
-
-	protected $issueDate;
-
-	protected $expireDate;
-
-	protected $issuerName;
-
-	protected $issuerOrganization;
-
-	/**
-	 * @param string $data base64 encoded certificate
-	 * @param string $name
-	 * @throws \Exception If the certificate could not get parsed
-	 */
-	public function __construct($data, $name) {
-		$this->name = $name;
-		$gmt = new \DateTimeZone('GMT');
-
-		// If string starts with "file://" ignore the certificate
-		$query = 'file://';
-		if(strtolower(substr($data, 0, strlen($query))) === $query) {
-			throw new \Exception('Certificate could not get parsed.');
-		}
-
-		$info = openssl_x509_parse($data);
-		if(!is_array($info)) {
-			throw new \Exception('Certificate could not get parsed.');
-		}
-
-		$this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null;
-		$this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null;
-		$this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt);
-		$this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt);
-		$this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
-		$this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getCommonName() {
-		return $this->commonName;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getOrganization() {
-		return $this->organization;
-	}
-
-	/**
-	 * @return \DateTime
-	 */
-	public function getIssueDate() {
-		return $this->issueDate;
-	}
-
-	/**
-	 * @return \DateTime
-	 */
-	public function getExpireDate() {
-		return $this->expireDate;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isExpired() {
-		$now = new \DateTime();
-		return $this->issueDate > $now or $now > $this->expireDate;
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getIssuerName() {
-		return $this->issuerName;
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getIssuerOrganization() {
-		return $this->issuerOrganization;
-	}
+    protected $name;
+
+    protected $commonName;
+
+    protected $organization;
+
+    protected $serial;
+
+    protected $issueDate;
+
+    protected $expireDate;
+
+    protected $issuerName;
+
+    protected $issuerOrganization;
+
+    /**
+     * @param string $data base64 encoded certificate
+     * @param string $name
+     * @throws \Exception If the certificate could not get parsed
+     */
+    public function __construct($data, $name) {
+        $this->name = $name;
+        $gmt = new \DateTimeZone('GMT');
+
+        // If string starts with "file://" ignore the certificate
+        $query = 'file://';
+        if(strtolower(substr($data, 0, strlen($query))) === $query) {
+            throw new \Exception('Certificate could not get parsed.');
+        }
+
+        $info = openssl_x509_parse($data);
+        if(!is_array($info)) {
+            throw new \Exception('Certificate could not get parsed.');
+        }
+
+        $this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null;
+        $this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null;
+        $this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt);
+        $this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt);
+        $this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
+        $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getCommonName() {
+        return $this->commonName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrganization() {
+        return $this->organization;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getIssueDate() {
+        return $this->issueDate;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getExpireDate() {
+        return $this->expireDate;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isExpired() {
+        $now = new \DateTime();
+        return $this->issueDate > $now or $now > $this->expireDate;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getIssuerName() {
+        return $this->issuerName;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getIssuerOrganization() {
+        return $this->issuerOrganization;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -54,19 +54,19 @@
 
 		// If string starts with "file://" ignore the certificate
 		$query = 'file://';
-		if(strtolower(substr($data, 0, strlen($query))) === $query) {
+		if (strtolower(substr($data, 0, strlen($query))) === $query) {
 			throw new \Exception('Certificate could not get parsed.');
 		}
 
 		$info = openssl_x509_parse($data);
-		if(!is_array($info)) {
+		if (!is_array($info)) {
 			throw new \Exception('Certificate could not get parsed.');
 		}
 
 		$this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null;
 		$this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null;
-		$this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt);
-		$this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt);
+		$this->issueDate = new \DateTime('@'.$info['validFrom_time_t'], $gmt);
+		$this->expireDate = new \DateTime('@'.$info['validTo_time_t'], $gmt);
 		$this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
 		$this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
 	}

lib/private/TempManager.php

Spacing +7 added lines, -7 removed lines

@@ -65,13 +65,13 @@ 
 	 * @return string
 	 */
 	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
-		if($postFix !== '') {
-			$postFix = '.' . ltrim($postFix, '.');
+		if ($postFix !== '') {
+			$postFix = '.'.ltrim($postFix, '.');
 			$postFix = str_replace(['\\', '/'], '', $postFix);
 			$absolutePath .= '-';
 		}
 
-		return $absolutePath . $postFix;
+		return $absolutePath.$postFix;
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 
 			// If a postfix got specified sanitize it and create a postfixed
 			// temporary file
-			if($postFix !== '') {
+			if ($postFix !== '') {
 				$fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
 				touch($fileNameWithPostfix);
 				chmod($fileNameWithPostfix, 0600);
@@ -127,11 +127,11 @@ 
 			$this->current[] = $uniqueFileName;
 
 			// Build a name without postfix
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
+			$path = $this->buildFileNameWithSuffix($uniqueFileName.'-folder', $postFix);
 			mkdir($path, 0700);
 			$this->current[] = $path;
 
-			return $path . '/';
+			return $path.'/';
 		} else {
 			$this->log->warning(
 				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
@@ -190,7 +190,7 @@ 
 		if ($dh) {
 			while (($file = readdir($dh)) !== false) {
 				if (substr($file, 0, 7) === self::TMP_PREFIX) {
-					$path = $this->tmpBaseDir . '/' . $file;
+					$path = $this->tmpBaseDir.'/'.$file;
 					$mtime = filemtime($path);
 					if ($mtime < $cutOfTime) {
 						$files[] = $path;

Indentation +221 added lines, -221 removed lines

@@ -34,246 +34,246 @@
 use OCP\ITempManager;
 
 class TempManager implements ITempManager {
-	/** @var string[] Current temporary files and folders, used for cleanup */
-	protected $current = [];
-	/** @var string i.e. /tmp on linux systems */
-	protected $tmpBaseDir;
-	/** @var ILogger */
-	protected $log;
-	/** @var IConfig */
-	protected $config;
+    /** @var string[] Current temporary files and folders, used for cleanup */
+    protected $current = [];
+    /** @var string i.e. /tmp on linux systems */
+    protected $tmpBaseDir;
+    /** @var ILogger */
+    protected $log;
+    /** @var IConfig */
+    protected $config;
 
-	/** Prefix */
-	const TMP_PREFIX = 'oc_tmp_';
+    /** Prefix */
+    const TMP_PREFIX = 'oc_tmp_';
 
-	/**
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(ILogger $logger, IConfig $config) {
-		$this->log = $logger;
-		$this->config = $config;
-		$this->tmpBaseDir = $this->getTempBaseDir();
-	}
+    /**
+     * @param \OCP\ILogger $logger
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(ILogger $logger, IConfig $config) {
+        $this->log = $logger;
+        $this->config = $config;
+        $this->tmpBaseDir = $this->getTempBaseDir();
+    }
 
-	/**
-	 * Builds the filename with suffix and removes potential dangerous characters
-	 * such as directory separators.
-	 *
-	 * @param string $absolutePath Absolute path to the file / folder
-	 * @param string $postFix Postfix appended to the temporary file name, may be user controlled
-	 * @return string
-	 */
-	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
-		if($postFix !== '') {
-			$postFix = '.' . ltrim($postFix, '.');
-			$postFix = str_replace(['\\', '/'], '', $postFix);
-			$absolutePath .= '-';
-		}
+    /**
+     * Builds the filename with suffix and removes potential dangerous characters
+     * such as directory separators.
+     *
+     * @param string $absolutePath Absolute path to the file / folder
+     * @param string $postFix Postfix appended to the temporary file name, may be user controlled
+     * @return string
+     */
+    private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
+        if($postFix !== '') {
+            $postFix = '.' . ltrim($postFix, '.');
+            $postFix = str_replace(['\\', '/'], '', $postFix);
+            $absolutePath .= '-';
+        }
 
-		return $absolutePath . $postFix;
-	}
+        return $absolutePath . $postFix;
+    }
 
-	/**
-	 * Create a temporary file and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary file name
-	 * @return string
-	 */
-	public function getTemporaryFile($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique file and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $file;
+    /**
+     * Create a temporary file and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary file name
+     * @return string
+     */
+    public function getTemporaryFile($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique file and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $file;
 
-			// If a postfix got specified sanitize it and create a postfixed
-			// temporary file
-			if($postFix !== '') {
-				$fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
-				touch($fileNameWithPostfix);
-				chmod($fileNameWithPostfix, 0600);
-				$this->current[] = $fileNameWithPostfix;
-				return $fileNameWithPostfix;
-			}
+            // If a postfix got specified sanitize it and create a postfixed
+            // temporary file
+            if($postFix !== '') {
+                $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
+                touch($fileNameWithPostfix);
+                chmod($fileNameWithPostfix, 0600);
+                $this->current[] = $fileNameWithPostfix;
+                return $fileNameWithPostfix;
+            }
 
-			return $file;
-		} else {
-			$this->log->warning(
-				'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $file;
+        } else {
+            $this->log->warning(
+                'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Create a temporary folder and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary folder name
-	 * @return string
-	 */
-	public function getTemporaryFolder($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique directory and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $uniqueFileName;
+    /**
+     * Create a temporary folder and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary folder name
+     * @return string
+     */
+    public function getTemporaryFolder($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique directory and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $uniqueFileName;
 
-			// Build a name without postfix
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
-			mkdir($path, 0700);
-			$this->current[] = $path;
+            // Build a name without postfix
+            $path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
+            mkdir($path, 0700);
+            $this->current[] = $path;
 
-			return $path . '/';
-		} else {
-			$this->log->warning(
-				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $path . '/';
+        } else {
+            $this->log->warning(
+                'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Remove the temporary files and folders generated during this request
-	 */
-	public function clean() {
-		$this->cleanFiles($this->current);
-	}
+    /**
+     * Remove the temporary files and folders generated during this request
+     */
+    public function clean() {
+        $this->cleanFiles($this->current);
+    }
 
-	/**
-	 * @param string[] $files
-	 */
-	protected function cleanFiles($files) {
-		foreach ($files as $file) {
-			if (file_exists($file)) {
-				try {
-					\OC_Helper::rmdirr($file);
-				} catch (\UnexpectedValueException $ex) {
-					$this->log->warning(
-						"Error deleting temporary file/folder: {file} - Reason: {error}",
-						[
-							'file' => $file,
-							'error' => $ex->getMessage(),
-						]
-					);
-				}
-			}
-		}
-	}
+    /**
+     * @param string[] $files
+     */
+    protected function cleanFiles($files) {
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                try {
+                    \OC_Helper::rmdirr($file);
+                } catch (\UnexpectedValueException $ex) {
+                    $this->log->warning(
+                        "Error deleting temporary file/folder: {file} - Reason: {error}",
+                        [
+                            'file' => $file,
+                            'error' => $ex->getMessage(),
+                        ]
+                    );
+                }
+            }
+        }
+    }
 
-	/**
-	 * Remove old temporary files and folders that were failed to be cleaned
-	 */
-	public function cleanOld() {
-		$this->cleanFiles($this->getOldFiles());
-	}
+    /**
+     * Remove old temporary files and folders that were failed to be cleaned
+     */
+    public function cleanOld() {
+        $this->cleanFiles($this->getOldFiles());
+    }
 
-	/**
-	 * Get all temporary files and folders generated by oc older than an hour
-	 *
-	 * @return string[]
-	 */
-	protected function getOldFiles() {
-		$cutOfTime = time() - 3600;
-		$files = [];
-		$dh = opendir($this->tmpBaseDir);
-		if ($dh) {
-			while (($file = readdir($dh)) !== false) {
-				if (substr($file, 0, 7) === self::TMP_PREFIX) {
-					$path = $this->tmpBaseDir . '/' . $file;
-					$mtime = filemtime($path);
-					if ($mtime < $cutOfTime) {
-						$files[] = $path;
-					}
-				}
-			}
-		}
-		return $files;
-	}
+    /**
+     * Get all temporary files and folders generated by oc older than an hour
+     *
+     * @return string[]
+     */
+    protected function getOldFiles() {
+        $cutOfTime = time() - 3600;
+        $files = [];
+        $dh = opendir($this->tmpBaseDir);
+        if ($dh) {
+            while (($file = readdir($dh)) !== false) {
+                if (substr($file, 0, 7) === self::TMP_PREFIX) {
+                    $path = $this->tmpBaseDir . '/' . $file;
+                    $mtime = filemtime($path);
+                    if ($mtime < $cutOfTime) {
+                        $files[] = $path;
+                    }
+                }
+            }
+        }
+        return $files;
+    }
 
-	/**
-	 * Get the temporary base directory configured on the server
-	 *
-	 * @return string Path to the temporary directory or null
-	 * @throws \UnexpectedValueException
-	 */
-	public function getTempBaseDir() {
-		if ($this->tmpBaseDir) {
-			return $this->tmpBaseDir;
-		}
+    /**
+     * Get the temporary base directory configured on the server
+     *
+     * @return string Path to the temporary directory or null
+     * @throws \UnexpectedValueException
+     */
+    public function getTempBaseDir() {
+        if ($this->tmpBaseDir) {
+            return $this->tmpBaseDir;
+        }
 
-		$directories = [];
-		if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
-			$directories[] = $temp;
-		}
-		if ($temp = \OC::$server->getIniWrapper()->get('upload_tmp_dir')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TEMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMPDIR')) {
-			$directories[] = $temp;
-		}
-		if ($temp = sys_get_temp_dir()) {
-			$directories[] = $temp;
-		}
+        $directories = [];
+        if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
+            $directories[] = $temp;
+        }
+        if ($temp = \OC::$server->getIniWrapper()->get('upload_tmp_dir')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TEMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMPDIR')) {
+            $directories[] = $temp;
+        }
+        if ($temp = sys_get_temp_dir()) {
+            $directories[] = $temp;
+        }
 
-		foreach ($directories as $dir) {
-			if ($this->checkTemporaryDirectory($dir)) {
-				return $dir;
-			}
-		}
+        foreach ($directories as $dir) {
+            if ($this->checkTemporaryDirectory($dir)) {
+                return $dir;
+            }
+        }
 
-		$temp = tempnam(dirname(__FILE__), '');
-		if (file_exists($temp)) {
-			unlink($temp);
-			return dirname($temp);
-		}
-		throw new \UnexpectedValueException('Unable to detect system temporary directory');
-	}
+        $temp = tempnam(dirname(__FILE__), '');
+        if (file_exists($temp)) {
+            unlink($temp);
+            return dirname($temp);
+        }
+        throw new \UnexpectedValueException('Unable to detect system temporary directory');
+    }
 
-	/**
-	 * Check if a temporary directory is ready for use
-	 *
-	 * @param mixed $directory
-	 * @return bool
-	 */
-	private function checkTemporaryDirectory($directory) {
-		// suppress any possible errors caused by is_writable
-		// checks missing or invalid path or characters, wrong permissions etc
-		try {
-			if (is_writable($directory)) {
-				return true;
-			}
-		} catch (\Exception $e) {
-		}
-		$this->log->warning('Temporary directory {dir} is not present or writable',
-			['dir' => $directory]
-		);
-		return false;
-	}
+    /**
+     * Check if a temporary directory is ready for use
+     *
+     * @param mixed $directory
+     * @return bool
+     */
+    private function checkTemporaryDirectory($directory) {
+        // suppress any possible errors caused by is_writable
+        // checks missing or invalid path or characters, wrong permissions etc
+        try {
+            if (is_writable($directory)) {
+                return true;
+            }
+        } catch (\Exception $e) {
+        }
+        $this->log->warning('Temporary directory {dir} is not present or writable',
+            ['dir' => $directory]
+        );
+        return false;
+    }
 
-	/**
-	 * Override the temporary base directory
-	 *
-	 * @param string $directory
-	 */
-	public function overrideTempBaseDir($directory) {
-		$this->tmpBaseDir = $directory;
-	}
+    /**
+     * Override the temporary base directory
+     *
+     * @param string $directory
+     */
+    public function overrideTempBaseDir($directory) {
+        $this->tmpBaseDir = $directory;
+    }
 
 }

lib/private/Log/ErrorHandler.php

Indentation +59 added lines, -59 removed lines

@@ -28,74 +28,74 @@
 use OCP\ILogger;
 
 class ErrorHandler {
-	/** @var ILogger */
-	private static $logger;
+    /** @var ILogger */
+    private static $logger;
 
-	/**
-	 * remove password in URLs
-	 * @param string $msg
-	 * @return string
-	 */
-	protected static function removePassword($msg) {
-		return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg);
-	}
+    /**
+     * remove password in URLs
+     * @param string $msg
+     * @return string
+     */
+    protected static function removePassword($msg) {
+        return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg);
+    }
 
-	public static function register($debug=false) {
-		$handler = new ErrorHandler();
+    public static function register($debug=false) {
+        $handler = new ErrorHandler();
 
-		if ($debug) {
-			set_error_handler(array($handler, 'onAll'), E_ALL);
-			if (\OC::$CLI) {
-				set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
-			}
-		} else {
-			set_error_handler(array($handler, 'onError'));
-		}
-		register_shutdown_function(array($handler, 'onShutdown'));
-		set_exception_handler(array($handler, 'onException'));
-	}
+        if ($debug) {
+            set_error_handler(array($handler, 'onAll'), E_ALL);
+            if (\OC::$CLI) {
+                set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
+            }
+        } else {
+            set_error_handler(array($handler, 'onError'));
+        }
+        register_shutdown_function(array($handler, 'onShutdown'));
+        set_exception_handler(array($handler, 'onException'));
+    }
 
-	public static function setLogger(ILogger $logger) {
-		self::$logger = $logger;
-	}
+    public static function setLogger(ILogger $logger) {
+        self::$logger = $logger;
+    }
 
-	//Fatal errors handler
-	public static function onShutdown() {
-		$error = error_get_last();
-		if($error && self::$logger) {
-			//ob_end_clean();
-			$msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
-			self::$logger->critical(self::removePassword($msg), array('app' => 'PHP'));
-		}
-	}
+    //Fatal errors handler
+    public static function onShutdown() {
+        $error = error_get_last();
+        if($error && self::$logger) {
+            //ob_end_clean();
+            $msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
+            self::$logger->critical(self::removePassword($msg), array('app' => 'PHP'));
+        }
+    }
 
-	/**
-	 * 	Uncaught exception handler
-	 *
-	 * @param \Exception $exception
-	 */
-	public static function onException($exception) {
-		$class = get_class($exception);
-		$msg = $exception->getMessage();
-		$msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine();
-		self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']);
-	}
+    /**
+     * 	Uncaught exception handler
+     *
+     * @param \Exception $exception
+     */
+    public static function onException($exception) {
+        $class = get_class($exception);
+        $msg = $exception->getMessage();
+        $msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine();
+        self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']);
+    }
 
-	//Recoverable errors handler
-	public static function onError($number, $message, $file, $line) {
-		if (error_reporting() === 0) {
-			return;
-		}
-		$msg = $message . ' at ' . $file . '#' . $line;
-		self::$logger->error(self::removePassword($msg), array('app' => 'PHP'));
+    //Recoverable errors handler
+    public static function onError($number, $message, $file, $line) {
+        if (error_reporting() === 0) {
+            return;
+        }
+        $msg = $message . ' at ' . $file . '#' . $line;
+        self::$logger->error(self::removePassword($msg), array('app' => 'PHP'));
 
-	}
+    }
 
-	//Recoverable handler which catch all errors, warnings and notices
-	public static function onAll($number, $message, $file, $line) {
-		$msg = $message . ' at ' . $file . '#' . $line;
-		self::$logger->debug(self::removePassword($msg), array('app' => 'PHP'));
+    //Recoverable handler which catch all errors, warnings and notices
+    public static function onAll($number, $message, $file, $line) {
+        $msg = $message . ' at ' . $file . '#' . $line;
+        self::$logger->debug(self::removePassword($msg), array('app' => 'PHP'));
 
-	}
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
 		return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg);
 	}
 
-	public static function register($debug=false) {
+	public static function register($debug = false) {
 		$handler = new ErrorHandler();
 
 		if ($debug) {
@@ -62,9 +62,9 @@ 
 	//Fatal errors handler
 	public static function onShutdown() {
 		$error = error_get_last();
-		if($error && self::$logger) {
+		if ($error && self::$logger) {
 			//ob_end_clean();
-			$msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
+			$msg = $error['message'].' at '.$error['file'].'#'.$error['line'];
 			self::$logger->critical(self::removePassword($msg), array('app' => 'PHP'));
 		}
 	}
@@ -77,7 +77,7 @@ 
 	public static function onException($exception) {
 		$class = get_class($exception);
 		$msg = $exception->getMessage();
-		$msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine();
+		$msg = "$class: $msg at ".$exception->getFile().'#'.$exception->getLine();
 		self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']);
 	}
 
@@ -86,14 +86,14 @@ 
 		if (error_reporting() === 0) {
 			return;
 		}
-		$msg = $message . ' at ' . $file . '#' . $line;
+		$msg = $message.' at '.$file.'#'.$line;
 		self::$logger->error(self::removePassword($msg), array('app' => 'PHP'));
 
 	}
 
 	//Recoverable handler which catch all errors, warnings and notices
 	public static function onAll($number, $message, $file, $line) {
-		$msg = $message . ' at ' . $file . '#' . $line;
+		$msg = $message.' at '.$file.'#'.$line;
 		self::$logger->debug(self::removePassword($msg), array('app' => 'PHP'));
 
 	}

lib/private/Search.php

Spacing +5 added lines, -5 removed lines

@@ -59,9 +59,9 @@ 
 	public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) {
 		$this->initProviders();
 		$results = array();
-		foreach($this->providers as $provider) {
+		foreach ($this->providers as $provider) {
 			/** @var $provider Provider */
-			if ( ! $provider->providesResultsFor($inApps) ) {
+			if (!$provider->providesResultsFor($inApps)) {
 				continue;
 			}
 			if ($provider instanceof PagedProvider) {
@@ -96,7 +96,7 @@ 
 	public function removeProvider($provider) {
 		$this->registeredProviders = array_filter(
 			$this->registeredProviders,
-			function ($element) use ($provider) {
+			function($element) use ($provider) {
 				return ($element['class'] != $provider);
 			}
 		);
@@ -117,10 +117,10 @@ 
 	 * Create instances of all the registered search providers
 	 */
 	private function initProviders() {
-		if( ! empty($this->providers) ) {
+		if (!empty($this->providers)) {
 			return;
 		}
-		foreach($this->registeredProviders as $provider) {
+		foreach ($this->registeredProviders as $provider) {
 			$class = $provider['class'];
 			$options = $provider['options'];
 			$this->providers[] = new $class($options);

Indentation +76 added lines, -76 removed lines

@@ -34,86 +34,86 @@
  */
 class Search implements ISearch {
 
-	private $providers = array();
-	private $registeredProviders = array();
+    private $providers = array();
+    private $registeredProviders = array();
 
-	/**
-	 * Search all providers for $query
-	 * @param string $query
-	 * @param string[] $inApps optionally limit results to the given apps
-	 * @param int $page pages start at page 1
-	 * @param int $size, 0 = all
-	 * @return array An array of OC\Search\Result's
-	 */
-	public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) {
-		$this->initProviders();
-		$results = array();
-		foreach($this->providers as $provider) {
-			/** @var $provider Provider */
-			if ( ! $provider->providesResultsFor($inApps) ) {
-				continue;
-			}
-			if ($provider instanceof PagedProvider) {
-				$results = array_merge($results, $provider->searchPaged($query, $page, $size));
-			} else if ($provider instanceof Provider) {
-				$providerResults = $provider->search($query);
-				if ($size > 0) {
-					$slicedResults = array_slice($providerResults, ($page - 1) * $size, $size);
-					$results = array_merge($results, $slicedResults);
-				} else {
-					$results = array_merge($results, $providerResults);
-				}
-			} else {
-				\OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider));
-			}
-		}
-		return $results;
-	}
+    /**
+     * Search all providers for $query
+     * @param string $query
+     * @param string[] $inApps optionally limit results to the given apps
+     * @param int $page pages start at page 1
+     * @param int $size, 0 = all
+     * @return array An array of OC\Search\Result's
+     */
+    public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) {
+        $this->initProviders();
+        $results = array();
+        foreach($this->providers as $provider) {
+            /** @var $provider Provider */
+            if ( ! $provider->providesResultsFor($inApps) ) {
+                continue;
+            }
+            if ($provider instanceof PagedProvider) {
+                $results = array_merge($results, $provider->searchPaged($query, $page, $size));
+            } else if ($provider instanceof Provider) {
+                $providerResults = $provider->search($query);
+                if ($size > 0) {
+                    $slicedResults = array_slice($providerResults, ($page - 1) * $size, $size);
+                    $results = array_merge($results, $slicedResults);
+                } else {
+                    $results = array_merge($results, $providerResults);
+                }
+            } else {
+                \OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider));
+            }
+        }
+        return $results;
+    }
 
-	/**
-	 * Remove all registered search providers
-	 */
-	public function clearProviders() {
-		$this->providers = array();
-		$this->registeredProviders = array();
-	}
+    /**
+     * Remove all registered search providers
+     */
+    public function clearProviders() {
+        $this->providers = array();
+        $this->registeredProviders = array();
+    }
 
-	/**
-	 * Remove one existing search provider
-	 * @param string $provider class name of a OC\Search\Provider
-	 */
-	public function removeProvider($provider) {
-		$this->registeredProviders = array_filter(
-			$this->registeredProviders,
-			function ($element) use ($provider) {
-				return ($element['class'] != $provider);
-			}
-		);
-		// force regeneration of providers on next search
-		$this->providers = array();
-	}
+    /**
+     * Remove one existing search provider
+     * @param string $provider class name of a OC\Search\Provider
+     */
+    public function removeProvider($provider) {
+        $this->registeredProviders = array_filter(
+            $this->registeredProviders,
+            function ($element) use ($provider) {
+                return ($element['class'] != $provider);
+            }
+        );
+        // force regeneration of providers on next search
+        $this->providers = array();
+    }
 
-	/**
-	 * Register a new search provider to search with
-	 * @param string $class class name of a OC\Search\Provider
-	 * @param array $options optional
-	 */
-	public function registerProvider($class, array $options = array()) {
-		$this->registeredProviders[] = array('class' => $class, 'options' => $options);
-	}
+    /**
+     * Register a new search provider to search with
+     * @param string $class class name of a OC\Search\Provider
+     * @param array $options optional
+     */
+    public function registerProvider($class, array $options = array()) {
+        $this->registeredProviders[] = array('class' => $class, 'options' => $options);
+    }
 
-	/**
-	 * Create instances of all the registered search providers
-	 */
-	private function initProviders() {
-		if( ! empty($this->providers) ) {
-			return;
-		}
-		foreach($this->registeredProviders as $provider) {
-			$class = $provider['class'];
-			$options = $provider['options'];
-			$this->providers[] = new $class($options);
-		}
-	}
+    /**
+     * Create instances of all the registered search providers
+     */
+    private function initProviders() {
+        if( ! empty($this->providers) ) {
+            return;
+        }
+        foreach($this->registeredProviders as $provider) {
+            $class = $provider['class'];
+            $options = $provider['options'];
+            $this->providers[] = new $class($options);
+        }
+    }
 
 }

lib/private/Http/Client/Response.php

Spacing +1 added lines, -2 removed lines

@@ -54,8 +54,7 @@
 	 */
 	public function getBody() {
 		return $this->stream ?
-			$this->response->getBody()->detach():
-			$this->response->getBody()->getContents();
+			$this->response->getBody()->detach() : $this->response->getBody()->getContents();
 	}
 
 	/**

Indentation +45 added lines, -45 removed lines

@@ -33,57 +33,57 @@
  * @package OC\Http
  */
 class Response implements IResponse {
-	/** @var ResponseInterface */
-	private $response;
+    /** @var ResponseInterface */
+    private $response;
 
-	/**
-	 * @var bool
-	 */
-	private $stream;
+    /**
+     * @var bool
+     */
+    private $stream;
 
-	/**
-	 * @param ResponseInterface $response
-	 * @param bool $stream
-	 */
-	public function __construct(ResponseInterface $response, $stream = false) {
-		$this->response = $response;
-		$this->stream = $stream;
-	}
+    /**
+     * @param ResponseInterface $response
+     * @param bool $stream
+     */
+    public function __construct(ResponseInterface $response, $stream = false) {
+        $this->response = $response;
+        $this->stream = $stream;
+    }
 
-	/**
-	 * @return string|resource
-	 */
-	public function getBody() {
-		return $this->stream ?
-			$this->response->getBody()->detach():
-			$this->response->getBody()->getContents();
-	}
+    /**
+     * @return string|resource
+     */
+    public function getBody() {
+        return $this->stream ?
+            $this->response->getBody()->detach():
+            $this->response->getBody()->getContents();
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getStatusCode(): int {
-		return $this->response->getStatusCode();
-	}
+    /**
+     * @return int
+     */
+    public function getStatusCode(): int {
+        return $this->response->getStatusCode();
+    }
 
-	/**
-	 * @param string $key
-	 * @return string
-	 */
-	public function getHeader(string $key): string {
-		$headers = $this->response->getHeader($key);
+    /**
+     * @param string $key
+     * @return string
+     */
+    public function getHeader(string $key): string {
+        $headers = $this->response->getHeader($key);
 
-		if (count($headers) === 0) {
-			return '';
-		}
+        if (count($headers) === 0) {
+            return '';
+        }
 
-		return $headers[0];
-	}
+        return $headers[0];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getHeaders(): array {
-		return $this->response->getHeaders();
-	}
+    /**
+     * @return array
+     */
+    public function getHeaders(): array {
+        return $this->response->getHeaders();
+    }
 }

lib/private/Session/CryptoWrapper.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 			// FIXME: Required for CI
 			if (!defined('PHPUNIT_RUN')) {
 				$webRoot = \OC::$WEBROOT;
-				if($webRoot === '') {
+				if ($webRoot === '') {
 					$webRoot = '/';
 				}
 				setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);

Indentation +49 added lines, -49 removed lines

@@ -48,58 +48,58 @@
  * @package OC\Session
  */
 class CryptoWrapper {
-	const COOKIE_NAME = 'oc_sessionPassphrase';
+    const COOKIE_NAME = 'oc_sessionPassphrase';
 
-	/** @var IConfig */
-	protected $config;
-	/** @var ISession */
-	protected $session;
-	/** @var ICrypto */
-	protected $crypto;
-	/** @var ISecureRandom */
-	protected $random;
-	/** @var string */
-	protected $passphrase;
+    /** @var IConfig */
+    protected $config;
+    /** @var ISession */
+    protected $session;
+    /** @var ICrypto */
+    protected $crypto;
+    /** @var ISecureRandom */
+    protected $random;
+    /** @var string */
+    protected $passphrase;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICrypto $crypto
-	 * @param ISecureRandom $random
-	 * @param IRequest $request
-	 */
-	public function __construct(IConfig $config,
-								ICrypto $crypto,
-								ISecureRandom $random,
-								IRequest $request) {
-		$this->crypto = $crypto;
-		$this->config = $config;
-		$this->random = $random;
+    /**
+     * @param IConfig $config
+     * @param ICrypto $crypto
+     * @param ISecureRandom $random
+     * @param IRequest $request
+     */
+    public function __construct(IConfig $config,
+                                ICrypto $crypto,
+                                ISecureRandom $random,
+                                IRequest $request) {
+        $this->crypto = $crypto;
+        $this->config = $config;
+        $this->random = $random;
 
-		if (!is_null($request->getCookie(self::COOKIE_NAME))) {
-			$this->passphrase = $request->getCookie(self::COOKIE_NAME);
-		} else {
-			$this->passphrase = $this->random->generate(128);
-			$secureCookie = $request->getServerProtocol() === 'https';
-			// FIXME: Required for CI
-			if (!defined('PHPUNIT_RUN')) {
-				$webRoot = \OC::$WEBROOT;
-				if($webRoot === '') {
-					$webRoot = '/';
-				}
-				setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
-			}
-		}
-	}
+        if (!is_null($request->getCookie(self::COOKIE_NAME))) {
+            $this->passphrase = $request->getCookie(self::COOKIE_NAME);
+        } else {
+            $this->passphrase = $this->random->generate(128);
+            $secureCookie = $request->getServerProtocol() === 'https';
+            // FIXME: Required for CI
+            if (!defined('PHPUNIT_RUN')) {
+                $webRoot = \OC::$WEBROOT;
+                if($webRoot === '') {
+                    $webRoot = '/';
+                }
+                setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
+            }
+        }
+    }
 
-	/**
-	 * @param ISession $session
-	 * @return ISession
-	 */
-	public function wrapSession(ISession $session) {
-		if (!($session instanceof CryptoSessionData)) {
-			return new CryptoSessionData($session, $this->crypto, $this->passphrase);
-		}
+    /**
+     * @param ISession $session
+     * @return ISession
+     */
+    public function wrapSession(ISession $session) {
+        if (!($session instanceof CryptoSessionData)) {
+            return new CryptoSessionData($session, $this->crypto, $this->passphrase);
+        }
 
-		return $session;
-	}
+        return $session;
+    }
 }

lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php

Spacing +10 added lines, -10 removed lines

@@ -30,25 +30,25 @@
 		parent::__construct($iterator);
 
 		$appFolders = \OC::$APPSROOTS;
-		foreach($appFolders as $key => $appFolder) {
+		foreach ($appFolders as $key => $appFolder) {
 			$appFolders[$key] = rtrim($appFolder['path'], '/');
 		}
 
 		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
+			rtrim($root.'/data', '/'),
+			rtrim($root.'/themes', '/'),
+			rtrim($root.'/config', '/'),
+			rtrim($root.'/apps', '/'),
+			rtrim($root.'/assets', '/'),
+			rtrim($root.'/lost+found', '/'),
 			// Ignore folders generated by updater since the updater is replaced
 			// after the integrity check is run.
 			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
+			rtrim($root.'/updater', '/'),
+			rtrim($root.'/_oc_upgrade', '/'),
 		];
 		$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
-		if($customDataDir !== '') {
+		if ($customDataDir !== '') {
 			$excludedFolders[] = rtrim($customDataDir, '/');
 		}
 

Indentation +36 added lines, -36 removed lines

@@ -25,45 +25,45 @@
 namespace OC\IntegrityCheck\Iterator;
 
 class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
-	private $excludedFolders;
+    private $excludedFolders;
 
-	public function __construct(\RecursiveIterator $iterator, $root = '') {
-		parent::__construct($iterator);
+    public function __construct(\RecursiveIterator $iterator, $root = '') {
+        parent::__construct($iterator);
 
-		$appFolders = \OC::$APPSROOTS;
-		foreach($appFolders as $key => $appFolder) {
-			$appFolders[$key] = rtrim($appFolder['path'], '/');
-		}
+        $appFolders = \OC::$APPSROOTS;
+        foreach($appFolders as $key => $appFolder) {
+            $appFolders[$key] = rtrim($appFolder['path'], '/');
+        }
 
-		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
-			// Ignore folders generated by updater since the updater is replaced
-			// after the integrity check is run.
-			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
-		];
-		$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
-		if($customDataDir !== '') {
-			$excludedFolders[] = rtrim($customDataDir, '/');
-		}
+        $excludedFolders = [
+            rtrim($root . '/data', '/'),
+            rtrim($root . '/themes', '/'),
+            rtrim($root . '/config', '/'),
+            rtrim($root . '/apps', '/'),
+            rtrim($root . '/assets', '/'),
+            rtrim($root . '/lost+found', '/'),
+            // Ignore folders generated by updater since the updater is replaced
+            // after the integrity check is run.
+            // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
+            rtrim($root . '/updater', '/'),
+            rtrim($root . '/_oc_upgrade', '/'),
+        ];
+        $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
+        if($customDataDir !== '') {
+            $excludedFolders[] = rtrim($customDataDir, '/');
+        }
 
-		$this->excludedFolders = array_merge($excludedFolders, $appFolders);
-	}
+        $this->excludedFolders = array_merge($excludedFolders, $appFolders);
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function accept() {
-		return !\in_array(
-			$this->current()->getPathName(),
-			$this->excludedFolders,
-			true
-		);
-	}
+    /**
+     * @return bool
+     */
+    public function accept() {
+        return !\in_array(
+            $this->current()->getPathName(),
+            $this->excludedFolders,
+            true
+        );
+    }
 }

lib/private/HintException.php

Indentation +39 added lines, -39 removed lines

@@ -35,46 +35,46 @@
  */
 class HintException extends \Exception {
 
-	private $hint;
+    private $hint;
 
-	/**
-	 * HintException constructor.
-	 *
-	 * @param string $message  The error message. It will be not revealed to the
-	 *                         the user (unless the hint is empty) and thus
-	 *                         should be not translated.
-	 * @param string $hint     A useful message that is presented to the end
-	 *                         user. It should be translated, but must not
-	 *                         contain sensitive data.
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 */
-	public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
-		$this->hint = $hint;
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * HintException constructor.
+     *
+     * @param string $message  The error message. It will be not revealed to the
+     *                         the user (unless the hint is empty) and thus
+     *                         should be not translated.
+     * @param string $hint     A useful message that is presented to the end
+     *                         user. It should be translated, but must not
+     *                         contain sensitive data.
+     * @param int $code
+     * @param \Exception|null $previous
+     */
+    public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
+        $this->hint = $hint;
+        parent::__construct($message, $code, $previous);
+    }
 
-	/**
-	 * Returns a string representation of this Exception that includes the error
-	 * code, the message and the hint.
-	 *
-	 * @return string
-	 */
-	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
-	}
+    /**
+     * Returns a string representation of this Exception that includes the error
+     * code, the message and the hint.
+     *
+     * @return string
+     */
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+    }
 
-	/**
-	 * Returns the hint with the intention to be presented to the end user. If
-	 * an empty hint was specified upon instatiation, the message is returned
-	 * instead.
-	 *
-	 * @return string
-	 */
-	public function getHint() {
-		if (empty($this->hint)) {
-			return $this->message;
-		}
-		return $this->hint;
-	}
+    /**
+     * Returns the hint with the intention to be presented to the end user. If
+     * an empty hint was specified upon instatiation, the message is returned
+     * instead.
+     *
+     * @return string
+     */
+    public function getHint() {
+        if (empty($this->hint)) {
+            return $this->message;
+        }
+        return $this->hint;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @return string
 	 */
 	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+		return __CLASS__.": [{$this->code}]: {$this->message} ({$this->hint})\n";
 	}
 
 	/**

lib/private/User/Backend.php

Indentation +120 added lines, -120 removed lines

@@ -29,136 +29,136 @@
  * capabilities.
  */
 abstract class Backend implements UserInterface {
-	/**
-	 * error code for functions not provided by the user backend
-	 */
-	const NOT_IMPLEMENTED = -501;
+    /**
+     * error code for functions not provided by the user backend
+     */
+    const NOT_IMPLEMENTED = -501;
 
-	/**
-	 * actions that user backends can define
-	 */
-	const CREATE_USER		= 1;			// 1 << 0
-	const SET_PASSWORD		= 16;			// 1 << 4
-	const CHECK_PASSWORD	= 256;			// 1 << 8
-	const GET_HOME			= 4096;			// 1 << 12
-	const GET_DISPLAYNAME	= 65536;		// 1 << 16
-	const SET_DISPLAYNAME	= 1048576;		// 1 << 20
-	const PROVIDE_AVATAR	= 16777216;		// 1 << 24
-	const COUNT_USERS		= 268435456;	// 1 << 28
+    /**
+     * actions that user backends can define
+     */
+    const CREATE_USER		= 1;			// 1 << 0
+    const SET_PASSWORD		= 16;			// 1 << 4
+    const CHECK_PASSWORD	= 256;			// 1 << 8
+    const GET_HOME			= 4096;			// 1 << 12
+    const GET_DISPLAYNAME	= 65536;		// 1 << 16
+    const SET_DISPLAYNAME	= 1048576;		// 1 << 20
+    const PROVIDE_AVATAR	= 16777216;		// 1 << 24
+    const COUNT_USERS		= 268435456;	// 1 << 28
 
-	protected $possibleActions = array(
-		self::CREATE_USER => 'createUser',
-		self::SET_PASSWORD => 'setPassword',
-		self::CHECK_PASSWORD => 'checkPassword',
-		self::GET_HOME => 'getHome',
-		self::GET_DISPLAYNAME => 'getDisplayName',
-		self::SET_DISPLAYNAME => 'setDisplayName',
-		self::PROVIDE_AVATAR => 'canChangeAvatar',
-		self::COUNT_USERS => 'countUsers',
-	);
+    protected $possibleActions = array(
+        self::CREATE_USER => 'createUser',
+        self::SET_PASSWORD => 'setPassword',
+        self::CHECK_PASSWORD => 'checkPassword',
+        self::GET_HOME => 'getHome',
+        self::GET_DISPLAYNAME => 'getDisplayName',
+        self::SET_DISPLAYNAME => 'setDisplayName',
+        self::PROVIDE_AVATAR => 'canChangeAvatar',
+        self::COUNT_USERS => 'countUsers',
+    );
 
-	/**
-	* Get all supported actions
-	* @return int bitwise-or'ed actions
-	*
-	* Returns the supported actions as int to be
-	* compared with self::CREATE_USER etc.
-	*/
-	public function getSupportedActions() {
-		$actions = 0;
-		foreach($this->possibleActions AS $action => $methodName) {
-			if(method_exists($this, $methodName)) {
-				$actions |= $action;
-			}
-		}
+    /**
+     * Get all supported actions
+     * @return int bitwise-or'ed actions
+     *
+     * Returns the supported actions as int to be
+     * compared with self::CREATE_USER etc.
+     */
+    public function getSupportedActions() {
+        $actions = 0;
+        foreach($this->possibleActions AS $action => $methodName) {
+            if(method_exists($this, $methodName)) {
+                $actions |= $action;
+            }
+        }
 
-		return $actions;
-	}
+        return $actions;
+    }
 
-	/**
-	* Check if backend implements actions
-	* @param int $actions bitwise-or'ed actions
-	* @return boolean
-	*
-	* Returns the supported actions as int to be
-	* compared with self::CREATE_USER etc.
-	*/
-	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
-	}
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return boolean
+     *
+     * Returns the supported actions as int to be
+     * compared with self::CREATE_USER etc.
+     */
+    public function implementsActions($actions) {
+        return (bool)($this->getSupportedActions() & $actions);
+    }
 
-	/**
-	 * delete a user
-	 * @param string $uid The username of the user to delete
-	 * @return bool
-	 *
-	 * Deletes a user
-	 */
-	public function deleteUser( $uid ) {
-		return false;
-	}
+    /**
+     * delete a user
+     * @param string $uid The username of the user to delete
+     * @return bool
+     *
+     * Deletes a user
+     */
+    public function deleteUser( $uid ) {
+        return false;
+    }
 
-	/**
-	 * Get a list of all users
-	 *
-	 * @param string $search
-	 * @param null|int $limit
-	 * @param null|int $offset
-	 * @return string[] an array of all uids
-	 */
-	public function getUsers($search = '', $limit = null, $offset = null) {
-		return array();
-	}
+    /**
+     * Get a list of all users
+     *
+     * @param string $search
+     * @param null|int $limit
+     * @param null|int $offset
+     * @return string[] an array of all uids
+     */
+    public function getUsers($search = '', $limit = null, $offset = null) {
+        return array();
+    }
 
-	/**
-	* check if a user exists
-	* @param string $uid the username
-	* @return boolean
-	*/
-	public function userExists($uid) {
-		return false;
-	}
+    /**
+     * check if a user exists
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function userExists($uid) {
+        return false;
+    }
 
-	/**
-	* get the user's home directory
-	* @param string $uid the username
-	* @return boolean
-	*/
-	public function getHome($uid) {
-		return false;
-	}
+    /**
+     * get the user's home directory
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function getHome($uid) {
+        return false;
+    }
 
-	/**
-	 * get display name of the user
-	 * @param string $uid user ID of the user
-	 * @return string display name
-	 */
-	public function getDisplayName($uid) {
-		return $uid;
-	}
+    /**
+     * get display name of the user
+     * @param string $uid user ID of the user
+     * @return string display name
+     */
+    public function getDisplayName($uid) {
+        return $uid;
+    }
 
-	/**
-	 * Get a list of all display names and user ids.
-	 *
-	 * @param string $search
-	 * @param string|null $limit
-	 * @param string|null $offset
-	 * @return array an array of all displayNames (value) and the corresponding uids (key)
-	 */
-	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$displayNames = array();
-		$users = $this->getUsers($search, $limit, $offset);
-		foreach ( $users as $user) {
-			$displayNames[$user] = $user;
-		}
-		return $displayNames;
-	}
+    /**
+     * Get a list of all display names and user ids.
+     *
+     * @param string $search
+     * @param string|null $limit
+     * @param string|null $offset
+     * @return array an array of all displayNames (value) and the corresponding uids (key)
+     */
+    public function getDisplayNames($search = '', $limit = null, $offset = null) {
+        $displayNames = array();
+        $users = $this->getUsers($search, $limit, $offset);
+        foreach ( $users as $user) {
+            $displayNames[$user] = $user;
+        }
+        return $displayNames;
+    }
 
-	/**
-	 * Check if a user list is available or not
-	 * @return boolean if users can be listed or not
-	 */
-	public function hasUserListings() {
-		return false;
-	}
+    /**
+     * Check if a user list is available or not
+     * @return boolean if users can be listed or not
+     */
+    public function hasUserListings() {
+        return false;
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -37,14 +37,14 @@ 
 	/**
 	 * actions that user backends can define
 	 */
-	const CREATE_USER		= 1;			// 1 << 0
-	const SET_PASSWORD		= 16;			// 1 << 4
-	const CHECK_PASSWORD	= 256;			// 1 << 8
-	const GET_HOME			= 4096;			// 1 << 12
-	const GET_DISPLAYNAME	= 65536;		// 1 << 16
-	const SET_DISPLAYNAME	= 1048576;		// 1 << 20
-	const PROVIDE_AVATAR	= 16777216;		// 1 << 24
-	const COUNT_USERS		= 268435456;	// 1 << 28
+	const CREATE_USER = 1; // 1 << 0
+	const SET_PASSWORD = 16; // 1 << 4
+	const CHECK_PASSWORD = 256; // 1 << 8
+	const GET_HOME = 4096; // 1 << 12
+	const GET_DISPLAYNAME	= 65536; // 1 << 16
+	const SET_DISPLAYNAME	= 1048576; // 1 << 20
+	const PROVIDE_AVATAR = 16777216; // 1 << 24
+	const COUNT_USERS = 268435456; // 1 << 28
 
 	protected $possibleActions = array(
 		self::CREATE_USER => 'createUser',
@@ -66,8 +66,8 @@ 
 	*/
 	public function getSupportedActions() {
 		$actions = 0;
-		foreach($this->possibleActions AS $action => $methodName) {
-			if(method_exists($this, $methodName)) {
+		foreach ($this->possibleActions AS $action => $methodName) {
+			if (method_exists($this, $methodName)) {
 				$actions |= $action;
 			}
 		}
@@ -84,7 +84,7 @@ 
 	* compared with self::CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
+		return (bool) ($this->getSupportedActions() & $actions);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 *
 	 * Deletes a user
 	 */
-	public function deleteUser( $uid ) {
+	public function deleteUser($uid) {
 		return false;
 	}
 
@@ -148,7 +148,7 @@ 
 	public function getDisplayNames($search = '', $limit = null, $offset = null) {
 		$displayNames = array();
 		$users = $this->getUsers($search, $limit, $offset);
-		foreach ( $users as $user) {
+		foreach ($users as $user) {
 			$displayNames[$user] = $user;
 		}
 		return $displayNames;