|
|
|
@ -22,6 +22,7 @@
|
|
|
|
|
*/
|
|
|
|
|
namespace OCA\Theming\Service;
|
|
|
|
|
|
|
|
|
|
use OCA\Theming\ITheme;
|
|
|
|
|
use OCA\Theming\Themes\DefaultTheme;
|
|
|
|
|
use OCA\Theming\Util;
|
|
|
|
|
use OCP\IConfig;
|
|
|
|
@ -48,6 +49,7 @@ class ThemeInjectionService {
|
|
|
|
|
$this->defaultTheme = $defaultTheme;
|
|
|
|
|
$this->util = $util;
|
|
|
|
|
$this->config = $config;
|
|
|
|
|
|
|
|
|
|
if ($userSession->getUser() !== null) {
|
|
|
|
|
$this->userId = $userSession->getUser()->getUID();
|
|
|
|
|
} else {
|
|
|
|
@ -55,7 +57,7 @@ class ThemeInjectionService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function injectHeaders() {
|
|
|
|
|
public function injectHeaders(): void {
|
|
|
|
|
$themes = $this->themesService->getThemes();
|
|
|
|
|
$defaultTheme = $themes[$this->defaultTheme->getId()];
|
|
|
|
|
$mediaThemes = array_filter($themes, function ($theme) {
|
|
|
|
@ -64,11 +66,11 @@ class ThemeInjectionService {
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Default theme fallback
|
|
|
|
|
$this->addThemeHeader($defaultTheme->getId());
|
|
|
|
|
$this->addThemeHeaders($defaultTheme);
|
|
|
|
|
|
|
|
|
|
// Themes applied by media queries
|
|
|
|
|
foreach($mediaThemes as $theme) {
|
|
|
|
|
$this->addThemeHeader($theme->getId(), true, $theme->getMediaQuery());
|
|
|
|
|
$this->addThemeHeaders($theme, true, $theme->getMediaQuery());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Themes
|
|
|
|
@ -77,20 +79,23 @@ class ThemeInjectionService {
|
|
|
|
|
if ($theme->getId() === $this->defaultTheme->getId()) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
$this->addThemeHeader($theme->getId(), false);
|
|
|
|
|
$this->addThemeHeaders($theme, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Meta headers
|
|
|
|
|
$this->addThemeMetaHeaders($themes);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Inject theme header into rendered page
|
|
|
|
|
*
|
|
|
|
|
* @param string $themeId the theme ID
|
|
|
|
|
* @param ITheme $theme the theme
|
|
|
|
|
* @param bool $plain request the :root syntax
|
|
|
|
|
* @param string $media media query to use in the <link> element
|
|
|
|
|
*/
|
|
|
|
|
private function addThemeHeader(string $themeId, bool $plain = true, string $media = null) {
|
|
|
|
|
private function addThemeHeaders(ITheme $theme, bool $plain = true, string $media = null): void {
|
|
|
|
|
$linkToCSS = $this->urlGenerator->linkToRoute('theming.Theming.getThemeStylesheet', [
|
|
|
|
|
'themeId' => $themeId,
|
|
|
|
|
'themeId' => $theme->getId(),
|
|
|
|
|
'plain' => $plain,
|
|
|
|
|
'v' => $this->util->getCacheBuster(),
|
|
|
|
|
]);
|
|
|
|
@ -101,4 +106,36 @@ class ThemeInjectionService {
|
|
|
|
|
'class' => 'theme'
|
|
|
|
|
]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Inject meta headers into rendered page
|
|
|
|
|
*
|
|
|
|
|
* @param ITheme[] $themes the theme
|
|
|
|
|
*/
|
|
|
|
|
private function addThemeMetaHeaders(array $themes): void {
|
|
|
|
|
$metaHeaders = [];
|
|
|
|
|
|
|
|
|
|
// Meta headers
|
|
|
|
|
foreach($this->themesService->getThemes() as $theme) {
|
|
|
|
|
if (!empty($theme->getMeta())) {
|
|
|
|
|
foreach($theme->getMeta() as $meta) {
|
|
|
|
|
if (!isset($meta['name']) || !isset($meta['content'])) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!isset($metaHeaders[$meta['name']])) {
|
|
|
|
|
$metaHeaders[$meta['name']] = [];
|
|
|
|
|
}
|
|
|
|
|
$metaHeaders[$meta['name']][] = $meta['content'];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
foreach($metaHeaders as $name => $content) {
|
|
|
|
|
\OCP\Util::addHeader('meta', [
|
|
|
|
|
'name' => $name,
|
|
|
|
|
'content' => join(' ', array_unique($content)),
|
|
|
|
|
]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|