nextcloud / server

apps/theming/lib/ThemingDefaults.php

Indentation +191 added lines, -191 removed lines

@@ -32,196 +32,196 @@
 
 class ThemingDefaults extends \OC_Defaults {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var ICacheFactory */
-	private $cacheFactory;
-	/** @var string */
-	private $name;
-	/** @var string */
-	private $url;
-	/** @var string */
-	private $slogan;
-	/** @var string */
-	private $color;
-
-	/**
-	 * ThemingDefaults constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IL10N $l
-	 * @param IURLGenerator $urlGenerator
-	 * @param \OC_Defaults $defaults
-	 * @param IRootFolder $rootFolder
-	 * @param ICacheFactory $cacheFactory
-	 */
-	public function __construct(IConfig $config,
-								IL10N $l,
-								IURLGenerator $urlGenerator,
-								\OC_Defaults $defaults,
-								IRootFolder $rootFolder,
-								ICacheFactory $cacheFactory
-	) {
-		parent::__construct();
-		$this->config = $config;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-		$this->rootFolder = $rootFolder;
-		$this->cacheFactory = $cacheFactory;
-
-		$this->name = $defaults->getName();
-		$this->url = $defaults->getBaseUrl();
-		$this->slogan = $defaults->getSlogan();
-		$this->color = $defaults->getColorPrimary();
-	}
-
-	public function getName() {
-		return strip_tags($this->config->getAppValue('theming', 'name', $this->name));
-	}
-
-	public function getHTMLName() {
-		return $this->config->getAppValue('theming', 'name', $this->name);
-	}
-
-	public function getTitle() {
-		return $this->getName();
-	}
-
-	public function getEntity() {
-		return $this->getName();
-	}
-
-	public function getBaseUrl() {
-		return $this->config->getAppValue('theming', 'url', $this->url);
-	}
-
-	public function getSlogan() {
-		return Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', $this->slogan));
-	}
-
-	public function getShortFooter() {
-		$slogan = $this->getSlogan();
-		$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-			' rel="noreferrer">' .$this->getEntity() . '</a>'.
-			($slogan !== '' ? ' – ' . $slogan : '');
-
-		return $footer;
-	}
-
-	/**
-	 * Color that is used for the header as well as for mail headers
-	 *
-	 * @return string
-	 */
-	public function getColorPrimary() {
-		return $this->config->getAppValue('theming', 'color', $this->color);
-	}
-
-	/**
-	 * Themed logo url
-	 *
-	 * @return string
-	 */
-	public function getLogo() {
-		$logo = $this->config->getAppValue('theming', 'logoMime');
-		if(!$logo || !$this->rootFolder->nodeExists('/themedinstancelogo')) {
-			return $this->urlGenerator->imagePath('core','logo.svg');
-		} else {
-			return $this->urlGenerator->linkToRoute('theming.Theming.getLogo');
-		}
-	}
-
-	/**
-	 * Themed background image url
-	 *
-	 * @return string
-	 */
-	public function getBackground() {
-		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime');
-		if(!$backgroundLogo || !$this->rootFolder->nodeExists('/themedbackgroundlogo')) {
-			return $this->urlGenerator->imagePath('core','background.jpg');
-		} else {
-			return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
-		}
-	}
-
-	/**
-	 * Check if Imagemagick is enabled and if SVG is supported
-	 * otherwise we can't render custom icons
-	 *
-	 * @return bool
-	 */
-	public function shouldReplaceIcons() {
-		$cache = $this->cacheFactory->create('theming');
-		if($value = $cache->get('shouldReplaceIcons')) {
-			return (bool)$value;
-		}
-		$value = false;
-		if(extension_loaded('imagick')) {
-			$checkImagick = new \Imagick();
-			if (count($checkImagick->queryFormats('SVG')) >= 1) {
-				$value = true;
-			}
-			$checkImagick->clear();
-		}
-		$cache->set('shouldReplaceIcons', $value);
-		return $value;
-	}
-
-	/**
-	 * Increases the cache buster key
-	 */
-	private function increaseCacheBuster() {
-		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
-	}
-
-	/**
-	 * Update setting in the database
-	 *
-	 * @param string $setting
-	 * @param string $value
-	 */
-	public function set($setting, $value) {
-		$this->config->setAppValue('theming', $setting, $value);
-		$this->increaseCacheBuster();
-	}
-
-	/**
-	 * Revert settings to the default value
-	 *
-	 * @param string $setting setting which should be reverted
-	 * @return string default value
-	 */
-	public function undo($setting) {
-		$this->config->deleteAppValue('theming', $setting);
-		$this->increaseCacheBuster();
-
-		switch ($setting) {
-			case 'name':
-				$returnValue = $this->getEntity();
-				break;
-			case 'url':
-				$returnValue = $this->getBaseUrl();
-				break;
-			case 'slogan':
-				$returnValue = $this->getSlogan();
-				break;
-			case 'color':
-				$returnValue = $this->getColorPrimary();
-				break;
-			default:
-				$returnValue = '';
-				break;
-		}
-
-		return $returnValue;
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    private $l;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var ICacheFactory */
+    private $cacheFactory;
+    /** @var string */
+    private $name;
+    /** @var string */
+    private $url;
+    /** @var string */
+    private $slogan;
+    /** @var string */
+    private $color;
+
+    /**
+     * ThemingDefaults constructor.
+     *
+     * @param IConfig $config
+     * @param IL10N $l
+     * @param IURLGenerator $urlGenerator
+     * @param \OC_Defaults $defaults
+     * @param IRootFolder $rootFolder
+     * @param ICacheFactory $cacheFactory
+     */
+    public function __construct(IConfig $config,
+                                IL10N $l,
+                                IURLGenerator $urlGenerator,
+                                \OC_Defaults $defaults,
+                                IRootFolder $rootFolder,
+                                ICacheFactory $cacheFactory
+    ) {
+        parent::__construct();
+        $this->config = $config;
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+        $this->rootFolder = $rootFolder;
+        $this->cacheFactory = $cacheFactory;
+
+        $this->name = $defaults->getName();
+        $this->url = $defaults->getBaseUrl();
+        $this->slogan = $defaults->getSlogan();
+        $this->color = $defaults->getColorPrimary();
+    }
+
+    public function getName() {
+        return strip_tags($this->config->getAppValue('theming', 'name', $this->name));
+    }
+
+    public function getHTMLName() {
+        return $this->config->getAppValue('theming', 'name', $this->name);
+    }
+
+    public function getTitle() {
+        return $this->getName();
+    }
+
+    public function getEntity() {
+        return $this->getName();
+    }
+
+    public function getBaseUrl() {
+        return $this->config->getAppValue('theming', 'url', $this->url);
+    }
+
+    public function getSlogan() {
+        return Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', $this->slogan));
+    }
+
+    public function getShortFooter() {
+        $slogan = $this->getSlogan();
+        $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
+            ' rel="noreferrer">' .$this->getEntity() . '</a>'.
+            ($slogan !== '' ? ' – ' . $slogan : '');
+
+        return $footer;
+    }
+
+    /**
+     * Color that is used for the header as well as for mail headers
+     *
+     * @return string
+     */
+    public function getColorPrimary() {
+        return $this->config->getAppValue('theming', 'color', $this->color);
+    }
+
+    /**
+     * Themed logo url
+     *
+     * @return string
+     */
+    public function getLogo() {
+        $logo = $this->config->getAppValue('theming', 'logoMime');
+        if(!$logo || !$this->rootFolder->nodeExists('/themedinstancelogo')) {
+            return $this->urlGenerator->imagePath('core','logo.svg');
+        } else {
+            return $this->urlGenerator->linkToRoute('theming.Theming.getLogo');
+        }
+    }
+
+    /**
+     * Themed background image url
+     *
+     * @return string
+     */
+    public function getBackground() {
+        $backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime');
+        if(!$backgroundLogo || !$this->rootFolder->nodeExists('/themedbackgroundlogo')) {
+            return $this->urlGenerator->imagePath('core','background.jpg');
+        } else {
+            return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
+        }
+    }
+
+    /**
+     * Check if Imagemagick is enabled and if SVG is supported
+     * otherwise we can't render custom icons
+     *
+     * @return bool
+     */
+    public function shouldReplaceIcons() {
+        $cache = $this->cacheFactory->create('theming');
+        if($value = $cache->get('shouldReplaceIcons')) {
+            return (bool)$value;
+        }
+        $value = false;
+        if(extension_loaded('imagick')) {
+            $checkImagick = new \Imagick();
+            if (count($checkImagick->queryFormats('SVG')) >= 1) {
+                $value = true;
+            }
+            $checkImagick->clear();
+        }
+        $cache->set('shouldReplaceIcons', $value);
+        return $value;
+    }
+
+    /**
+     * Increases the cache buster key
+     */
+    private function increaseCacheBuster() {
+        $cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
+        $this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
+    }
+
+    /**
+     * Update setting in the database
+     *
+     * @param string $setting
+     * @param string $value
+     */
+    public function set($setting, $value) {
+        $this->config->setAppValue('theming', $setting, $value);
+        $this->increaseCacheBuster();
+    }
+
+    /**
+     * Revert settings to the default value
+     *
+     * @param string $setting setting which should be reverted
+     * @return string default value
+     */
+    public function undo($setting) {
+        $this->config->deleteAppValue('theming', $setting);
+        $this->increaseCacheBuster();
+
+        switch ($setting) {
+            case 'name':
+                $returnValue = $this->getEntity();
+                break;
+            case 'url':
+                $returnValue = $this->getBaseUrl();
+                break;
+            case 'slogan':
+                $returnValue = $this->getSlogan();
+                break;
+            case 'color':
+                $returnValue = $this->getColorPrimary();
+                break;
+            default:
+                $returnValue = '';
+                break;
+        }
+
+        return $returnValue;
+    }
 
 }

apps/theming/lib/Capabilities.php

Indentation +29 added lines, -29 removed lines

@@ -33,37 +33,37 @@
  */
 class Capabilities implements ICapability {
 
-	/** @var ThemingDefaults */
-	protected $theming;
+    /** @var ThemingDefaults */
+    protected $theming;
 
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	/**
-	 * @param ThemingDefaults $theming
-	 * @param IURLGenerator $url
-	 */
-	public function __construct(ThemingDefaults $theming, IURLGenerator $url) {
-		$this->theming = $theming;
-		$this->url = $url;
-	}
+    /**
+     * @param ThemingDefaults $theming
+     * @param IURLGenerator $url
+     */
+    public function __construct(ThemingDefaults $theming, IURLGenerator $url) {
+        $this->theming = $theming;
+        $this->url = $url;
+    }
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'theming' => [
-				'name' => $this->theming->getName(),
-				'url' => $this->theming->getBaseUrl(),
-				'slogan' => $this->theming->getSlogan(),
-				'color' => $this->theming->getColorPrimary(),
-				'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
-				'background' => $this->url->getAbsoluteURL($this->theming->getBackground()),
-			],
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'theming' => [
+                'name' => $this->theming->getName(),
+                'url' => $this->theming->getBaseUrl(),
+                'slogan' => $this->theming->getSlogan(),
+                'color' => $this->theming->getColorPrimary(),
+                'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
+                'background' => $this->url->getAbsoluteURL($this->theming->getBackground()),
+            ],
+        ];
+    }
 }

