nextcloud / server

apps/systemtags/lib/Controller/LastUsedController.php

Indentation +23 added lines, -23 removed lines

@@ -31,30 +31,30 @@
 
 class LastUsedController extends Controller {
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var IUserSession */
-	protected $userSession;
+    /** @var IUserSession */
+    protected $userSession;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 */
-	public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->userSession = $userSession;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     */
+    public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 */
-	public function getLastUsedTagIds() {
-		$lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
-		$tagIds = json_decode($lastUsed, true);
-		return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds));
-	}
+    /**
+     * @NoAdminRequired
+     */
+    public function getLastUsedTagIds() {
+        $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
+        $tagIds = json_decode($lastUsed, true);
+        return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds));
+    }
 }

apps/dav/lib/CardDAV/SyncService.php

Indentation +298 added lines, -298 removed lines

@@ -42,304 +42,304 @@
 
 class SyncService {
 
-	/** @var CardDavBackend */
-	private $backend;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var array */
-	private $localSystemAddressBook;
-
-	/** @var AccountManager */
-	private $accountManager;
-
-	/** @var string */
-	protected $certPath;
-
-	/**
-	 * SyncService constructor.
-	 *
-	 * @param CardDavBackend $backend
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param AccountManager $accountManager
-	 */
-	public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger, AccountManager $accountManager) {
-		$this->backend = $backend;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->accountManager = $accountManager;
-		$this->certPath = '';
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @param int $targetBookId
-	 * @param string $targetPrincipal
-	 * @param array $targetProperties
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function syncRemoteAddressBook($url, $userName, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
-		// 1. create addressbook
-		$book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetProperties);
-		$addressBookId = $book['id'];
-
-		// 2. query changes
-		try {
-			$response = $this->requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken);
-		} catch (ClientHttpException $ex) {
-			if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
-				// remote server revoked access to the address book, remove it
-				$this->backend->deleteAddressBook($addressBookId);
-				$this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
-				throw $ex;
-			}
-		}
-
-		// 3. apply changes
-		// TODO: use multi-get for download
-		foreach ($response['response'] as $resource => $status) {
-			$cardUri = basename($resource);
-			if (isset($status[200])) {
-				$vCard = $this->download($url, $userName, $sharedSecret, $resource);
-				$existingCard = $this->backend->getCard($addressBookId, $cardUri);
-				if ($existingCard === false) {
-					$this->backend->createCard($addressBookId, $cardUri, $vCard['body']);
-				} else {
-					$this->backend->updateCard($addressBookId, $cardUri, $vCard['body']);
-				}
-			} else {
-				$this->backend->deleteCard($addressBookId, $cardUri);
-			}
-		}
-
-		return $response['token'];
-	}
-
-	/**
-	 * @param string $principal
-	 * @param string $id
-	 * @param array $properties
-	 * @return array|null
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function ensureSystemAddressBookExists($principal, $id, $properties) {
-		$book = $this->backend->getAddressBooksByUri($principal, $id);
-		if (!is_null($book)) {
-			return $book;
-		}
-		$this->backend->createAddressBook($principal, $id, $properties);
-
-		return $this->backend->getAddressBooksByUri($principal, $id);
-	}
-
-	/**
-	 * Check if there is a valid certPath we should use
-	 *
-	 * @return string
-	 */
-	protected function getCertPath() {
-
-		// we already have a valid certPath
-		if ($this->certPath !== '') {
-			return $this->certPath;
-		}
-
-		/** @var ICertificateManager $certManager */
-		$certManager = \OC::$server->getCertificateManager(null);
-		$certPath = $certManager->getAbsoluteBundlePath();
-		if (file_exists($certPath)) {
-			$this->certPath = $certPath;
-		}
-
-		return $this->certPath;
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @return Client
-	 */
-	protected function getClient($url, $userName, $sharedSecret) {
-		$settings = [
-			'baseUri' => $url . '/',
-			'userName' => $userName,
-			'password' => $sharedSecret,
-		];
-		$client = new Client($settings);
-		$certPath = $this->getCertPath();
-		$client->setThrowExceptions(true);
-
-		if ($certPath !== '' && strpos($url, 'http://') !== 0) {
-			$client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
-		}
-
-		return $client;
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @return array
-	 */
-	 protected function requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken) {
-		 $client = $this->getClient($url, $userName, $sharedSecret);
-
-		 $body = $this->buildSyncCollectionRequestBody($syncToken);
-
-		 $response = $client->request('REPORT', $addressBookUrl, $body, [
-		 	'Content-Type' => 'application/xml'
-		 ]);
-
-		 return $this->parseMultiStatus($response['body']);
-	 }
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $sharedSecret
-	 * @param string $resourcePath
-	 * @return array
-	 */
-	protected function download($url, $userName, $sharedSecret, $resourcePath) {
-		$client = $this->getClient($url, $userName, $sharedSecret);
-		return $client->request('GET', $resourcePath);
-	}
-
-	/**
-	 * @param string|null $syncToken
-	 * @return string
-	 */
-	private function buildSyncCollectionRequestBody($syncToken) {
-
-		$dom = new \DOMDocument('1.0', 'UTF-8');
-		$dom->formatOutput = true;
-		$root = $dom->createElementNS('DAV:', 'd:sync-collection');
-		$sync = $dom->createElement('d:sync-token', $syncToken);
-		$prop = $dom->createElement('d:prop');
-		$cont = $dom->createElement('d:getcontenttype');
-		$etag = $dom->createElement('d:getetag');
-
-		$prop->appendChild($cont);
-		$prop->appendChild($etag);
-		$root->appendChild($sync);
-		$root->appendChild($prop);
-		$dom->appendChild($root);
-		return $dom->saveXML();
-	}
-
-	/**
-	 * @param string $body
-	 * @return array
-	 * @throws \Sabre\Xml\ParseException
-	 */
-	private function parseMultiStatus($body) {
-		$xml = new Service();
-
-		/** @var MultiStatus $multiStatus */
-		$multiStatus = $xml->expect('{DAV:}multistatus', $body);
-
-		$result = [];
-		foreach ($multiStatus->getResponses() as $response) {
-			$result[$response->getHref()] = $response->getResponseProperties();
-		}
-
-		return ['response' => $result, 'token' => $multiStatus->getSyncToken()];
-	}
-
-	/**
-	 * @param IUser $user
-	 */
-	public function updateUser(IUser $user) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$addressBookId = $systemAddressBook['id'];
-		$converter = new Converter($this->accountManager);
-		$name = $user->getBackendClassName();
-		$userId = $user->getUID();
-
-		$cardId = "$name:$userId.vcf";
-		$card = $this->backend->getCard($addressBookId, $cardId);
-		if ($user->isEnabled()) {
-			if ($card === false) {
-				$vCard = $converter->createCardFromUser($user);
-				if ($vCard !== null) {
-					$this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
-				}
-			} else {
-				$vCard = $converter->createCardFromUser($user);
-				if (is_null($vCard)) {
-					$this->backend->deleteCard($addressBookId, $cardId);
-				} else {
-					$this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
-				}
-			}
-		} else {
-			$this->backend->deleteCard($addressBookId, $cardId);
-		}
-	}
-
-	/**
-	 * @param IUser|string $userOrCardId
-	 */
-	public function deleteUser($userOrCardId) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		if ($userOrCardId instanceof IUser){
-			$name = $userOrCardId->getBackendClassName();
-			$userId = $userOrCardId->getUID();
-
-			$userOrCardId = "$name:$userId.vcf";
-		}
-		$this->backend->deleteCard($systemAddressBook['id'], $userOrCardId);
-	}
-
-	/**
-	 * @return array|null
-	 */
-	public function getLocalSystemAddressBook() {
-		if (is_null($this->localSystemAddressBook)) {
-			$systemPrincipal = "principals/system/system";
-			$this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
-			]);
-		}
-
-		return $this->localSystemAddressBook;
-	}
-
-	public function syncInstance(\Closure $progressCallback = null) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$this->userManager->callForSeenUsers(function($user) use ($systemAddressBook, $progressCallback) {
-			$this->updateUser($user);
-			if (!is_null($progressCallback)) {
-				$progressCallback();
-			}
-		});
-
-		// remove no longer existing
-		$allCards = $this->backend->getCards($systemAddressBook['id']);
-		foreach($allCards as $card) {
-			$vCard = Reader::read($card['carddata']);
-			$uid = $vCard->UID->getValue();
-			// load backend and see if user exists
-			if (!$this->userManager->userExists($uid)) {
-				$this->deleteUser($card['uri']);
-			}
-		}
-	}
+    /** @var CardDavBackend */
+    private $backend;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var array */
+    private $localSystemAddressBook;
+
+    /** @var AccountManager */
+    private $accountManager;
+
+    /** @var string */
+    protected $certPath;
+
+    /**
+     * SyncService constructor.
+     *
+     * @param CardDavBackend $backend
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param AccountManager $accountManager
+     */
+    public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger, AccountManager $accountManager) {
+        $this->backend = $backend;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->accountManager = $accountManager;
+        $this->certPath = '';
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @param int $targetBookId
+     * @param string $targetPrincipal
+     * @param array $targetProperties
+     * @return string
+     * @throws \Exception
+     */
+    public function syncRemoteAddressBook($url, $userName, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
+        // 1. create addressbook
+        $book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetProperties);
+        $addressBookId = $book['id'];
+
+        // 2. query changes
+        try {
+            $response = $this->requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken);
+        } catch (ClientHttpException $ex) {
+            if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
+                // remote server revoked access to the address book, remove it
+                $this->backend->deleteAddressBook($addressBookId);
+                $this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+                throw $ex;
+            }
+        }
+
+        // 3. apply changes
+        // TODO: use multi-get for download
+        foreach ($response['response'] as $resource => $status) {
+            $cardUri = basename($resource);
+            if (isset($status[200])) {
+                $vCard = $this->download($url, $userName, $sharedSecret, $resource);
+                $existingCard = $this->backend->getCard($addressBookId, $cardUri);
+                if ($existingCard === false) {
+                    $this->backend->createCard($addressBookId, $cardUri, $vCard['body']);
+                } else {
+                    $this->backend->updateCard($addressBookId, $cardUri, $vCard['body']);
+                }
+            } else {
+                $this->backend->deleteCard($addressBookId, $cardUri);
+            }
+        }
+
+        return $response['token'];
+    }
+
+    /**
+     * @param string $principal
+     * @param string $id
+     * @param array $properties
+     * @return array|null
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function ensureSystemAddressBookExists($principal, $id, $properties) {
+        $book = $this->backend->getAddressBooksByUri($principal, $id);
+        if (!is_null($book)) {
+            return $book;
+        }
+        $this->backend->createAddressBook($principal, $id, $properties);
+
+        return $this->backend->getAddressBooksByUri($principal, $id);
+    }
+
+    /**
+     * Check if there is a valid certPath we should use
+     *
+     * @return string
+     */
+    protected function getCertPath() {
+
+        // we already have a valid certPath
+        if ($this->certPath !== '') {
+            return $this->certPath;
+        }
+
+        /** @var ICertificateManager $certManager */
+        $certManager = \OC::$server->getCertificateManager(null);
+        $certPath = $certManager->getAbsoluteBundlePath();
+        if (file_exists($certPath)) {
+            $this->certPath = $certPath;
+        }
+
+        return $this->certPath;
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @return Client
+     */
+    protected function getClient($url, $userName, $sharedSecret) {
+        $settings = [
+            'baseUri' => $url . '/',
+            'userName' => $userName,
+            'password' => $sharedSecret,
+        ];
+        $client = new Client($settings);
+        $certPath = $this->getCertPath();
+        $client->setThrowExceptions(true);
+
+        if ($certPath !== '' && strpos($url, 'http://') !== 0) {
+            $client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
+        }
+
+        return $client;
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @return array
+     */
+        protected function requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken) {
+            $client = $this->getClient($url, $userName, $sharedSecret);
+
+            $body = $this->buildSyncCollectionRequestBody($syncToken);
+
+            $response = $client->request('REPORT', $addressBookUrl, $body, [
+                'Content-Type' => 'application/xml'
+            ]);
+
+            return $this->parseMultiStatus($response['body']);
+        }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $sharedSecret
+     * @param string $resourcePath
+     * @return array
+     */
+    protected function download($url, $userName, $sharedSecret, $resourcePath) {
+        $client = $this->getClient($url, $userName, $sharedSecret);
+        return $client->request('GET', $resourcePath);
+    }
+
+    /**
+     * @param string|null $syncToken
+     * @return string
+     */
+    private function buildSyncCollectionRequestBody($syncToken) {
+
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->formatOutput = true;
+        $root = $dom->createElementNS('DAV:', 'd:sync-collection');
+        $sync = $dom->createElement('d:sync-token', $syncToken);
+        $prop = $dom->createElement('d:prop');
+        $cont = $dom->createElement('d:getcontenttype');
+        $etag = $dom->createElement('d:getetag');
+
+        $prop->appendChild($cont);
+        $prop->appendChild($etag);
+        $root->appendChild($sync);
+        $root->appendChild($prop);
+        $dom->appendChild($root);
+        return $dom->saveXML();
+    }
+
+    /**
+     * @param string $body
+     * @return array
+     * @throws \Sabre\Xml\ParseException
+     */
+    private function parseMultiStatus($body) {
+        $xml = new Service();
+
+        /** @var MultiStatus $multiStatus */
+        $multiStatus = $xml->expect('{DAV:}multistatus', $body);
+
+        $result = [];
+        foreach ($multiStatus->getResponses() as $response) {
+            $result[$response->getHref()] = $response->getResponseProperties();
+        }
+
+        return ['response' => $result, 'token' => $multiStatus->getSyncToken()];
+    }
+
+    /**
+     * @param IUser $user
+     */
+    public function updateUser(IUser $user) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        $addressBookId = $systemAddressBook['id'];
+        $converter = new Converter($this->accountManager);
+        $name = $user->getBackendClassName();
+        $userId = $user->getUID();
+
+        $cardId = "$name:$userId.vcf";
+        $card = $this->backend->getCard($addressBookId, $cardId);
+        if ($user->isEnabled()) {
+            if ($card === false) {
+                $vCard = $converter->createCardFromUser($user);
+                if ($vCard !== null) {
+                    $this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
+                }
+            } else {
+                $vCard = $converter->createCardFromUser($user);
+                if (is_null($vCard)) {
+                    $this->backend->deleteCard($addressBookId, $cardId);
+                } else {
+                    $this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
+                }
+            }
+        } else {
+            $this->backend->deleteCard($addressBookId, $cardId);
+        }
+    }
+
+    /**
+     * @param IUser|string $userOrCardId
+     */
+    public function deleteUser($userOrCardId) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        if ($userOrCardId instanceof IUser){
+            $name = $userOrCardId->getBackendClassName();
+            $userId = $userOrCardId->getUID();
+
+            $userOrCardId = "$name:$userId.vcf";
+        }
+        $this->backend->deleteCard($systemAddressBook['id'], $userOrCardId);
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getLocalSystemAddressBook() {
+        if (is_null($this->localSystemAddressBook)) {
+            $systemPrincipal = "principals/system/system";
+            $this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
+                '{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
+            ]);
+        }
+
+        return $this->localSystemAddressBook;
+    }
+
+    public function syncInstance(\Closure $progressCallback = null) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        $this->userManager->callForSeenUsers(function($user) use ($systemAddressBook, $progressCallback) {
+            $this->updateUser($user);
+            if (!is_null($progressCallback)) {
+                $progressCallback();
+            }
+        });
+
+        // remove no longer existing
+        $allCards = $this->backend->getCards($systemAddressBook['id']);
+        foreach($allCards as $card) {
+            $vCard = Reader::read($card['carddata']);
+            $uid = $vCard->UID->getValue();
+            // load backend and see if user exists
+            if (!$this->userManager->userExists($uid)) {
+                $this->deleteUser($card['uri']);
+            }
+        }
+    }
 
 
 }

apps/user_ldap/lib/ConnectionFactory.php

Indentation +8 added lines, -8 removed lines

@@ -24,14 +24,14 @@
 namespace OCA\User_LDAP;
 
 class ConnectionFactory {
-	/** @var ILDAPWrapper */
-	private $ldap;
+    /** @var ILDAPWrapper */
+    private $ldap;
 
-	public function __construct(ILDAPWrapper $ldap) {
-		$this->ldap = $ldap;
-	}
+    public function __construct(ILDAPWrapper $ldap) {
+        $this->ldap = $ldap;
+    }
 
-	public function get($prefix) {
-		return new Connection($this->ldap, $prefix, 'user_ldap');
-	}
+    public function get($prefix) {
+        return new Connection($this->ldap, $prefix, 'user_ldap');
+    }
 }

apps/admin_audit/lib/Actions/Console.php

Indentation +15 added lines, -15 removed lines

@@ -29,21 +29,21 @@
 namespace OCA\AdminAudit\Actions;
 
 class Console extends Action {
-	/**
-	 * @param $arguments
-	 */
-	public function runCommand(array $arguments) {
-		if (!isset($arguments[1]) || $arguments[1] === '_completion') {
-			// Don't log autocompletion
-			return;
-		}
+    /**
+     * @param $arguments
+     */
+    public function runCommand(array $arguments) {
+        if (!isset($arguments[1]) || $arguments[1] === '_completion') {
+            // Don't log autocompletion
+            return;
+        }
 
-		// Remove `./occ`
-		array_shift($arguments);
+        // Remove `./occ`
+        array_shift($arguments);
 
-		$this->log('Console command executed: %s',
-			['arguments' => implode(' ', $arguments)],
-			['arguments']
-		);
-	}
+        $this->log('Console command executed: %s',
+            ['arguments' => implode(' ', $arguments)],
+            ['arguments']
+        );
+    }
 }

