nextcloud / server

lib/private/AppFramework/Middleware/Security/Exceptions/LaxSameSiteCookieFailedException.php

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class LaxSameSiteCookieFailedException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

apps/dav/lib/CardDAV/ContactsManager.php

Indentation +50 added lines, -50 removed lines

@@ -29,60 +29,60 @@
 use OCP\IURLGenerator;
 
 class ContactsManager {
-	/** @var CardDavBackend  */
-	private $backend;
+    /** @var CardDavBackend  */
+    private $backend;
 
-	/** @var IL10N  */
-	private $l10n;
+    /** @var IL10N  */
+    private $l10n;
 
-	/**
-	 * ContactsManager constructor.
-	 *
-	 * @param CardDavBackend $backend
-	 * @param IL10N $l10n
-	 */
-	public function __construct(CardDavBackend $backend, IL10N $l10n) {
-		$this->backend = $backend;
-		$this->l10n = $l10n;
-	}
+    /**
+     * ContactsManager constructor.
+     *
+     * @param CardDavBackend $backend
+     * @param IL10N $l10n
+     */
+    public function __construct(CardDavBackend $backend, IL10N $l10n) {
+        $this->backend = $backend;
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param string $userId
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
-		$addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
-		$this->register($cm, $addressBooks, $urlGenerator);
-		$this->setupSystemContactsProvider($cm, $urlGenerator);
-	}
+    /**
+     * @param IManager $cm
+     * @param string $userId
+     * @param IURLGenerator $urlGenerator
+     */
+    public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
+        $addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
+        $this->register($cm, $addressBooks, $urlGenerator);
+        $this->setupSystemContactsProvider($cm, $urlGenerator);
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
-		$addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
-		$this->register($cm, $addressBooks, $urlGenerator);
-	}
+    /**
+     * @param IManager $cm
+     * @param IURLGenerator $urlGenerator
+     */
+    public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
+        $addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
+        $this->register($cm, $addressBooks, $urlGenerator);
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param $addressBooks
-	 * @param IURLGenerator $urlGenerator
-	 */
-	private function register(IManager $cm, $addressBooks, $urlGenerator) {
-		foreach ($addressBooks as $addressBookInfo) {
-			$addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n);
-			$cm->registerAddressBook(
-				new AddressBookImpl(
-					$addressBook,
-					$addressBookInfo,
-					$this->backend,
-					$urlGenerator
-				)
-			);
-		}
-	}
+    /**
+     * @param IManager $cm
+     * @param $addressBooks
+     * @param IURLGenerator $urlGenerator
+     */
+    private function register(IManager $cm, $addressBooks, $urlGenerator) {
+        foreach ($addressBooks as $addressBookInfo) {
+            $addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n);
+            $cm->registerAddressBook(
+                new AddressBookImpl(
+                    $addressBook,
+                    $addressBookInfo,
+                    $this->backend,
+                    $urlGenerator
+                )
+            );
+        }
+    }
 
 }

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php

Indentation +10 added lines, -10 removed lines

@@ -11,15 +11,15 @@
  */
 class Version1002Date20170926101419 extends BigIntMigration {
 
-	/**
-	 * @return array Returns an array with the following structure
-	 * ['table1' => ['column1', 'column2'], ...]
-	 * @since 13.0.0
-	 */
-	protected function getColumnsByTable() {
-		return [
-			'twofactor_backupcodes' => ['id'],
-		];
-	}
+    /**
+     * @return array Returns an array with the following structure
+     * ['table1' => ['column1', 'column2'], ...]
+     * @since 13.0.0
+     */
+    protected function getColumnsByTable() {
+        return [
+            'twofactor_backupcodes' => ['id'],
+        ];
+    }
 
 }

apps/dav/lib/Migration/Version1004Date20170926103422.php

Indentation +20 added lines, -20 removed lines

