nextcloud / server

apps/user_ldap/lib/IGroupLDAP.php

Indentation +13 added lines, -13 removed lines

@@ -26,20 +26,20 @@
 
 interface IGroupLDAP {
 
-	//Used by LDAPProvider
+    //Used by LDAPProvider
 
-	/**
-	 * Return access for LDAP interaction.
-	 * @param string $gid
-	 * @return Access instance of Access for LDAP interaction
-	 */
-	public function getLDAPAccess($gid);
+    /**
+     * Return access for LDAP interaction.
+     * @param string $gid
+     * @return Access instance of Access for LDAP interaction
+     */
+    public function getLDAPAccess($gid);
 
-	/**
-	 * Return a new LDAP connection for the specified group.
-	 * @param string $gid
-	 * @return resource of the LDAP connection
-	 */
-	public function getNewLDAPConnection($gid);
+    /**
+     * Return a new LDAP connection for the specified group.
+     * @param string $gid
+     * @return resource of the LDAP connection
+     */
+    public function getNewLDAPConnection($gid);
 
 }

lib/public/Authentication/IApacheBackend.php

Indentation +20 added lines, -20 removed lines

@@ -38,27 +38,27 @@
  */
 interface IApacheBackend {
 
-	/**
-	 * In case the user has been authenticated by a module true is returned.
-	 *
-	 * @return boolean whether the module reports a user as currently logged in.
-	 * @since 6.0.0
-	 */
-	public function isSessionActive();
+    /**
+     * In case the user has been authenticated by a module true is returned.
+     *
+     * @return boolean whether the module reports a user as currently logged in.
+     * @since 6.0.0
+     */
+    public function isSessionActive();
 
-	/**
-	 * Gets the current logout URL
-	 *
-	 * @return string
-	 * @since 12.0.3
-	 */
-	public function getLogoutUrl();
+    /**
+     * Gets the current logout URL
+     *
+     * @return string
+     * @since 12.0.3
+     */
+    public function getLogoutUrl();
 
-	/**
-	 * Return the id of the current user
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getCurrentUserId();
+    /**
+     * Return the id of the current user
+     * @return string
+     * @since 6.0.0
+     */
+    public function getCurrentUserId();
 
 }

core/templates/twofactorselectchallenge.php

Indentation +10 added lines, -10 removed lines

@@ -7,11 +7,11 @@ 
 				<li>
 					<a class="button two-factor-provider"
 					   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-										[
-											'challengeProviderId' => $provider->getId(),
-											'redirect_url' => $_['redirect_url'],
-										]
-									)) ?>">
+                                        [
+                                            'challengeProviderId' => $provider->getId(),
+                                            'redirect_url' => $_['redirect_url'],
+                                        ]
+                                    )) ?>">
 						<?php p($provider->getDescription()) ?>
 					</a>
 				</li>
@@ -22,11 +22,11 @@ 
 		<a class="button" href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Cancel log in')) ?></a>
 		<?php if (!is_null($_['backupProvider'])): ?>
 		<a class="button" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-												[
-													'challengeProviderId' => $_['backupProvider']->getId(),
-													'redirect_url' => $_['redirect_url'],
-												]
-											)) ?>"><?php p($l->t('Use backup code')) ?></a>
+                                                [
+                                                    'challengeProviderId' => $_['backupProvider']->getId(),
+                                                    'redirect_url' => $_['redirect_url'],
+                                                ]
+                                            )) ?>"><?php p($l->t('Use backup code')) ?></a>
 		<?php endif; ?>
 	</p>
 </div>

lib/public/Files/Config/IUserMountCache.php

Indentation +77 added lines, -77 removed lines

