nextcloud / server

lib/private/Contacts/ContactsMenu/ActionProviderStore.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 	 * @return string[]
 	 */
 	private function getAppProviderClasses(IUser $user) {
-		return array_reduce($this->appManager->getEnabledAppsForUser($user), function ($all, $appId) {
+		return array_reduce($this->appManager->getEnabledAppsForUser($user), function($all, $appId) {
 			$info = $this->appManager->getAppInfo($appId);
 
 			if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
@@ -103,7 +103,7 @@ 
 				return $all;
 			}
 
-			$providers = array_reduce($info['contactsmenu'], function ($all, $provider) {
+			$providers = array_reduce($info['contactsmenu'], function($all, $provider) {
 				return array_merge($all, [$provider]);
 			}, []);
 

Indentation +64 added lines, -64 removed lines

@@ -34,79 +34,79 @@
 
 class ActionProviderStore {
 
-	/** @var IServerContainer */
-	private $serverContainer;
+    /** @var IServerContainer */
+    private $serverContainer;
 
-	/** @var AppManager */
-	private $appManager;
+    /** @var AppManager */
+    private $appManager;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param IServerContainer $serverContainer
-	 * @param AppManager $appManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
-		$this->serverContainer = $serverContainer;
-		$this->appManager = $appManager;
-		$this->logger = $logger;
-	}
+    /**
+     * @param IServerContainer $serverContainer
+     * @param AppManager $appManager
+     * @param ILogger $logger
+     */
+    public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
+        $this->serverContainer = $serverContainer;
+        $this->appManager = $appManager;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * @param IUser $user
-	 * @return IProvider[]
-	 * @throws Exception
-	 */
-	public function getProviders(IUser $user) {
-		$appClasses = $this->getAppProviderClasses($user);
-		$providerClasses = $this->getServerProviderClasses();
-		$allClasses = array_merge($providerClasses, $appClasses);
-		$providers = [];
+    /**
+     * @param IUser $user
+     * @return IProvider[]
+     * @throws Exception
+     */
+    public function getProviders(IUser $user) {
+        $appClasses = $this->getAppProviderClasses($user);
+        $providerClasses = $this->getServerProviderClasses();
+        $allClasses = array_merge($providerClasses, $appClasses);
+        $providers = [];
 
-		foreach ($allClasses as $class) {
-			try {
-				$providers[] = $this->serverContainer->query($class);
-			} catch (QueryException $ex) {
-				$this->logger->logException($ex, [
-					'message' => "Could not load contacts menu action provider $class",
-					'app' => 'core',
-				]);
-				throw new Exception("Could not load contacts menu action provider");
-			}
-		}
+        foreach ($allClasses as $class) {
+            try {
+                $providers[] = $this->serverContainer->query($class);
+            } catch (QueryException $ex) {
+                $this->logger->logException($ex, [
+                    'message' => "Could not load contacts menu action provider $class",
+                    'app' => 'core',
+                ]);
+                throw new Exception("Could not load contacts menu action provider");
+            }
+        }
 
-		return $providers;
-	}
+        return $providers;
+    }
 
-	/**
-	 * @return string[]
-	 */
-	private function getServerProviderClasses() {
-		return [
-			EMailProvider::class,
-		];
-	}
+    /**
+     * @return string[]
+     */
+    private function getServerProviderClasses() {
+        return [
+            EMailProvider::class,
+        ];
+    }
 
-	/**
-	 * @param IUser $user
-	 * @return string[]
-	 */
-	private function getAppProviderClasses(IUser $user) {
-		return array_reduce($this->appManager->getEnabledAppsForUser($user), function ($all, $appId) {
-			$info = $this->appManager->getAppInfo($appId);
+    /**
+     * @param IUser $user
+     * @return string[]
+     */
+    private function getAppProviderClasses(IUser $user) {
+        return array_reduce($this->appManager->getEnabledAppsForUser($user), function ($all, $appId) {
+            $info = $this->appManager->getAppInfo($appId);
 
-			if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
-				// Nothing to add
-				return $all;
-			}
+            if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
+                // Nothing to add
+                return $all;
+            }
 
-			$providers = array_reduce($info['contactsmenu'], function ($all, $provider) {
-				return array_merge($all, [$provider]);
-			}, []);
+            $providers = array_reduce($info['contactsmenu'], function ($all, $provider) {
+                return array_merge($all, [$provider]);
+            }, []);
 
-			return array_merge($all, $providers);
-		}, []);
-	}
+            return array_merge($all, $providers);
+        }, []);
+    }
 }

lib/private/BackgroundJob/Legacy/QueuedJob.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
 namespace OC\BackgroundJob\Legacy;
 
 class QueuedJob extends \OC\BackgroundJob\QueuedJob {
-	public function run($argument) {
-		$class = $argument['klass'];
-		$method = $argument['method'];
-		$parameters = $argument['parameters'];
-		if (is_callable([$class, $method])) {
-			call_user_func([$class, $method], $parameters);
-		}
-	}
+    public function run($argument) {
+        $class = $argument['klass'];
+        $method = $argument['method'];
+        $parameters = $argument['parameters'];
+        if (is_callable([$class, $method])) {
+            call_user_func([$class, $method], $parameters);
+        }
+    }
 }

lib/private/Hooks/EmitterTrait.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param callable $callback
 	 */
 	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
+		$eventName = $scope.'::'.$method;
 		if (!isset($this->listeners[$eventName])) {
 			$this->listeners[$eventName] = [];
 		}
@@ -53,7 +53,7 @@ 
 		$names = [];
 		$allNames = array_keys($this->listeners);
 		if ($scope and $method) {
-			$name = $scope . '::' . $method;
+			$name = $scope.'::'.$method;
 			if (isset($this->listeners[$name])) {
 				$names[] = $name;
 			}
@@ -93,7 +93,7 @@ 
 	 * @param array $arguments optional
 	 */
 	protected function emit($scope, $method, array $arguments = []) {
-		$eventName = $scope . '::' . $method;
+		$eventName = $scope.'::'.$method;
 		if (isset($this->listeners[$eventName])) {
 			foreach ($this->listeners[$eventName] as $callback) {
 				call_user_func_array($callback, $arguments);

Indentation +72 added lines, -72 removed lines

@@ -25,80 +25,80 @@
 
 trait EmitterTrait {
 
-	/**
-	 * @var callable[][] $listeners
-	 */
-	protected $listeners = [];
+    /**
+     * @var callable[][] $listeners
+     */
+    protected $listeners = [];
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$eventName = $scope . '::' . $method;
-		if (!isset($this->listeners[$eventName])) {
-			$this->listeners[$eventName] = [];
-		}
-		if (array_search($callback, $this->listeners[$eventName], true) === false) {
-			$this->listeners[$eventName][] = $callback;
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        $eventName = $scope . '::' . $method;
+        if (!isset($this->listeners[$eventName])) {
+            $this->listeners[$eventName] = [];
+        }
+        if (array_search($callback, $this->listeners[$eventName], true) === false) {
+            $this->listeners[$eventName][] = $callback;
+        }
+    }
 
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null) {
-		$names = [];
-		$allNames = array_keys($this->listeners);
-		if ($scope and $method) {
-			$name = $scope . '::' . $method;
-			if (isset($this->listeners[$name])) {
-				$names[] = $name;
-			}
-		} elseif ($scope) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[0] == $scope) {
-					$names[] = $name;
-				}
-			}
-		} elseif ($method) {
-			foreach ($allNames as $name) {
-				$parts = explode('::', $name, 2);
-				if ($parts[1] == $method) {
-					$names[] = $name;
-				}
-			}
-		} else {
-			$names = $allNames;
-		}
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null) {
+        $names = [];
+        $allNames = array_keys($this->listeners);
+        if ($scope and $method) {
+            $name = $scope . '::' . $method;
+            if (isset($this->listeners[$name])) {
+                $names[] = $name;
+            }
+        } elseif ($scope) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[0] == $scope) {
+                    $names[] = $name;
+                }
+            }
+        } elseif ($method) {
+            foreach ($allNames as $name) {
+                $parts = explode('::', $name, 2);
+                if ($parts[1] == $method) {
+                    $names[] = $name;
+                }
+            }
+        } else {
+            $names = $allNames;
+        }
 
-		foreach ($names as $name) {
-			if ($callback) {
-				$index = array_search($callback, $this->listeners[$name], true);
-				if ($index !== false) {
-					unset($this->listeners[$name][$index]);
-				}
-			} else {
-				$this->listeners[$name] = [];
-			}
-		}
-	}
+        foreach ($names as $name) {
+            if ($callback) {
+                $index = array_search($callback, $this->listeners[$name], true);
+                if ($index !== false) {
+                    unset($this->listeners[$name][$index]);
+                }
+            } else {
+                $this->listeners[$name] = [];
+            }
+        }
+    }
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments optional
-	 */
-	protected function emit($scope, $method, array $arguments = []) {
-		$eventName = $scope . '::' . $method;
-		if (isset($this->listeners[$eventName])) {
-			foreach ($this->listeners[$eventName] as $callback) {
-				call_user_func_array($callback, $arguments);
-			}
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments optional
+     */
+    protected function emit($scope, $method, array $arguments = []) {
+        $eventName = $scope . '::' . $method;
+        if (isset($this->listeners[$eventName])) {
+            foreach ($this->listeners[$eventName] as $callback) {
+                call_user_func_array($callback, $arguments);
+            }
+        }
+    }
 }

lib/private/Hooks/ForwardingEmitter.php

Indentation +28 added lines, -28 removed lines

@@ -31,35 +31,35 @@
  * @package OC\Hooks
  */
 abstract class ForwardingEmitter extends BasicEmitter {
-	/**
-	 * @var \OC\Hooks\Emitter[] array
-	 */
-	private $forwardEmitters = [];
+    /**
+     * @var \OC\Hooks\Emitter[] array
+     */
+    private $forwardEmitters = [];
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		parent::listen($scope, $method, $callback);
-		foreach ($this->forwardEmitters as $emitter) {
-			$emitter->listen($scope, $method, $callback);
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        parent::listen($scope, $method, $callback);
+        foreach ($this->forwardEmitters as $emitter) {
+            $emitter->listen($scope, $method, $callback);
+        }
+    }
 
-	/**
-	 * @param \OC\Hooks\Emitter $emitter
-	 */
-	protected function forward(Emitter $emitter) {
-		$this->forwardEmitters[] = $emitter;
+    /**
+     * @param \OC\Hooks\Emitter $emitter
+     */
+    protected function forward(Emitter $emitter) {
+        $this->forwardEmitters[] = $emitter;
 
-		//forward all previously connected hooks
-		foreach ($this->listeners as $key => $listeners) {
-			list($scope, $method) = explode('::', $key, 2);
-			foreach ($listeners as $listener) {
-				$emitter->listen($scope, $method, $listener);
-			}
-		}
-	}
+        //forward all previously connected hooks
+        foreach ($this->listeners as $key => $listeners) {
+            list($scope, $method) = explode('::', $key, 2);
+            foreach ($listeners as $listener) {
+                $emitter->listen($scope, $method, $listener);
+            }
+        }
+    }
 }

lib/private/Hooks/LegacyEmitter.php

Indentation +11 added lines, -11 removed lines

@@ -24,15 +24,15 @@
 namespace OC\Hooks;
 
 abstract class LegacyEmitter extends BasicEmitter {
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 *
-	 * @suppress PhanAccessMethodProtected
-	 */
-	protected function emit($scope, $method, array $arguments = []) {
-		\OC_Hook::emit($scope, $method, $arguments);
-		parent::emit($scope, $method, $arguments);
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     *
+     * @suppress PhanAccessMethodProtected
+     */
+    protected function emit($scope, $method, array $arguments = []) {
+        \OC_Hook::emit($scope, $method, $arguments);
+        parent::emit($scope, $method, $arguments);
+    }
 }

lib/private/TagManager.php

Indentation +44 added lines, -44 removed lines

@@ -40,51 +40,51 @@
 
 class TagManager implements \OCP\ITagManager {
 
-	/**
-	 * User session
-	 *
-	 * @var \OCP\IUserSession
-	 */
-	private $userSession;
+    /**
+     * User session
+     *
+     * @var \OCP\IUserSession
+     */
+    private $userSession;
 
-	/**
-	 * TagMapper
-	 *
-	 * @var TagMapper
-	 */
-	private $mapper;
+    /**
+     * TagMapper
+     *
+     * @var TagMapper
+     */
+    private $mapper;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param TagMapper $mapper Instance of the TagMapper abstraction layer.
-	 * @param \OCP\IUserSession $userSession the user session
-	 */
-	public function __construct(TagMapper $mapper, \OCP\IUserSession $userSession) {
-		$this->mapper = $mapper;
-		$this->userSession = $userSession;
-	}
+    /**
+     * Constructor.
+     *
+     * @param TagMapper $mapper Instance of the TagMapper abstraction layer.
+     * @param \OCP\IUserSession $userSession the user session
+     */
+    public function __construct(TagMapper $mapper, \OCP\IUserSession $userSession) {
+        $this->mapper = $mapper;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * Create a new \OCP\ITags instance and load tags from db.
-	 *
-	 * @see \OCP\ITags
-	 * @param string $type The type identifier e.g. 'contact' or 'event'.
-	 * @param array $defaultTags An array of default tags to be used if none are stored.
-	 * @param boolean $includeShared Whether to include tags for items shared with this user by others.
-	 * @param string $userId user for which to retrieve the tags, defaults to the currently
-	 * logged in user
-	 * @return \OCP\ITags
-	 */
-	public function load($type, $defaultTags = [], $includeShared = false, $userId = null) {
-		if (is_null($userId)) {
-			$user = $this->userSession->getUser();
-			if ($user === null) {
-				// nothing we can do without a user
-				return null;
-			}
-			$userId = $this->userSession->getUser()->getUId();
-		}
-		return new Tags($this->mapper, $userId, $type, $defaultTags, $includeShared);
-	}
+    /**
+     * Create a new \OCP\ITags instance and load tags from db.
+     *
+     * @see \OCP\ITags
+     * @param string $type The type identifier e.g. 'contact' or 'event'.
+     * @param array $defaultTags An array of default tags to be used if none are stored.
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
+     * @param string $userId user for which to retrieve the tags, defaults to the currently
+     * logged in user
+     * @return \OCP\ITags
+     */
+    public function load($type, $defaultTags = [], $includeShared = false, $userId = null) {
+        if (is_null($userId)) {
+            $user = $this->userSession->getUser();
+            if ($user === null) {
+                // nothing we can do without a user
+                return null;
+            }
+            $userId = $this->userSession->getUser()->getUId();
+        }
+        return new Tags($this->mapper, $userId, $type, $defaultTags, $includeShared);
+    }
 }

lib/private/Template/TemplateFileLocator.php

Indentation +29 added lines, -29 removed lines

@@ -26,37 +26,37 @@
 namespace OC\Template;
 
 class TemplateFileLocator {
-	protected $dirs;
-	private $path;
+    protected $dirs;
+    private $path;
 
-	/**
-	 * @param string[] $dirs
-	 */
-	public function __construct($dirs) {
-		$this->dirs = $dirs;
-	}
+    /**
+     * @param string[] $dirs
+     */
+    public function __construct($dirs) {
+        $this->dirs = $dirs;
+    }
 
-	/**
-	 * @param string $template
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function find($template) {
-		if ($template === '') {
-			throw new \InvalidArgumentException('Empty template name');
-		}
+    /**
+     * @param string $template
+     * @return string
+     * @throws \Exception
+     */
+    public function find($template) {
+        if ($template === '') {
+            throw new \InvalidArgumentException('Empty template name');
+        }
 
-		foreach ($this->dirs as $dir) {
-			$file = $dir.$template.'.php';
-			if (is_file($file)) {
-				$this->path = $dir;
-				return $file;
-			}
-		}
-		throw new \Exception('template file not found: template:'.$template);
-	}
+        foreach ($this->dirs as $dir) {
+            $file = $dir.$template.'.php';
+            if (is_file($file)) {
+                $this->path = $dir;
+                return $file;
+            }
+        }
+        throw new \Exception('template file not found: template:'.$template);
+    }
 
-	public function getPath() {
-		return $this->path;
-	}
+    public function getPath() {
+        return $this->path;
+    }
 }

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]);
 				}
 			}
 		}
