diff options
Diffstat (limited to 'apps/theming/lib/ThemingDefaults.php')
-rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index 413e2a9e64f..059dc55cb99 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -188,9 +188,10 @@ class ThemingDefaults extends \OC_Defaults { }, $navigation); $links = array_merge($links, $guestNavigation); - $legalLinks = ''; $divider = ''; - foreach($links as $link) { - if($link['url'] !== '' + $legalLinks = ''; + $divider = ''; + foreach ($links as $link) { + if ($link['url'] !== '' && filter_var($link['url'], FILTER_VALIDATE_URL) ) { $legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"' . @@ -198,7 +199,7 @@ class ThemingDefaults extends \OC_Defaults { $divider = ' ยท '; } } - if($legalLinks !== '') { + if ($legalLinks !== '') { $footer .= '<br/>' . $legalLinks; } @@ -232,8 +233,8 @@ class ThemingDefaults extends \OC_Defaults { $cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0'); - if(!$logo || !$logoExists) { - if($useSvg) { + if (!$logo || !$logoExists) { + if ($useSvg) { $logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg'); } else { $logo = $this->urlGenerator->imagePath('core', 'logo/logo.png'); @@ -309,7 +310,7 @@ class ThemingDefaults extends \OC_Defaults { } $variables['has-legal-links'] = 'false'; - if($this->getImprintUrl() !== '' || $this->getPrivacyUrl() !== '') { + if ($this->getImprintUrl() !== '' || $this->getPrivacyUrl() !== '') { $variables['has-legal-links'] = 'true'; } @@ -350,7 +351,8 @@ class ThemingDefaults extends \OC_Defaults { if (file_exists($appPath . '/img/manifest.json')) { return false; } - } catch (AppPathNotFoundException $e) {} + } catch (AppPathNotFoundException $e) { + } $route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest'); } if (strpos($image, 'filetypes/') === 0 && file_exists(\OC::$SERVERROOT . '/core/img/' . $image)) { @@ -372,7 +374,6 @@ class ThemingDefaults extends \OC_Defaults { $this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1); $this->cacheFactory->createDistributed('theming-')->clear(); $this->cacheFactory->createDistributed('imagePath')->clear(); - } /** |