apps/files_trashbin/lib/Sabre/TrashFolderFile.php

Indentation +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@
 namespace OCA\Files_Trashbin\Sabre;
 
 class TrashFolderFile extends AbstractTrashFile {
-	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath(), 'rb');
-	}
+    public function get() {
+        return $this->data->getStorage()->fopen($this->data->getInternalPath(), 'rb');
+    }
 }

apps/files_trashbin/lib/Sabre/TrashFolder.php

Indentation +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@
 namespace OCA\Files_Trashbin\Sabre;
 
 class TrashFolder extends AbstractTrashFolder {
-	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
-	}
+    public function getName(): string {
+        return $this->data->getName() . '.d' . $this->getLastModified();
+    }
 }

lib/public/Files/Cache/ICache.php

Indentation +196 added lines, -196 removed lines

@@ -37,220 +37,220 @@
  * @since 9.0.0
  */
 interface ICache {
-	const NOT_FOUND = 0;
-	const PARTIAL = 1; //only partial data available, file not cached in the database
-	const SHALLOW = 2; //folder in cache, but not all child files are completely scanned
-	const COMPLETE = 3;
+    const NOT_FOUND = 0;
+    const PARTIAL = 1; //only partial data available, file not cached in the database
+    const SHALLOW = 2; //folder in cache, but not all child files are completely scanned
+    const COMPLETE = 3;
 
-	/**
-	 * Get the numeric storage id for this cache's storage
-	 *
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getNumericStorageId();
+    /**
+     * Get the numeric storage id for this cache's storage
+     *
+     * @return int
+     * @since 9.0.0
+     */
+    public function getNumericStorageId();
 
-	/**
-	 * get the stored metadata of a file or folder
-	 *
-	 * @param string | int $file either the path of a file or folder or the file id for a file or folder
-	 * @return ICacheEntry|false the cache entry or false if the file is not found in the cache
-	 * @since 9.0.0
-	 */
-	public function get($file);
+    /**
+     * get the stored metadata of a file or folder
+     *
+     * @param string | int $file either the path of a file or folder or the file id for a file or folder
+     * @return ICacheEntry|false the cache entry or false if the file is not found in the cache
+     * @since 9.0.0
+     */
+    public function get($file);
 
-	/**
-	 * get the metadata of all files stored in $folder
-	 *
-	 * Only returns files one level deep, no recursion
-	 *
-	 * @param string $folder
-	 * @return ICacheEntry[]
-	 * @since 9.0.0
-	 */
-	public function getFolderContents($folder);
+    /**
+     * get the metadata of all files stored in $folder
+     *
+     * Only returns files one level deep, no recursion
+     *
+     * @param string $folder
+     * @return ICacheEntry[]
+     * @since 9.0.0
+     */
+    public function getFolderContents($folder);
 
-	/**
-	 * get the metadata of all files stored in $folder
-	 *
-	 * Only returns files one level deep, no recursion
-	 *
-	 * @param int $fileId the file id of the folder
-	 * @return ICacheEntry[]
-	 * @since 9.0.0
-	 */
-	public function getFolderContentsById($fileId);
+    /**
+     * get the metadata of all files stored in $folder
+     *
+     * Only returns files one level deep, no recursion
+     *
+     * @param int $fileId the file id of the folder
+     * @return ICacheEntry[]
+     * @since 9.0.0
+     */
+    public function getFolderContentsById($fileId);
 
-	/**
-	 * store meta data for a file or folder
-	 * This will automatically call either insert or update depending on if the file exists
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 * @since 9.0.0
-	 */
-	public function put($file, array $data);
+    /**
+     * store meta data for a file or folder
+     * This will automatically call either insert or update depending on if the file exists
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     * @since 9.0.0
+     */
+    public function put($file, array $data);
 
-	/**
-	 * insert meta data for a new file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 * @since 9.0.0
-	 */
-	public function insert($file, array $data);
+    /**
+     * insert meta data for a new file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     * @since 9.0.0
+     */
+    public function insert($file, array $data);
 
-	/**
-	 * update the metadata of an existing file or folder in the cache
-	 *
-	 * @param int $id the fileid of the existing file or folder
-	 * @param array $data [$key => $value] the metadata to update, only the fields provided in the array will be updated, non-provided values will remain unchanged
-	 * @since 9.0.0
-	 */
-	public function update($id, array $data);
+    /**
+     * update the metadata of an existing file or folder in the cache
+     *
+     * @param int $id the fileid of the existing file or folder
+     * @param array $data [$key => $value] the metadata to update, only the fields provided in the array will be updated, non-provided values will remain unchanged
+     * @since 9.0.0
+     */
+    public function update($id, array $data);
 
-	/**
-	 * get the file id for a file
-	 *
-	 * A file id is a numeric id for a file or folder that's unique within an owncloud instance which stays the same for the lifetime of a file
-	 *
-	 * File ids are easiest way for apps to store references to a file since unlike paths they are not affected by renames or sharing
-	 *
-	 * @param string $file
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getId($file);
+    /**
+     * get the file id for a file
+     *
+     * A file id is a numeric id for a file or folder that's unique within an owncloud instance which stays the same for the lifetime of a file
+     *
+     * File ids are easiest way for apps to store references to a file since unlike paths they are not affected by renames or sharing
+     *
+     * @param string $file
+     * @return int
+     * @since 9.0.0
+     */
+    public function getId($file);
 
-	/**
-	 * get the id of the parent folder of a file
-	 *
-	 * @param string $file
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getParentId($file);
+    /**
+     * get the id of the parent folder of a file
+     *
+     * @param string $file
+     * @return int
+     * @since 9.0.0
+     */
+    public function getParentId($file);
 
-	/**
-	 * check if a file is available in the cache
-	 *
-	 * @param string $file
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function inCache($file);
+    /**
+     * check if a file is available in the cache
+     *
+     * @param string $file
+     * @return bool
+     * @since 9.0.0
+     */
+    public function inCache($file);
 
-	/**
-	 * remove a file or folder from the cache
-	 *
-	 * when removing a folder from the cache all files and folders inside the folder will be removed as well
-	 *
-	 * @param string $file
-	 * @since 9.0.0
-	 */
-	public function remove($file);
+    /**
+     * remove a file or folder from the cache
+     *
+     * when removing a folder from the cache all files and folders inside the folder will be removed as well
+     *
+     * @param string $file
+     * @since 9.0.0
+     */
+    public function remove($file);
 
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @since 9.0.0
-	 */
-	public function move($source, $target);
+    /**
+     * Move a file or folder in the cache
+     *
+     * @param string $source
+     * @param string $target
+     * @since 9.0.0
+     */
+    public function move($source, $target);
 
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * Note that this should make sure the entries are removed from the source cache
-	 *
-	 * @param \OCP\Files\Cache\ICache $sourceCache
-	 * @param string $sourcePath
-	 * @param string $targetPath
-	 * @throws \OC\DatabaseException
-	 * @since 9.0.0
-	 */
-	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath);
+    /**
+     * Move a file or folder in the cache
+     *
+     * Note that this should make sure the entries are removed from the source cache
+     *
+     * @param \OCP\Files\Cache\ICache $sourceCache
+     * @param string $sourcePath
+     * @param string $targetPath
+     * @throws \OC\DatabaseException
+     * @since 9.0.0
+     */
+    public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath);
 
