nextcloud / server

lib/public/Search/IProvider.php

Indentation +50 added lines, -50 removed lines

@@ -39,56 +39,56 @@
  */
 interface IProvider {
 
-	/**
-	 * Get the unique ID of this search provider
-	 *
-	 * Ideally this should be the app name or an identifier identified with the
-	 * app name, especially if the app registers more than one provider.
-	 *
-	 * Example: 'mail', 'mail_recipients', 'files_sharing'
-	 *
-	 * @return string
-	 *
-	 * @since 20.0.0
-	 */
-	public function getId(): string;
+    /**
+     * Get the unique ID of this search provider
+     *
+     * Ideally this should be the app name or an identifier identified with the
+     * app name, especially if the app registers more than one provider.
+     *
+     * Example: 'mail', 'mail_recipients', 'files_sharing'
+     *
+     * @return string
+     *
+     * @since 20.0.0
+     */
+    public function getId(): string;
 
-	/**
-	 * Get the translated name of this search provider
-	 *
-	 * Example: 'Mail', 'Contacts'...
-	 *
-	 * @return string
-	 *
-	 * @since 20.0.0
-	 */
-	public function getName(): string;
+    /**
+     * Get the translated name of this search provider
+     *
+     * Example: 'Mail', 'Contacts'...
+     *
+     * @return string
+     *
+     * @since 20.0.0
+     */
+    public function getName(): string;
 
-	/**
-	 * Find matching search entries in an app
-	 *
-	 * Search results can either be a complete list of all the matches the app can
-	 * find, or ideally a paginated result set where more data can be fetched on
-	 * demand. To be able to tell where the next offset starts the search uses
-	 * "cursors" which are a property of the last result entry. E.g. search results
-	 * that show most recent entries first can look for entries older than the last
-	 * one of the first result set. This approach was chosen over a numeric limit/
-	 * offset approach as the offset moves as new data comes in. The cursor is
-	 * resistant to these changes and will still show results without overlaps or
-	 * gaps.
-	 *
-	 * See https://dev.to/jackmarchant/offset-and-cursor-pagination-explained-b89
-	 * for the concept of cursors.
-	 *
-	 * Implementations that return result pages have to adhere to the limit
-	 * property of a search query.
-	 *
-	 * @param IUser $user
-	 * @param ISearchQuery $query
-	 *
-	 * @return SearchResult
-	 *
-	 * @since 20.0.0
-	 */
-	public function search(IUser $user, ISearchQuery $query): SearchResult;
+    /**
+     * Find matching search entries in an app
+     *
+     * Search results can either be a complete list of all the matches the app can
+     * find, or ideally a paginated result set where more data can be fetched on
+     * demand. To be able to tell where the next offset starts the search uses
+     * "cursors" which are a property of the last result entry. E.g. search results
+     * that show most recent entries first can look for entries older than the last
+     * one of the first result set. This approach was chosen over a numeric limit/
+     * offset approach as the offset moves as new data comes in. The cursor is
+     * resistant to these changes and will still show results without overlaps or
+     * gaps.
+     *
+     * See https://dev.to/jackmarchant/offset-and-cursor-pagination-explained-b89
+     * for the concept of cursors.
+     *
+     * Implementations that return result pages have to adhere to the limit
+     * property of a search query.
+     *
+     * @param IUser $user
+     * @param ISearchQuery $query
+     *
+     * @return SearchResult
+     *
+     * @since 20.0.0
+     */
+    public function search(IUser $user, ISearchQuery $query): SearchResult;
 }

lib/public/Search/ASearchResultEntry.php

Indentation +68 added lines, -68 removed lines

@@ -44,79 +44,79 @@
  */
 abstract class ASearchResultEntry implements JsonSerializable {
 
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	protected $thumbnailUrl;
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    protected $thumbnailUrl;
 
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	protected $title;
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    protected $title;
 
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	protected $subline;
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    protected $subline;
 
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	protected $resourceUrl;
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    protected $resourceUrl;
 
-	/**
-	 * @var string
-	 * @since 20.0.0
-	 */
-	protected $iconClass;
+    /**
+     * @var string
+     * @since 20.0.0
+     */
+    protected $iconClass;
 
-	/**
-	 * @var boolean
-	 * @since 20.0.0
-	 */
-	protected $rounded;
+    /**
+     * @var boolean
+     * @since 20.0.0
+     */
+    protected $rounded;
 
-	/**
-	 * @param string $thumbnailUrl a relative or absolute URL to the thumbnail or icon of the entry
-	 * @param string $title a main title of the entry
-	 * @param string $subline the secondary line of the entry
-	 * @param string $resourceUrl the URL where the user can find the detail, like a deep link inside the app
-	 * @param string $iconClass the icon class fallback
-	 * @param boolean $rounded is the thumbnail rounded
-	 *
-	 * @since 20.0.0
-	 */
-	public function __construct(string $thumbnailUrl,
-								string $title,
-								string $subline,
-								string $resourceUrl,
-								string $iconClass = '',
-								bool $rounded = false) {
-		$this->thumbnailUrl = $thumbnailUrl;
-		$this->title = $title;
-		$this->subline = $subline;
-		$this->resourceUrl = $resourceUrl;
-		$this->iconClass = $iconClass;
-		$this->rounded = $rounded;
-	}
+    /**
+     * @param string $thumbnailUrl a relative or absolute URL to the thumbnail or icon of the entry
+     * @param string $title a main title of the entry
+     * @param string $subline the secondary line of the entry
+     * @param string $resourceUrl the URL where the user can find the detail, like a deep link inside the app
+     * @param string $iconClass the icon class fallback
+     * @param boolean $rounded is the thumbnail rounded
+     *
+     * @since 20.0.0
+     */
+    public function __construct(string $thumbnailUrl,
+                                string $title,
+                                string $subline,
+                                string $resourceUrl,
+                                string $iconClass = '',
+                                bool $rounded = false) {
+        $this->thumbnailUrl = $thumbnailUrl;
+        $this->title = $title;
+        $this->subline = $subline;
+        $this->resourceUrl = $resourceUrl;
+        $this->iconClass = $iconClass;
+        $this->rounded = $rounded;
+    }
 
-	/**
-	 * @return array
-	 *
-	 * @since 20.0.0
-	 */
-	public function jsonSerialize(): array {
-		return [
-			'thumbnailUrl' => $this->thumbnailUrl,
-			'title' => $this->title,
-			'subline' => $this->subline,
-			'resourceUrl' => $this->resourceUrl,
-			'iconClass' => $this->iconClass,
-			'rounded' => $this->rounded,
-		];
-	}
+    /**
+     * @return array
+     *
+     * @since 20.0.0
+     */
+    public function jsonSerialize(): array {
+        return [
+            'thumbnailUrl' => $this->thumbnailUrl,
+            'title' => $this->title,
+            'subline' => $this->subline,
+            'resourceUrl' => $this->resourceUrl,
+            'iconClass' => $this->iconClass,
+            'rounded' => $this->rounded,
+        ];
+    }
 }

