nextcloud / server

apps/encryption/lib/HookManager.php

Indentation +28 added lines, -28 removed lines

@@ -26,34 +26,34 @@
 use OCA\Encryption\Hooks\Contracts\IHook;
 
 class HookManager {
-	/** @var IHook[] */
-	private $hookInstances = [];
+    /** @var IHook[] */
+    private $hookInstances = [];
 
-	/**
-	 * @param array|IHook $instances
-	 *        - This accepts either a single instance of IHook or an array of instances of IHook
-	 * @return bool
-	 */
-	public function registerHook($instances) {
-		if (is_array($instances)) {
-			foreach ($instances as $instance) {
-				if (!$instance instanceof IHook) {
-					return false;
-				}
-				$this->hookInstances[] = $instance;
-			}
-		} elseif ($instances instanceof IHook) {
-			$this->hookInstances[] = $instances;
-		}
-		return true;
-	}
+    /**
+     * @param array|IHook $instances
+     *        - This accepts either a single instance of IHook or an array of instances of IHook
+     * @return bool
+     */
+    public function registerHook($instances) {
+        if (is_array($instances)) {
+            foreach ($instances as $instance) {
+                if (!$instance instanceof IHook) {
+                    return false;
+                }
+                $this->hookInstances[] = $instance;
+            }
+        } elseif ($instances instanceof IHook) {
+            $this->hookInstances[] = $instances;
+        }
+        return true;
+    }
 
-	public function fireHooks() {
-		foreach ($this->hookInstances as $instance) {
-			/**
-			 * Fire off the add hooks method of each instance stored in cache
-			 */
-			$instance->addHooks();
-		}
-	}
+    public function fireHooks() {
+        foreach ($this->hookInstances as $instance) {
+            /**
+             * Fire off the add hooks method of each instance stored in cache
+             */
+            $instance->addHooks();
+        }
+    }
 }

lib/private/Search.php

Indentation +76 added lines, -76 removed lines

@@ -36,85 +36,85 @@
  * Provide an interface to all search providers
  */
 class Search implements ISearch {
-	/** @var Provider[] */
-	private $providers = [];
-	private $registeredProviders = [];
+    /** @var Provider[] */
+    private $providers = [];
+    private $registeredProviders = [];
 
-	/**
-	 * 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 = [], $page = 1, $size = 30) {
-		$this->initProviders();
-		$results = [];
-		foreach ($this->providers as $provider) {
-			if (! $provider->providesResultsFor($inApps)) {
-				continue;
-			}
-			if ($provider instanceof PagedProvider) {
-				$results = array_merge($results, $provider->searchPaged($query, $page, $size));
-			} elseif ($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', ['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 = [], $page = 1, $size = 30) {
+        $this->initProviders();
+        $results = [];
+        foreach ($this->providers as $provider) {
+            if (! $provider->providesResultsFor($inApps)) {
+                continue;
+            }
+            if ($provider instanceof PagedProvider) {
+                $results = array_merge($results, $provider->searchPaged($query, $page, $size));
+            } elseif ($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', ['provider' => $provider]);
+            }
+        }
+        return $results;
+    }
 
-	/**
-	 * Remove all registered search providers
-	 */
-	public function clearProviders() {
-		$this->providers = [];
-		$this->registeredProviders = [];
-	}
+    /**
+     * Remove all registered search providers
+     */
+    public function clearProviders() {
+        $this->providers = [];
+        $this->registeredProviders = [];
+    }
 
-	/**
-	 * 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 = [];
-	}
+    /**
+     * 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 = [];
+    }
 
-	/**
-	 * 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 = []) {
-		$this->registeredProviders[] = ['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 = []) {
+        $this->registeredProviders[] = ['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);
+        }
+    }
 }

core/templates/404.php

Indentation +4 added lines, -4 removed lines

@@ -4,11 +4,11 @@
 /** @var \OCP\Defaults $theme */
 // @codeCoverageIgnoreStart
 if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
-	require_once '../../lib/base.php';
+    require_once '../../lib/base.php';
 
-	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
-	exit;
+    $urlGenerator = \OC::$server->getURLGenerator();
+    header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+    exit;
 }
 // @codeCoverageIgnoreEnd
 ?>