@@ -11,25 +11,25 @@
  */
 class Version1004Date20170926103422 extends BigIntMigration {
 
-	/**
-	 * @return array Returns an array with the following structure
-	 * ['table1' => ['column1', 'column2'], ...]
-	 * @since 13.0.0
-	 */
-	protected function getColumnsByTable() {
-		return [
-			'addressbooks' => ['id'],
-			'addressbookchanges' => ['id', 'addressbookid'],
-			'calendars' => ['id'],
-			'calendarchanges' => ['id', 'calendarid'],
-			'calendarobjects' => ['id', 'calendarid'],
-			'calendarobjects_props' => ['id', 'calendarid', 'objectid'],
-			'calendarsubscriptions' => ['id'],
-			'cards' => ['id', 'addressbookid'],
-			'cards_properties' => ['id', 'addressbookid', 'cardid'],
-			'dav_shares' => ['id', 'resourceid'],
-			'schedulingobjects' => ['id'],
-		];
-	}
+    /**
+     * @return array Returns an array with the following structure
+     * ['table1' => ['column1', 'column2'], ...]
+     * @since 13.0.0
+     */
+    protected function getColumnsByTable() {
+        return [
+            'addressbooks' => ['id'],
+            'addressbookchanges' => ['id', 'addressbookid'],
+            'calendars' => ['id'],
+            'calendarchanges' => ['id', 'calendarid'],
+            'calendarobjects' => ['id', 'calendarid'],
+            'calendarobjects_props' => ['id', 'calendarid', 'objectid'],
+            'calendarsubscriptions' => ['id'],
+            'cards' => ['id', 'addressbookid'],
+            'cards_properties' => ['id', 'addressbookid', 'cardid'],
+            'dav_shares' => ['id', 'resourceid'],
+            'schedulingobjects' => ['id'],
+        ];
+    }
 
 }

lib/private/Remote/Credentials.php

Indentation +24 added lines, -24 removed lines

