From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 12 Jun 2017 10:17:02 +0000 (+0200)
Subject: Updated favicon support
X-Git-Tag: 3.1.0_Alpha_1~373
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aef117b529098f2d78b06cc0a2f3012225c57c78;p=GitHub%2FWoltLab%2FWCF.git

Updated favicon support

See #2257
---

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index 146d5b665f..f08fbf457f 100644
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -28,10 +28,10 @@
 {event name='javascriptInclude'}
 
 <!-- Icons -->
-<link rel="icon" href="{@$__wcf->getFavicon()}" type="image/x-icon">
-<link rel="apple-touch-icon" href="{@$__wcf->getPath()}images/apple-touch-icon.png">
-
-<!-- theme color (mobile Chrome) -->
+<link rel="apple-touch-icon" sizes="180x180" href="{$__wcf->getStyleHandler()->getStyle()->getFaviconAppleTouchIcon()}">
+<link rel="manifest" href="{@$__wcf->getStyleHandler()->getStyle()->getFaviconManifest()}">
+<link rel="shortcut icon" href="{@$__wcf->getFavicon()}">
+<meta name="msapplication-config" content="{@$__wcf->getStyleHandler()->getStyle()->getFaviconBrowserconfig()}">
 <meta name="theme-color" content="{$__wcf->getStyleHandler()->getStyle()->getVariable('wcfHeaderBackground')}">
 
 <script data-relocate="true">