-	/**
-	 * Get the scan status of a file
-	 *
-	 * - ICache::NOT_FOUND: File is not in the cache
-	 * - ICache::PARTIAL: File is not stored in the cache but some incomplete data is known
-	 * - ICache::SHALLOW: The folder and it's direct children are in the cache but not all sub folders are fully scanned
-	 * - ICache::COMPLETE: The file or folder, with all it's children) are fully scanned
-	 *
-	 * @param string $file
-	 *
-	 * @return int ICache::NOT_FOUND, ICache::PARTIAL, ICache::SHALLOW or ICache::COMPLETE
-	 * @since 9.0.0
-	 */
-	public function getStatus($file);
+    /**
+     * Get the scan status of a file
+     *
+     * - ICache::NOT_FOUND: File is not in the cache
+     * - ICache::PARTIAL: File is not stored in the cache but some incomplete data is known
+     * - ICache::SHALLOW: The folder and it's direct children are in the cache but not all sub folders are fully scanned
+     * - ICache::COMPLETE: The file or folder, with all it's children) are fully scanned
+     *
+     * @param string $file
+     *
+     * @return int ICache::NOT_FOUND, ICache::PARTIAL, ICache::SHALLOW or ICache::COMPLETE
+     * @since 9.0.0
+     */
+    public function getStatus($file);
 