apps/settings/lib/Search/AppSearch.php

Indentation +72 added lines, -72 removed lines

@@ -33,76 +33,76 @@
 
 class AppSearch implements IProvider {
 
-	/** @var INavigationManager */
-	protected $navigationManager;
-
-	/** @var IL10N */
-	protected $l;
-
-	public function __construct(INavigationManager $navigationManager,
-								IL10N $l) {
-		$this->navigationManager = $navigationManager;
-		$this->l = $l;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'settings_apps';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l->t('Apps');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		return -50;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		$entries = $this->navigationManager->getAll('all');
-
-		$result = [];
-		foreach ($entries as $entry) {
-			if (
-				stripos($entry['name'], $query->getTerm()) === false &&
-				stripos($entry['id'], $query->getTerm()) === false
-			) {
-				continue;
-			}
-
-			if (strpos($query->getRoute(), $entry['id'] . '.') === 0) {
-				// Skip the current app, unlikely this is intended
-				continue;
-			}
-
-			if ($entry['href'] === '') {
-				// Nothing we can open, so ignore
-				continue;
-			}
-
-			$result[] = new SearchResultEntry(
-				'',
-				$entry['name'],
-				'',
-				$entry['href'],
-				'icon-confirm'
-			);
-		}
-
-		return SearchResult::complete(
-			$this->l->t('Apps'),
-			$result
-		);
-	}
+    /** @var INavigationManager */
+    protected $navigationManager;
+
+    /** @var IL10N */
+    protected $l;
+
+    public function __construct(INavigationManager $navigationManager,
+                                IL10N $l) {
+        $this->navigationManager = $navigationManager;
+        $this->l = $l;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'settings_apps';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l->t('Apps');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        return -50;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        $entries = $this->navigationManager->getAll('all');
+
+        $result = [];
+        foreach ($entries as $entry) {
+            if (
+                stripos($entry['name'], $query->getTerm()) === false &&
+                stripos($entry['id'], $query->getTerm()) === false
+            ) {
+                continue;
+            }
+
+            if (strpos($query->getRoute(), $entry['id'] . '.') === 0) {
+                // Skip the current app, unlikely this is intended
+                continue;
+            }
+
+            if ($entry['href'] === '') {
+                // Nothing we can open, so ignore
+                continue;
+            }
+
+            $result[] = new SearchResultEntry(
+                '',
+                $entry['name'],
+                '',
+                $entry['href'],
+                'icon-confirm'
+            );
+        }
+
+        return SearchResult::complete(
+            $this->l->t('Apps'),
+            $result
+        );
+    }
 }

lib/public/Files/Config/IRootMountProvider.php

Indentation +7 added lines, -7 removed lines

@@ -31,11 +31,11 @@
  * @since 20.0.0
  */
 interface IRootMountProvider {
-	/**
-	 * Get all root mountpoints of this provider
-	 *
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 * @since 20.0.0
-	 */
-	public function getRootMounts(IStorageFactory $loader): array;
+    /**
+     * Get all root mountpoints of this provider
+     *
+     * @return \OCP\Files\Mount\IMountPoint[]
+     * @since 20.0.0
+     */
+    public function getRootMounts(IStorageFactory $loader): array;
 }

apps/dav/lib/DAV/Sharing/Plugin.php

Indentation +171 added lines, -171 removed lines