@@ -31,89 +31,89 @@
  * @since 9.0.0
  */
 interface IUserMountCache {
-	/**
-	 * Register mounts for a user to the cache
-	 *
-	 * @param IUser $user
-	 * @param IMountPoint[] $mounts
-	 * @since 9.0.0
-	 */
-	public function registerMounts(IUser $user, array $mounts);
+    /**
+     * Register mounts for a user to the cache
+     *
+     * @param IUser $user
+     * @param IMountPoint[] $mounts
+     * @since 9.0.0
+     */
+    public function registerMounts(IUser $user, array $mounts);
 
-	/**
-	 * Get all cached mounts for a user
-	 *
-	 * @param IUser $user
-	 * @return ICachedMountInfo[]
-	 * @since 9.0.0
-	 */
-	public function getMountsForUser(IUser $user);
+    /**
+     * Get all cached mounts for a user
+     *
+     * @param IUser $user
+     * @return ICachedMountInfo[]
+     * @since 9.0.0
+     */
+    public function getMountsForUser(IUser $user);
 
-	/**
-	 * Get all cached mounts by storage
-	 *
-	 * @param int $numericStorageId
-	 * @param string|null $user limit the results to a single user @since 12.0.0
-	 * @return ICachedMountInfo[]
-	 * @since 9.0.0
-	 */
-	public function getMountsForStorageId($numericStorageId, $user = null);
+    /**
+     * Get all cached mounts by storage
+     *
+     * @param int $numericStorageId
+     * @param string|null $user limit the results to a single user @since 12.0.0
+     * @return ICachedMountInfo[]
+     * @since 9.0.0
+     */
+    public function getMountsForStorageId($numericStorageId, $user = null);
 
-	/**
-	 * Get all cached mounts by root
-	 *
-	 * @param int $rootFileId
-	 * @return ICachedMountInfo[]
-	 * @since 9.0.0
-	 */
-	public function getMountsForRootId($rootFileId);
+    /**
+     * Get all cached mounts by root
+     *
+     * @param int $rootFileId
+     * @return ICachedMountInfo[]
+     * @since 9.0.0
+     */
+    public function getMountsForRootId($rootFileId);
 
-	/**
-	 * Get all cached mounts that contain a file
-	 *
-	 * @param int $fileId
-	 * @param string|null $user optionally restrict the results to a single user @since 12.0.0
-	 * @return ICachedMountFileInfo[]
-	 * @since 9.0.0
-	 */
-	public function getMountsForFileId($fileId, $user = null);
+    /**
+     * Get all cached mounts that contain a file
+     *
+     * @param int $fileId
+     * @param string|null $user optionally restrict the results to a single user @since 12.0.0
+     * @return ICachedMountFileInfo[]
+     * @since 9.0.0
+     */
+    public function getMountsForFileId($fileId, $user = null);
 
-	/**
-	 * Remove all cached mounts for a user
-	 *
-	 * @param IUser $user
-	 * @since 9.0.0
-	 */
-	public function removeUserMounts(IUser $user);
+    /**
+     * Remove all cached mounts for a user
+     *
+     * @param IUser $user
+     * @since 9.0.0
+     */
+    public function removeUserMounts(IUser $user);
 
-	/**
-	 * Remove all mounts for a user and storage
-	 *
-	 * @param $storageId
-	 * @param string $userId
-	 * @return mixed
-	 * @since 9.0.0
-	 */
-	public function removeUserStorageMount($storageId, $userId);
+    /**
+     * Remove all mounts for a user and storage
+     *
+     * @param $storageId
+     * @param string $userId
+     * @return mixed
+     * @since 9.0.0
+     */
+    public function removeUserStorageMount($storageId, $userId);
 
-	/**
-	 * Remove all cached mounts for a storage
-	 *
-	 * @param $storageId
-	 * @return mixed
-	 * @since 9.0.0
-	 */
-	public function remoteStorageMounts($storageId);
+    /**
+     * Remove all cached mounts for a storage
+     *
+     * @param $storageId
+     * @return mixed
+     * @since 9.0.0
+     */
+    public function remoteStorageMounts($storageId);
 
-	/**
-	 * Get the used space for users
-	 *
-	 * Note that this only includes the space in their home directory,
-	 * not any incoming shares or external storages.
-	 *
-	 * @param IUser[] $users
-	 * @return int[] [$userId => $userSpace]
-	 * @since 13.0.0
-	 */
-	public function getUsedSpaceForUsers(array $users);
+    /**
+     * Get the used space for users
+     *
+     * Note that this only includes the space in their home directory,
+     * not any incoming shares or external storages.
+     *
+     * @param IUser[] $users
+     * @return int[] [$userId => $userSpace]
+     * @since 13.0.0
+     */
+    public function getUsedSpaceForUsers(array $users);
 }