-	/**
-	 * search for files matching $pattern, files are matched if their filename matches the search pattern
-	 *
-	 * @param string $pattern the search pattern using SQL search syntax (e.g. '%searchstring%')
-	 * @return ICacheEntry[] an array of cache entries where the name matches the search pattern
-	 * @since 9.0.0
-	 * @deprecated 9.0.0 due to lack of pagination, not all backends might implement this
-	 */
-	public function search($pattern);
+    /**
+     * search for files matching $pattern, files are matched if their filename matches the search pattern
+     *
+     * @param string $pattern the search pattern using SQL search syntax (e.g. '%searchstring%')
+     * @return ICacheEntry[] an array of cache entries where the name matches the search pattern
+     * @since 9.0.0
+     * @deprecated 9.0.0 due to lack of pagination, not all backends might implement this
+     */
+    public function search($pattern);
 
-	/**
-	 * search for files by mimetype
-	 *
-	 * @param string $mimetype either a full mimetype to search ('text/plain') or only the first part of a mimetype ('image')
-	 *        where it will search for all mimetypes in the group ('image/*')
-	 * @return ICacheEntry[] an array of cache entries where the mimetype matches the search
-	 * @since 9.0.0
-	 * @deprecated 9.0.0 due to lack of pagination, not all backends might implement this
-	 */
-	public function searchByMime($mimetype);
+    /**
+     * search for files by mimetype
+     *
+     * @param string $mimetype either a full mimetype to search ('text/plain') or only the first part of a mimetype ('image')
+     *        where it will search for all mimetypes in the group ('image/*')
+     * @return ICacheEntry[] an array of cache entries where the mimetype matches the search
+     * @since 9.0.0
+     * @deprecated 9.0.0 due to lack of pagination, not all backends might implement this
+     */
+    public function searchByMime($mimetype);
 
