Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
This commit is contained in:
Sam Tuke
commit
22dd155e4d
|
|
@ -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 )
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,606 @@
|
|||
<?php
|
||||
/**
|
||||
* JavaScript Minifier
|
||||
*
|
||||
* @file
|
||||
* @author Paul Copperman <paul.copperman@gmail.com>
|
||||
* @license Choose any of Apache, MIT, GPL, LGPL
|
||||
*/
|
||||
|
||||
/**
|
||||
* This class is meant to safely minify javascript code, while leaving syntactically correct
|
||||
* programs intact. Other libraries, such as JSMin require a certain coding style to work
|
||||
* correctly. OTOH, libraries like jsminplus, that do parse the code correctly are rather
|
||||
* slow, because they construct a complete parse tree before outputting the code minified.
|
||||
* So this class is meant to allow arbitrary (but syntactically correct) input, while being
|
||||
* fast enough to be used for on-the-fly minifying.
|
||||
*/
|
||||
class JavaScriptMinifier {
|
||||
|
||||
/* Class constants */
|
||||
/* Parsing states.
|
||||
* The state machine is only necessary to decide whether to parse a slash as division
|
||||
* operator or as regexp literal.
|
||||
* States are named after the next expected item. We only distinguish states when the
|
||||
* distinction is relevant for our purpose.
|
||||
*/
|
||||
const STATEMENT = 0;
|
||||
const CONDITION = 1;
|
||||
const PROPERTY_ASSIGNMENT = 2;
|
||||
const EXPRESSION = 3;
|
||||
const EXPRESSION_NO_NL = 4; // only relevant for semicolon insertion
|
||||
const EXPRESSION_OP = 5;
|
||||
const EXPRESSION_FUNC = 6;
|
||||
const EXPRESSION_TERNARY = 7; // used to determine the role of a colon
|
||||
const EXPRESSION_TERNARY_OP = 8;
|
||||
const EXPRESSION_TERNARY_FUNC = 9;
|
||||
const PAREN_EXPRESSION = 10; // expression which is not on the top level
|
||||
const PAREN_EXPRESSION_OP = 11;
|
||||
const PAREN_EXPRESSION_FUNC = 12;
|
||||
const PROPERTY_EXPRESSION = 13; // expression which is within an object literal
|
||||
const PROPERTY_EXPRESSION_OP = 14;
|
||||
const PROPERTY_EXPRESSION_FUNC = 15;
|
||||
|
||||
/* Token types */
|
||||
const TYPE_UN_OP = 1; // unary operators
|
||||
const TYPE_INCR_OP = 2; // ++ and --
|
||||
const TYPE_BIN_OP = 3; // binary operators
|
||||
const TYPE_ADD_OP = 4; // + and - which can be either unary or binary ops
|
||||
const TYPE_HOOK = 5; // ?
|
||||
const TYPE_COLON = 6; // :
|
||||
const TYPE_COMMA = 7; // ,
|
||||
const TYPE_SEMICOLON = 8; // ;
|
||||
const TYPE_BRACE_OPEN = 9; // {
|
||||
const TYPE_BRACE_CLOSE = 10; // }
|
||||
const TYPE_PAREN_OPEN = 11; // ( and [
|
||||
const TYPE_PAREN_CLOSE = 12; // ) and ]
|
||||
const TYPE_RETURN = 13; // keywords: break, continue, return, throw
|
||||
const TYPE_IF = 14; // keywords: catch, for, with, switch, while, if
|
||||
const TYPE_DO = 15; // keywords: case, var, finally, else, do, try
|
||||
const TYPE_FUNC = 16; // keywords: function
|
||||
const TYPE_LITERAL = 17; // all literals, identifiers and unrecognised tokens
|
||||
|
||||
// Sanity limit to avoid excessive memory usage
|
||||
const STACK_LIMIT = 1000;
|
||||
|
||||
/* Static functions */
|
||||
|
||||
/**
|
||||
* Returns minified JavaScript code.
|
||||
*
|
||||
* NOTE: $maxLineLength isn't a strict maximum. Longer lines will be produced when
|
||||
* literals (e.g. quoted strings) longer than $maxLineLength are encountered
|
||||
* or when required to guard against semicolon insertion.
|
||||
*
|
||||
* @param $s String JavaScript code to minify
|
||||
* @param $statementsOnOwnLine Bool Whether to put each statement on its own line
|
||||
* @param $maxLineLength Int Maximum length of a single line, or -1 for no maximum.
|
||||
* @return String Minified code
|
||||
*/
|
||||
public static function minify( $s, $statementsOnOwnLine = false, $maxLineLength = 1000 ) {
|
||||
// First we declare a few tables that contain our parsing rules
|
||||
|
||||
// $opChars : characters, which can be combined without whitespace in between them
|
||||
$opChars = array(
|
||||
'!' => true,
|
||||
'"' => true,
|
||||
'%' => true,
|
||||
'&' => true,
|
||||
"'" => true,
|
||||
'(' => true,
|
||||
')' => true,
|
||||
'*' => true,
|
||||
'+' => true,
|
||||
',' => true,
|
||||
'-' => true,
|
||||
'.' => true,
|
||||
'/' => true,
|
||||
':' => true,
|
||||
';' => true,
|
||||
'<' => true,
|
||||
'=' => true,
|
||||
'>' => true,
|
||||
'?' => true,
|
||||
'[' => true,
|
||||
']' => true,
|
||||
'^' => true,
|
||||
'{' => true,
|
||||
'|' => true,
|
||||
'}' => true,
|
||||
'~' => true
|
||||
);
|
||||
|
||||
// $tokenTypes : maps keywords and operators to their corresponding token type
|
||||
$tokenTypes = array(
|
||||
'!' => self::TYPE_UN_OP,
|
||||
'~' => self::TYPE_UN_OP,
|
||||
'delete' => self::TYPE_UN_OP,
|
||||
'new' => self::TYPE_UN_OP,
|
||||
'typeof' => self::TYPE_UN_OP,
|
||||
'void' => self::TYPE_UN_OP,
|
||||
'++' => self::TYPE_INCR_OP,
|
||||
'--' => self::TYPE_INCR_OP,
|
||||
'!=' => self::TYPE_BIN_OP,
|
||||
'!==' => self::TYPE_BIN_OP,
|
||||
'%' => self::TYPE_BIN_OP,
|
||||
'%=' => self::TYPE_BIN_OP,
|
||||
'&' => self::TYPE_BIN_OP,
|
||||
'&&' => self::TYPE_BIN_OP,
|
||||
'&=' => self::TYPE_BIN_OP,
|
||||
'*' => self::TYPE_BIN_OP,
|
||||
'*=' => self::TYPE_BIN_OP,
|
||||
'+=' => self::TYPE_BIN_OP,
|
||||
'-=' => self::TYPE_BIN_OP,
|
||||
'.' => self::TYPE_BIN_OP,
|
||||
'/' => self::TYPE_BIN_OP,
|
||||
'/=' => self::TYPE_BIN_OP,
|
||||
'<' => self::TYPE_BIN_OP,
|
||||
'<<' => self::TYPE_BIN_OP,
|
||||
'<<=' => self::TYPE_BIN_OP,
|
||||
'<=' => self::TYPE_BIN_OP,
|
||||
'=' => self::TYPE_BIN_OP,
|
||||
'==' => self::TYPE_BIN_OP,
|
||||
'===' => self::TYPE_BIN_OP,
|
||||
'>' => self::TYPE_BIN_OP,
|
||||
'>=' => self::TYPE_BIN_OP,
|
||||
'>>' => self::TYPE_BIN_OP,
|
||||
'>>=' => self::TYPE_BIN_OP,
|
||||
'>>>' => self::TYPE_BIN_OP,
|
||||
'>>>=' => self::TYPE_BIN_OP,
|
||||
'^' => self::TYPE_BIN_OP,
|
||||
'^=' => self::TYPE_BIN_OP,
|
||||
'|' => self::TYPE_BIN_OP,
|
||||
'|=' => self::TYPE_BIN_OP,
|
||||
'||' => self::TYPE_BIN_OP,
|
||||
'in' => self::TYPE_BIN_OP,
|
||||
'instanceof' => self::TYPE_BIN_OP,
|
||||
'+' => self::TYPE_ADD_OP,
|
||||
'-' => self::TYPE_ADD_OP,
|
||||
'?' => self::TYPE_HOOK,
|
||||
':' => self::TYPE_COLON,
|
||||
',' => self::TYPE_COMMA,
|
||||
';' => self::TYPE_SEMICOLON,
|
||||
'{' => self::TYPE_BRACE_OPEN,
|
||||
'}' => self::TYPE_BRACE_CLOSE,
|
||||
'(' => self::TYPE_PAREN_OPEN,
|
||||
'[' => self::TYPE_PAREN_OPEN,
|
||||
')' => self::TYPE_PAREN_CLOSE,
|
||||
']' => self::TYPE_PAREN_CLOSE,
|
||||
'break' => self::TYPE_RETURN,
|
||||
'continue' => self::TYPE_RETURN,
|
||||
'return' => self::TYPE_RETURN,
|
||||
'throw' => self::TYPE_RETURN,
|
||||
'catch' => self::TYPE_IF,
|
||||
'for' => self::TYPE_IF,
|
||||
'if' => self::TYPE_IF,
|
||||
'switch' => self::TYPE_IF,
|
||||
'while' => self::TYPE_IF,
|
||||
'with' => self::TYPE_IF,
|
||||
'case' => self::TYPE_DO,
|
||||
'do' => self::TYPE_DO,
|
||||
'else' => self::TYPE_DO,
|
||||
'finally' => self::TYPE_DO,
|
||||
'try' => self::TYPE_DO,
|
||||
'var' => self::TYPE_DO,
|
||||
'function' => self::TYPE_FUNC
|
||||
);
|
||||
|
||||
// $goto : This is the main table for our state machine. For every state/token pair
|
||||
// the following state is defined. When no rule exists for a given pair,
|
||||
// the state is left unchanged.
|
||||
$goto = array(
|
||||
self::STATEMENT => array(
|
||||
self::TYPE_UN_OP => self::EXPRESSION,
|
||||
self::TYPE_INCR_OP => self::EXPRESSION,
|
||||
self::TYPE_ADD_OP => self::EXPRESSION,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
|
||||
self::TYPE_RETURN => self::EXPRESSION_NO_NL,
|
||||
self::TYPE_IF => self::CONDITION,
|
||||
self::TYPE_FUNC => self::CONDITION,
|
||||
self::TYPE_LITERAL => self::EXPRESSION_OP
|
||||
),
|
||||
self::CONDITION => array(
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
|
||||
),
|
||||
self::PROPERTY_ASSIGNMENT => array(
|
||||
self::TYPE_COLON => self::PROPERTY_EXPRESSION,
|
||||
self::TYPE_BRACE_OPEN => self::STATEMENT
|
||||
),
|
||||
self::EXPRESSION => array(
|
||||
self::TYPE_SEMICOLON => self::STATEMENT,
|
||||
self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
|
||||
self::TYPE_FUNC => self::EXPRESSION_FUNC,
|
||||
self::TYPE_LITERAL => self::EXPRESSION_OP
|
||||
),
|
||||
self::EXPRESSION_NO_NL => array(
|
||||
self::TYPE_SEMICOLON => self::STATEMENT,
|
||||
self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
|
||||
self::TYPE_FUNC => self::EXPRESSION_FUNC,
|
||||
self::TYPE_LITERAL => self::EXPRESSION_OP
|
||||
),
|
||||
self::EXPRESSION_OP => array(
|
||||
self::TYPE_BIN_OP => self::EXPRESSION,
|
||||
self::TYPE_ADD_OP => self::EXPRESSION,
|
||||
self::TYPE_HOOK => self::EXPRESSION_TERNARY,
|
||||
self::TYPE_COLON => self::STATEMENT,
|
||||
self::TYPE_COMMA => self::EXPRESSION,
|
||||
self::TYPE_SEMICOLON => self::STATEMENT,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
|
||||
),
|
||||
self::EXPRESSION_FUNC => array(
|
||||
self::TYPE_BRACE_OPEN => self::STATEMENT
|
||||
),
|
||||
self::EXPRESSION_TERNARY => array(
|
||||
self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
|
||||
self::TYPE_FUNC => self::EXPRESSION_TERNARY_FUNC,
|
||||
self::TYPE_LITERAL => self::EXPRESSION_TERNARY_OP
|
||||
),
|
||||
self::EXPRESSION_TERNARY_OP => array(
|
||||
self::TYPE_BIN_OP => self::EXPRESSION_TERNARY,
|
||||
self::TYPE_ADD_OP => self::EXPRESSION_TERNARY,
|
||||
self::TYPE_HOOK => self::EXPRESSION_TERNARY,
|
||||
self::TYPE_COMMA => self::EXPRESSION_TERNARY,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
|
||||
),
|
||||
self::EXPRESSION_TERNARY_FUNC => array(
|
||||
self::TYPE_BRACE_OPEN => self::STATEMENT
|
||||
),
|
||||
self::PAREN_EXPRESSION => array(
|
||||
self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
|
||||
self::TYPE_FUNC => self::PAREN_EXPRESSION_FUNC,
|
||||
self::TYPE_LITERAL => self::PAREN_EXPRESSION_OP
|
||||
),
|
||||
self::PAREN_EXPRESSION_OP => array(
|
||||
self::TYPE_BIN_OP => self::PAREN_EXPRESSION,
|
||||
self::TYPE_ADD_OP => self::PAREN_EXPRESSION,
|
||||
self::TYPE_HOOK => self::PAREN_EXPRESSION,
|
||||
self::TYPE_COLON => self::PAREN_EXPRESSION,
|
||||
self::TYPE_COMMA => self::PAREN_EXPRESSION,
|
||||
self::TYPE_SEMICOLON => self::PAREN_EXPRESSION,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
|
||||
),
|
||||
self::PAREN_EXPRESSION_FUNC => array(
|
||||
self::TYPE_BRACE_OPEN => self::STATEMENT
|
||||
),
|
||||
self::PROPERTY_EXPRESSION => array(
|
||||
self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION,
|
||||
self::TYPE_FUNC => self::PROPERTY_EXPRESSION_FUNC,
|
||||
self::TYPE_LITERAL => self::PROPERTY_EXPRESSION_OP
|
||||
),
|
||||
self::PROPERTY_EXPRESSION_OP => array(
|
||||
self::TYPE_BIN_OP => self::PROPERTY_EXPRESSION,
|
||||
self::TYPE_ADD_OP => self::PROPERTY_EXPRESSION,
|
||||
self::TYPE_HOOK => self::PROPERTY_EXPRESSION,
|
||||
self::TYPE_COMMA => self::PROPERTY_ASSIGNMENT,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION
|
||||
),
|
||||
self::PROPERTY_EXPRESSION_FUNC => array(
|
||||
self::TYPE_BRACE_OPEN => self::STATEMENT
|
||||
)
|
||||
);
|
||||
|
||||
// $push : This table contains the rules for when to push a state onto the stack.
|
||||
// The pushed state is the state to return to when the corresponding
|
||||
// closing token is found
|
||||
$push = array(
|
||||
self::STATEMENT => array(
|
||||
self::TYPE_BRACE_OPEN => self::STATEMENT,
|
||||
self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
|
||||
),
|
||||
self::CONDITION => array(
|
||||
self::TYPE_PAREN_OPEN => self::STATEMENT
|
||||
),
|
||||
self::PROPERTY_ASSIGNMENT => array(
|
||||
self::TYPE_BRACE_OPEN => self::PROPERTY_ASSIGNMENT
|
||||
),
|
||||
self::EXPRESSION => array(
|
||||
self::TYPE_BRACE_OPEN => self::EXPRESSION_OP,
|
||||
self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
|
||||
),
|
||||
self::EXPRESSION_NO_NL => array(
|
||||
self::TYPE_BRACE_OPEN => self::EXPRESSION_OP,
|
||||
self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
|
||||
),
|
||||
self::EXPRESSION_OP => array(
|
||||
self::TYPE_HOOK => self::EXPRESSION,
|
||||
self::TYPE_PAREN_OPEN => self::EXPRESSION_OP
|
||||
),
|
||||
self::EXPRESSION_FUNC => array(
|
||||
self::TYPE_BRACE_OPEN => self::EXPRESSION_OP
|
||||
),
|
||||
self::EXPRESSION_TERNARY => array(
|
||||
self::TYPE_BRACE_OPEN => self::EXPRESSION_TERNARY_OP,
|
||||
self::TYPE_PAREN_OPEN => self::EXPRESSION_TERNARY_OP
|
||||
),
|
||||
self::EXPRESSION_TERNARY_OP => array(
|
||||
self::TYPE_HOOK => self::EXPRESSION_TERNARY,
|
||||
self::TYPE_PAREN_OPEN => self::EXPRESSION_TERNARY_OP
|
||||
),
|
||||
self::EXPRESSION_TERNARY_FUNC => array(
|
||||
self::TYPE_BRACE_OPEN => self::EXPRESSION_TERNARY_OP
|
||||
),
|
||||
self::PAREN_EXPRESSION => array(
|
||||
self::TYPE_BRACE_OPEN => self::PAREN_EXPRESSION_OP,
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION_OP
|
||||
),
|
||||
self::PAREN_EXPRESSION_OP => array(
|
||||
self::TYPE_PAREN_OPEN => self::PAREN_EXPRESSION_OP
|
||||
),
|
||||
self::PAREN_EXPRESSION_FUNC => array(
|
||||
self::TYPE_BRACE_OPEN => self::PAREN_EXPRESSION_OP
|
||||
),
|
||||
self::PROPERTY_EXPRESSION => array(
|
||||
self::TYPE_BRACE_OPEN => self::PROPERTY_EXPRESSION_OP,
|
||||
self::TYPE_PAREN_OPEN => self::PROPERTY_EXPRESSION_OP
|
||||
),
|
||||
self::PROPERTY_EXPRESSION_OP => array(
|
||||
self::TYPE_PAREN_OPEN => self::PROPERTY_EXPRESSION_OP
|
||||
),
|
||||
self::PROPERTY_EXPRESSION_FUNC => array(
|
||||
self::TYPE_BRACE_OPEN => self::PROPERTY_EXPRESSION_OP
|
||||
)
|
||||
);
|
||||
|
||||
// $pop : Rules for when to pop a state from the stack
|
||||
$pop = array(
|
||||
self::STATEMENT => array( self::TYPE_BRACE_CLOSE => true ),
|
||||
self::PROPERTY_ASSIGNMENT => array( self::TYPE_BRACE_CLOSE => true ),
|
||||
self::EXPRESSION => array( self::TYPE_BRACE_CLOSE => true ),
|
||||
self::EXPRESSION_NO_NL => array( self::TYPE_BRACE_CLOSE => true ),
|
||||
self::EXPRESSION_OP => array( self::TYPE_BRACE_CLOSE => true ),
|
||||
self::EXPRESSION_TERNARY_OP => array( self::TYPE_COLON => true ),
|
||||
self::PAREN_EXPRESSION => array( self::TYPE_PAREN_CLOSE => true ),
|
||||
self::PAREN_EXPRESSION_OP => array( self::TYPE_PAREN_CLOSE => true ),
|
||||
self::PROPERTY_EXPRESSION => array( self::TYPE_BRACE_CLOSE => true ),
|
||||
self::PROPERTY_EXPRESSION_OP => array( self::TYPE_BRACE_CLOSE => true )
|
||||
);
|
||||
|
||||
// $semicolon : Rules for when a semicolon insertion is appropriate
|
||||
$semicolon = array(
|
||||
self::EXPRESSION_NO_NL => array(
|
||||
self::TYPE_UN_OP => true,
|
||||
self::TYPE_INCR_OP => true,
|
||||
self::TYPE_ADD_OP => true,
|
||||
self::TYPE_BRACE_OPEN => true,
|
||||
self::TYPE_PAREN_OPEN => true,
|
||||
self::TYPE_RETURN => true,
|
||||
self::TYPE_IF => true,
|
||||
self::TYPE_DO => true,
|
||||
self::TYPE_FUNC => true,
|
||||
self::TYPE_LITERAL => true
|
||||
),
|
||||
self::EXPRESSION_OP => array(
|
||||
self::TYPE_UN_OP => true,
|
||||
self::TYPE_INCR_OP => true,
|
||||
self::TYPE_BRACE_OPEN => true,
|
||||
self::TYPE_RETURN => true,
|
||||
self::TYPE_IF => true,
|
||||
self::TYPE_DO => true,
|
||||
self::TYPE_FUNC => true,
|
||||
self::TYPE_LITERAL => true
|
||||
)
|
||||
);
|
||||
|
||||
// Rules for when newlines should be inserted if
|
||||
// $statementsOnOwnLine is enabled.
|
||||
// $newlineBefore is checked before switching state,
|
||||
// $newlineAfter is checked after
|
||||
$newlineBefore = array(
|
||||
self::STATEMENT => array(
|
||||
self::TYPE_BRACE_CLOSE => true,
|
||||
),
|
||||
);
|
||||
$newlineAfter = array(
|
||||
self::STATEMENT => array(
|
||||
self::TYPE_BRACE_OPEN => true,
|
||||
self::TYPE_PAREN_CLOSE => true,
|
||||
self::TYPE_SEMICOLON => true,
|
||||
),
|
||||
);
|
||||
|
||||
// $divStates : Contains all states that can be followed by a division operator
|
||||
$divStates = array(
|
||||
self::EXPRESSION_OP => true,
|
||||
self::EXPRESSION_TERNARY_OP => true,
|
||||
self::PAREN_EXPRESSION_OP => true,
|
||||
self::PROPERTY_EXPRESSION_OP => true
|
||||
);
|
||||
|
||||
// Here's where the minifying takes place: Loop through the input, looking for tokens
|
||||
// and output them to $out, taking actions to the above defined rules when appropriate.
|
||||
$out = '';
|
||||
$pos = 0;
|
||||
$length = strlen( $s );
|
||||
$lineLength = 0;
|
||||
$newlineFound = true;
|
||||
$state = self::STATEMENT;
|
||||
$stack = array();
|
||||
$last = ';'; // Pretend that we have seen a semicolon yet
|
||||
while( $pos < $length ) {
|
||||
// First, skip over any whitespace and multiline comments, recording whether we
|
||||
// found any newline character
|
||||
$skip = strspn( $s, " \t\n\r\xb\xc", $pos );
|
||||
if( !$skip ) {
|
||||
$ch = $s[$pos];
|
||||
if( $ch === '/' && substr( $s, $pos, 2 ) === '/*' ) {
|
||||
// Multiline comment. Search for the end token or EOT.
|
||||
$end = strpos( $s, '*/', $pos + 2 );
|
||||
$skip = $end === false ? $length - $pos : $end - $pos + 2;
|
||||
}
|
||||
}
|
||||
if( $skip ) {
|
||||
// The semicolon insertion mechanism needs to know whether there was a newline
|
||||
// between two tokens, so record it now.
|
||||
if( !$newlineFound && strcspn( $s, "\r\n", $pos, $skip ) !== $skip ) {
|
||||
$newlineFound = true;
|
||||
}
|
||||
$pos += $skip;
|
||||
continue;
|
||||
}
|
||||
// Handle C++-style comments and html comments, which are treated as single line
|
||||
// comments by the browser, regardless of whether the end tag is on the same line.
|
||||
// Handle --> the same way, but only if it's at the beginning of the line
|
||||
if( ( $ch === '/' && substr( $s, $pos, 2 ) === '//' )
|
||||
|| ( $ch === '<' && substr( $s, $pos, 4 ) === '<!--' )
|
||||
|| ( $ch === '-' && $newlineFound && substr( $s, $pos, 3 ) === '-->' )
|
||||
) {
|
||||
$pos += strcspn( $s, "\r\n", $pos );
|
||||
continue;
|
||||
}
|
||||
|
||||
// Find out which kind of token we're handling. $end will point past the end of it.
|
||||
$end = $pos + 1;
|
||||
// Handle string literals
|
||||
if( $ch === "'" || $ch === '"' ) {
|
||||
// Search to the end of the string literal, skipping over backslash escapes
|
||||
$search = $ch . '\\';
|
||||
do{
|
||||
$end += strcspn( $s, $search, $end ) + 2;
|
||||
} while( $end - 2 < $length && $s[$end - 2] === '\\' );
|
||||
$end--;
|
||||
// We have to distinguish between regexp literals and division operators
|
||||
// A division operator is only possible in certain states
|
||||
} elseif( $ch === '/' && !isset( $divStates[$state] ) ) {
|
||||
// Regexp literal, search to the end, skipping over backslash escapes and
|
||||
// character classes
|
||||
for( ; ; ) {
|
||||
do{
|
||||
$end += strcspn( $s, '/[\\', $end ) + 2;
|
||||
} while( $end - 2 < $length && $s[$end - 2] === '\\' );
|
||||
$end--;
|
||||
if( $end - 1 >= $length || $s[$end - 1] === '/' ) {
|
||||
break;
|
||||
}
|
||||
do{
|
||||
$end += strcspn( $s, ']\\', $end ) + 2;
|
||||
} while( $end - 2 < $length && $s[$end - 2] === '\\' );
|
||||
$end--;
|
||||
};
|
||||
// Search past the regexp modifiers (gi)
|
||||
while( $end < $length && ctype_alpha( $s[$end] ) ) {
|
||||
$end++;
|
||||
}
|
||||
} elseif(
|
||||
$ch === '0'
|
||||
&& ($pos + 1 < $length) && ($s[$pos + 1] === 'x' || $s[$pos + 1] === 'X' )
|
||||
) {
|
||||
// Hex numeric literal
|
||||
$end++; // x or X
|
||||
$len = strspn( $s, '0123456789ABCDEFabcdef', $end );
|
||||
if ( !$len ) {
|
||||
return self::parseError($s, $pos, 'Expected a hexadecimal number but found ' . substr( $s, $pos, 5 ) . '...' );
|
||||
}
|
||||
$end += $len;
|
||||
} elseif(
|
||||
ctype_digit( $ch )
|
||||
|| ( $ch === '.' && $pos + 1 < $length && ctype_digit( $s[$pos + 1] ) )
|
||||
) {
|
||||
$end += strspn( $s, '0123456789', $end );
|
||||
$decimal = strspn( $s, '.', $end );
|
||||
if ($decimal) {
|
||||
if ( $decimal > 2 ) {
|
||||
return self::parseError($s, $end, 'The number has too many decimal points' );
|
||||
}
|
||||
$end += strspn( $s, '0123456789', $end + 1 ) + $decimal;
|
||||
}
|
||||
$exponent = strspn( $s, 'eE', $end );
|
||||
if( $exponent ) {
|
||||
if ( $exponent > 1 ) {
|
||||
return self::parseError($s, $end, 'Number with several E' );
|
||||
}
|
||||
$end++;
|
||||
|
||||
// + sign is optional; - sign is required.
|
||||
$end += strspn( $s, '-+', $end );
|
||||
$len = strspn( $s, '0123456789', $end );
|
||||
if ( !$len ) {
|
||||
return self::parseError($s, $pos, 'No decimal digits after e, how many zeroes should be added?' );
|
||||
}
|
||||
$end += $len;
|
||||
}
|
||||
} elseif( isset( $opChars[$ch] ) ) {
|
||||
// Punctuation character. Search for the longest matching operator.
|
||||
while(
|
||||
$end < $length
|
||||
&& isset( $tokenTypes[substr( $s, $pos, $end - $pos + 1 )] )
|
||||
) {
|
||||
$end++;
|
||||
}
|
||||
} else {
|
||||
// Identifier or reserved word. Search for the end by excluding whitespace and
|
||||
// punctuation.
|
||||
$end += strcspn( $s, " \t\n.;,=<>+-{}()[]?:*/%'\"!&|^~\xb\xc\r", $end );
|
||||
}
|
||||
|
||||
// Now get the token type from our type array
|
||||
$token = substr( $s, $pos, $end - $pos ); // so $end - $pos == strlen( $token )
|
||||
$type = isset( $tokenTypes[$token] ) ? $tokenTypes[$token] : self::TYPE_LITERAL;
|
||||
|
||||
if( $newlineFound && isset( $semicolon[$state][$type] ) ) {
|
||||
// This token triggers the semicolon insertion mechanism of javascript. While we
|
||||
// could add the ; token here ourselves, keeping the newline has a few advantages.
|
||||
$out .= "\n";
|
||||
$state = self::STATEMENT;
|
||||
$lineLength = 0;
|
||||
} elseif( $maxLineLength > 0 && $lineLength + $end - $pos > $maxLineLength &&
|
||||
!isset( $semicolon[$state][$type] ) && $type !== self::TYPE_INCR_OP )
|
||||
{
|
||||
// This line would get too long if we added $token, so add a newline first.
|
||||
// Only do this if it won't trigger semicolon insertion and if it won't
|
||||
// put a postfix increment operator on its own line, which is illegal in js.
|
||||
$out .= "\n";
|
||||
$lineLength = 0;
|
||||
// Check, whether we have to separate the token from the last one with whitespace
|
||||
} elseif( !isset( $opChars[$last] ) && !isset( $opChars[$ch] ) ) {
|
||||
$out .= ' ';
|
||||
$lineLength++;
|
||||
// Don't accidentally create ++, -- or // tokens
|
||||
} elseif( $last === $ch && ( $ch === '+' || $ch === '-' || $ch === '/' ) ) {
|
||||
$out .= ' ';
|
||||
$lineLength++;
|
||||
}
|
||||
|
||||
$out .= $token;
|
||||
$lineLength += $end - $pos; // += strlen( $token )
|
||||
$last = $s[$end - 1];
|
||||
$pos = $end;
|
||||
$newlineFound = false;
|
||||
|
||||
// Output a newline after the token if required
|
||||
// This is checked before AND after switching state
|
||||
$newlineAdded = false;
|
||||
if ( $statementsOnOwnLine && !$newlineAdded && isset( $newlineBefore[$state][$type] ) ) {
|
||||
$out .= "\n";
|
||||
$lineLength = 0;
|
||||
$newlineAdded = true;
|
||||
}
|
||||
|
||||
// Now that we have output our token, transition into the new state.
|
||||
if( isset( $push[$state][$type] ) && count( $stack ) < self::STACK_LIMIT ) {
|
||||
$stack[] = $push[$state][$type];
|
||||
}
|
||||
if( $stack && isset( $pop[$state][$type] ) ) {
|
||||
$state = array_pop( $stack );
|
||||
} elseif( isset( $goto[$state][$type] ) ) {
|
||||
$state = $goto[$state][$type];
|
||||
}
|
||||
|
||||
// Check for newline insertion again
|
||||
if ( $statementsOnOwnLine && !$newlineAdded && isset( $newlineAfter[$state][$type] ) ) {
|
||||
$out .= "\n";
|
||||
$lineLength = 0;
|
||||
}
|
||||
}
|
||||
return $out;
|
||||
}
|
||||
|
||||
static function parseError($fullJavascript, $position, $errorMsg) {
|
||||
// TODO: Handle the error: trigger_error, throw exception, return false...
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<?php
|
||||
|
||||
if ($service == 'core.css'){
|
||||
$minimizer = new OC_Minimizer_CSS();
|
||||
$files = $minimizer->findFiles(OC_Util::$core_styles);
|
||||
$minimizer->output($files);
|
||||
}
|
||||
else if ($service == 'core.js'){
|
||||
$minimizer = new OC_Minimizer_JS();
|
||||
$files = $minimizer->findFiles(OC_Util::$core_scripts);
|
||||
$minimizer->output($files);
|
||||
}
|
||||
|
|
@ -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; ?>
|
||||
|
|
@ -12,6 +15,9 @@
|
|||
var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
|
||||
var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
|
||||
</script>
|
||||
<?php if (!defined('DEBUG') || !DEBUG): ?>
|
||||
<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
|
||||
<?php endif ?>
|
||||
<?php foreach($_['jsfiles'] as $jsfile): ?>
|
||||
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
||||
<?php endforeach; ?>
|
||||
|
|
|
|||
|
|
@ -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; ?>
|
||||
|
|
@ -12,6 +15,9 @@
|
|||
var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
|
||||
var oc_current_user = '<?php echo OC_User::getUser() ?>';
|
||||
</script>
|
||||
<?php if (!defined('DEBUG') || !DEBUG): ?>
|
||||
<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
|
||||
<?php endif ?>
|
||||
<?php foreach($_['jsfiles'] as $jsfile): ?>
|
||||
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
||||
<?php endforeach; ?>
|
||||
|
|
|
|||
|
|
@ -73,6 +73,14 @@ class OC_App{
|
|||
|
||||
self::$init = true;
|
||||
|
||||
if (!defined('DEBUG') || !DEBUG){
|
||||
if (is_null($types)) {
|
||||
OC_Util::$core_scripts = OC_Util::$scripts;
|
||||
OC_Util::$scripts = array();
|
||||
OC_Util::$core_styles = OC_Util::$styles;
|
||||
OC_Util::$styles = array();
|
||||
}
|
||||
}
|
||||
// return
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
13
lib/base.php
13
lib/base.php
|
|
@ -230,6 +230,9 @@ class OC{
|
|||
OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
|
||||
}
|
||||
|
||||
OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
|
||||
OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
|
||||
|
||||
OC_App::updateApps();
|
||||
}
|
||||
}
|
||||
|
|
@ -278,13 +281,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);
|
||||
|
|
|
|||
|
|
@ -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?'/':'');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
<?php
|
||||
|
||||
require_once('mediawiki/JavaScriptMinifier.php');
|
||||
|
||||
class OC_Minimizer_JS extends OC_Minimizer
|
||||
{
|
||||
protected $contentType = 'application/javascript';
|
||||
|
||||
public function findFiles($scripts) {
|
||||
// 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();
|
||||
// Add the core js files or the js files provided by the selected theme
|
||||
foreach($scripts as $script){
|
||||
// Is it in 3rd party?
|
||||
if($this->appendIfExist(OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
|
||||
|
||||
// Is it in apps and overwritten by the theme?
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
|
||||
|
||||
// Is it part of an app?
|
||||
}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script$fext.js" )) {
|
||||
}elseif($this->appendIfExist(OC::$APPSROOT, OC::$APPSWEBROOT, "apps/$script.js" )) {
|
||||
|
||||
// Is it in the owncloud root but overwritten by the theme?
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
|
||||
|
||||
// Is it in the owncloud root ?
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
|
||||
|
||||
// Is in core but overwritten by a theme?
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
|
||||
|
||||
// Is it in core?
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
|
||||
}elseif($this->appendIfExist(OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
|
||||
|
||||
}else{
|
||||
echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
|
||||
die();
|
||||
}
|
||||
}
|
||||
return $this->files;
|
||||
}
|
||||
|
||||
public function minimizeFiles($files) {
|
||||
$js_out = '';
|
||||
foreach($files as $file_info) {
|
||||
$file = $file_info[0] . '/' . $file_info[2];
|
||||
$js_out .= '/* ' . $file . ' */' . "\n";
|
||||
$js_out .= file_get_contents($file);
|
||||
}
|
||||
$js_out = JavaScriptMinifier::minify($js_out);
|
||||
return $js_out;
|
||||
}
|
||||
}
|
||||
|
|
@ -163,7 +163,7 @@ class OC_Template{
|
|||
/**
|
||||
* @brief Returns the formfactor extension for current formfactor
|
||||
*/
|
||||
protected function getFormFactorExtension()
|
||||
static public function getFormFactorExtension()
|
||||
{
|
||||
$formfactor=$_SESSION['formfactor'];
|
||||
if($formfactor=='default') {
|
||||
|
|
@ -193,7 +193,7 @@ class OC_Template{
|
|||
$theme=OC_Config::getValue( "theme" );
|
||||
|
||||
// Read the detected formfactor and use the right file name.
|
||||
$fext = $this->getFormFactorExtension();
|
||||
$fext = self::getFormFactorExtension();
|
||||
|
||||
$app = $this->application;
|
||||
// Check if it is a app template or not.
|
||||
|
|
@ -376,8 +376,9 @@ class OC_Template{
|
|||
$theme=OC_Config::getValue( "theme" );
|
||||
|
||||
// Read the detected formfactor and use the right file name.
|
||||
$fext = $this->getFormFactorExtension();
|
||||
$fext = self::getFormFactorExtension();
|
||||
|
||||
$page->assign('jsfiles', array());
|
||||
// Add the core js files or the js files provided by the selected theme
|
||||
foreach(OC_Util::$scripts as $script){
|
||||
// Is it in 3rd party?
|
||||
|
|
@ -414,6 +415,7 @@ class OC_Template{
|
|||
}
|
||||
}
|
||||
// Add the css files
|
||||
$page->assign('cssfiles', array());
|
||||
foreach(OC_Util::$styles as $style){
|
||||
// is it in 3rdparty?
|
||||
if($page->appendIfExist('cssfiles', OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
|
||||
|
|
@ -431,7 +433,7 @@ class OC_Template{
|
|||
}elseif($page->appendIfExist('cssfiles', OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
|
||||
|
||||
}else{
|
||||
echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
|
||||
echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
|
||||
die();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ class OC_Util {
|
|||
public static $headers=array();
|
||||
private static $rootMounted=false;
|
||||
private static $fsSetup=false;
|
||||
public static $core_styles=array();
|
||||
public static $core_scripts=array();
|
||||
|
||||
// Can be set up
|
||||
public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue