Add support for font families to getFont.php

diff --git a/wcfsetup/install/files/font/getFont.php b/wcfsetup/install/files/font/getFont.php
index bfcf0b88d225caea3d5f8de37dd81810d3ba3b2d..258ca313db70f6b44f40af08535e9efc714ae44a 100644 (file)
--- a/wcfsetup/install/files/font/getFont.php
+++ b/wcfsetup/install/files/font/getFont.php
@@ -19,49 +19,65 @@ $types = [
        'woff2' => 'font/woff2' // the specs at http://dev.w3.org/webfonts/WOFF2/spec/ are not perfectly clear, but font/woff2 seems to be the most sane one and is currently used by Google Fonts
 ];
 
-if (!empty($_GET['type'])) {
-       // get parameters
-       $type = $_GET['type'];
-       $font = (!empty($_GET['font']) ? basename($_GET['font']) : 'fontawesome-webfont');
-       
-       if (isset($types[$type])) {
-               if (file_exists($font . '.' . $type)) {
-                       $filename = $font . '.' . $type;
-                       $filemtime = filemtime($filename);
-                       
-                       $etag = '"' . md5($filemtime . $filename) . '"';
-                       $clientEtag = (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : '';
-                       $clientLastModified = (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) ? trim($_SERVER['HTTP_IF_MODIFIED_SINCE']) : 0;
-                       $clientLastModified = @strtotime($clientLastModified);
-                       
-                       // ignore request if client seems to already have fetched this file
-                       if (($clientLastModified && $clientEtag) ? (($clientLastModified == $filemtime) && ($clientEtag == $etag)) : ($clientLastModified == $filemtime) ) {
-                               header("HTTP/1.1 304 Not Modified");
-                               exit;
-                       }
-                       
-                       $data = file_get_contents($filename);
-                       
-                       // send cache and type headers
-                       // allow font fetching from all domains (CORS)
-                       header('Access-Control-Allow-Origin: *');
-                       header('Content-Type: ' . $types[$type]);
-                       header('Cache-Control: max-age=31536000, public');
-                       header('ETag: ' . $etag);
-                       header('Expires: ' . gmdate("D, d M Y H:i:s", time() + 31536000) . ' GMT');
-                       header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $filemtime) . ' GMT');
-                       header('Content-Length: ' . strlen($data));
-                       
-                       die($data);
-               }
-               
-               header("HTTP/1.1 400 Bad Request");
-               die("Invalid font '" . htmlentities($font) . "' given");
-       }
-       
+function badRequest($reason) {
        header("HTTP/1.1 400 Bad Request");
-       die("Invalid type '" . htmlentities($type) . "' given");
+       header("Content-Type: text/plain");
+       die($reason);
+}
+
+function notFound($reason = "Unable to find font.") {
+       header("HTTP/1.1 404 Not Found");
+       header("Content-Type: text/plain");
+       die($reason);
+}
+
+if (empty($_GET['filename'])) {
+       if (empty($_GET['type'])) {
+               badRequest('Neither filename nor type is given.');
+       }
+       $filename = (!empty($_GET['font']) ? basename($_GET['font']) : 'fontawesome-webfont').'.'.$_GET['type'];
+}
+else {
+       $filename = __DIR__.'/';
+       if (!empty($_GET['family'])) {
+               $filename .= 'families/'.basename($_GET['family']).'/';
+       }
+       $filename .= $_GET['filename'];
 }
 
-header("HTTP/1.1 400 Bad Request");
-die("Missing type parameter");
+$type = pathinfo($filename, PATHINFO_EXTENSION);
+
+if (!isset($types[$type])) {
+       badRequest('Invalid type given.');
+}
+
+if (!is_readable($filename)) {
+       notFound();
+}
+
+$filemtime = filemtime($filename);
+
+$etag = '"' . md5($filemtime . $filename) . '"';
+$clientEtag = (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : '';
+$clientLastModified = (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) ? trim($_SERVER['HTTP_IF_MODIFIED_SINCE']) : 0;
+$clientLastModified = @strtotime($clientLastModified);
+
+// ignore request if client seems to already have fetched this file
+if (($clientLastModified && $clientEtag) ? (($clientLastModified == $filemtime) && ($clientEtag == $etag)) : ($clientLastModified == $filemtime) ) {
+       header("HTTP/1.1 304 Not Modified");
+       exit;
+}
+
+$data = file_get_contents($filename);
+
+// send cache and type headers
+// allow font fetching from all domains (CORS)
+header('Access-Control-Allow-Origin: *');
+header('Content-Type: ' . $types[$type]);
+header('Cache-Control: max-age=31536000, public');
+header('ETag: ' . $etag);
+header('Expires: ' . gmdate("D, d M Y H:i:s", time() + 31536000) . ' GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $filemtime) . ' GMT');
+header('Content-Length: ' . strlen($data));
+
+die($data);