-	/**
-	 * Search for files with a flexible query
-	 *
-	 * @param ISearchQuery $query
-	 * @return ICacheEntry[]
-	 * @throw \InvalidArgumentException if the cache is unable to perform the query
-	 * @since 12.0.0
-	 */
-	public function searchQuery(ISearchQuery $query);
+    /**
+     * Search for files with a flexible query
+     *
+     * @param ISearchQuery $query
+     * @return ICacheEntry[]
+     * @throw \InvalidArgumentException if the cache is unable to perform the query
+     * @since 12.0.0
+     */
+    public function searchQuery(ISearchQuery $query);
 
-	/**
-	 * find a folder in the cache which has not been fully scanned
-	 *
-	 * If multiple incomplete folders are in the cache, the one with the highest id will be returned,
-	 * use the one with the highest id gives the best result with the background scanner, since that is most
-	 * likely the folder where we stopped scanning previously
-	 *
-	 * @return string|bool the path of the folder or false when no folder matched
-	 * @since 9.0.0
-	 */
-	public function getIncomplete();
+    /**
+     * find a folder in the cache which has not been fully scanned
+     *
+     * If multiple incomplete folders are in the cache, the one with the highest id will be returned,
+     * use the one with the highest id gives the best result with the background scanner, since that is most
+     * likely the folder where we stopped scanning previously
+     *
+     * @return string|bool the path of the folder or false when no folder matched
+     * @since 9.0.0
+     */
+    public function getIncomplete();
 