lib/private/Files/Config/CachedMountFileInfo.php

Indentation +16 added lines, -16 removed lines

@@ -26,23 +26,23 @@
 use OCP\IUser;
 
 class CachedMountFileInfo extends CachedMountInfo implements ICachedMountFileInfo {
-	/** @var string */
-	private $internalPath;
+    /** @var string */
+    private $internalPath;
 
-	public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '', $internalPath) {
-		parent::__construct($user, $storageId, $rootId, $mountPoint, $mountId, $rootInternalPath);
-		$this->internalPath = $internalPath;
-	}
+    public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '', $internalPath) {
+        parent::__construct($user, $storageId, $rootId, $mountPoint, $mountId, $rootInternalPath);
+        $this->internalPath = $internalPath;
+    }
 
-	public function getInternalPath() {
-		if ($this->getRootInternalPath()) {
-			return substr($this->internalPath, strlen($this->getRootInternalPath()) + 1);
-		} else {
-			return $this->internalPath;
-		}
-	}
+    public function getInternalPath() {
+        if ($this->getRootInternalPath()) {
+            return substr($this->internalPath, strlen($this->getRootInternalPath()) + 1);
+        } else {
+            return $this->internalPath;
+        }
+    }
 
-	public function getPath() {
-		return $this->getMountPoint() . $this->getInternalPath();
-	}
+    public function getPath() {
+        return $this->getMountPoint() . $this->getInternalPath();
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
 	}
 
 	public function getPath() {
-		return $this->getMountPoint() . $this->getInternalPath();
+		return $this->getMountPoint().$this->getInternalPath();
 	}
 }
\ No newline at end of file

lib/private/Command/AsyncBus.php

Indentation +66 added lines, -66 removed lines

