diff options
author | Bart Visscher <bartv@thisnet.nl> | 2012-05-14 19:57:43 +0400 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2012-05-16 20:53:46 +0400 |
commit | f71fec8cdcb5d7d24b7dfa30dfaf24c5115e51c1 (patch) | |
tree | 4b510fcd7da78d67fa995c6daa33c3d7cd13842e | |
parent | 2faae817f183e82975251d5023417e2f331971d3 (diff) |
Combine and minimize core and default app css files
-rw-r--r-- | 3rdparty/mediawiki/CSSMin.php | 229 | ||||
-rw-r--r-- | core/minimizer.php | 5 | ||||
-rw-r--r-- | core/templates/layout.guest.php | 3 | ||||
-rw-r--r-- | core/templates/layout.user.php | 3 | ||||
-rw-r--r-- | lib/app.php | 6 | ||||
-rw-r--r-- | lib/base.php | 12 | ||||
-rw-r--r-- | lib/helper.php | 4 | ||||
-rw-r--r-- | lib/minimizer.php | 39 | ||||
-rw-r--r-- | lib/minimizer/css.php | 73 | ||||
-rw-r--r-- | lib/util.php | 1 | ||||
-rw-r--r-- | remote.php | 2 |
11 files changed, 367 insertions, 10 deletions
diff --git a/3rdparty/mediawiki/CSSMin.php b/3rdparty/mediawiki/CSSMin.php new file mode 100644 index 00000000000..1ee2919140f --- /dev/null +++ b/3rdparty/mediawiki/CSSMin.php @@ -0,0 +1,229 @@ +<?php +/** + * Minification of CSS stylesheets. + * + * Copyright 2010 Wikimedia Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + * OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * @file + * @version 0.1.1 -- 2010-09-11 + * @author Trevor Parscal <tparscal@wikimedia.org> + * @copyright Copyright 2010 Wikimedia Foundation + * @license http://www.apache.org/licenses/LICENSE-2.0 + */ + +/** + * Transforms CSS data + * + * This class provides minification, URL remapping, URL extracting, and data-URL embedding. + */ +class CSSMin { + + /* Constants */ + + /** + * Maximum file size to still qualify for in-line embedding as a data-URI + * + * 24,576 is used because Internet Explorer has a 32,768 byte limit for data URIs, + * which when base64 encoded will result in a 1/3 increase in size. + */ + const EMBED_SIZE_LIMIT = 24576; + const URL_REGEX = 'url\(\s*[\'"]?(?P<file>[^\?\)\'"]*)(?P<query>\??[^\)\'"]*)[\'"]?\s*\)'; + + /* Protected Static Members */ + + /** @var array List of common image files extensions and mime-types */ + protected static $mimeTypes = array( + 'gif' => 'image/gif', + 'jpe' => 'image/jpeg', + 'jpeg' => 'image/jpeg', + 'jpg' => 'image/jpeg', + 'png' => 'image/png', + 'tif' => 'image/tiff', + 'tiff' => 'image/tiff', + 'xbm' => 'image/x-xbitmap', + ); + + /* Static Methods */ + + /** + * Gets a list of local file paths which are referenced in a CSS style sheet + * + * @param $source string CSS data to remap + * @param $path string File path where the source was read from (optional) + * @return array List of local file references + */ + public static function getLocalFileReferences( $source, $path = null ) { + $files = array(); + $rFlags = PREG_OFFSET_CAPTURE | PREG_SET_ORDER; + if ( preg_match_all( '/' . self::URL_REGEX . '/', $source, $matches, $rFlags ) ) { + foreach ( $matches as $match ) { + $file = ( isset( $path ) + ? rtrim( $path, '/' ) . '/' + : '' ) . "{$match['file'][0]}"; + + // Only proceed if we can access the file + if ( !is_null( $path ) && file_exists( $file ) ) { + $files[] = $file; + } + } + } + return $files; + } + + /** + * @param $file string + * @return bool|string + */ + protected static function getMimeType( $file ) { + $realpath = realpath( $file ); + // Try a couple of different ways to get the mime-type of a file, in order of + // preference + if ( + $realpath + && function_exists( 'finfo_file' ) + && function_exists( 'finfo_open' ) + && defined( 'FILEINFO_MIME_TYPE' ) + ) { + // As of PHP 5.3, this is how you get the mime-type of a file; it uses the Fileinfo + // PECL extension + return finfo_file( finfo_open( FILEINFO_MIME_TYPE ), $realpath ); + } elseif ( function_exists( 'mime_content_type' ) ) { + // Before this was deprecated in PHP 5.3, this was how you got the mime-type of a file + return mime_content_type( $file ); + } else { + // Worst-case scenario has happened, use the file extension to infer the mime-type + $ext = strtolower( pathinfo( $file, PATHINFO_EXTENSION ) ); + if ( isset( self::$mimeTypes[$ext] ) ) { + return self::$mimeTypes[$ext]; + } + } + return false; + } + + /** + * Remaps CSS URL paths and automatically embeds data URIs for URL rules + * preceded by an /* @embed * / comment + * + * @param $source string CSS data to remap + * @param $local string File path where the source was read from + * @param $remote string URL path to the file + * @param $embedData bool If false, never do any data URI embedding, even if / * @embed * / is found + * @return string Remapped CSS data + */ + public static function remap( $source, $local, $remote, $embedData = true ) { + $pattern = '/((?P<embed>\s*\/\*\s*\@embed\s*\*\/)(?P<pre>[^\;\}]*))?' . + self::URL_REGEX . '(?P<post>[^;]*)[\;]?/'; + $offset = 0; + while ( preg_match( $pattern, $source, $match, PREG_OFFSET_CAPTURE, $offset ) ) { + // Skip fully-qualified URLs and data URIs + $urlScheme = parse_url( $match['file'][0], PHP_URL_SCHEME ); + if ( $urlScheme ) { + // Move the offset to the end of the match, leaving it alone + $offset = $match[0][1] + strlen( $match[0][0] ); + continue; + } + // URLs with absolute paths like /w/index.php need to be expanded + // to absolute URLs but otherwise left alone + if ( $match['file'][0] !== '' && $match['file'][0][0] === '/' ) { + // Replace the file path with an expanded (possibly protocol-relative) URL + // ...but only if wfExpandUrl() is even available. + // This will not be the case if we're running outside of MW + $lengthIncrease = 0; + if ( function_exists( 'wfExpandUrl' ) ) { + $expanded = wfExpandUrl( $match['file'][0], PROTO_RELATIVE ); + $origLength = strlen( $match['file'][0] ); + $lengthIncrease = strlen( $expanded ) - $origLength; + $source = substr_replace( $source, $expanded, + $match['file'][1], $origLength + ); + } + // Move the offset to the end of the match, leaving it alone + $offset = $match[0][1] + strlen( $match[0][0] ) + $lengthIncrease; + continue; + } + // Shortcuts + $embed = $match['embed'][0]; + $pre = $match['pre'][0]; + $post = $match['post'][0]; + $query = $match['query'][0]; + $url = "{$remote}/{$match['file'][0]}"; + $file = "{$local}/{$match['file'][0]}"; + // bug 27052 - Guard against double slashes, because foo//../bar + // apparently resolves to foo/bar on (some?) clients + $url = preg_replace( '#([^:])//+#', '\1/', $url ); + $replacement = false; + if ( $local !== false && file_exists( $file ) ) { + // Add version parameter as a time-stamp in ISO 8601 format, + // using Z for the timezone, meaning GMT + $url .= '?' . gmdate( 'Y-m-d\TH:i:s\Z', round( filemtime( $file ), -2 ) ); + // Embedding requires a bit of extra processing, so let's skip that if we can + if ( $embedData && $embed ) { + $type = self::getMimeType( $file ); + // Detect when URLs were preceeded with embed tags, and also verify file size is + // below the limit + var_dump($match['embed'], $file, filesize($file)); + if ( + $type + && $match['embed'][1] > 0 + && filesize( $file ) < self::EMBED_SIZE_LIMIT + ) { + // Strip off any trailing = symbols (makes browsers freak out) + $data = base64_encode( file_get_contents( $file ) ); + // Build 2 CSS properties; one which uses a base64 encoded data URI in place + // of the @embed comment to try and retain line-number integrity, and the + // other with a remapped an versioned URL and an Internet Explorer hack + // making it ignored in all browsers that support data URIs + $replacement = "{$pre}url(data:{$type};base64,{$data}){$post};"; + $replacement .= "{$pre}url({$url}){$post}!ie;"; + } + } + if ( $replacement === false ) { + // Assume that all paths are relative to $remote, and make them absolute + $replacement = "{$embed}{$pre}url({$url}){$post};"; + } + } elseif ( $local === false ) { + // Assume that all paths are relative to $remote, and make them absolute + $replacement = "{$embed}{$pre}url({$url}{$query}){$post};"; + } + if ( $replacement !== false ) { + // Perform replacement on the source + $source = substr_replace( + $source, $replacement, $match[0][1], strlen( $match[0][0] ) + ); + // Move the offset to the end of the replacement in the source + $offset = $match[0][1] + strlen( $replacement ); + continue; + } + // Move the offset to the end of the match, leaving it alone + $offset = $match[0][1] + strlen( $match[0][0] ); + } + return $source; + } + + /** + * Removes whitespace from CSS data + * + * @param $css string CSS data to minify + * @return string Minified CSS data + */ + public static function minify( $css ) { + return trim( + str_replace( + array( '; ', ': ', ' {', '{ ', ', ', '} ', ';}' ), + array( ';', ':', '{', '{', ',', '}', '}' ), + preg_replace( array( '/\s+/', '/\/\*.*?\*\//s' ), array( ' ', '' ), $css ) + ) + ); + } +} diff --git a/core/minimizer.php b/core/minimizer.php new file mode 100644 index 00000000000..e4e6ff50e66 --- /dev/null +++ b/core/minimizer.php @@ -0,0 +1,5 @@ +<?php + +$minimizer = new OC_Minimizer_CSS(); +$files = $minimizer->findFiles(OC_Util::$core_styles); +$minimizer->output($files); diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 86f46d9c7eb..37a74f46968 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -4,6 +4,9 @@ <title>ownCloud</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" /> + <?php endif ?> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index b832ac2636f..e6fa910ce04 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -4,6 +4,9 @@ <title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> + <?php if (!defined('DEBUG') || !DEBUG): ?> + <link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" /> + <?php endif ?> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> diff --git a/lib/app.php b/lib/app.php index f274194b25c..39e90ada019 100644 --- a/lib/app.php +++ b/lib/app.php @@ -73,6 +73,12 @@ class OC_App{ self::$init = true; + if (!defined('DEBUG') || !DEBUG){ + if (is_null($types)) { + OC_Util::$core_styles = OC_Util::$styles; + OC_Util::$styles = array(); + } + } // return return true; } diff --git a/lib/base.php b/lib/base.php index f01e1f5be6c..673a47ba450 100644 --- a/lib/base.php +++ b/lib/base.php @@ -230,6 +230,8 @@ class OC{ OC_Config::setValue('version',implode('.',OC_Util::getVersion())); } + OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php'); + OC_App::updateApps(); } } @@ -278,13 +280,9 @@ class OC{ public static function loadfile(){ if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE)){ if(substr(OC::$REQUESTEDFILE, -3) == 'css'){ - $appswebroot = (string) OC::$APPSWEBROOT; - $webroot = (string) OC::$WEBROOT; - $cssfile = file_get_contents(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE); - $cssfile = str_replace('%appswebroot%', $appswebroot, $cssfile); - $cssfile = str_replace('%webroot%', $webroot, $cssfile); - header('Content-Type: text/css'); - echo $cssfile; + $file = 'apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE; + $minimizer = new OC_Minimizer_CSS(); + $minimizer->output(array(array(OC::$APPSROOT, OC::$APPSWEBROOT, $file))); exit; }elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){ require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE); diff --git a/lib/helper.php b/lib/helper.php index 31819d2e3fc..41ff119ff5f 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -112,8 +112,8 @@ class OC_Helper { * * Returns a absolute url to the given service. */ - public static function linkToRemote( $service ) { - return self::linkToAbsolute( '', 'remote.php') . '/' . $service . '/'; + public static function linkToRemote( $service, $add_slash = true ) { + return self::linkToAbsolute( '', 'remote.php') . '/' . $service . ($add_slash?'/':''); } /** diff --git a/lib/minimizer.php b/lib/minimizer.php new file mode 100644 index 00000000000..2d2708c59e9 --- /dev/null +++ b/lib/minimizer.php @@ -0,0 +1,39 @@ +<?php + +abstract class OC_Minimizer +{ + protected $files = array(); + + protected function appendIfExist($root, $webroot, $file) { + if (is_file($root.'/'.$file)) { + $this->files[] = array($root, $webroot, $file); + return true; + } + return false; + } + + public function getLastModified($files) { + $last_modified = 0; + foreach($files as $file_info) { + $file = $file_info[0] . '/' . $file_info[2]; + $filemtime = filemtime($file); + if ($filemtime > $last_modified) { + $last_modified = $filemtime; + } + } + return $last_modified; + } + + abstract public function minimizeFiles($files); + + public function output($files) { + header('Content-Type: '.$this->contentType); + OC_Response::enableCaching(); + $last_modified = $this->getLastModified($files); + OC_Response::setLastModifiedHeader($last_modified); + + $out = $this->minimizeFiles($files); + header('Content-Length: '.strlen($out)); + echo $out; + } +} diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php new file mode 100644 index 00000000000..3d1196390e2 --- /dev/null +++ b/lib/minimizer/css.php @@ -0,0 +1,73 @@ +<?php + +require_once('mediawiki/CSSMin.php'); + +class OC_Minimizer_CSS extends OC_Minimizer +{ + protected $contentType = 'text/css'; + + public function findFiles($styles) { + // Read the selected theme from the config file + $theme=OC_Config::getValue( "theme" ); + + // Read the detected formfactor and use the right file name. + $fext = OC_Template::getFormFactorExtension(); + foreach($styles as $style){ + // is it in 3rdparty? + if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) { + + // or in apps? + }elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style$fext.css" )) { + }elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$style.css" )) { + + // or in the owncloud root? + }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) { + }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) { + + // or in core ? + }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) { + }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) { + + }else{ + echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); + die(); + } + } + // Add the theme css files. you can override the default values here + if(!empty($theme)) { + foreach($styles as $style){ + if($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) { + }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) { + + }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) { + }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) { + + }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) { + }elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) { + } + } + } + return $this->files; + } + + public function minimizeFiles($files) { + $css_out = ''; + $appswebroot = (string) OC::$APPSWEBROOT; + $webroot = (string) OC::$WEBROOT; + foreach($files as $file_info) { + $file = $file_info[0] . '/' . $file_info[2]; + $css_out .= '/* ' . $file . ' */' . "\n"; + $css = file_get_contents($file); + if (strpos($file, OC::$APPSROOT) == 0) { + $css = str_replace('%appswebroot%', $appswebroot, $css); + $css = str_replace('%webroot%', $webroot, $css); + } + $remote = $file_info[1]; + $remote .= '../'; + $remote .= dirname($file_info[2]); + $css_out .= CSSMin::remap($css, dirname($file), $remote, true); + } + $css_out = CSSMin::minify($css_out); + return $css_out; + } +} diff --git a/lib/util.php b/lib/util.php index ff117998713..c7a5a9cfd68 100644 --- a/lib/util.php +++ b/lib/util.php @@ -10,6 +10,7 @@ class OC_Util { public static $headers=array(); private static $rootMounted=false; private static $fsSetup=false; + public static $core_styles=array(); // Can be set up public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration diff --git a/remote.php b/remote.php index 2a7ab167d04..7b36b31d802 100644 --- a/remote.php +++ b/remote.php @@ -7,7 +7,7 @@ if (!$pos = strpos($path_info, '/', 1)) { $pos = strlen($path_info); } $service=substr($path_info, 1, $pos-1); -$file = OCP\CONFIG::getAppValue('core', 'remote_' . $service); +$file = OC_AppConfig::getValue('core', 'remote_' . $service); if(is_null($file)){ header('HTTP/1.0 404 Not Found'); exit; |