nextcloud / server

lib/public/Collaboration/AutoComplete/IManager.php

Indentation +12 added lines, -12 removed lines

@@ -30,17 +30,17 @@
  * @since 13.0.0
  */
 interface IManager {
-	/**
-	 * @param string $className – class name of the ISorter implementation
-	 * @since 13.0.0
-	 */
-	public function registerSorter($className);
+    /**
+     * @param string $className – class name of the ISorter implementation
+     * @since 13.0.0
+     */
+    public function registerSorter($className);
 
-	/**
-	 * @param array $sorters	list of sorter IDs, seperated by "|"
-	 * @param array $sortArray	array representation of OCP\Collaboration\Collaborators\ISearchResult
-	 * @param array $context	context info of the search, keys: itemType, itemId
-	 * @since 13.0.0
-	 */
-	public function runSorters(array $sorters, array &$sortArray, array $context);
+    /**
+     * @param array $sorters	list of sorter IDs, seperated by "|"
+     * @param array $sortArray	array representation of OCP\Collaboration\Collaborators\ISearchResult
+     * @param array $context	context info of the search, keys: itemType, itemId
+     * @since 13.0.0
+     */
+    public function runSorters(array $sorters, array &$sortArray, array $context);
 }

core/templates/layout.noscript.warning.php

Indentation +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 	<div id="nojavascript">
 		<div>
 			<?php print_unescaped(str_replace(
-					['{linkstart}', '{linkend}'],
-					['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
-					$l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
-				)); ?>
+                    ['{linkstart}', '{linkend}'],
+                    ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
+                    $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
+                )); ?>
 		</div>
 	</div>
 </noscript>

lib/public/Collaboration/AutoComplete/ISorter.php

Indentation +13 added lines, -13 removed lines

@@ -33,18 +33,18 @@
  */
 interface ISorter {
 
-	/**
-	 * @return string The ID of the sorter, e.g. commenters
-	 * @since 13.0.0
-	 */
-	public function getId();
+    /**
+     * @return string The ID of the sorter, e.g. commenters
+     * @since 13.0.0
+     */
+    public function getId();
 
-	/**
-	 * executes the sort action
-	 *
-	 * @param array $sortArray the array to be sorted, provided as reference
-	 * @param array $context carries key 'itemType' and 'itemId' of the source object (e.g. a file)
-	 * @since 13.0.0
-	 */
-	public function sort(array &$sortArray, array $context);
+    /**
+     * executes the sort action
+     *
+     * @param array $sortArray the array to be sorted, provided as reference
+     * @param array $context carries key 'itemType' and 'itemId' of the source object (e.g. a file)
+     * @since 13.0.0
+     */
+    public function sort(array &$sortArray, array $context);
 }

lib/private/Files/Mount/CacheMountProvider.php

Indentation +35 added lines, -35 removed lines

@@ -31,42 +31,42 @@
  * Mount provider for custom cache storages
  */
 class CacheMountProvider implements IMountProvider {
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * ObjectStoreHomeMountProvider constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * ObjectStoreHomeMountProvider constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Get the cache mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$cacheBaseDir = $this->config->getSystemValue('cache_path', '');
-		if ($cacheBaseDir !== '') {
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
-			if (!file_exists($cacheDir)) {
-				mkdir($cacheDir, 0770, true);
-				mkdir($cacheDir . '/uploads', 0770, true);
-			}
+    /**
+     * Get the cache mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $cacheBaseDir = $this->config->getSystemValue('cache_path', '');
+        if ($cacheBaseDir !== '') {
+            $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
+            if (!file_exists($cacheDir)) {
+                mkdir($cacheDir, 0770, true);
+                mkdir($cacheDir . '/uploads', 0770, true);
+            }
 
-			return [
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]),
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader])
-			];
-		} else {
-			return [];
-		}
-	}
+            return [
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]),
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader])
+            ];
+        } else {
+            return [];
+        }
+    }
 }

core/Migrations/Version13000Date20170926101637.php

Indentation +27 added lines, -27 removed lines

@@ -11,32 +11,32 @@
  */
 class Version13000Date20170926101637 extends BigIntMigration {
 
-	/**
-	 * @return array Returns an array with the following structure
-	 * ['table1' => ['column1', 'column2'], ...]
-	 * @since 13.0.0
-	 */
-	protected function getColumnsByTable() {
-		return [
-			'admin_settings' => ['id'],
-			'authtoken' => ['id'],
-			'bruteforce_attempts' => ['id'],
-			'comments' => ['id', 'parent_id', 'topmost_parent_id'],
-			// Disabled for now 'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart'],
-			'file_locks' => ['id'],
-			'jobs' => ['id'],
-			// Disabled for now 'mimetypes' => ['id'],
-			'mounts' => ['id'],
-			'personal_settings' => ['id'],
-			'properties' => ['id'],
-			'share' => ['id', 'parent', 'file_source'],
-			// Disabled for now 'storages' => ['numeric_id'],
-			'systemtag' => ['id'],
-			'systemtag_group' => ['systemtagid'],
-			'systemtag_object_mapping' => ['systemtagid'],
-			'vcategory' => ['id'],
-			'vcategory_to_object' => ['objid', 'categoryid'],
-		];
-	}
+    /**
+     * @return array Returns an array with the following structure
+     * ['table1' => ['column1', 'column2'], ...]
+     * @since 13.0.0
+     */
+    protected function getColumnsByTable() {
+        return [
+            'admin_settings' => ['id'],
+            'authtoken' => ['id'],
+            'bruteforce_attempts' => ['id'],
+            'comments' => ['id', 'parent_id', 'topmost_parent_id'],
+            // Disabled for now 'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart'],
+            'file_locks' => ['id'],
+            'jobs' => ['id'],
+            // Disabled for now 'mimetypes' => ['id'],
+            'mounts' => ['id'],
+            'personal_settings' => ['id'],
+            'properties' => ['id'],
+            'share' => ['id', 'parent', 'file_source'],
+            // Disabled for now 'storages' => ['numeric_id'],
+            'systemtag' => ['id'],
+            'systemtag_group' => ['systemtagid'],
+            'systemtag_object_mapping' => ['systemtagid'],
+            'vcategory' => ['id'],
+            'vcategory_to_object' => ['objid', 'categoryid'],
+        ];
+    }
 
 }

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