@@ -158,7 +158,7 @@ 
 		}
 		$this->resources[] = [$root, $webRoot, $file];
 
-		if ($throw && !is_file($root . '/' . $file)) {
+		if ($throw && !is_file($root.'/'.$file)) {
 			throw new ResourceNotFoundException($file, $webRoot);
 		}
 	}

Indentation +168 added lines, -168 removed lines

@@ -31,172 +31,172 @@
 namespace OC\Template;
 
 abstract class ResourceLocator {
-	protected $theme;
-
-	protected $mapping;
-	protected $serverroot;
-	protected $thirdpartyroot;
-	protected $webroot;
-
-	protected $resources = [];
-
-	/** @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[] = [$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 = [];
+
+    /** @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[] = [$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;
+    }
 }

lib/private/Template/Base.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 		if (array_key_exists($key, $this->vars)) {
 			$this->vars[$key][] = $value;
 		} else {
-			$this->vars[$key] = [ $value ];
+			$this->vars[$key] = [$value];
 		}
 	}
 

Indentation +153 added lines, -153 removed lines

@@ -33,157 +33,157 @@
 use OCP\Defaults;
 
 class Base {
-	private $template; // The template
-	private $vars; // Vars
-
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	/** @var Defaults */
-	private $theme;
-
-	/**
-	 * @param string $template
-	 * @param string $requestToken
-	 * @param \OCP\IL10N $l10n
-	 * @param Defaults $theme
-	 */
-	public function __construct($template, $requestToken, $l10n, $theme) {
-		$this->vars = [];
-		$this->vars['requesttoken'] = $requestToken;
-		$this->l10n = $l10n;
-		$this->template = $template;
-		$this->theme = $theme;
-	}
-
-	/**
-	 * @param string $serverRoot
-	 * @param string|false $app_dir
-	 * @param string $theme
-	 * @param string $app
-	 * @return string[]
-	 */
-	protected function getAppTemplateDirs($theme, $app, $serverRoot, $app_dir) {
-		// Check if the app is in the app folder or in the root
-		if (file_exists($app_dir.'/templates/')) {
-			return [
-				$serverRoot.'/themes/'.$theme.'/apps/'.$app.'/templates/',
-				$app_dir.'/templates/',
-			];
-		}
-		return [
-			$serverRoot.'/themes/'.$theme.'/'.$app.'/templates/',
-			$serverRoot.'/'.$app.'/templates/',
-		];
-	}
-
-	/**
-	 * @param string $serverRoot
-	 * @param string $theme
-	 * @return string[]
-	 */
-	protected function getCoreTemplateDirs($theme, $serverRoot) {
-		return [
-			$serverRoot.'/themes/'.$theme.'/core/templates/',
-			$serverRoot.'/core/templates/',
-		];
-	}
-
-	/**
-	 * Assign variables
-	 * @param string $key key
-	 * @param array|bool|integer|string $value value
-	 * @return bool
-	 *
-	 * This function assigns a variable. It can be accessed via $_[$key] in
-	 * the template.
-	 *
-	 * If the key existed before, it will be overwritten
-	 */
-	public function assign($key, $value) {
-		$this->vars[$key] = $value;
-		return true;
-	}
-
-	/**
-	 * Appends a variable
-	 * @param string $key key
-	 * @param mixed $value value
-	 *
-	 * This function assigns a variable in an array context. If the key already
-	 * exists, the value will be appended. It can be accessed via
-	 * $_[$key][$position] in the template.
-	 */
-	public function append($key, $value) {
-		if (array_key_exists($key, $this->vars)) {
-			$this->vars[$key][] = $value;
-		} else {
-			$this->vars[$key] = [ $value ];
-		}
-	}
-
-	/**
-	 * Prints the proceeded template
-	 * @return bool
-	 *
-	 * This function proceeds the template and prints its output.
-	 */
-	public function printPage() {
-		$data = $this->fetchPage();
-		if ($data === false) {
-			return false;
-		} else {
-			print $data;
-			return true;
-		}
-	}
-
-	/**
-	 * Process the template
-	 *
-	 * @param array|null $additionalParams
-	 * @return string This function processes the template.
-	 *
-	 * This function processes the template.
-	 */
-	public function fetchPage($additionalParams = null) {
-		return $this->load($this->template, $additionalParams);
-	}
-
-	/**
-	 * doing the actual work
-	 *
-	 * @param string $file
-	 * @param array|null $additionalParams
-	 * @return string content
-	 *
-	 * Includes the template file, fetches its output
-	 */
-	protected function load($file, $additionalParams = null) {
-		// Register the variables
-		$_ = $this->vars;
-		$l = $this->l10n;
-		$theme = $this->theme;
-
-		if (!is_null($additionalParams)) {
-			$_ = array_merge($additionalParams, $this->vars);
-			foreach ($_ as $var => $value) {
-				${$var} = $value;
-			}
-		}
-
-		// Include
-		ob_start();
-		try {
-			include $file;
-			$data = ob_get_contents();
-		} catch (\Exception $e) {
-			@ob_end_clean();
-			throw $e;
-		}
-		@ob_end_clean();
-
-		// Return data
-		return $data;
-	}
+    private $template; // The template
+    private $vars; // Vars
+
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    /** @var Defaults */
+    private $theme;
+
+    /**
+     * @param string $template
+     * @param string $requestToken
+     * @param \OCP\IL10N $l10n
+     * @param Defaults $theme
+     */
+    public function __construct($template, $requestToken, $l10n, $theme) {
+        $this->vars = [];
+        $this->vars['requesttoken'] = $requestToken;
+        $this->l10n = $l10n;
+        $this->template = $template;
+        $this->theme = $theme;
+    }
+
+    /**
+     * @param string $serverRoot
+     * @param string|false $app_dir
+     * @param string $theme
+     * @param string $app
+     * @return string[]
+     */
+    protected function getAppTemplateDirs($theme, $app, $serverRoot, $app_dir) {
+        // Check if the app is in the app folder or in the root
+        if (file_exists($app_dir.'/templates/')) {
+            return [
+                $serverRoot.'/themes/'.$theme.'/apps/'.$app.'/templates/',
+                $app_dir.'/templates/',
+            ];
+        }
+        return [
+            $serverRoot.'/themes/'.$theme.'/'.$app.'/templates/',
+            $serverRoot.'/'.$app.'/templates/',
+        ];
+    }
+
+    /**
+     * @param string $serverRoot
+     * @param string $theme
+     * @return string[]
+     */
+    protected function getCoreTemplateDirs($theme, $serverRoot) {
+        return [
+            $serverRoot.'/themes/'.$theme.'/core/templates/',
+            $serverRoot.'/core/templates/',
+        ];
+    }
+
+    /**
+     * Assign variables
+     * @param string $key key
+     * @param array|bool|integer|string $value value
+     * @return bool
+     *
+     * This function assigns a variable. It can be accessed via $_[$key] in
+     * the template.
+     *
+     * If the key existed before, it will be overwritten
+     */
+    public function assign($key, $value) {
+        $this->vars[$key] = $value;
+        return true;
+    }
+
+    /**
+     * Appends a variable
+     * @param string $key key
+     * @param mixed $value value
+     *
+     * This function assigns a variable in an array context. If the key already
+     * exists, the value will be appended. It can be accessed via
+     * $_[$key][$position] in the template.
+     */
+    public function append($key, $value) {
+        if (array_key_exists($key, $this->vars)) {
+            $this->vars[$key][] = $value;
+        } else {
+            $this->vars[$key] = [ $value ];
+        }
+    }
+
+    /**
+     * Prints the proceeded template
+     * @return bool
+     *
+     * This function proceeds the template and prints its output.
+     */
+    public function printPage() {
+        $data = $this->fetchPage();
+        if ($data === false) {
+            return false;
+        } else {
+            print $data;
+            return true;
+        }
+    }
+
+    /**
+     * Process the template
+     *
+     * @param array|null $additionalParams
+     * @return string This function processes the template.
+     *
+     * This function processes the template.
+     */
+    public function fetchPage($additionalParams = null) {
+        return $this->load($this->template, $additionalParams);
+    }
+
+    /**
+     * doing the actual work
+     *
+     * @param string $file
+     * @param array|null $additionalParams
+     * @return string content
+     *
+     * Includes the template file, fetches its output
+     */
+    protected function load($file, $additionalParams = null) {
+        // Register the variables
+        $_ = $this->vars;
+        $l = $this->l10n;
+        $theme = $this->theme;
+
+        if (!is_null($additionalParams)) {
+            $_ = array_merge($additionalParams, $this->vars);
+            foreach ($_ as $var => $value) {
+                ${$var} = $value;
+            }
+        }
+
+        // Include
+        ob_start();
+        try {
+            include $file;
+            $data = ob_get_contents();
+        } catch (\Exception $e) {
+            @ob_end_clean();
+            throw $e;
+        }
+        @ob_end_clean();
+
+        // Return data
+        return $data;
+    }
 }