From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 28 Nov 2014 00:50:02 +0000 (+0100)
Subject: Fallback to base64-encoded favicon for multiple domain setups
X-Git-Tag: 2.1.0_Beta_1~130
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d38bd16f7e26c234a2ea1f235c9c8b94d6559452;p=GitHub%2FWoltLab%2FWCF.git

Fallback to base64-encoded favicon for multiple domain setups

Favico.js uses a <canvas> to draw the badge, but this will fail if the accessed domain is foo.example.com and the favicon was served from bar.example.com. This is caused by the fact that the <canvas> is considered tainted once an external image has been loaded and thus refuses to export the resulting image.

Roughly 99.99% of all setups use only a single domain, thus there is absolutely no change in this case. This change adresses potentially issues when running a multiple-domain setup.
---

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index 93e2c6b905..f6695c669e 100644
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -23,7 +23,7 @@
 {event name='stylesheets'}
 
 <!-- Icons -->
-<link rel="icon" href="{@$__wcf->getPath()}images/favicon.ico" type="image/x-icon" />
+<link rel="icon" href="{@$__wcf->getFavicon()}" type="image/x-icon" />
 <link rel="apple-touch-icon" href="{@$__wcf->getPath()}images/apple-touch-icon.png" />
 
 <script data-relocate="true">
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 31d024eeeb..213351318b 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -822,6 +822,26 @@ class WCF {
 		return substr(sha1(preg_replace('~^https~', 'http', self::getPath())), 0, 8);
 	}
 	
+	/**
+	 * Returns the favicon URL or a base64 encoded image.
+	 * 
+	 * @return	string
+	 */
+	public function getFavicon() {
+		$activeApplication = ApplicationHandler::getInstance()->getActiveApplication();
+		$primaryApplication = ApplicationHandler::getInstance()->getPrimaryApplication();
+		
+		if ($activeApplication->domainName != $primaryApplication->domainName) {
+			if (file_exists(WCF_DIR.'images/favicon.ico')) {
+				$favicon = file_get_contents(WCF_DIR.'images/favicon.ico');
+				
+				return 'data:image/x-icon;base64,' . base64_encode($favicon);
+			}
+		}
+		
+		return WCF::getPath() . 'images/favicon.ico';
+	}
+	
 	/**
 	 * Initialises the cronjobs.
 	 */