@@ -38,175 +38,175 @@
 use Sabre\HTTP\ResponseInterface;
 
 class Plugin extends ServerPlugin {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	public const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
-
-	/** @var Auth */
-	private $auth;
-
-	/** @var IRequest */
-	private $request;
-
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * Plugin constructor.
-	 *
-	 * @param Auth $authBackEnd
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 */
-	public function __construct(Auth $authBackEnd, IRequest $request, IConfig $config) {
-		$this->auth = $authBackEnd;
-		$this->request = $request;
-		$this->config = $config;
-	}
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		return ['oc-resource-sharing'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'oc-resource-sharing';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
-	}
-
-	/**
-	 * We intercept this to handle POST requests on a dav resource.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return null|false
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-
-		// Only handling xml
-		$contentType = $request->getHeader('Content-Type');
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
-			return;
-		}
-
-		// Making sure the node exists
-		try {
-			$node = $this->server->tree->getNodeForPath($path);
-		} catch (NotFound $e) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-
-		// If this request handler could not deal with this POST request, it
-		// will return 'null' and other plugins get a chance to handle the
-		// request.
-		//
-		// However, we already requested the full body. This is a problem,
-		// because a body can only be read once. This is why we preemptively
-		// re-populated the request body with the existing data.
-		$request->setBody($requestBody);
-
-		$message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-		switch ($documentType) {
-
-			// Dealing with the 'share' document, which modified invitees on a
-			// calendar.
-			case '{' . self::NS_OWNCLOUD . '}share':
-
-				// We can only deal with IShareableCalendar objects
-				if (!$node instanceof IShareable) {
-					return;
-				}
-
-				$this->server->transactionType = 'post-oc-resource-share';
-
-				// Getting ACL info
-				$acl = $this->server->getPlugin('acl');
-
-				// If there's no ACL support, we allow everything
-				if ($acl) {
-					/** @var \Sabre\DAVACL\Plugin $acl */
-					$acl->checkPrivileges($path, '{DAV:}write');
-
-					$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
-					$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
-					if ($limitSharingToOwner && !$isOwner) {
-						return;
-					}
-				}
-
-				$node->updateShares($message->set, $message->remove);
-
-				$response->setStatus(200);
-				// Adding this because sending a response body may cause issues,
-				// and I wanted some type of indicator the response was handled.
-				$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-				// Breaking the event chain
-				return false;
-		}
-	}
-
-	/**
-	 * This event is triggered when properties are requested for a certain
-	 * node.
-	 *
-	 * This allows us to inject any properties early.
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof IShareable) {
-			$propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
-				return new Invite(
-					$node->getShares()
-				);
-			});
-		}
-	}
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
+
+    /** @var Auth */
+    private $auth;
+
+    /** @var IRequest */
+    private $request;
+
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * Plugin constructor.
+     *
+     * @param Auth $authBackEnd
+     * @param IRequest $request
+     * @param IConfig $config
+     */
+    public function __construct(Auth $authBackEnd, IRequest $request, IConfig $config) {
+        $this->auth = $authBackEnd;
+        $this->request = $request;
+        $this->config = $config;
+    }
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        return ['oc-resource-sharing'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'oc-resource-sharing';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+        $this->server->on('propFind',    [$this, 'propFind']);
+    }
+
+    /**
+     * We intercept this to handle POST requests on a dav resource.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return null|false
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+
+        // Only handling xml
+        $contentType = $request->getHeader('Content-Type');
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
+            return;
+        }
+
+        // Making sure the node exists
+        try {
+            $node = $this->server->tree->getNodeForPath($path);
+        } catch (NotFound $e) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $request->setBody($requestBody);
+
+        $message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+        switch ($documentType) {
+
+            // Dealing with the 'share' document, which modified invitees on a
+            // calendar.
+            case '{' . self::NS_OWNCLOUD . '}share':
+
+                // We can only deal with IShareableCalendar objects
+                if (!$node instanceof IShareable) {
+                    return;
+                }
+
+                $this->server->transactionType = 'post-oc-resource-share';
+
+                // Getting ACL info
+                $acl = $this->server->getPlugin('acl');
+
+                // If there's no ACL support, we allow everything
+                if ($acl) {
+                    /** @var \Sabre\DAVACL\Plugin $acl */
+                    $acl->checkPrivileges($path, '{DAV:}write');
+
+                    $limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
+                    $isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
+                    if ($limitSharingToOwner && !$isOwner) {
+                        return;
+                    }
+                }
+
+                $node->updateShares($message->set, $message->remove);
+
+                $response->setStatus(200);
+                // Adding this because sending a response body may cause issues,
+                // and I wanted some type of indicator the response was handled.
+                $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+                // Breaking the event chain
+                return false;
+        }
+    }
+
+    /**
+     * This event is triggered when properties are requested for a certain
+     * node.
+     *
+     * This allows us to inject any properties early.
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof IShareable) {
+            $propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
+                return new Invite(
+                    $node->getShares()
+                );
+            });
+        }
+    }
 }

apps/files_external/lib/Migration/DummyUserSession.php

Indentation +34 added lines, -34 removed lines

@@ -29,45 +29,45 @@
 
 class DummyUserSession implements IUserSession {
 
-	/**
-	 * @var IUser
-	 */
-	private $user;
+    /**
+     * @var IUser
+     */
+    private $user;
 
