nextcloud / server

lib/private/Security/IdentityProof/Signer.php

Indentation +66 added lines, -66 removed lines

@@ -26,76 +26,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($type, array $data, IUser $user) {
-		$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($type, array $data, IUser $user) {
+        $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) {
-		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) {
+        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;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
 	 * @return bool
 	 */
 	public function verify(array $data) {
-		if(isset($data['message'])
+		if (isset($data['message'])
 			&& isset($data['signature'])
 			&& isset($data['message']['signer'])
 		) {
@@ -85,9 +85,9 @@ 
 			$userId = substr($data['message']['signer'], 0, $location);
 
 			$user = $this->userManager->get($userId);
-			if($user !== null) {
+			if ($user !== null) {
 				$key = $this->keyManager->getKey($user);
-				return (bool)openssl_verify(
+				return (bool) openssl_verify(
 					json_encode($data['message']),
 					base64_decode($data['signature']),
 					$key->getPublic(),

lib/private/Security/IdentityProof/Key.php

Indentation +18 added lines, -18 removed lines

@@ -22,25 +22,25 @@
 namespace OC\Security\IdentityProof;
 
 class Key {
-	/** @var string */
-	private $publicKey;
-	/** @var string */
-	private $privateKey;
+    /** @var string */
+    private $publicKey;
+    /** @var string */
+    private $privateKey;
 
-	/**
-	 * @param string $publicKey
-	 * @param string $privateKey
-	 */
-	public function __construct($publicKey, $privateKey) {
-		$this->publicKey = $publicKey;
-		$this->privateKey = $privateKey;
-	}
+    /**
+     * @param string $publicKey
+     * @param string $privateKey
+     */
+    public function __construct($publicKey, $privateKey) {
+        $this->publicKey = $publicKey;
+        $this->privateKey = $privateKey;
+    }
 
-	public function getPrivate() {
-		return $this->privateKey;
-	}
+    public function getPrivate() {
+        return $this->privateKey;
+    }
 
-	public function getPublic() {
-		return $this->publicKey;
-	}
+    public function getPublic() {
+        return $this->publicKey;
+    }
 }

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/Errorlog.php

Indentation +14 added lines, -14 removed lines

@@ -28,20 +28,20 @@
 class Errorlog {
 
 
-	/**
-	 * Init class data
-	 */
-	public static function init() {
-	}
+    /**
+     * Init class data
+     */
+    public static function init() {
+    }
 
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public static function write($app, $message, $level) {
-		error_log('[owncloud]['.$app.']['.$level.'] '.$message);
-	}
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     */
+    public static function write($app, $message, $level) {
+        error_log('[owncloud]['.$app.']['.$level.'] '.$message);
+    }
 }
 

lib/private/Log/Syslog.php

Indentation +25 added lines, -25 removed lines

@@ -26,31 +26,31 @@
 namespace OC\Log;
 
 class Syslog {
-	static protected $levels = array(
-		\OCP\Util::DEBUG => LOG_DEBUG,
-		\OCP\Util::INFO => LOG_INFO,
-		\OCP\Util::WARN => LOG_WARNING,
-		\OCP\Util::ERROR => LOG_ERR,
-		\OCP\Util::FATAL => LOG_CRIT,
-	);
+    static protected $levels = array(
+        \OCP\Util::DEBUG => LOG_DEBUG,
+        \OCP\Util::INFO => LOG_INFO,
+        \OCP\Util::WARN => LOG_WARNING,
+        \OCP\Util::ERROR => LOG_ERR,
+        \OCP\Util::FATAL => LOG_CRIT,
+    );
 
-	/**
-	 * Init class data
-	 */
-	public static function init() {
-		openlog(\OC::$server->getSystemConfig()->getValue("syslog_tag", "ownCloud"), LOG_PID | LOG_CONS, LOG_USER);
-		// Close at shutdown
-		register_shutdown_function('closelog');
-	}
+    /**
+     * Init class data
+     */
+    public static function init() {
+        openlog(\OC::$server->getSystemConfig()->getValue("syslog_tag", "ownCloud"), LOG_PID | LOG_CONS, LOG_USER);
+        // Close at shutdown
+        register_shutdown_function('closelog');
+    }
 
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public static function write($app, $message, $level) {
-		$syslog_level = self::$levels[$level];
-		syslog($syslog_level, '{'.$app.'} '.$message);
-	}
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     */
+    public static function write($app, $message, $level) {
+        $syslog_level = self::$levels[$level];
+        syslog($syslog_level, '{'.$app.'} '.$message);
+    }
 }

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/Log/Rotate.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	private $max_log_size;
 	public function run($dummy) {
 		$systemConfig = \OC::$server->getSystemConfig();
-		$logFile = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
+		$logFile = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT.'/data').'/nextcloud.log');
 		$this->max_log_size = \OC::$server->getConfig()->getSystemValue('log_rotate_size', false);
 		if ($this->max_log_size) {
 			$filesize = @filesize($logFile);

Indentation +18 added lines, -18 removed lines

@@ -32,23 +32,23 @@
  * location and manage that with your own tools.
  */
 class Rotate extends \OC\BackgroundJob\Job {
-	private $max_log_size;
-	public function run($dummy) {
-		$systemConfig = \OC::$server->getSystemConfig();
-		$logFile = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
-		$this->max_log_size = \OC::$server->getConfig()->getSystemValue('log_rotate_size', false);
-		if ($this->max_log_size) {
-			$filesize = @filesize($logFile);
-			if ($filesize >= $this->max_log_size) {
-				$this->rotate($logFile);
-			}
-		}
-	}
+    private $max_log_size;
+    public function run($dummy) {
+        $systemConfig = \OC::$server->getSystemConfig();
+        $logFile = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
+        $this->max_log_size = \OC::$server->getConfig()->getSystemValue('log_rotate_size', false);
+        if ($this->max_log_size) {
+            $filesize = @filesize($logFile);
+            if ($filesize >= $this->max_log_size) {
+                $this->rotate($logFile);
+            }
+        }
+    }
 
-	protected function rotate($logfile) {
-		$rotatedLogfile = $logfile.'.1';
-		rename($logfile, $rotatedLogfile);
-		$msg = 'Log file "'.$logfile.'" was over '.$this->max_log_size.' bytes, moved to "'.$rotatedLogfile.'"';
-		\OCP\Util::writeLog(Rotate::class, $msg, \OCP\Util::WARN);
-	}
+    protected function rotate($logfile) {
+        $rotatedLogfile = $logfile.'.1';
+        rename($logfile, $rotatedLogfile);
+        $msg = 'Log file "'.$logfile.'" was over '.$this->max_log_size.' bytes, moved to "'.$rotatedLogfile.'"';
+        \OCP\Util::writeLog(Rotate::class, $msg, \OCP\Util::WARN);
+    }
 }

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/Session/Memory.php

Indentation +72 added lines, -72 removed lines

@@ -38,86 +38,86 @@
  * @package OC\Session
  */
 class Memory extends Session {
-	protected $data;
+    protected $data;
 
-	public function __construct($name) {
-		//no need to use $name since all data is already scoped to this instance
-		$this->data = array();
-	}
+    public function __construct($name) {
+        //no need to use $name since all data is already scoped to this instance
+        $this->data = array();
+    }
 
-	/**
-	 * @param string $key
-	 * @param integer $value
-	 */
-	public function set($key, $value) {
-		$this->validateSession();
-		$this->data[$key] = $value;
-	}
+    /**
+     * @param string $key
+     * @param integer $value
+     */
+    public function set($key, $value) {
+        $this->validateSession();
+        $this->data[$key] = $value;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get($key) {
-		if (!$this->exists($key)) {
-			return null;
-		}
-		return $this->data[$key];
-	}
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function get($key) {
+        if (!$this->exists($key)) {
+            return null;
+        }
+        return $this->data[$key];
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	public function exists($key) {
-		return isset($this->data[$key]);
-	}
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function exists($key) {
+        return isset($this->data[$key]);
+    }
 
-	/**
-	 * @param string $key
-	 */
-	public function remove($key) {
-		$this->validateSession();
-		unset($this->data[$key]);
-	}
+    /**
+     * @param string $key
+     */
+    public function remove($key) {
+        $this->validateSession();
+        unset($this->data[$key]);
+    }
 
-	public function clear() {
-		$this->data = array();
-	}
+    public function clear() {
+        $this->data = array();
+    }
 
-	/**
-	 * Stub since the session ID does not need to get regenerated for the cache
-	 *
-	 * @param bool $deleteOldSession
-	 */
-	public function regenerateId($deleteOldSession = true) {}
+    /**
+     * Stub since the session ID does not need to get regenerated for the cache
+     *
+     * @param bool $deleteOldSession
+     */
+    public function regenerateId($deleteOldSession = true) {}
 
-	/**
-	 * Wrapper around session_id
-	 *
-	 * @return string
-	 * @throws SessionNotAvailableException
-	 * @since 9.1.0
-	 */
-	public function getId() {
-		throw new SessionNotAvailableException('Memory session does not have an ID');
-	}
+    /**
+     * Wrapper around session_id
+     *
+     * @return string
+     * @throws SessionNotAvailableException
+     * @since 9.1.0
+     */
+    public function getId() {
+        throw new SessionNotAvailableException('Memory session does not have an ID');
+    }
 
-	/**
-	 * Helper function for PHPUnit execution - don't use in non-test code
-	 */
-	public function reopen() {
-		$this->sessionClosed = false;
-	}
+    /**
+     * Helper function for PHPUnit execution - don't use in non-test code
+     */
+    public function reopen() {
+        $this->sessionClosed = false;
+    }
 
-	/**
-	 * In case the session has already been locked an exception will be thrown
-	 *
-	 * @throws Exception
-	 */
-	private function validateSession() {
-		if ($this->sessionClosed) {
-			throw new Exception('Session has been closed - no further changes to the session are allowed');
-		}
-	}
+    /**
+     * In case the session has already been locked an exception will be thrown
+     *
+     * @throws Exception
+     */
+    private function validateSession() {
+        if ($this->sessionClosed) {
+            throw new Exception('Session has been closed - no further changes to the session are allowed');
+        }
+    }
 }