-	/**
-	 * get the path of a file on this storage by it's file id
-	 *
-	 * @param int $id the file id of the file or folder to search
-	 * @return string|null the path of the file (relative to the storage) or null if a file with the given id does not exists within this cache
-	 * @since 9.0.0
-	 */
-	public function getPathById($id);
+    /**
+     * get the path of a file on this storage by it's file id
+     *
+     * @param int $id the file id of the file or folder to search
+     * @return string|null the path of the file (relative to the storage) or null if a file with the given id does not exists within this cache
+     * @since 9.0.0
+     */
+    public function getPathById($id);
 
-	/**
-	 * normalize the given path for usage in the cache
-	 *
-	 * @param string $path
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function normalize($path);
+    /**
+     * normalize the given path for usage in the cache
+     *
+     * @param string $path
+     * @return string
+     * @since 9.0.0
+     */
+    public function normalize($path);
 }

lib/public/Authentication/Events/LoginFailedEvent.php

Indentation +20 added lines, -20 removed lines

@@ -36,24 +36,24 @@
  */
 class LoginFailedEvent extends Event {
 
-	/** @var string */
-	private $uid;
-
-	/**
-	 * @since 19.0.0
-	 */
-	public function __construct(string $uid) {
-		parent::__construct();
-
-		$this->uid = $uid;
-	}
-
-	/**
-	 * returns the uid of the user that was tried to login against
-	 *
-	 * @since 19.0.0
-	 */
-	public function getUid(): string {
-		return $this->uid;
-	}
+    /** @var string */
+    private $uid;
+
+    /**
+     * @since 19.0.0
+     */
+    public function __construct(string $uid) {
+        parent::__construct();
+
+        $this->uid = $uid;
+    }
+
+    /**
+     * returns the uid of the user that was tried to login against
+     *
+     * @since 19.0.0
+     */
+    public function getUid(): string {
+        return $this->uid;
+    }
 }