-	public function login($uid, $password) {
-	}
+    public function login($uid, $password) {
+    }
 
-	public function logout() {
-	}
+    public function logout() {
+    }
 
-	public function setUser($user) {
-		$this->user = $user;
-	}
+    public function setUser($user) {
+        $this->user = $user;
+    }
 
-	public function getUser() {
-		return $this->user;
-	}
+    public function getUser() {
+        return $this->user;
+    }
 
-	public function isLoggedIn() {
-		return !is_null($this->user);
-	}
+    public function isLoggedIn() {
+        return !is_null($this->user);
+    }
 
-	/**
-	 * get getImpersonatingUserID
-	 *
-	 * @return string|null
-	 * @since 17.0.0
-	 */
-	public function getImpersonatingUserID() : ?string {
-		return null;
-	}
+    /**
+     * get getImpersonatingUserID
+     *
+     * @return string|null
+     * @since 17.0.0
+     */
+    public function getImpersonatingUserID() : ?string {
+        return null;
+    }
 
-	/**
-	 * set setImpersonatingUserID
-	 *
-	 * @since 17.0.0
-	 */
-	public function setImpersonatingUserID(bool $useCurrentUser = true): void {
-		//no OP
-	}
+    /**
+     * set setImpersonatingUserID
+     *
+     * @since 17.0.0
+     */
+    public function setImpersonatingUserID(bool $useCurrentUser = true): void {
+        //no OP
+    }
 }

apps/files_external/lib/Lib/Auth/Password/UserProvided.php

Indentation +39 added lines, -39 removed lines

@@ -38,51 +38,51 @@
  * User provided Username and Password
  */
 class UserProvided extends AuthMechanism implements IUserProvided {
-	public const CREDENTIALS_IDENTIFIER_PREFIX = 'password::userprovided/';
+    public const CREDENTIALS_IDENTIFIER_PREFIX = 'password::userprovided/';
 
-	/** @var ICredentialsManager */
-	protected $credentialsManager;
+    /** @var ICredentialsManager */
+    protected $credentialsManager;
 
-	public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
-		$this->credentialsManager = $credentialsManager;
+    public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
+        $this->credentialsManager = $credentialsManager;
 
-		$this
-			->setIdentifier('password::userprovided')
-			->setVisibility(BackendService::VISIBILITY_ADMIN)
-			->setScheme(self::SCHEME_PASSWORD)
-			->setText($l->t('User entered, store in database'))
-			->addParameters([
-				(new DefinitionParameter('user', $l->t('Username')))
-					->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
-				(new DefinitionParameter('password', $l->t('Password')))
-					->setType(DefinitionParameter::VALUE_PASSWORD)
-					->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
-			]);
-	}
+        $this
+            ->setIdentifier('password::userprovided')
+            ->setVisibility(BackendService::VISIBILITY_ADMIN)
+            ->setScheme(self::SCHEME_PASSWORD)
+            ->setText($l->t('User entered, store in database'))
+            ->addParameters([
+                (new DefinitionParameter('user', $l->t('Username')))
+                    ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
+                (new DefinitionParameter('password', $l->t('Password')))
+                    ->setType(DefinitionParameter::VALUE_PASSWORD)
+                    ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
+            ]);
+    }
 
-	private function getCredentialsIdentifier($storageId) {
-		return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId;
-	}
+    private function getCredentialsIdentifier($storageId) {
+        return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId;
+    }
 