@@ -29,76 +29,76 @@
  * Asynchronous command bus that uses the background job system as backend
  */
 abstract class AsyncBus implements IBus {
-	/**
-	 * List of traits for command which require sync execution
-	 *
-	 * @var string[]
-	 */
-	private $syncTraits = [];
+    /**
+     * List of traits for command which require sync execution
+     *
+     * @var string[]
+     */
+    private $syncTraits = [];
 
-	/**
-	 * Schedule a command to be fired
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	public function push($command) {
-		if ($this->canRunAsync($command)) {
-			$this->queueCommand($command);
-		} else {
-			$this->runCommand($command);
-		}
-	}
+    /**
+     * Schedule a command to be fired
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    public function push($command) {
+        if ($this->canRunAsync($command)) {
+            $this->queueCommand($command);
+        } else {
+            $this->runCommand($command);
+        }
+    }
 
-	/**
-	 * Queue a command in the bus
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	abstract protected function queueCommand($command);
+    /**
+     * Queue a command in the bus
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    abstract protected function queueCommand($command);
 
-	/**
-	 * Require all commands using a trait to be run synchronous
-	 *
-	 * @param string $trait
-	 */
-	public function requireSync($trait) {
-		$this->syncTraits[] = trim($trait, '\\');
-	}
+    /**
+     * Require all commands using a trait to be run synchronous
+     *
+     * @param string $trait
+     */
+    public function requireSync($trait) {
+        $this->syncTraits[] = trim($trait, '\\');
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	private function runCommand($command) {
-		if ($command instanceof ICommand) {
-			$command->handle();
-		} else {
-			$command();
-		}
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    private function runCommand($command) {
+        if ($command instanceof ICommand) {
+            $command->handle();
+        } else {
+            $command();
+        }
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 * @return bool
-	 */
-	private function canRunAsync($command) {
-		$traits = $this->getTraits($command);
-		foreach ($traits as $trait) {
-			if (array_search($trait, $this->syncTraits) !== false) {
-				return false;
-			}
-		}
-		return true;
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     * @return bool
+     */
+    private function canRunAsync($command) {
+        $traits = $this->getTraits($command);
+        foreach ($traits as $trait) {
+            if (array_search($trait, $this->syncTraits) !== false) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 * @return string[]
-	 */
-	private function getTraits($command) {
-		if ($command instanceof ICommand) {
-			return class_uses($command);
-		} else {
-			return [];
-		}
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     * @return string[]
+     */
+    private function getTraits($command) {
+        if ($command instanceof ICommand) {
+            return class_uses($command);
+        } else {
+            return [];
+        }
+    }
 }

apps/dav/appinfo/v1/webdav.php

Indentation +20 added lines, -20 removed lines

@@ -25,7 +25,7 @@ 
 
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 
@@ -33,38 +33,38 @@ 
 \OC_Util::obEnd();
 
 $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
-	\OC::$server->getConfig(),
-	\OC::$server->getLogger(),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager(),
-	\OC::$server->getRequest(),
-	\OC::$server->getPreviewManager()
+    \OC::$server->getConfig(),
+    \OC::$server->getLogger(),
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getMountManager(),
+    \OC::$server->getTagManager(),
+    \OC::$server->getRequest(),
+    \OC::$server->getPreviewManager()
 );
 
 // Backends
 $authBackend = new \OCA\DAV\Connector\Sabre\Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $authPlugin = new \Sabre\DAV\Auth\Plugin($authBackend);
 $bearerAuthPlugin = new \OCA\DAV\Connector\Sabre\BearerAuth(
-	\OC::$server->getUserSession(),
-	\OC::$server->getSession(),
-	\OC::$server->getRequest()
+    \OC::$server->getUserSession(),
+    \OC::$server->getSession(),
+    \OC::$server->getRequest()
 );
 $authPlugin->addBackend($bearerAuthPlugin);
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function() {
-	// use the view for the logged in user
-	return \OC\Files\Filesystem::getView();
+    // use the view for the logged in user
+    return \OC\Files\Filesystem::getView();
 });
 
 $dispatcher = \OC::$server->getEventDispatcher();

lib/private/Collaboration/Collaborators/LookupPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		try {
 			$client = $this->clientService->newClient();
 			$response = $client->get(
-				$lookupServerUrl . '/users?search=' . urlencode($search),
+				$lookupServerUrl.'/users?search='.urlencode($search),
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,

Indentation +41 added lines, -41 removed lines

@@ -33,53 +33,53 @@
 
 class LookupPlugin implements ISearchPlugin {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
+    /** @var IConfig */
+    private $config;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(IConfig $config, IClientService $clientService) {
-		$this->config = $config;
-		$this->clientService = $clientService;
-	}
+    public function __construct(IConfig $config, IClientService $clientService) {
+        $this->config = $config;
+        $this->clientService = $clientService;
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		if ($this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') !== 'yes') {
-			return false;
-		}
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        if ($this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') !== 'yes') {
+            return false;
+        }
 
-		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		$lookupServerUrl = rtrim($lookupServerUrl, '/');
-		$result = [];
+        $lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        $lookupServerUrl = rtrim($lookupServerUrl, '/');
+        $result = [];
 
-		try {
-			$client = $this->clientService->newClient();
-			$response = $client->get(
-				$lookupServerUrl . '/users?search=' . urlencode($search),
-				[
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
+        try {
+            $client = $this->clientService->newClient();
+            $response = $client->get(
+                $lookupServerUrl . '/users?search=' . urlencode($search),
+                [
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
 
-			$body = json_decode($response->getBody(), true);
+            $body = json_decode($response->getBody(), true);
 
-			foreach ($body as $lookup) {
-				$result[] = [
-					'label' => $lookup['federationId'],
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_REMOTE,
-						'shareWith' => $lookup['federationId'],
-					],
-					'extra' => $lookup,
-				];
-			}
-		} catch (\Exception $e) {
-		}
+            foreach ($body as $lookup) {
+                $result[] = [
+                    'label' => $lookup['federationId'],
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_REMOTE,
+                        'shareWith' => $lookup['federationId'],
+                    ],
+                    'extra' => $lookup,
+                ];
+            }
+        } catch (\Exception $e) {
+        }
 
-		$type = new SearchResultType('lookup');
-		$searchResult->addResultSet($type, $result, []);
+        $type = new SearchResultType('lookup');
+        $searchResult->addResultSet($type, $result, []);
 
-		return false;
-	}
+        return false;
+    }
 }

lib/private/Template/ResourceLocator.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 				$this->doFind($resource);
 			} catch (ResourceNotFoundException $e) {
 				$resourceApp = substr($resource, 0, strpos($resource, '/'));
-				$this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+				$this->logger->debug('Could not find resource file "'.$e->getResourcePath().'"', ['app' => $resourceApp]);
 			}
 		}
 		if (!empty($this->theme)) {
@@ -84,7 +84,7 @@ 
 					$this->doFindTheme($resource);
 				} catch (ResourceNotFoundException $e) {
 					$resourceApp = substr($resource, 0, strpos($resource, '/'));
-					$this->logger->debug('Could not find resource file in theme "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+					$this->logger->debug('Could not find resource file in theme "'.$e->getResourcePath().'"', ['app' => $resourceApp]);
 				}
 			}
 		}
@@ -185,7 +185,7 @@ 
 		}
 		$this->resources[] = array($root, $webRoot, $file);
 
-		if ($throw && !is_file($root . '/' . $file)) {
+		if ($throw && !is_file($root.'/'.$file)) {
 			throw new ResourceNotFoundException($file, $webRoot);
 		}
 	}

Indentation +169 added lines, -169 removed lines

@@ -27,173 +27,173 @@
 namespace OC\Template;
 
 abstract class ResourceLocator {
-	protected $theme;
-
-	protected $mapping;
-	protected $serverroot;
-	protected $thirdpartyroot;
-	protected $webroot;
-
-	protected $resources = array();
-
-	/** @var \OCP\ILogger */
-	protected $logger;
-
-	/**
-	 * @param \OCP\ILogger $logger
-	 * @param string $theme
-	 * @param array $core_map
-	 * @param array $party_map
-	 */
-	public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map) {
-		$this->logger = $logger;
-		$this->theme = $theme;
-		$this->mapping = $core_map + $party_map;
-		$this->serverroot = key($core_map);
-		$this->thirdpartyroot = key($party_map);
-		$this->webroot = $this->mapping[$this->serverroot];
-	}
-
-	/**
-	 * @param string $resource
-	 */
-	abstract public function doFind($resource);
-
-	/**
-	 * @param string $resource
-	 */
-	abstract public function doFindTheme($resource);
-
-	/**
-	 * Finds the resources and adds them to the list
-	 *
-	 * @param array $resources
-	 */
-	public function find($resources) {
-		foreach ($resources as $resource) {
-			try {
-				$this->doFind($resource);
-			} catch (ResourceNotFoundException $e) {
-				$resourceApp = substr($resource, 0, strpos($resource, '/'));
-				$this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
-			}
-		}
-		if (!empty($this->theme)) {
-			foreach ($resources as $resource) {
-				try {
-					$this->doFindTheme($resource);
-				} catch (ResourceNotFoundException $e) {
-					$resourceApp = substr($resource, 0, strpos($resource, '/'));
-					$this->logger->debug('Could not find resource file in theme "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * append the $file resource if exist at $root
-	 *
-	 * @param string $root path to check
-	 * @param string $file the filename
-	 * @param string|null $webRoot base for path, default map $root to $webRoot
-	 * @return bool True if the resource was found, false otherwise
-	 */
-	protected function appendIfExist($root, $file, $webRoot = null) {
-		if (is_file($root.'/'.$file)) {
-			$this->append($root, $file, $webRoot, false);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Attempt to find the webRoot
-	 *
-	 * traverse the potential web roots upwards in the path
-	 *
-	 * example:
-	 *   - root: /srv/www/apps/myapp
-	 *   - available mappings: ['/srv/www']
-	 *
-	 * First we check if a mapping for /srv/www/apps/myapp is available,
-	 * then /srv/www/apps, /srv/www/apps, /srv/www, ... until we find a
-	 * valid web root
-	 *
-	 * @param string $root
-	 * @return string|null The web root or null on failure
-	 */
-	protected function findWebRoot($root) {
-		$webRoot = null;
-		$tmpRoot = $root;
-
-		while ($webRoot === null) {
-			if (isset($this->mapping[$tmpRoot])) {
-				$webRoot = $this->mapping[$tmpRoot];
-				break;
-			}
-
-			if ($tmpRoot === '/') {
-				break;
-			}
-
-			$tmpRoot = dirname($tmpRoot);
-		}
-
-		if ($webRoot === null) {
-			$realpath = realpath($root);
-
-			if ($realpath && ($realpath !== $root)) {
-				return $this->findWebRoot($realpath);
-			}
-		}
-
-		return $webRoot;
-	}
-
-	/**
-	 * append the $file resource at $root
-	 *
-	 * @param string $root path to check
-	 * @param string $file the filename
-	 * @param string|null $webRoot base for path, default map $root to $webRoot
-	 * @param bool $throw Throw an exception, when the route does not exist
-	 * @throws ResourceNotFoundException Only thrown when $throw is true and the resource is missing
-	 */
-	protected function append($root, $file, $webRoot = null, $throw = true) {
-
-		if (!is_string($root)) {
-			if ($throw) {
-				throw new ResourceNotFoundException($file, $webRoot);
-			}
-			return;
-		}
-
-		if (!$webRoot) {
-			$webRoot = $this->findWebRoot($root);
-
-			if ($webRoot === null) {
-				$webRoot = '';
-				$this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
-					'app' => 'lib',
-					'root' => $root,
-					'file' => $file,
-					'webRoot' => $webRoot,
-					'throw' => $throw ? 'true' : 'false'
-				]);
-			}
-		}
-		$this->resources[] = array($root, $webRoot, $file);
-
-		if ($throw && !is_file($root . '/' . $file)) {
-			throw new ResourceNotFoundException($file, $webRoot);
-		}
-	}
-
-	/**
-	 * Returns the list of all resources that should be loaded
-	 * @return array
-	 */
-	public function getResources() {
-		return $this->resources;
-	}
+    protected $theme;
+
+    protected $mapping;
+    protected $serverroot;
+    protected $thirdpartyroot;
+    protected $webroot;
+
+    protected $resources = array();
+
+    /** @var \OCP\ILogger */
+    protected $logger;
+
+    /**
+     * @param \OCP\ILogger $logger
+     * @param string $theme
+     * @param array $core_map
+     * @param array $party_map
+     */
+    public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map) {
+        $this->logger = $logger;
+        $this->theme = $theme;
+        $this->mapping = $core_map + $party_map;
+        $this->serverroot = key($core_map);
+        $this->thirdpartyroot = key($party_map);
+        $this->webroot = $this->mapping[$this->serverroot];
+    }
+
+    /**
+     * @param string $resource
+     */
+    abstract public function doFind($resource);
+
+    /**
+     * @param string $resource
+     */
+    abstract public function doFindTheme($resource);
+
+    /**
+     * Finds the resources and adds them to the list
+     *
+     * @param array $resources
+     */
+    public function find($resources) {
+        foreach ($resources as $resource) {
+            try {
+                $this->doFind($resource);
+            } catch (ResourceNotFoundException $e) {
+                $resourceApp = substr($resource, 0, strpos($resource, '/'));
+                $this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+            }
+        }
+        if (!empty($this->theme)) {
+            foreach ($resources as $resource) {
+                try {
+                    $this->doFindTheme($resource);
+                } catch (ResourceNotFoundException $e) {
+                    $resourceApp = substr($resource, 0, strpos($resource, '/'));
+                    $this->logger->debug('Could not find resource file in theme "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+                }
+            }
+        }
+    }
+
+    /**
+     * append the $file resource if exist at $root
+     *
+     * @param string $root path to check
+     * @param string $file the filename
+     * @param string|null $webRoot base for path, default map $root to $webRoot
+     * @return bool True if the resource was found, false otherwise
+     */
+    protected function appendIfExist($root, $file, $webRoot = null) {
+        if (is_file($root.'/'.$file)) {
+            $this->append($root, $file, $webRoot, false);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Attempt to find the webRoot
+     *
+     * traverse the potential web roots upwards in the path
+     *
+     * example:
+     *   - root: /srv/www/apps/myapp
+     *   - available mappings: ['/srv/www']
+     *
+     * First we check if a mapping for /srv/www/apps/myapp is available,
+     * then /srv/www/apps, /srv/www/apps, /srv/www, ... until we find a
+     * valid web root
+     *
+     * @param string $root
+     * @return string|null The web root or null on failure
+     */
+    protected function findWebRoot($root) {
+        $webRoot = null;
+        $tmpRoot = $root;
+
+        while ($webRoot === null) {
+            if (isset($this->mapping[$tmpRoot])) {
+                $webRoot = $this->mapping[$tmpRoot];
+                break;
+            }
+
+            if ($tmpRoot === '/') {
+                break;
+            }
+
+            $tmpRoot = dirname($tmpRoot);
+        }
+
+        if ($webRoot === null) {
+            $realpath = realpath($root);
+
+            if ($realpath && ($realpath !== $root)) {
+                return $this->findWebRoot($realpath);
+            }
+        }
+
+        return $webRoot;
+    }
+
+    /**
+     * append the $file resource at $root
+     *
+     * @param string $root path to check
+     * @param string $file the filename
+     * @param string|null $webRoot base for path, default map $root to $webRoot
+     * @param bool $throw Throw an exception, when the route does not exist
+     * @throws ResourceNotFoundException Only thrown when $throw is true and the resource is missing
+     */
+    protected function append($root, $file, $webRoot = null, $throw = true) {
+
+        if (!is_string($root)) {
+            if ($throw) {
+                throw new ResourceNotFoundException($file, $webRoot);
+            }
+            return;
+        }
+
+        if (!$webRoot) {
+            $webRoot = $this->findWebRoot($root);
+
+            if ($webRoot === null) {
+                $webRoot = '';
+                $this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
+                    'app' => 'lib',
+                    'root' => $root,
+                    'file' => $file,
+                    'webRoot' => $webRoot,
+                    'throw' => $throw ? 'true' : 'false'
+                ]);
+            }
+        }
+        $this->resources[] = array($root, $webRoot, $file);
+
+        if ($throw && !is_file($root . '/' . $file)) {
+            throw new ResourceNotFoundException($file, $webRoot);
+        }
+    }
+
+    /**
+     * Returns the list of all resources that should be loaded
+     * @return array
+     */
+    public function getResources() {
+        return $this->resources;
+    }
 }