diff --git a/wcfsetup/install/files/images/apple-touch-icon.png b/wcfsetup/install/files/images/apple-touch-icon.png
deleted file mode 100644
index eddf7635bb..0000000000
Binary files a/wcfsetup/install/files/images/apple-touch-icon.png and /dev/null differ
diff --git a/wcfsetup/install/files/images/favicon.ico b/wcfsetup/install/files/images/favicon.ico
deleted file mode 100644
index cc36101468..0000000000
Binary files a/wcfsetup/install/files/images/favicon.ico and /dev/null differ
diff --git a/wcfsetup/install/files/images/favicon/default.android-chrome-192x192.png b/wcfsetup/install/files/images/favicon/default.android-chrome-192x192.png
new file mode 100644
index 0000000000..ddbbeae099
Binary files /dev/null and b/wcfsetup/install/files/images/favicon/default.android-chrome-192x192.png differ
diff --git a/wcfsetup/install/files/images/favicon/default.android-chrome-256x256.png b/wcfsetup/install/files/images/favicon/default.android-chrome-256x256.png
new file mode 100644
index 0000000000..3937b8316a
Binary files /dev/null and b/wcfsetup/install/files/images/favicon/default.android-chrome-256x256.png differ
diff --git a/wcfsetup/install/files/images/favicon/default.apple-touch-icon.png b/wcfsetup/install/files/images/favicon/default.apple-touch-icon.png
new file mode 100644
index 0000000000..d01b51459b
Binary files /dev/null and b/wcfsetup/install/files/images/favicon/default.apple-touch-icon.png differ
diff --git a/wcfsetup/install/files/images/favicon/default.browserconfig.xml b/wcfsetup/install/files/images/favicon/default.browserconfig.xml
new file mode 100644
index 0000000000..5c4d1e29d1
--- /dev/null
+++ b/wcfsetup/install/files/images/favicon/default.browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/abc/test/mstile-150x150.png"/>
+            <TileColor>#3a6d9c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/wcfsetup/install/files/images/favicon/default.favicon.ico b/wcfsetup/install/files/images/favicon/default.favicon.ico
new file mode 100644
index 0000000000..19f87b42ad
Binary files /dev/null and b/wcfsetup/install/files/images/favicon/default.favicon.ico differ
diff --git a/wcfsetup/install/files/images/favicon/default.manifest.json b/wcfsetup/install/files/images/favicon/default.manifest.json
new file mode 100644
index 0000000000..8380019f91
--- /dev/null
+++ b/wcfsetup/install/files/images/favicon/default.manifest.json
@@ -0,0 +1,18 @@
+{
+    "name": "",
+    "icons": [
+        {
+            "src": "/abc/test/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/abc/test/android-chrome-256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
\ No newline at end of file
diff --git a/wcfsetup/install/files/images/favicon/default.mstile-150x150.png b/wcfsetup/install/files/images/favicon/default.mstile-150x150.png
new file mode 100644
index 0000000000..aef320d950
Binary files /dev/null and b/wcfsetup/install/files/images/favicon/default.mstile-150x150.png differ
diff --git a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
index 77f61f33f3..1fafba7b8f 100644
--- a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
+++ b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
@@ -69,4 +69,29 @@ class ActiveStyle extends DatabaseObjectDecorator {
 		
 		return WCF::getPath() . 'images/default-logo-small.png';
 	}
+	
+	public function getFaviconAppleTouchIcon() {
+		return $this->getFaviconPath('apple-touch-icon.png');
+	}
+	
+	public function getFaviconManifest() {
+		return $this->getFaviconPath('manifest.json');
+	}
+	
+	public function getFaviconBrowserconfig() {
+		return $this->getFaviconPath('browserconfig.xml');
+	}
+	
+	public function getRelativeFavicon() {
+		return $this->getFaviconPath('favicon.ico', false);
+	}
+	
+	protected function getFaviconPath($filename, $absolutePath = true) {
+		$path = 'images/favicon/'. ($this->getDecoratedObject()->hasFavicon ? $this->getDecoratedObject()->styleID : 'default') . ".{$filename}";
+		if ($absolutePath) {
+			return WCF::getPath() . $path;
+		}
+		
+		return $path;
+	}
 }
diff --git a/wcfsetup/install/files/lib/data/style/Style.class.php b/wcfsetup/install/files/lib/data/style/Style.class.php
index dac458dbf1..6b35f62407 100644
--- a/wcfsetup/install/files/lib/data/style/Style.class.php
+++ b/wcfsetup/install/files/lib/data/style/Style.class.php
@@ -28,6 +28,7 @@ use wcf\system\WCF;
  * @property-read	string		$imagePath		path (relative to `WCF_DIR`) to the images used by the style or empty if style has no special image path
  * @property-read	string		$packageName		package identifier used to export the style as a package or empty (thus style cannot be exported as package)
  * @property-read	integer		$isTainted		is `0` if the original declarations of an imported or installed style are not and cannot be altered, otherwise `1`
+ * @property-read	integer		$hasFavicon		is `0` if the default favicon data should be used
  */
 class Style extends DatabaseObject {
 	/**
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 6a0b386649..b9ed2b0a54 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -969,16 +969,17 @@ class WCF {
 	public function getFavicon() {
 		$activeApplication = ApplicationHandler::getInstance()->getActiveApplication();
 		$wcf = ApplicationHandler::getInstance()->getWCF();
+		$favicon = StyleHandler::getInstance()->getStyle()->getRelativeFavicon();
 		
 		if ($activeApplication->domainName !== $wcf->domainName) {
-			if (file_exists(WCF_DIR.'images/favicon.ico')) {
-				$favicon = file_get_contents(WCF_DIR.'images/favicon.ico');
+			if (file_exists(WCF_DIR.$favicon)) {
+				$favicon = file_get_contents(WCF_DIR.$favicon);
 				
 				return 'data:image/x-icon;base64,' . base64_encode($favicon);
 			}
 		}
 		
-		return self::getPath() . 'images/favicon.ico';
+		return self::getPath() . $favicon;
 	}
 	
 	/**
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index e98c7e87e0..de90d01626 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1194,7 +1194,8 @@ CREATE TABLE wcf1_style (
 	authorURL VARCHAR(255) NOT NULL DEFAULT '',
 	imagePath VARCHAR(255) NOT NULL DEFAULT '',
 	packageName VARCHAR(255) NOT NULL DEFAULT '',
-	isTainted TINYINT(1) NOT NULL DEFAULT 0
+	isTainted TINYINT(1) NOT NULL DEFAULT 0,
+	hasFavicon TINYINT(1) NOT NULL DEFAULT 0
 );
 
 DROP TABLE IF EXISTS wcf1_style_variable;