-	public function saveBackendOptions(IUser $user, $mountId, array $options) {
-		$this->credentialsManager->store($user->getUID(), $this->getCredentialsIdentifier($mountId), [
-			'user' => $options['user'], // explicitly copy the fields we want instead of just passing the entire $options array
-			'password' => $options['password'] // this way we prevent users from being able to modify any other field
-		]);
-	}
+    public function saveBackendOptions(IUser $user, $mountId, array $options) {
+        $this->credentialsManager->store($user->getUID(), $this->getCredentialsIdentifier($mountId), [
+            'user' => $options['user'], // explicitly copy the fields we want instead of just passing the entire $options array
+            'password' => $options['password'] // this way we prevent users from being able to modify any other field
+        ]);
+    }
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		if (!isset($user)) {
-			throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
-		}
-		$uid = $user->getUID();
-		$credentials = $this->credentialsManager->retrieve($uid, $this->getCredentialsIdentifier($storage->getId()));
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        if (!isset($user)) {
+            throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
+        }
+        $uid = $user->getUID();
+        $credentials = $this->credentialsManager->retrieve($uid, $this->getCredentialsIdentifier($storage->getId()));
 
-		if (!isset($credentials)) {
-			throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
-		}
+        if (!isset($credentials)) {
+            throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
+        }
 
-		$storage->setBackendOption('user', $credentials['user']);
-		$storage->setBackendOption('password', $credentials['password']);
-	}
+        $storage->setBackendOption('user', $credentials['user']);
+        $storage->setBackendOption('password', $credentials['password']);
+    }
 }

lib/public/IUserSession.php

Indentation +51 added lines, -51 removed lines

@@ -43,61 +43,61 @@
  * @since 6.0.0
  */
 interface IUserSession {
-	/**
-	 * Do a user login
-	 *
-	 * @param string $uid the username
-	 * @param string $password the password
-	 * @return bool true if successful
-	 * @since 6.0.0
-	 */
-	public function login($uid, $password);
+    /**
+     * Do a user login
+     *
+     * @param string $uid the username
+     * @param string $password the password
+     * @return bool true if successful
+     * @since 6.0.0
+     */
+    public function login($uid, $password);
 
-	/**
-	 * Logs the user out including all the session data
-	 * Logout, destroys session
-	 *
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function logout();
+    /**
+     * Logs the user out including all the session data
+     * Logout, destroys session
+     *
+     * @return void
+     * @since 6.0.0
+     */
+    public function logout();
 
-	/**
-	 * set the currently active user
-	 *
-	 * @param \OCP\IUser|null $user
-	 * @since 8.0.0
-	 */
-	public function setUser($user);
+    /**
+     * set the currently active user
+     *
+     * @param \OCP\IUser|null $user
+     * @since 8.0.0
+     */
+    public function setUser($user);
 
-	/**
-	 * get the current active user
-	 *
-	 * @return \OCP\IUser|null Current user, otherwise null
-	 * @since 8.0.0
-	 */
-	public function getUser();
+    /**
+     * get the current active user
+     *
+     * @return \OCP\IUser|null Current user, otherwise null
+     * @since 8.0.0
+     */
+    public function getUser();
 
-	/**
-	 * Checks whether the user is logged in
-	 *
-	 * @return bool if logged in
-	 * @since 8.0.0
-	 */
-	public function isLoggedIn();
+    /**
+     * Checks whether the user is logged in
+     *
+     * @return bool if logged in
+     * @since 8.0.0
+     */
+    public function isLoggedIn();
 
-	/**
-	 * get getImpersonatingUserID
-	 *
-	 * @return string|null
-	 * @since 18.0.0
-	 */
-	public function getImpersonatingUserID(): ?string;
+    /**
+     * get getImpersonatingUserID
+     *
+     * @return string|null
+     * @since 18.0.0
+     */
+    public function getImpersonatingUserID(): ?string;
 
-	/**
-	 * set setImpersonatingUserID
-	 *
-	 * @since 18.0.0
-	 */
-	public function setImpersonatingUserID(bool $useCurrentUser = true): void;
+    /**
+     * set setImpersonatingUserID
+     *
+     * @since 18.0.0
+     */
+    public function setImpersonatingUserID(bool $useCurrentUser = true): void;
 }