lib/public/Files_FullTextSearch/Model/AFilesDocument.php

Indentation +40 added lines, -40 removed lines

@@ -53,52 +53,52 @@
 abstract class AFilesDocument extends IndexDocument {
 
 
-	/**
-	 * Returns the owner of the document/file.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	abstract public function getOwnerId(): string;
+    /**
+     * Returns the owner of the document/file.
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    abstract public function getOwnerId(): string;
 
 
-	/**
-	 * Returns the current viewer of the document/file.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	abstract public function getViewerId(): string;
+    /**
+     * Returns the current viewer of the document/file.
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    abstract public function getViewerId(): string;
 
 
-	/**
-	 * Returns the type of the document/file.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
-	 */
-	abstract public function getType(): string;
+    /**
+     * Returns the type of the document/file.
+     *
+     * @since 15.0.0
+     *
+     * @return string \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
+     */
+    abstract public function getType(): string;
 
 
-	/**
-	 * Returns the mimetype of the document/file.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	abstract public function getMimetype(): string;
+    /**
+     * Returns the mimetype of the document/file.
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    abstract public function getMimetype(): string;
 
-	/**
-	 * Returns the path of the document/file.
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	abstract public function getPath(): string;
+    /**
+     * Returns the path of the document/file.
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    abstract public function getPath(): string;
 
 }