@@ -25,31 +25,31 @@
 use OCP\Remote\ICredentials;
 
 class Credentials implements ICredentials {
-	/** @var string */
-	private $user;
-	/** @var string */
-	private $password;
+    /** @var string */
+    private $user;
+    /** @var string */
+    private $password;
 
-	/**
-	 * @param string $user
-	 * @param string $password
-	 */
-	public function __construct($user, $password) {
-		$this->user = $user;
-		$this->password = $password;
-	}
+    /**
+     * @param string $user
+     * @param string $password
+     */
+    public function __construct($user, $password) {
+        $this->user = $user;
+        $this->password = $password;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getUsername() {
-		return $this->user;
-	}
+    /**
+     * @return string
+     */
+    public function getUsername() {
+        return $this->user;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
+    /**
+     * @return string
+     */
+    public function getPassword() {
+        return $this->password;
+    }
 }

lib/private/Remote/Instance.php

Indentation +103 added lines, -103 removed lines

@@ -30,118 +30,118 @@
  * Provides some basic info about a remote Nextcloud instance
  */
 class Instance implements IInstance {
-	/** @var string */
-	private $url;
+    /** @var string */
+    private $url;
 
-	/** @var ICache */
-	private $cache;
+    /** @var ICache */
+    private $cache;
 
-	/** @var IClientService */
-	private $clientService;
+    /** @var IClientService */
+    private $clientService;
 
-	/** @var array|null */
-	private $status;
+    /** @var array|null */
+    private $status;
 
-	/**
-	 * @param string $url
-	 * @param ICache $cache
-	 * @param IClientService $clientService
-	 */
-	public function __construct($url, ICache $cache, IClientService $clientService) {
-		$url = str_replace('https://', '', $url);
-		$this->url = str_replace('http://', '', $url);
-		$this->cache = $cache;
-		$this->clientService = $clientService;
-	}
+    /**
+     * @param string $url
+     * @param ICache $cache
+     * @param IClientService $clientService
+     */
+    public function __construct($url, ICache $cache, IClientService $clientService) {
+        $url = str_replace('https://', '', $url);
+        $this->url = str_replace('http://', '', $url);
+        $this->cache = $cache;
+        $this->clientService = $clientService;
+    }
 
-	/**
-	 * @return string The url of the remote server without protocol
-	 */
-	public function getUrl() {
-		return $this->url;
-	}
+    /**
+     * @return string The url of the remote server without protocol
+     */
+    public function getUrl() {
+        return $this->url;
+    }
 
-	/**
-	 * @return string The of of the remote server with protocol
-	 */
-	public function getFullUrl() {
-		return $this->getProtocol() . '://' . $this->getUrl();
-	}
+    /**
+     * @return string The of of the remote server with protocol
+     */
+    public function getFullUrl() {
+        return $this->getProtocol() . '://' . $this->getUrl();
+    }
 
-	/**
-	 * @return string The full version string in '13.1.2.3' format
-	 */
-	public function getVersion() {
-		$status = $this->getStatus();
-		return $status['version'];
-	}
+    /**
+     * @return string The full version string in '13.1.2.3' format
+     */
+    public function getVersion() {
+        $status = $this->getStatus();
+        return $status['version'];
+    }
 
-	/**
-	 * @return string 'http' or 'https'
-	 */
-	public function getProtocol() {
-		$status = $this->getStatus();
-		return $status['protocol'];
-	}
+    /**
+     * @return string 'http' or 'https'
+     */
+    public function getProtocol() {
+        $status = $this->getStatus();
+        return $status['protocol'];
+    }
 
-	/**
-	 * Check that the remote server is installed and not in maintenance mode
-	 *
-	 * @return bool
-	 */
-	public function isActive() {
-		$status = $this->getStatus();
-		return $status['installed'] && !$status['maintenance'];
-	}
+    /**
+     * Check that the remote server is installed and not in maintenance mode
+     *
+     * @return bool
+     */
+    public function isActive() {
+        $status = $this->getStatus();
+        return $status['installed'] && !$status['maintenance'];
+    }
 
-	/**
-	 * @return array
-	 * @throws NotFoundException
-	 * @throws \Exception
-	 */
-	private function getStatus() {
-		if ($this->status) {
-			return $this->status;
-		}
-		$key = 'remote/' . $this->url . '/status';
-		$httpsKey = 'remote/' . $this->url . '/https';
-		$status = $this->cache->get($key);
-		if (!$status) {
-			$response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
-			$protocol = 'https';
-			if (!$response) {
-				if ($status = $this->cache->get($httpsKey)) {
-					throw new \Exception('refusing to connect to remote instance(' . $this->url . ') over http that was previously accessible over https');
-				}
-				$response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
-				$protocol = 'http';
-			} else {
-				$this->cache->set($httpsKey, true, 60 * 60 * 24 * 365);
-			}
-			$status = json_decode($response, true);
-			if ($status) {
-				$status['protocol'] = $protocol;
-			}
-			if ($status) {
-				$this->cache->set($key, $status, 5 * 60);
-				$this->status = $status;
-			} else {
-				throw new NotFoundException('Remote server not found at address ' . $this->url);
-			}
-		}
-		return $status;
-	}
+    /**
+     * @return array
+     * @throws NotFoundException
+     * @throws \Exception
+     */
+    private function getStatus() {
+        if ($this->status) {
+            return $this->status;
+        }
+        $key = 'remote/' . $this->url . '/status';
+        $httpsKey = 'remote/' . $this->url . '/https';
+        $status = $this->cache->get($key);
+        if (!$status) {
+            $response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
+            $protocol = 'https';
+            if (!$response) {
+                if ($status = $this->cache->get($httpsKey)) {
+                    throw new \Exception('refusing to connect to remote instance(' . $this->url . ') over http that was previously accessible over https');
+                }
+                $response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
+                $protocol = 'http';
+            } else {
+                $this->cache->set($httpsKey, true, 60 * 60 * 24 * 365);
+            }
+            $status = json_decode($response, true);
+            if ($status) {
+                $status['protocol'] = $protocol;
+            }
+            if ($status) {
+                $this->cache->set($key, $status, 5 * 60);
+                $this->status = $status;
+            } else {
+                throw new NotFoundException('Remote server not found at address ' . $this->url);
+            }
+        }
+        return $status;
+    }
 
-	/**
-	 * @param string $url
-	 * @return bool|string
-	 */
-	private function downloadStatus($url) {
-		try {
-			$request = $this->clientService->newClient()->get($url);
-			return $request->getBody();
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
+    /**
+     * @param string $url
+     * @return bool|string
+     */
+    private function downloadStatus($url) {
+        try {
+            $request = $this->clientService->newClient()->get($url);
+            return $request->getBody();
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 }

lib/private/Remote/Api/ApiFactory.php

Indentation +8 added lines, -8 removed lines

@@ -28,14 +28,14 @@
 use OCP\Remote\IInstance;
 
 class ApiFactory implements IApiFactory {
-	/** @var IClientService */
-	private $clientService;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(IClientService $clientService) {
-		$this->clientService = $clientService;
-	}
+    public function __construct(IClientService $clientService) {
+        $this->clientService = $clientService;
+    }
 
-	public function getApiCollection(IInstance $instance, ICredentials $credentials) {
-		return new ApiCollection($instance, $credentials, $this->clientService);
-	}
+    public function getApiCollection(IInstance $instance, ICredentials $credentials) {
+        return new ApiCollection($instance, $credentials, $this->clientService);
+    }
 }

lib/private/Remote/Api/ApiCollection.php

Indentation +17 added lines, -17 removed lines

@@ -28,24 +28,24 @@
 use OCP\Remote\IInstance;
 
 class ApiCollection implements IApiCollection {
-	/** @var IInstance */
-	private $instance;
-	/** @var ICredentials */
-	private $credentials;
-	/** @var IClientService */
-	private $clientService;
+    /** @var IInstance */
+    private $instance;
+    /** @var ICredentials */
+    private $credentials;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
-		$this->instance = $instance;
-		$this->credentials = $credentials;
-		$this->clientService = $clientService;
-	}
+    public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
+        $this->instance = $instance;
+        $this->credentials = $credentials;
+        $this->clientService = $clientService;
+    }
 
-	public function getCapabilitiesApi() {
-		return new OCS($this->instance, $this->credentials, $this->clientService);
-	}
+    public function getCapabilitiesApi() {
+        return new OCS($this->instance, $this->credentials, $this->clientService);
+    }
 
-	public function getUserApi() {
-		return new OCS($this->instance, $this->credentials, $this->clientService);
-	}
+    public function getUserApi() {
+        return new OCS($this->instance, $this->credentials, $this->clientService);
+    }
 }

lib/private/Remote/Api/ApiBase.php

Indentation +61 added lines, -61 removed lines

@@ -26,72 +26,72 @@
 use OCP\Remote\IInstance;
 
 class ApiBase {
-	/** @var IInstance */
-	private $instance;
-	/** @var ICredentials */
-	private $credentials;
-	/** @var IClientService */
-	private $clientService;
+    /** @var IInstance */
+    private $instance;
+    /** @var ICredentials */
+    private $credentials;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
-		$this->instance = $instance;
-		$this->credentials = $credentials;
-		$this->clientService = $clientService;
-	}
+    public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
+        $this->instance = $instance;
+        $this->credentials = $credentials;
+        $this->clientService = $clientService;
+    }
 
-	protected function getHttpClient() {
-		return $this->clientService->newClient();
-	}
+    protected function getHttpClient() {
+        return $this->clientService->newClient();
+    }
 
-	protected function addDefaultHeaders(array $headers) {
-		return array_merge([
-			'OCS-APIREQUEST' => 'true',
-			'Accept' => 'application/json'
-		], $headers);
-	}
+    protected function addDefaultHeaders(array $headers) {
+        return array_merge([
+            'OCS-APIREQUEST' => 'true',
+            'Accept' => 'application/json'
+        ], $headers);
+    }
 
-	/**
-	 * @param string $method
-	 * @param string $url
-	 * @param array $body
-	 * @param array $query
-	 * @param array $headers
-	 * @return resource|string
-	 * @throws \InvalidArgumentException
-	 */
-	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
-		$fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;
-		$options = [
-			'query' => $query,
-			'headers' => $this->addDefaultHeaders($headers),
-			'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()]
-		];
-		if ($body) {
-			$options['body'] = $body;
-		}
+    /**
+     * @param string $method
+     * @param string $url
+     * @param array $body
+     * @param array $query
+     * @param array $headers
+     * @return resource|string
+     * @throws \InvalidArgumentException
+     */
+    protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
+        $fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;
+        $options = [
+            'query' => $query,
+            'headers' => $this->addDefaultHeaders($headers),
+            'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()]
+        ];
+        if ($body) {
+            $options['body'] = $body;
+        }
 
-		$client = $this->getHttpClient();
+        $client = $this->getHttpClient();
 
-		switch ($method) {
-			case 'get':
-				$response = $client->get($fullUrl, $options);
-				break;
-			case 'post':
-				$response = $client->post($fullUrl, $options);
-				break;
-			case 'put':
-				$response = $client->put($fullUrl, $options);
-				break;
-			case 'delete':
-				$response = $client->delete($fullUrl, $options);
-				break;
-			case 'options':
-				$response = $client->options($fullUrl, $options);
-				break;
-			default:
-				throw new \InvalidArgumentException('Invalid method ' . $method);
-		}
+        switch ($method) {
+            case 'get':
+                $response = $client->get($fullUrl, $options);
+                break;
+            case 'post':
+                $response = $client->post($fullUrl, $options);
+                break;
+            case 'put':
+                $response = $client->put($fullUrl, $options);
+                break;
+            case 'delete':
+                $response = $client->delete($fullUrl, $options);
+                break;
+            case 'options':
+                $response = $client->options($fullUrl, $options);
+                break;
+            default:
+                throw new \InvalidArgumentException('Invalid method ' . $method);
+        }
 
-		return $response->getBody();
-	}
+        return $response->getBody();
+    }
 }