nextcloud / server

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'));
 
-	}
+    }
 
 }

lib/private/Log/Rotate.php

Indentation +18 added lines, -18 removed lines

@@ -31,23 +31,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('OC\Log\Rotate', $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('OC\Log\Rotate', $msg, \OCP\Util::WARN);
+    }
 }

lib/private/Search.php

Indentation +86 added lines, -86 removed lines

@@ -34,97 +34,97 @@
  */
 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
-	 * @return array An array of OC\Search\Result's
-	 */
-	public function search($query, array $inApps = array()) {
-		// old apps might assume they get all results, so we set size 0
-		return $this->searchPaged($query, $inApps, 1, 0);
-	}
+    /**
+     * Search all providers for $query
+     * @param string $query
+     * @param string[] $inApps optionally limit results to the given apps
+     * @return array An array of OC\Search\Result's
+     */
+    public function search($query, array $inApps = array()) {
+        // old apps might assume they get all results, so we set size 0
+        return $this->searchPaged($query, $inApps, 1, 0);
+    }
 
-	/**
-	 * 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

Indentation +41 added lines, -41 removed lines

@@ -32,51 +32,51 @@
  * @package OC\Http
  */
 class Response implements IResponse {
-	/** @var GuzzleResponse */
-	private $response;
+    /** @var GuzzleResponse */
+    private $response;
 
-	/**
-	 * @var bool
-	 */
-	private $stream;
+    /**
+     * @var bool
+     */
+    private $stream;
 
-	/**
-	 * @param GuzzleResponse $response
-	 * @param bool $stream
-	 */
-	public function __construct(GuzzleResponse $response, $stream = false) {
-		$this->response = $response;
-		$this->stream = $stream;
-	}
+    /**
+     * @param GuzzleResponse $response
+     * @param bool $stream
+     */
+    public function __construct(GuzzleResponse $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() {
-		return $this->response->getStatusCode();
-	}
+    /**
+     * @return int
+     */
+    public function getStatusCode() {
+        return $this->response->getStatusCode();
+    }
 
-	/**
-	 * @param $key
-	 * @return string
-	 */
-	public function getHeader($key) {
-		return $this->response->getHeader($key);
-	}
+    /**
+     * @param $key
+     * @return string
+     */
+    public function getHeader($key) {
+        return $this->response->getHeader($key);
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getHeaders() {
-		return $this->response->getHeaders();
-	}
+    /**
+     * @return array
+     */
+    public function getHeaders() {
+        return $this->response->getHeaders();
+    }
 }

lib/private/Http/Client/Client.php

Indentation +263 added lines, -263 removed lines

@@ -34,280 +34,280 @@
  * @package OC\Http
  */
 class Client implements IClient {
-	/** @var GuzzleClient */
-	private $client;
-	/** @var IConfig */
-	private $config;
-	/** @var ICertificateManager */
-	private $certificateManager;
-	private $configured = false;
+    /** @var GuzzleClient */
+    private $client;
+    /** @var IConfig */
+    private $config;
+    /** @var ICertificateManager */
+    private $certificateManager;
+    private $configured = false;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICertificateManager $certificateManager
-	 * @param GuzzleClient $client
-	 */
-	public function __construct(IConfig $config,
-								ICertificateManager $certificateManager,
-								GuzzleClient $client) {
-		$this->config = $config;
-		$this->client = $client;
-		$this->certificateManager = $certificateManager;
-	}
+    /**
+     * @param IConfig $config
+     * @param ICertificateManager $certificateManager
+     * @param GuzzleClient $client
+     */
+    public function __construct(IConfig $config,
+                                ICertificateManager $certificateManager,
+                                GuzzleClient $client) {
+        $this->config = $config;
+        $this->client = $client;
+        $this->certificateManager = $certificateManager;
+    }
 
-	/**
-	 * Sets the default options to the client
-	 */
-	private function setDefaultOptions() {
-		if ($this->configured) {
-			return;
-		}
-		$this->configured = true;
-		// Either use user bundle or the system bundle if nothing is specified
-		if ($this->certificateManager->listCertificates() !== []) {
-			$this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath());
-		} else {
-			// If the instance is not yet setup we need to use the static path as
-			// $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate
-			// a view
-			if ($this->config->getSystemValue('installed', false)) {
-				$this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null));
-			} else {
-				$this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
-			}
-		}
+    /**
+     * Sets the default options to the client
+     */
+    private function setDefaultOptions() {
+        if ($this->configured) {
+            return;
+        }
+        $this->configured = true;
+        // Either use user bundle or the system bundle if nothing is specified
+        if ($this->certificateManager->listCertificates() !== []) {
+            $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath());
+        } else {
+            // If the instance is not yet setup we need to use the static path as
+            // $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate
+            // a view
+            if ($this->config->getSystemValue('installed', false)) {
+                $this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null));
+            } else {
+                $this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+            }
+        }
 
-		$this->client->setDefaultOption('headers/User-Agent', 'Nextcloud Server Crawler');
-		$proxyUri = $this->getProxyUri();
-		if ($proxyUri !== '') {
-			$this->client->setDefaultOption('proxy', $proxyUri);
-		}
-	}
+        $this->client->setDefaultOption('headers/User-Agent', 'Nextcloud Server Crawler');
+        $proxyUri = $this->getProxyUri();
+        if ($proxyUri !== '') {
+            $this->client->setDefaultOption('proxy', $proxyUri);
+        }
+    }
 