lib/private/Search/SearchQuery.php

Indentation +48 added lines, -48 removed lines

@@ -28,61 +28,61 @@
 use OCP\Search\ISearchQuery;
 
 class SearchQuery implements ISearchQuery {
-	public const LIMIT_DEFAULT = 5;
+    public const LIMIT_DEFAULT = 5;
 
-	/** @var string */
-	private $term;
+    /** @var string */
+    private $term;
 
-	/** @var int */
-	private $sortOrder;
+    /** @var int */
+    private $sortOrder;
 
-	/** @var int */
-	private $limit;
+    /** @var int */
+    private $limit;
 
-	/** @var int|string|null */
-	private $cursor;
+    /** @var int|string|null */
+    private $cursor;
 
-	/**
-	 * @param string $term
-	 * @param int $sortOrder
-	 * @param int $limit
-	 * @param int|string|null $cursor
-	 */
-	public function __construct(string $term,
-								int $sortOrder = ISearchQuery::SORT_DATE_DESC,
-								int $limit = self::LIMIT_DEFAULT,
-								$cursor = null) {
-		$this->term = $term;
-		$this->sortOrder = $sortOrder;
-		$this->limit = $limit;
-		$this->cursor = $cursor;
-	}
+    /**
+     * @param string $term
+     * @param int $sortOrder
+     * @param int $limit
+     * @param int|string|null $cursor
+     */
+    public function __construct(string $term,
+                                int $sortOrder = ISearchQuery::SORT_DATE_DESC,
+                                int $limit = self::LIMIT_DEFAULT,
+                                $cursor = null) {
+        $this->term = $term;
+        $this->sortOrder = $sortOrder;
+        $this->limit = $limit;
+        $this->cursor = $cursor;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getTerm(): string {
-		return $this->term;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getTerm(): string {
+        return $this->term;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getSortOrder(): int {
-		return $this->sortOrder;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getSortOrder(): int {
+        return $this->sortOrder;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getLimit(): int {
-		return $this->limit;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getLimit(): int {
+        return $this->limit;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getCursor() {
-		return $this->cursor;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getCursor() {
+        return $this->cursor;
+    }
 }

lib/private/Search/SearchComposer.php

Indentation +89 added lines, -89 removed lines

@@ -57,93 +57,93 @@
  */
 class SearchComposer {
 
-	/** @var IProvider[] */
-	private $providers = [];
-
-	/** @var Coordinator */
-	private $bootstrapCoordinator;
-
-	/** @var IServerContainer */
-	private $container;
-
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(Coordinator $bootstrapCoordinator,
-								IServerContainer $container,
-								ILogger $logger) {
-		$this->container = $container;
-		$this->logger = $logger;
-		$this->bootstrapCoordinator = $bootstrapCoordinator;
-	}
-
-	/**
-	 * Load all providers dynamically that were registered through `registerProvider`
-	 *
-	 * If a provider can't be loaded we log it but the operation continues nevertheless
-	 */
-	private function loadLazyProviders(): void {
-		$context = $this->bootstrapCoordinator->getRegistrationContext();
-		if ($context === null) {
-			// Too early, nothing registered yet
-			return;
-		}
-
-		$registrations = $context->getSearchProviders();
-		foreach ($registrations as $registration) {
-			try {
-				/** @var IProvider $provider */
-				$provider = $this->container->query($registration['class']);
-				$this->providers[$provider->getId()] = $provider;
-			} catch (QueryException $e) {
-				// Log an continue. We can be fault tolerant here.
-				$this->logger->logException($e, [
-					'message' => 'Could not load search provider dynamically: ' . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * Get a list of all provider IDs & Names for the consecutive calls to `search`
-	 *
-	 * @return array
-	 */
-	public function getProviders(): array {
-		$this->loadLazyProviders();
-
-		/**
-		 * Return an array with the IDs, but strip the associative keys
-		 */
-		return array_values(
-			array_map(function (IProvider $provider) {
-				return [
-					'id' => $provider->getId(),
-					'name' => $provider->getName()
-				];
-			}, $this->providers));
-	}
-
-	/**
-	 * Query an individual search provider for results
-	 *
-	 * @param IUser $user
-	 * @param string $providerId one of the IDs received by `getProviders`
-	 * @param ISearchQuery $query
-	 *
-	 * @return SearchResult
-	 * @throws InvalidArgumentException when the $providerId does not correspond to a registered provider
-	 */
-	public function search(IUser $user,
-						   string $providerId,
-						   ISearchQuery $query): SearchResult {
-		$this->loadLazyProviders();
-
-		$provider = $this->providers[$providerId] ?? null;
-		if ($provider === null) {
-			throw new InvalidArgumentException("Provider $providerId is unknown");
-		}
-		return $provider->search($user, $query);
-	}
+    /** @var IProvider[] */
+    private $providers = [];
+
+    /** @var Coordinator */
+    private $bootstrapCoordinator;
+
+    /** @var IServerContainer */
+    private $container;
+
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(Coordinator $bootstrapCoordinator,
+                                IServerContainer $container,
+                                ILogger $logger) {
+        $this->container = $container;
+        $this->logger = $logger;
+        $this->bootstrapCoordinator = $bootstrapCoordinator;
+    }
+
+    /**
+     * Load all providers dynamically that were registered through `registerProvider`
+     *
+     * If a provider can't be loaded we log it but the operation continues nevertheless
+     */
+    private function loadLazyProviders(): void {
+        $context = $this->bootstrapCoordinator->getRegistrationContext();
+        if ($context === null) {
+            // Too early, nothing registered yet
+            return;
+        }
+
+        $registrations = $context->getSearchProviders();
+        foreach ($registrations as $registration) {
+            try {
+                /** @var IProvider $provider */
+                $provider = $this->container->query($registration['class']);
+                $this->providers[$provider->getId()] = $provider;
+            } catch (QueryException $e) {
+                // Log an continue. We can be fault tolerant here.
+                $this->logger->logException($e, [
+                    'message' => 'Could not load search provider dynamically: ' . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * Get a list of all provider IDs & Names for the consecutive calls to `search`
+     *
+     * @return array
+     */
+    public function getProviders(): array {
+        $this->loadLazyProviders();
+
+        /**
+         * Return an array with the IDs, but strip the associative keys
+         */
+        return array_values(
+            array_map(function (IProvider $provider) {
+                return [
+                    'id' => $provider->getId(),
+                    'name' => $provider->getName()
+                ];
+            }, $this->providers));
+    }
+
+    /**
+     * Query an individual search provider for results
+     *
+     * @param IUser $user
+     * @param string $providerId one of the IDs received by `getProviders`
+     * @param ISearchQuery $query
+     *
+     * @return SearchResult
+     * @throws InvalidArgumentException when the $providerId does not correspond to a registered provider
+     */
+    public function search(IUser $user,
+                            string $providerId,
+                            ISearchQuery $query): SearchResult {
+        $this->loadLazyProviders();
+
+        $provider = $this->providers[$providerId] ?? null;
+        if ($provider === null) {
+            throw new InvalidArgumentException("Provider $providerId is unknown");
+        }
+        return $provider->search($user, $query);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 			} catch (QueryException $e) {
 				// Log an continue. We can be fault tolerant here.
 				$this->logger->logException($e, [
-					'message' => 'Could not load search provider dynamically: ' . $e->getMessage(),
+					'message' => 'Could not load search provider dynamically: '.$e->getMessage(),
 					'level' => ILogger::ERROR,
 				]);
 			}
@@ -117,7 +117,7 @@ 
 		 * Return an array with the IDs, but strip the associative keys
 		 */
 		return array_values(
-			array_map(function (IProvider $provider) {
+			array_map(function(IProvider $provider) {
 				return [
 					'id' => $provider->getId(),
 					'name' => $provider->getName()

lib/private/TemplateLayout.php

Indentation +310 added lines, -310 removed lines

@@ -56,315 +56,315 @@
 use OCP\Util;
 
 class TemplateLayout extends \OC_Template {
-	private static $versionHash = '';
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IInitialStateService */
-	private $initialState;
-
-	/**
-	 * @param string $renderAs
-	 * @param string $appId application id
-	 */
-	public function __construct($renderAs, $appId = '') {
-
-		/** @var IConfig */
-		$this->config = \OC::$server->get(IConfig::class);
-
-		/** @var IInitialStateService */
-		$this->initialState = \OC::$server->get(InitialStateService::class);
-
-		if (Util::isIE()) {
-			Util::addStyle('ie');
-		}
-
-		// Decide which page we show
-		if ($renderAs === TemplateResponse::RENDER_AS_USER) {
-			parent::__construct('core', 'layout.user');
-			if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
-				$this->assign('bodyid', 'body-settings');
-			} else {
-				$this->assign('bodyid', 'body-user');
-			}
-
-			$this->initialState->provideInitialState('unified-search', 'limit-default', SearchQuery::LIMIT_DEFAULT);
-			Util::addScript('dist/unified-search', null, true);
-
-			// Add navigation entry
-			$this->assign('application', '');
-			$this->assign('appid', $appId);
-			$navigation = \OC::$server->getNavigationManager()->getAll();
-			$this->assign('navigation', $navigation);
-			$settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings');
-			$this->assign('settingsnavigation', $settingsNavigation);
-			foreach ($navigation as $entry) {
-				if ($entry['active']) {
-					$this->assign('application', $entry['name']);
-					break;
-				}
-			}
-
-			foreach ($settingsNavigation as $entry) {
-				if ($entry['active']) {
-					$this->assign('application', $entry['name']);
-					break;
-				}
-			}
-			$userDisplayName = \OC_User::getDisplayName();
-			$this->assign('user_displayname', $userDisplayName);
-			$this->assign('user_uid', \OC_User::getUser());
-
-			if (\OC_User::getUser() === false) {
-				$this->assign('userAvatarSet', false);
-			} else {
-				$this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());
-				$this->assign('userAvatarVersion', $this->config->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0));
-			}
-
-			// check if app menu icons should be inverted
-			try {
-				/** @var \OCA\Theming\Util $util */
-				$util = \OC::$server->query(\OCA\Theming\Util::class);
-				$this->assign('themingInvertMenu', $util->invertTextColor(\OC::$server->getThemingDefaults()->getColorPrimary()));
-			} catch (\OCP\AppFramework\QueryException $e) {
-				$this->assign('themingInvertMenu', false);
-			} catch (\OCP\AutoloadNotAllowedException $e) {
-				$this->assign('themingInvertMenu', false);
-			}
-		} elseif ($renderAs === TemplateResponse::RENDER_AS_ERROR) {
-			parent::__construct('core', 'layout.guest', '', false);
-			$this->assign('bodyid', 'body-login');
-			$this->assign('user_displayname', '');
-			$this->assign('user_uid', '');
-		} elseif ($renderAs === TemplateResponse::RENDER_AS_GUEST) {
-			parent::__construct('core', 'layout.guest');
-			\OC_Util::addStyle('guest');
-			$this->assign('bodyid', 'body-login');
-
-			$userDisplayName = \OC_User::getDisplayName();
-			$this->assign('user_displayname', $userDisplayName);
-			$this->assign('user_uid', \OC_User::getUser());
-		} elseif ($renderAs === TemplateResponse::RENDER_AS_PUBLIC) {
-			parent::__construct('core', 'layout.public');
-			$this->assign('appid', $appId);
-			$this->assign('bodyid', 'body-public');
-
-			/** @var IRegistry $subscription */
-			$subscription = \OC::$server->query(IRegistry::class);
-			$showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true);
-			if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) {
-				$showSimpleSignup = false;
-			}
-			$this->assign('showSimpleSignUpLink', $showSimpleSignup);
-		} else {
-			parent::__construct('core', 'layout.base');
-		}
-		// Send the language and the locale to our layouts
-		$lang = \OC::$server->getL10NFactory()->findLanguage();
-		$locale = \OC::$server->getL10NFactory()->findLocale($lang);
-
-		$lang = str_replace('_', '-', $lang);
-		$this->assign('language', $lang);
-		$this->assign('locale', $locale);
-
-		if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-			if (empty(self::$versionHash)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = implode('.', \OCP\Util::getVersion());
-				self::$versionHash = substr(md5(implode(',', $v)), 0, 8);
-			}
-		} else {
-			self::$versionHash = md5('not installed');
-		}
-
-		// Add the js files
-		$jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
-		$this->assign('jsfiles', []);
-		if ($this->config->getSystemValue('installed', false) && $renderAs != TemplateResponse::RENDER_AS_ERROR) {
-			if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
-				$jsConfigHelper = new JSConfigHelper(
-					\OC::$server->getL10N('lib'),
-					\OC::$server->query(Defaults::class),
-					\OC::$server->getAppManager(),
-					\OC::$server->getSession(),
-					\OC::$server->getUserSession()->getUser(),
-					$this->config,
-					\OC::$server->getGroupManager(),
-					\OC::$server->getIniWrapper(),
-					\OC::$server->getURLGenerator(),
-					\OC::$server->getCapabilitiesManager(),
-					\OC::$server->query(IInitialStateService::class)
-				);
-				$this->assign('inline_ocjs', $jsConfigHelper->getConfig());
-			} else {
-				$this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
-			}
-		}
-		foreach ($jsFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
-			$this->append('jsfiles', $web.'/'.$file . $this->getVersionHashSuffix());
-		}
-
-		try {
-			$pathInfo = \OC::$server->getRequest()->getPathInfo();
-		} catch (\Exception $e) {
-			$pathInfo = '';
-		}
-
-		// Do not initialise scss appdata until we have a fully installed instance
-		// Do not load scss for update, errors, installation or login page
-		if (\OC::$server->getSystemConfig()->getValue('installed', false)
-			&& !\OCP\Util::needUpgrade()
-			&& $pathInfo !== ''
-			&& !preg_match('/^\/login/', $pathInfo)
-			&& $renderAs !== TemplateResponse::RENDER_AS_ERROR
-		) {
-			$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
-		} else {
-			// If we ignore the scss compiler,
-			// we need to load the guest css fallback
-			\OC_Util::addStyle('guest');
-			$cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false);
-		}
-
-		$this->assign('cssfiles', []);
-		$this->assign('printcssfiles', []);
-		$this->assign('versionHash', self::$versionHash);
-		foreach ($cssFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
-
-			if (substr($file, -strlen('print.css')) === 'print.css') {
-				$this->append('printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix());
-			} else {
-				$suffix = $this->getVersionHashSuffix($web, $file);
-
-				if (strpos($file, '?v=') == false) {
-					$this->append('cssfiles', $web.'/'.$file . $suffix);
-				} else {
-					$this->append('cssfiles', $web.'/'.$file . '-' . substr($suffix, 3));
-				}
-			}
-		}
+    private static $versionHash = '';
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IInitialStateService */
+    private $initialState;
+
+    /**
+     * @param string $renderAs
+     * @param string $appId application id
+     */
+    public function __construct($renderAs, $appId = '') {
+
+        /** @var IConfig */
+        $this->config = \OC::$server->get(IConfig::class);
+
+        /** @var IInitialStateService */
+        $this->initialState = \OC::$server->get(InitialStateService::class);
+
+        if (Util::isIE()) {
+            Util::addStyle('ie');
+        }
+
+        // Decide which page we show
+        if ($renderAs === TemplateResponse::RENDER_AS_USER) {
+            parent::__construct('core', 'layout.user');
+            if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+                $this->assign('bodyid', 'body-settings');
+            } else {
+                $this->assign('bodyid', 'body-user');
+            }
+
+            $this->initialState->provideInitialState('unified-search', 'limit-default', SearchQuery::LIMIT_DEFAULT);
+            Util::addScript('dist/unified-search', null, true);
+
+            // Add navigation entry
+            $this->assign('application', '');
+            $this->assign('appid', $appId);
+            $navigation = \OC::$server->getNavigationManager()->getAll();
+            $this->assign('navigation', $navigation);
+            $settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings');
+            $this->assign('settingsnavigation', $settingsNavigation);
+            foreach ($navigation as $entry) {
+                if ($entry['active']) {
+                    $this->assign('application', $entry['name']);
+                    break;
+                }
+            }
+
+            foreach ($settingsNavigation as $entry) {
+                if ($entry['active']) {
+                    $this->assign('application', $entry['name']);
+                    break;
+                }
+            }
+            $userDisplayName = \OC_User::getDisplayName();
+            $this->assign('user_displayname', $userDisplayName);
+            $this->assign('user_uid', \OC_User::getUser());
+
+            if (\OC_User::getUser() === false) {
+                $this->assign('userAvatarSet', false);
+            } else {
+                $this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());
+                $this->assign('userAvatarVersion', $this->config->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0));
+            }
+
+            // check if app menu icons should be inverted
+            try {
+                /** @var \OCA\Theming\Util $util */
+                $util = \OC::$server->query(\OCA\Theming\Util::class);
+                $this->assign('themingInvertMenu', $util->invertTextColor(\OC::$server->getThemingDefaults()->getColorPrimary()));
+            } catch (\OCP\AppFramework\QueryException $e) {
+                $this->assign('themingInvertMenu', false);
+            } catch (\OCP\AutoloadNotAllowedException $e) {
+                $this->assign('themingInvertMenu', false);
+            }
+        } elseif ($renderAs === TemplateResponse::RENDER_AS_ERROR) {
+            parent::__construct('core', 'layout.guest', '', false);
+            $this->assign('bodyid', 'body-login');
+            $this->assign('user_displayname', '');
+            $this->assign('user_uid', '');
+        } elseif ($renderAs === TemplateResponse::RENDER_AS_GUEST) {
+            parent::__construct('core', 'layout.guest');
+            \OC_Util::addStyle('guest');
+            $this->assign('bodyid', 'body-login');
+
+            $userDisplayName = \OC_User::getDisplayName();
+            $this->assign('user_displayname', $userDisplayName);
+            $this->assign('user_uid', \OC_User::getUser());
+        } elseif ($renderAs === TemplateResponse::RENDER_AS_PUBLIC) {
+            parent::__construct('core', 'layout.public');
+            $this->assign('appid', $appId);
+            $this->assign('bodyid', 'body-public');
+
+            /** @var IRegistry $subscription */
+            $subscription = \OC::$server->query(IRegistry::class);
+            $showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true);
+            if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) {
+                $showSimpleSignup = false;
+            }
+            $this->assign('showSimpleSignUpLink', $showSimpleSignup);
+        } else {
+            parent::__construct('core', 'layout.base');
+        }
+        // Send the language and the locale to our layouts
+        $lang = \OC::$server->getL10NFactory()->findLanguage();
+        $locale = \OC::$server->getL10NFactory()->findLocale($lang);
+
+        $lang = str_replace('_', '-', $lang);
+        $this->assign('language', $lang);
+        $this->assign('locale', $locale);
+
+        if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+            if (empty(self::$versionHash)) {
+                $v = \OC_App::getAppVersions();
+                $v['core'] = implode('.', \OCP\Util::getVersion());
+                self::$versionHash = substr(md5(implode(',', $v)), 0, 8);
+            }
+        } else {
+            self::$versionHash = md5('not installed');
+        }
+
+        // Add the js files
+        $jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
+        $this->assign('jsfiles', []);
+        if ($this->config->getSystemValue('installed', false) && $renderAs != TemplateResponse::RENDER_AS_ERROR) {
+            if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) {
+                $jsConfigHelper = new JSConfigHelper(
+                    \OC::$server->getL10N('lib'),
+                    \OC::$server->query(Defaults::class),
+                    \OC::$server->getAppManager(),
+                    \OC::$server->getSession(),
+                    \OC::$server->getUserSession()->getUser(),
+                    $this->config,
+                    \OC::$server->getGroupManager(),
+                    \OC::$server->getIniWrapper(),
+                    \OC::$server->getURLGenerator(),
+                    \OC::$server->getCapabilitiesManager(),
+                    \OC::$server->query(IInitialStateService::class)
+                );
+                $this->assign('inline_ocjs', $jsConfigHelper->getConfig());
+            } else {
+                $this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
+            }
+        }
+        foreach ($jsFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
+            $this->append('jsfiles', $web.'/'.$file . $this->getVersionHashSuffix());
+        }
+
+        try {
+            $pathInfo = \OC::$server->getRequest()->getPathInfo();
+        } catch (\Exception $e) {
+            $pathInfo = '';
+        }
+
+        // Do not initialise scss appdata until we have a fully installed instance
+        // Do not load scss for update, errors, installation or login page
+        if (\OC::$server->getSystemConfig()->getValue('installed', false)
+            && !\OCP\Util::needUpgrade()
+            && $pathInfo !== ''
+            && !preg_match('/^\/login/', $pathInfo)
+            && $renderAs !== TemplateResponse::RENDER_AS_ERROR
+        ) {
+            $cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
+        } else {
+            // If we ignore the scss compiler,
+            // we need to load the guest css fallback
+            \OC_Util::addStyle('guest');
+            $cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false);
+        }
+
+        $this->assign('cssfiles', []);
+        $this->assign('printcssfiles', []);
+        $this->assign('versionHash', self::$versionHash);
+        foreach ($cssFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
+
+            if (substr($file, -strlen('print.css')) === 'print.css') {
+                $this->append('printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix());
+            } else {
+                $suffix = $this->getVersionHashSuffix($web, $file);
+
+                if (strpos($file, '?v=') == false) {
+                    $this->append('cssfiles', $web.'/'.$file . $suffix);
+                } else {
+                    $this->append('cssfiles', $web.'/'.$file . '-' . substr($suffix, 3));
+                }
+            }
+        }
 		
-		$this->assign('initialStates', $this->initialState->getInitialStates());
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $file
-	 * @return string
-	 */
-	protected function getVersionHashSuffix($path = false, $file = false) {
-		if ($this->config->getSystemValue('debug', false)) {
-			// allows chrome workspace mapping in debug mode
-			return "";
-		}
-		$themingSuffix = '';
-		$v = [];
-
-		if ($this->config->getSystemValue('installed', false)) {
-			if (\OC::$server->getAppManager()->isInstalled('theming')) {
-				$themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
-			}
-			$v = \OC_App::getAppVersions();
-		}
-
-		// Try the webroot path for a match
-		if ($path !== false && $path !== '') {
-			$appName = $this->getAppNamefromPath($path);
-			if (array_key_exists($appName, $v)) {
-				$appVersion = $v[$appName];
-				return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
-			}
-		}
-		// fallback to the file path instead
-		if ($file !== false && $file !== '') {
-			$appName = $this->getAppNamefromPath($file);
-			if (array_key_exists($appName, $v)) {
-				$appVersion = $v[$appName];
-				return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
-			}
-		}
-
-		return '?v=' . self::$versionHash . $themingSuffix;
-	}
-
-	/**
-	 * @param array $styles
-	 * @return array
-	 */
-	public static function findStylesheetFiles($styles, $compileScss = true) {
-		// Read the selected theme from the config file
-		$theme = \OC_Util::getTheme();
-
-		if ($compileScss) {
-			$SCSSCacher = \OC::$server->query(SCSSCacher::class);
-		} else {
-			$SCSSCacher = null;
-		}
-
-		$locator = new \OC\Template\CSSResourceLocator(
-			\OC::$server->getLogger(),
-			$theme,
-			[ \OC::$SERVERROOT => \OC::$WEBROOT ],
-			[ \OC::$SERVERROOT => \OC::$WEBROOT ],
-			$SCSSCacher
-		);
-		$locator->find($styles);
-		return $locator->getResources();
-	}
-
-	/**
-	 * @param string $path
-	 * @return string|boolean
-	 */
-	public function getAppNamefromPath($path) {
-		if ($path !== '' && is_string($path)) {
-			$pathParts = explode('/', $path);
-			if ($pathParts[0] === 'css') {
-				// This is a scss request
-				return $pathParts[1];
-			}
-			return end($pathParts);
-		}
-		return false;
-	}
-
-	/**
-	 * @param array $scripts
-	 * @return array
-	 */
-	public static function findJavascriptFiles($scripts) {
-		// Read the selected theme from the config file
-		$theme = \OC_Util::getTheme();
-
-		$locator = new \OC\Template\JSResourceLocator(
-			\OC::$server->getLogger(),
-			$theme,
-			[ \OC::$SERVERROOT => \OC::$WEBROOT ],
-			[ \OC::$SERVERROOT => \OC::$WEBROOT ],
-			\OC::$server->query(JSCombiner::class)
-			);
-		$locator->find($scripts);
-		return $locator->getResources();
-	}
-
-	/**
-	 * Converts the absolute file path to a relative path from \OC::$SERVERROOT
-	 * @param string $filePath Absolute path
-	 * @return string Relative path
-	 * @throws \Exception If $filePath is not under \OC::$SERVERROOT
-	 */
-	public static function convertToRelativePath($filePath) {
-		$relativePath = explode(\OC::$SERVERROOT, $filePath);
-		if (count($relativePath) !== 2) {
-			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
-		}
-
-		return $relativePath[1];
-	}
+        $this->assign('initialStates', $this->initialState->getInitialStates());
+    }
+
+    /**
+     * @param string $path
+     * @param string $file
+     * @return string
+     */
+    protected function getVersionHashSuffix($path = false, $file = false) {
+        if ($this->config->getSystemValue('debug', false)) {
+            // allows chrome workspace mapping in debug mode
+            return "";
+        }
+        $themingSuffix = '';
+        $v = [];
+
+        if ($this->config->getSystemValue('installed', false)) {
+            if (\OC::$server->getAppManager()->isInstalled('theming')) {
+                $themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
+            }
+            $v = \OC_App::getAppVersions();
+        }
+
+        // Try the webroot path for a match
+        if ($path !== false && $path !== '') {
+            $appName = $this->getAppNamefromPath($path);
+            if (array_key_exists($appName, $v)) {
+                $appVersion = $v[$appName];
+                return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
+            }
+        }
+        // fallback to the file path instead
+        if ($file !== false && $file !== '') {
+            $appName = $this->getAppNamefromPath($file);
+            if (array_key_exists($appName, $v)) {
+                $appVersion = $v[$appName];
+                return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
+            }
+        }
+
+        return '?v=' . self::$versionHash . $themingSuffix;
+    }
+
+    /**
+     * @param array $styles
+     * @return array
+     */
+    public static function findStylesheetFiles($styles, $compileScss = true) {
+        // Read the selected theme from the config file
+        $theme = \OC_Util::getTheme();
+
+        if ($compileScss) {
+            $SCSSCacher = \OC::$server->query(SCSSCacher::class);
+        } else {
+            $SCSSCacher = null;
+        }
+
+        $locator = new \OC\Template\CSSResourceLocator(
+            \OC::$server->getLogger(),
+            $theme,
+            [ \OC::$SERVERROOT => \OC::$WEBROOT ],
+            [ \OC::$SERVERROOT => \OC::$WEBROOT ],
+            $SCSSCacher
+        );
+        $locator->find($styles);
+        return $locator->getResources();
+    }
+
+    /**
+     * @param string $path
+     * @return string|boolean
+     */
+    public function getAppNamefromPath($path) {
+        if ($path !== '' && is_string($path)) {
+            $pathParts = explode('/', $path);
+            if ($pathParts[0] === 'css') {
+                // This is a scss request
+                return $pathParts[1];
+            }
+            return end($pathParts);
+        }
+        return false;
+    }
+
+    /**
+     * @param array $scripts
+     * @return array
+     */
+    public static function findJavascriptFiles($scripts) {
+        // Read the selected theme from the config file
+        $theme = \OC_Util::getTheme();
+
+        $locator = new \OC\Template\JSResourceLocator(
+            \OC::$server->getLogger(),
+            $theme,
+            [ \OC::$SERVERROOT => \OC::$WEBROOT ],
+            [ \OC::$SERVERROOT => \OC::$WEBROOT ],
+            \OC::$server->query(JSCombiner::class)
+            );
+        $locator->find($scripts);
+        return $locator->getResources();
+    }
+
+    /**
+     * Converts the absolute file path to a relative path from \OC::$SERVERROOT
+     * @param string $filePath Absolute path
+     * @return string Relative path
+     * @throws \Exception If $filePath is not under \OC::$SERVERROOT
+     */
+    public static function convertToRelativePath($filePath) {
+        $relativePath = explode(\OC::$SERVERROOT, $filePath);
+        if (count($relativePath) !== 2) {
+            throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
+        }
+
+        return $relativePath[1];
+    }
 }

apps/files/lib/Search/FilesSearchResultEntry.php

Indentation +7 added lines, -7 removed lines

@@ -28,11 +28,11 @@
 use OCP\Search\ASearchResultEntry;
 
 class FilesSearchResultEntry extends ASearchResultEntry {
-	public function __construct(string $thumbnailUrl,
-								string $filename,
-								string $path,
-								string $url,
-								string $icon) {
-		parent::__construct($thumbnailUrl, $filename, $path, $url, $icon, false);
-	}
+    public function __construct(string $thumbnailUrl,
+                                string $filename,
+                                string $path,
+                                string $url,
+                                string $icon) {
+        parent::__construct($thumbnailUrl, $filename, $path, $url, $icon, false);
+    }
 }

apps/files/lib/Search/FilesSearchProvider.php

Indentation +51 added lines, -51 removed lines

@@ -36,64 +36,64 @@
 
 class FilesSearchProvider implements IProvider {
 
-	/** @var File */
-	private $fileSearch;
+    /** @var File */
+    private $fileSearch;
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(File $fileSearch,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator) {
-		$this->l10n = $l10n;
-		$this->fileSearch = $fileSearch;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(File $fileSearch,
+                                IL10N $l10n,
+                                IURLGenerator $urlGenerator) {
+        $this->l10n = $l10n;
+        $this->fileSearch = $fileSearch;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	public function getId(): string {
-		return 'files';
-	}
+    public function getId(): string {
+        return 'files';
+    }
 
-	public function getName(): string {
-		return $this->l10n->t('Files');
-	}
+    public function getName(): string {
+        return $this->l10n->t('Files');
+    }
 
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		return SearchResult::complete(
-			$this->l10n->t('Files'),
-			array_map(function (FileResult $result) {
-				// Generate thumbnail url
-				$thumbnailUrl = $result->type === 'folder'
-					? ''
-					: $this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]);
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        return SearchResult::complete(
+            $this->l10n->t('Files'),
+            array_map(function (FileResult $result) {
+                // Generate thumbnail url
+                $thumbnailUrl = $result->type === 'folder'
+                    ? ''
+                    : $this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]);
 
-				return new FilesSearchResultEntry(
-					$thumbnailUrl,
-					$result->name,
-					$this->formatSubline($result),
-					$result->link,
-					$result->type === 'folder' ? 'icon-folder' : 'icon-filetype-file'
-				);
-			}, $this->fileSearch->search($query->getTerm()))
-		);
-	}
+                return new FilesSearchResultEntry(
+                    $thumbnailUrl,
+                    $result->name,
+                    $this->formatSubline($result),
+                    $result->link,
+                    $result->type === 'folder' ? 'icon-folder' : 'icon-filetype-file'
+                );
+            }, $this->fileSearch->search($query->getTerm()))
+        );
+    }
 
-	/**
-	 * Format subline for files
-	 *
-	 * @param FileResult $result
-	 * @return string
-	 */
-	private function formatSubline($result): string {
-		// Do not show the location if the file is in root
-		if ($result->path === '/' . $result->name) {
-			return '';
-		}
+    /**
+     * Format subline for files
+     *
+     * @param FileResult $result
+     * @return string
+     */
+    private function formatSubline($result): string {
+        // Do not show the location if the file is in root
+        if ($result->path === '/' . $result->name) {
+            return '';
+        }
 
-		$path = ltrim(dirname($result->path), '/');
-		return $this->l10n->t('in %s', [$path]);
-	}
+        $path = ltrim(dirname($result->path), '/');
+        return $this->l10n->t('in %s', [$path]);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	public function search(IUser $user, ISearchQuery $query): SearchResult {
 		return SearchResult::complete(
 			$this->l10n->t('Files'),
-			array_map(function (FileResult $result) {
+			array_map(function(FileResult $result) {
 				// Generate thumbnail url
 				$thumbnailUrl = $result->type === 'folder'
 					? ''
@@ -89,7 +89,7 @@ 
 	 */
 	private function formatSubline($result): string {
 		// Do not show the location if the file is in root
-		if ($result->path === '/' . $result->name) {
+		if ($result->path === '/'.$result->name) {
 			return '';
 		}
 

apps/comments/lib/Search/Provider.php

Indentation +47 added lines, -47 removed lines

@@ -37,58 +37,58 @@
 
 class Provider implements IProvider {
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var IL10N */
-	private $l10n;
+    /** @var IL10N */
+    private $l10n;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var LegacyProvider */
-	private $legacyProvider;
+    /** @var LegacyProvider */
+    private $legacyProvider;
 
-	public function __construct(IUserManager $userManager,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator,
-								LegacyProvider $legacyProvider) {
-		$this->userManager = $userManager;
-		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->legacyProvider = $legacyProvider;
-	}
+    public function __construct(IUserManager $userManager,
+                                IL10N $l10n,
+                                IURLGenerator $urlGenerator,
+                                LegacyProvider $legacyProvider) {
+        $this->userManager = $userManager;
+        $this->l10n = $l10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->legacyProvider = $legacyProvider;
+    }
 
-	public function getId(): string {
-		return 'comments';
-	}
+    public function getId(): string {
+        return 'comments';
+    }
 
-	public function getName(): string {
-		return $this->l10n->t('Comments');
-	}
+    public function getName(): string {
+        return $this->l10n->t('Comments');
+    }
 
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		return SearchResult::complete(
-			$this->l10n->t('Comments'),
-			array_map(function (Result $result) {
-				$path = $result->path;
-				$pathInfo = pathinfo($path);
-				$isUser = $this->userManager->userExists($result->authorId);
-				$avatarUrl = $isUser
-					? $this->urlGenerator->linkToRoute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42])
-					: $this->urlGenerator->linkToRoute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]);
-				return new CommentsSearchResultEntry(
-					$avatarUrl,
-					$result->name,
-					$path,
-					$this->urlGenerator->linkToRoute('files.view.index',[
-						'dir' => $pathInfo['dirname'],
-						'scrollto' => $pathInfo['basename'],
-					]),
-					'',
-					true
-				);
-			}, $this->legacyProvider->search($query->getTerm()))
-		);
-	}
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        return SearchResult::complete(
+            $this->l10n->t('Comments'),
+            array_map(function (Result $result) {
+                $path = $result->path;
+                $pathInfo = pathinfo($path);
+                $isUser = $this->userManager->userExists($result->authorId);
+                $avatarUrl = $isUser
+                    ? $this->urlGenerator->linkToRoute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42])
+                    : $this->urlGenerator->linkToRoute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]);
+                return new CommentsSearchResultEntry(
+                    $avatarUrl,
+                    $result->name,
+                    $path,
+                    $this->urlGenerator->linkToRoute('files.view.index',[
+                        'dir' => $pathInfo['dirname'],
+                        'scrollto' => $pathInfo['basename'],
+                    ]),
+                    '',
+                    true
+                );
+            }, $this->legacyProvider->search($query->getTerm()))
+        );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 	public function search(IUser $user, ISearchQuery $query): SearchResult {
 		return SearchResult::complete(
 			$this->l10n->t('Comments'),
-			array_map(function (Result $result) {
+			array_map(function(Result $result) {
 				$path = $result->path;
 				$pathInfo = pathinfo($path);
 				$isUser = $this->userManager->userExists($result->authorId);
@@ -81,7 +81,7 @@ 
 					$avatarUrl,
 					$result->name,
 					$path,
-					$this->urlGenerator->linkToRoute('files.view.index',[
+					$this->urlGenerator->linkToRoute('files.view.index', [
 						'dir' => $pathInfo['dirname'],
 						'scrollto' => $pathInfo['basename'],
 					]),

core/templates/layout.user.php

Spacing +13 added lines, -13 removed lines

@@ -4,7 +4,7 @@ 
 		<meta charset="utf-8">
 		<title>
 			<?php
-				p(!empty($_['application'])?$_['application'].' - ':'');
+				p(!empty($_['application']) ? $_['application'].' - ' : '');
 				p($theme->getTitle());
 			?>
 		</title>
@@ -15,7 +15,7 @@ 
 		<?php } ?>
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>">
+		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>">
 		<meta name="mobile-web-app-capable" content="yes">
 		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
 		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
@@ -26,7 +26,7 @@ 
 		<?php emit_script_loading_tags($_); ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 	<?php include 'layout.noscript.warning.php'; ?>
 
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
@@ -45,7 +45,7 @@ 
 					id="nextcloud">
 					<div class="logo logo-icon">
 						<h1 class="hidden-visually">
-							<?php p($theme->getName()); ?> <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
+							<?php p($theme->getName()); ?> <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
 						</h1>
 					</div>
 				</a>
@@ -60,7 +60,7 @@ 
 										<?php if ($_['themingInvertMenu']) { ?>
 										<defs><filter id="invertMenuMain-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" /></filter></defs>
 										<?php } ?>
-										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
+										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
 									</svg>
 								<span>
 									<?php p($entry['name']); ?>
@@ -88,7 +88,7 @@ 
 										aria-label="<?php p($entry['name']); ?>">
 										<svg width="16" height="16" viewBox="0 0 16 16" alt="">
 											<defs><filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
-											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
+											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
 										</svg>
 										<span><?php p($entry['name']); ?></span>
 									</a>
@@ -106,14 +106,14 @@ 
 				<div id="contactsmenu">
 					<div class="icon-contacts menutoggle" tabindex="0" role="button"
 					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
-						<span class="hidden-visually"><?php p($l->t('Contacts'));?></span>
+						<span class="hidden-visually"><?php p($l->t('Contacts')); ?></span>
 					</div>
 					<div id="contactsmenu-menu" class="menu"
-						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
+						aria-label="<?php p($l->t('Contacts menu')); ?>"></div>
 				</div>
 				<div id="settings">
 					<div id="expand" tabindex="0" role="button" class="menutoggle"
-						aria-label="<?php p($l->t('Settings'));?>"
+						aria-label="<?php p($l->t('Settings')); ?>"
 						aria-haspopup="true" aria-controls="expanddiv" aria-expanded="false">
 						<div class="avatardiv<?php if ($_['userAvatarSet']) {
 				print_unescaped(' avatardiv-shown');
@@ -122,21 +122,21 @@ 
 			} ?>">
 							<?php if ($_['userAvatarSet']): ?>
 								<img alt="" width="32" height="32"
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
-								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
+								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']])); ?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']])); ?> 4x"
 								>
 							<?php endif; ?>
 						</div>
 						<div id="expandDisplayName" class="icon-settings-white"></div>
 					</div>
 					<nav class="settings-menu" id="expanddiv" style="display:none;"
-						aria-label="<?php p($l->t('Settings menu'));?>">
+						aria-label="<?php p($l->t('Settings menu')); ?>">
 					<ul>
 					<?php foreach ($_['settingsnavigation'] as $entry):?>
 						<li data-id="<?php p($entry['id']); ?>">
 							<a href="<?php print_unescaped($entry['href']); ?>"
 								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
 								<?php p($entry['name']) ?>
 							</a>
 						</li>