apps/theming/lib/IconBuilder.php

Indentation +157 added lines, -157 removed lines

@@ -28,162 +28,162 @@
 use OCP\App\AppPathNotFoundException;
 
 class IconBuilder {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var Util */
-	private $util;
-
-	/**
-	 * IconBuilder constructor.
-	 *
-	 * @param ThemingDefaults $themingDefaults
-	 * @param Util $util
-	 */
-	public function __construct(
-		ThemingDefaults $themingDefaults,
-		Util $util
-	) {
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getFavicon($app) {
-		$icon = $this->renderAppIcon($app, 32);
-		if($icon === false) {
-			return false;
-		}
-		$icon->setImageFormat("png24");
-		$data = $icon->getImageBlob();
-		$icon->destroy();
-		return $data;
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getTouchIcon($app) {
-		$icon = $this->renderAppIcon($app, 512);
-		if($icon === false) {
-			return false;
-		}
-		$icon->setImageFormat("png24");
-		$data = $icon->getImageBlob();
-		$icon->destroy();
-		return $data;
-	}
-
-	/**
-	 * Render app icon on themed background color
-	 * fallback to logo
-	 *
-	 * @param $app string app name
-	 * @param $size int size of the icon in px
-	 * @return Imagick|false
-	 */
-	public function renderAppIcon($app, $size) {
-		try {
-			$appIcon = $this->util->getAppIcon($app);
-			$appIconContent = file_get_contents($appIcon);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-
-		if($appIconContent === false) {
-			return false;
-		}
-
-		$color = $this->themingDefaults->getColorPrimary();
-		$mime = mime_content_type($appIcon);
-
-		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
-			'</svg>';
-		// resize svg magic as this seems broken in Imagemagick
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
-				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
-			} else {
-				$svg = $appIconContent;
-			}
-			$tmp = new Imagick();
-			$tmp->readImageBlob($svg);
-			$x = $tmp->getImageWidth();
-			$y = $tmp->getImageHeight();
-			$res = $tmp->getImageResolution();
-			$tmp->destroy();
-
-			if($x>$y) {
-				$max = $x;
-			} else {
-				$max = $y;
-			}
-
-			// convert svg to resized image
-			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
-			$appIconFile->setResolution($resX, $resY);
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($svg);
-			$appIconFile->scaleImage(512, 512, true);
-		} else {
-			$appIconFile = new Imagick();
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob(file_get_contents($appIcon));
-			$appIconFile->scaleImage(512, 512, true);
-		}
-
-		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
-		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
-		// center icon
-		$offset_w = 512 / 2 - $innerWidth / 2;
-		$offset_h = 512 / 2 - $innerHeight / 2;
-
-		$appIconFile->setImageFormat("png24");
-
-		$finalIconFile = new Imagick();
-		$finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-		$finalIconFile->readImageBlob($background);
-		$finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
-		$finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
-		$finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
-		$finalIconFile->setImageFormat('png24');
-		if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
-			$filter = Imagick::INTERPOLATE_BICUBIC;
-		} else {
-			$filter = Imagick::FILTER_LANCZOS;
-		}
-		$finalIconFile->resizeImage($size, $size, $filter, 1, false);
-
-		$appIconFile->destroy();
-		return $finalIconFile;
-	}
-
-	public function colorSvg($app, $image) {
-		try {
-			$imageFile = $this->util->getAppImage($app, $image);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-		$svg = file_get_contents($imageFile);
-		if ($svg !== false && $svg !== "") {
-			$color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
-			$svg = $this->util->colorizeSvg($svg, $color);
-			return $svg;
-		} else {
-			return false;
-		}
-	}
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var Util */
+    private $util;
+
+    /**
+     * IconBuilder constructor.
+     *
+     * @param ThemingDefaults $themingDefaults
+     * @param Util $util
+     */
+    public function __construct(
+        ThemingDefaults $themingDefaults,
+        Util $util
+    ) {
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getFavicon($app) {
+        $icon = $this->renderAppIcon($app, 32);
+        if($icon === false) {
+            return false;
+        }
+        $icon->setImageFormat("png24");
+        $data = $icon->getImageBlob();
+        $icon->destroy();
+        return $data;
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getTouchIcon($app) {
+        $icon = $this->renderAppIcon($app, 512);
+        if($icon === false) {
+            return false;
+        }
+        $icon->setImageFormat("png24");
+        $data = $icon->getImageBlob();
+        $icon->destroy();
+        return $data;
+    }
+
+    /**
+     * Render app icon on themed background color
+     * fallback to logo
+     *
+     * @param $app string app name
+     * @param $size int size of the icon in px
+     * @return Imagick|false
+     */
+    public function renderAppIcon($app, $size) {
+        try {
+            $appIcon = $this->util->getAppIcon($app);
+            $appIconContent = file_get_contents($appIcon);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+
+        if($appIconContent === false) {
+            return false;
+        }
+
+        $color = $this->themingDefaults->getColorPrimary();
+        $mime = mime_content_type($appIcon);
+
+        // generate background image with rounded corners
+        $background = '<?xml version="1.0" encoding="UTF-8"?>' .
+            '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
+            '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+            '</svg>';
+        // resize svg magic as this seems broken in Imagemagick
+        if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+            if(substr($appIconContent, 0, 5) !== "<?xml") {
+                $svg = "<?xml version=\"1.0\"?>".$appIconContent;
+            } else {
+                $svg = $appIconContent;
+            }
+            $tmp = new Imagick();
+            $tmp->readImageBlob($svg);
+            $x = $tmp->getImageWidth();
+            $y = $tmp->getImageHeight();
+            $res = $tmp->getImageResolution();
+            $tmp->destroy();
+
+            if($x>$y) {
+                $max = $x;
+            } else {
+                $max = $y;
+            }
+
+            // convert svg to resized image
+            $appIconFile = new Imagick();
+            $resX = (int)(512 * $res['x'] / $max * 2.53);
+            $resY = (int)(512 * $res['y'] / $max * 2.53);
+            $appIconFile->setResolution($resX, $resY);
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($svg);
+            $appIconFile->scaleImage(512, 512, true);
+        } else {
+            $appIconFile = new Imagick();
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob(file_get_contents($appIcon));
+            $appIconFile->scaleImage(512, 512, true);
+        }
+
+        // offset for icon positioning
+        $border_w = (int)($appIconFile->getImageWidth() * 0.05);
+        $border_h = (int)($appIconFile->getImageHeight() * 0.05);
+        $innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
+        $innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
+        $appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
+        // center icon
+        $offset_w = 512 / 2 - $innerWidth / 2;
+        $offset_h = 512 / 2 - $innerHeight / 2;
+
+        $appIconFile->setImageFormat("png24");
+
+        $finalIconFile = new Imagick();
+        $finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+        $finalIconFile->readImageBlob($background);
+        $finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
+        $finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
+        $finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
+        $finalIconFile->setImageFormat('png24');
+        if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
+            $filter = Imagick::INTERPOLATE_BICUBIC;
+        } else {
+            $filter = Imagick::FILTER_LANCZOS;
+        }
+        $finalIconFile->resizeImage($size, $size, $filter, 1, false);
+
+        $appIconFile->destroy();
+        return $finalIconFile;
+    }
+
+    public function colorSvg($app, $image) {
+        try {
+            $imageFile = $this->util->getAppImage($app, $image);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+        $svg = file_get_contents($imageFile);
+        if ($svg !== false && $svg !== "") {
+            $color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
+            $svg = $this->util->colorizeSvg($svg, $color);
+            return $svg;
+        } else {
+            return false;
+        }
+    }
 
 }

apps/encryption/templates/mail.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 	<tr><td>
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
 				<tr>
-					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
+					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>">
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 					</td>
 				</tr>
@@ -27,7 +27,7 @@ 
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 						<?php p($theme->getName()); ?> -
 						<?php p($theme->getSlogan()); ?>
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
 					</td>
 				</tr>
 				<tr>