-	/**
-	 * Get the proxy URI
-	 *
-	 * @return string
-	 */
-	private function getProxyUri() {
-		$proxyHost = $this->config->getSystemValue('proxy', null);
-		$proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null);
-		$proxyUri = '';
+    /**
+     * Get the proxy URI
+     *
+     * @return string
+     */
+    private function getProxyUri() {
+        $proxyHost = $this->config->getSystemValue('proxy', null);
+        $proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null);
+        $proxyUri = '';
 
-		if ($proxyUserPwd !== null) {
-			$proxyUri .= $proxyUserPwd . '@';
-		}
-		if ($proxyHost !== null) {
-			$proxyUri .= $proxyHost;
-		}
+        if ($proxyUserPwd !== null) {
+            $proxyUri .= $proxyUserPwd . '@';
+        }
+        if ($proxyHost !== null) {
+            $proxyUri .= $proxyHost;
+        }
 
-		return $proxyUri;
-	}
+        return $proxyUri;
+    }
 
-	/**
-	 * Sends a GET request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'query' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function get($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->get($uri, $options);
-		$isStream = isset($options['stream']) && $options['stream'];
-		return new Response($response, $isStream);
-	}
+    /**
+     * Sends a GET request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'query' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function get($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->get($uri, $options);
+        $isStream = isset($options['stream']) && $options['stream'];
+        return new Response($response, $isStream);
+    }
 
-	/**
-	 * Sends a HEAD request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function head($uri, $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->head($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a HEAD request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function head($uri, $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->head($uri, $options);
+        return new Response($response);
+    }
 
-	/**
-	 * Sends a POST request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function post($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->post($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a POST request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function post($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->post($uri, $options);
+        return new Response($response);
+    }
 
-	/**
-	 * Sends a PUT request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function put($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->put($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a PUT request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function put($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->put($uri, $options);
+        return new Response($response);
+    }
 
-	/**
-	 * Sends a DELETE request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function delete($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->delete($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a DELETE request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function delete($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->delete($uri, $options);
+        return new Response($response);
+    }
 
 
-	/**
-	 * Sends a options request
-	 *
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 *              'timeout' => 5,
-	 * @return Response
-	 * @throws \Exception If the request could not get completed
-	 */
-	public function options($uri, array $options = []) {
-		$this->setDefaultOptions();
-		$response = $this->client->options($uri, $options);
-		return new Response($response);
-	}
+    /**
+     * Sends a options request
+     *
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     *              'timeout' => 5,
+     * @return Response
+     * @throws \Exception If the request could not get completed
+     */
+    public function options($uri, array $options = []) {
+        $this->setDefaultOptions();
+        $response = $this->client->options($uri, $options);
+        return new Response($response);
+    }
 }

lib/private/Http/Client/ClientService.php

Indentation +19 added lines, -19 removed lines

@@ -33,25 +33,25 @@
  * @package OC\Http
  */
 class ClientService implements IClientService {
-	/** @var IConfig */
-	private $config;
-	/** @var ICertificateManager */
-	private $certificateManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ICertificateManager */
+    private $certificateManager;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICertificateManager $certificateManager
-	 */
-	public function __construct(IConfig $config,
-								ICertificateManager $certificateManager) {
-		$this->config = $config;
-		$this->certificateManager = $certificateManager;
-	}
+    /**
+     * @param IConfig $config
+     * @param ICertificateManager $certificateManager
+     */
+    public function __construct(IConfig $config,
+                                ICertificateManager $certificateManager) {
+        $this->config = $config;
+        $this->certificateManager = $certificateManager;
+    }
 
-	/**
-	 * @return Client
-	 */
-	public function newClient() {
-		return new Client($this->config, $this->certificateManager, new GuzzleClient());
-	}
+    /**
+     * @return Client
+     */
+    public function newClient() {
+        return new Client($this->config, $this->certificateManager, new GuzzleClient());
+    }
 }

lib/private/Session/Session.php

Indentation +43 added lines, -43 removed lines

@@ -28,53 +28,53 @@
 
 abstract class Session implements \ArrayAccess, ISession {
 
-	/**
-	 * @var bool
-	 */
-	protected $sessionClosed = false;
+    /**
+     * @var bool
+     */
+    protected $sessionClosed = false;
 
-	/**
-	 * $name serves as a namespace for the session keys
-	 *
-	 * @param string $name
-	 */
-	abstract public function __construct($name);
+    /**
+     * $name serves as a namespace for the session keys
+     *
+     * @param string $name
+     */
+    abstract public function __construct($name);
 
-	/**
-	 * @param mixed $offset
-	 * @return bool
-	 */
-	public function offsetExists($offset) {
-		return $this->exists($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset) {
+        return $this->exists($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @return mixed
-	 */
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @param mixed $value
-	 */
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	/**
-	 * @param mixed $offset
-	 */
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 
-	/**
-	 * Close the session and release the lock
-	 */
-	public function close() {
-		$this->sessionClosed = true;
-	}
+    /**
+     * Close the session and release the lock
+     */
+    public function close() {
+        $this->sessionClosed = true;
+    }
 }