EGroupware / egroupware

phpgwapi/inc/min/lib/Minify/Controller/Version1.php

Indentation +91 added lines, -91 removed lines

@@ -16,104 +16,104 @@
  */
 class Minify_Controller_Version1 extends Minify_Controller_Base {
 
-    /**
-     * Set up groups of files as sources
-     *
-     * @param array $options controller and Minify options
-     * @return array Minify options
-     *
-     */
-    public function setupSources($options) {
-        // PHP insecure by default: realpath() and other FS functions can't handle null bytes.
-        if (isset($_GET['files'])) {
-            $_GET['files'] = str_replace("\x00", '', (string)$_GET['files']);
-        }
+	/**
+	 * Set up groups of files as sources
+	 *
+	 * @param array $options controller and Minify options
+	 * @return array Minify options
+	 *
+	 */
+	public function setupSources($options) {
+		// PHP insecure by default: realpath() and other FS functions can't handle null bytes.
+		if (isset($_GET['files'])) {
+			$_GET['files'] = str_replace("\x00", '', (string)$_GET['files']);
+		}
 
-        self::_setupDefines();
-        if (MINIFY_USE_CACHE) {
-            $cacheDir = defined('MINIFY_CACHE_DIR')
-                ? MINIFY_CACHE_DIR
-                : '';
-            Minify::setCache($cacheDir);
-        }
-        $options['badRequestHeader'] = 'HTTP/1.0 404 Not Found';
-        $options['contentTypeCharset'] = MINIFY_ENCODING;
+		self::_setupDefines();
+		if (MINIFY_USE_CACHE) {
+			$cacheDir = defined('MINIFY_CACHE_DIR')
+				? MINIFY_CACHE_DIR
+				: '';
+			Minify::setCache($cacheDir);
+		}
+		$options['badRequestHeader'] = 'HTTP/1.0 404 Not Found';
+		$options['contentTypeCharset'] = MINIFY_ENCODING;
 
-        // The following restrictions are to limit the URLs that minify will
-        // respond to. Ideally there should be only one way to reference a file.
-        if (! isset($_GET['files'])
-            // verify at least one file, files are single comma separated,
-            // and are all same extension
-            || ! preg_match('/^[^,]+\\.(css|js)(,[^,]+\\.\\1)*$/', $_GET['files'], $m)
-            // no "//" (makes URL rewriting easier)
-            || strpos($_GET['files'], '//') !== false
-            // no "\"
-            || strpos($_GET['files'], '\\') !== false
-            // no "./"
-            || preg_match('/(?:^|[^\\.])\\.\\//', $_GET['files'])
-        ) {
-            return $options;
-        }
+		// The following restrictions are to limit the URLs that minify will
+		// respond to. Ideally there should be only one way to reference a file.
+		if (! isset($_GET['files'])
+			// verify at least one file, files are single comma separated,
+			// and are all same extension
+			|| ! preg_match('/^[^,]+\\.(css|js)(,[^,]+\\.\\1)*$/', $_GET['files'], $m)
+			// no "//" (makes URL rewriting easier)
+			|| strpos($_GET['files'], '//') !== false
+			// no "\"
+			|| strpos($_GET['files'], '\\') !== false
+			// no "./"
+			|| preg_match('/(?:^|[^\\.])\\.\\//', $_GET['files'])
+		) {
+			return $options;
+		}
 
-        $files = explode(',', $_GET['files']);
-        if (count($files) > MINIFY_MAX_FILES) {
-            return $options;
-        }
+		$files = explode(',', $_GET['files']);
+		if (count($files) > MINIFY_MAX_FILES) {
+			return $options;
+		}
 
-        // strings for prepending to relative/absolute paths
-        $prependRelPaths = dirname($_SERVER['SCRIPT_FILENAME'])
-            . DIRECTORY_SEPARATOR;
-        $prependAbsPaths = $_SERVER['DOCUMENT_ROOT'];
+		// strings for prepending to relative/absolute paths
+		$prependRelPaths = dirname($_SERVER['SCRIPT_FILENAME'])
+			. DIRECTORY_SEPARATOR;
+		$prependAbsPaths = $_SERVER['DOCUMENT_ROOT'];
 
-        $goodFiles = array();
-        $hasBadSource = false;
+		$goodFiles = array();
+		$hasBadSource = false;
 
-        $allowDirs = isset($options['allowDirs'])
-            ? $options['allowDirs']
-            : MINIFY_BASE_DIR;
+		$allowDirs = isset($options['allowDirs'])
+			? $options['allowDirs']
+			: MINIFY_BASE_DIR;
 
-        foreach ($files as $file) {
-            // prepend appropriate string for abs/rel paths
-            $file = ($file[0] === '/' ? $prependAbsPaths : $prependRelPaths) . $file;
-            // make sure a real file!
-            $file = realpath($file);
-            // don't allow unsafe or duplicate files
-            if (parent::_fileIsSafe($file, $allowDirs)
-                && !in_array($file, $goodFiles))
-            {
-                $goodFiles[] = $file;
-                $srcOptions = array(
-                    'filepath' => $file
-                );
-                $this->sources[] = new Minify_Source($srcOptions);
-            } else {
-                $hasBadSource = true;
-                break;
-            }
-        }
-        if ($hasBadSource) {
-            $this->sources = array();
-        }
-        if (! MINIFY_REWRITE_CSS_URLS) {
-            $options['rewriteCssUris'] = false;
-        }
-        return $options;
-    }
+		foreach ($files as $file) {
+			// prepend appropriate string for abs/rel paths
+			$file = ($file[0] === '/' ? $prependAbsPaths : $prependRelPaths) . $file;
+			// make sure a real file!
+			$file = realpath($file);
+			// don't allow unsafe or duplicate files
+			if (parent::_fileIsSafe($file, $allowDirs)
+				&& !in_array($file, $goodFiles))
+			{
+				$goodFiles[] = $file;
+				$srcOptions = array(
+					'filepath' => $file
+				);
+				$this->sources[] = new Minify_Source($srcOptions);
+			} else {
+				$hasBadSource = true;
+				break;
+			}
+		}
+		if ($hasBadSource) {
+			$this->sources = array();
+		}
+		if (! MINIFY_REWRITE_CSS_URLS) {
+			$options['rewriteCssUris'] = false;
+		}
+		return $options;
+	}
 
-    private static function _setupDefines()
-    {
-        $defaults = array(
-            'MINIFY_BASE_DIR' => realpath($_SERVER['DOCUMENT_ROOT'])
-            ,'MINIFY_ENCODING' => 'utf-8'
-            ,'MINIFY_MAX_FILES' => 16
-            ,'MINIFY_REWRITE_CSS_URLS' => true
-            ,'MINIFY_USE_CACHE' => true
-        );
-        foreach ($defaults as $const => $val) {
-            if (! defined($const)) {
-                define($const, $val);
-            }
-        }
-    }
+	private static function _setupDefines()
+	{
+		$defaults = array(
+			'MINIFY_BASE_DIR' => realpath($_SERVER['DOCUMENT_ROOT'])
+			,'MINIFY_ENCODING' => 'utf-8'
+			,'MINIFY_MAX_FILES' => 16
+			,'MINIFY_REWRITE_CSS_URLS' => true
+			,'MINIFY_USE_CACHE' => true
+		);
+		foreach ($defaults as $const => $val) {
+			if (! defined($const)) {
+				define($const, $val);
+			}
+		}
+	}
 }
 

phpgwapi/inc/min/lib/Minify/DebugDetector.php

Indentation +16 added lines, -16 removed lines

@@ -7,20 +7,20 @@
  * @author Stephen Clay <steve@mrclay.org>
  */
 class Minify_DebugDetector {
-    public static function shouldDebugRequest($cookie, $get, $requestUri)
-    {
-        if (isset($get['debug'])) {
-            return true;
-        }
-        if (! empty($cookie['minifyDebug'])) {
-            foreach (preg_split('/\\s+/', $cookie['minifyDebug']) as $debugUri) {
-                $pattern = '@' . preg_quote($debugUri, '@') . '@i';
-                $pattern = str_replace(array('\\*', '\\?'), array('.*', '.'), $pattern);
-                if (preg_match($pattern, $requestUri)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
+	public static function shouldDebugRequest($cookie, $get, $requestUri)
+	{
+		if (isset($get['debug'])) {
+			return true;
+		}
+		if (! empty($cookie['minifyDebug'])) {
+			foreach (preg_split('/\\s+/', $cookie['minifyDebug']) as $debugUri) {
+				$pattern = '@' . preg_quote($debugUri, '@') . '@i';
+				$pattern = str_replace(array('\\*', '\\?'), array('.*', '.'), $pattern);
+				if (preg_match($pattern, $requestUri)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
 }

phpgwapi/inc/min/lib/Minify/Logger.php

Indentation +28 added lines, -28 removed lines

@@ -14,34 +14,34 @@
  */
 class Minify_Logger {
 
-    /**
-     * Set logger object.
-     *
-     * The object should have a method "log" that accepts a value as 1st argument and
-     * an optional string label as the 2nd.
-     *
-     * @param mixed $obj or a "falsey" value to disable
-     * @return null
-     */
-    public static function setLogger($obj = null) {
-        self::$_logger = $obj
-            ? $obj
-            : null;
-    }
+	/**
+	 * Set logger object.
+	 *
+	 * The object should have a method "log" that accepts a value as 1st argument and
+	 * an optional string label as the 2nd.
+	 *
+	 * @param mixed $obj or a "falsey" value to disable
+	 * @return null
+	 */
+	public static function setLogger($obj = null) {
+		self::$_logger = $obj
+			? $obj
+			: null;
+	}
 
-    /**
-     * Pass a message to the logger (if set)
-     *
-     * @param string $msg message to log
-     * @return null
-     */
-    public static function log($msg, $label = 'Minify') {
-        if (! self::$_logger) return;
-        self::$_logger->log($msg, $label);
-    }
+	/**
+	 * Pass a message to the logger (if set)
+	 *
+	 * @param string $msg message to log
+	 * @return null
+	 */
+	public static function log($msg, $label = 'Minify') {
+		if (! self::$_logger) return;
+		self::$_logger->log($msg, $label);
+	}
 
-    /**
-     * @var mixed logger object (like FirePHP) or null (i.e. no logger available)
-     */
-    private static $_logger = null;
+	/**
+	 * @var mixed logger object (like FirePHP) or null (i.e. no logger available)
+	 */
+	private static $_logger = null;
 }

phpgwapi/inc/min/lib/Minify/Source.php

Indentation +157 added lines, -157 removed lines

@@ -15,173 +15,173 @@
  */
 class Minify_Source {
 
-    /**
-     * @var int time of last modification
-     */
-    public $lastModified = null;
+	/**
+	 * @var int time of last modification
+	 */
+	public $lastModified = null;
 
-    /**
-     * @var callback minifier function specifically for this source.
-     */
-    public $minifier = null;
+	/**
+	 * @var callback minifier function specifically for this source.
+	 */
+	public $minifier = null;
 
-    /**
-     * @var array minification options specific to this source.
-     */
-    public $minifyOptions = null;
+	/**
+	 * @var array minification options specific to this source.
+	 */
+	public $minifyOptions = null;
 
-    /**
-     * @var string full path of file
-     */
-    public $filepath = null;
+	/**
+	 * @var string full path of file
+	 */
+	public $filepath = null;
 
-    /**
-     * @var string HTTP Content Type (Minify requires one of the constants Minify::TYPE_*)
-     */
-    public $contentType = null;
+	/**
+	 * @var string HTTP Content Type (Minify requires one of the constants Minify::TYPE_*)
+	 */
+	public $contentType = null;
 
-    /**
-     * Create a Minify_Source
-     *
-     * In the $spec array(), you can either provide a 'filepath' to an existing
-     * file (existence will not be checked!) or give 'id' (unique string for
-     * the content), 'content' (the string content) and 'lastModified'
-     * (unixtime of last update).
-     *
-     * As a shortcut, the controller will replace "//" at the beginning
-     * of a filepath with $_SERVER['DOCUMENT_ROOT'] . '/'.
-     *
-     * @param array $spec options
-     */
-    public function __construct($spec)
-    {
-        if (isset($spec['filepath'])) {
-            if (0 === strpos($spec['filepath'], '//')) {
-                $spec['filepath'] = $_SERVER['DOCUMENT_ROOT'] . substr($spec['filepath'], 1);
-            }
-            $segments = explode('.', $spec['filepath']);
-            $ext = strtolower(array_pop($segments));
-            switch ($ext) {
-            case 'js'   : $this->contentType = 'application/x-javascript';
-                          break;
-            case 'css'  : $this->contentType = 'text/css';
-                          break;
-            case 'htm'  : // fallthrough
-            case 'html' : $this->contentType = 'text/html';
-                          break;
-            }
-            $this->filepath = $spec['filepath'];
-            $this->_id = $spec['filepath'];
-            $this->lastModified = filemtime($spec['filepath'])
-                // offset for Windows uploaders with out of sync clocks
-                + round(Minify::$uploaderHoursBehind * 3600);
-        } elseif (isset($spec['id'])) {
-            $this->_id = 'id::' . $spec['id'];
-            if (isset($spec['content'])) {
-                $this->_content = $spec['content'];
-            } else {
-                $this->_getContentFunc = $spec['getContentFunc'];
-            }
-            $this->lastModified = isset($spec['lastModified'])
-                ? $spec['lastModified']
-                : time();
-        }
-        if (isset($spec['contentType'])) {
-            $this->contentType = $spec['contentType'];
-        }
-        if (isset($spec['minifier'])) {
-            $this->minifier = $spec['minifier'];
-        }
-        if (isset($spec['minifyOptions'])) {
-            $this->minifyOptions = $spec['minifyOptions'];
-        }
-    }
+	/**
+	 * Create a Minify_Source
+	 *
+	 * In the $spec array(), you can either provide a 'filepath' to an existing
+	 * file (existence will not be checked!) or give 'id' (unique string for
+	 * the content), 'content' (the string content) and 'lastModified'
+	 * (unixtime of last update).
+	 *
+	 * As a shortcut, the controller will replace "//" at the beginning
+	 * of a filepath with $_SERVER['DOCUMENT_ROOT'] . '/'.
+	 *
+	 * @param array $spec options
+	 */
+	public function __construct($spec)
+	{
+		if (isset($spec['filepath'])) {
+			if (0 === strpos($spec['filepath'], '//')) {
+				$spec['filepath'] = $_SERVER['DOCUMENT_ROOT'] . substr($spec['filepath'], 1);
+			}
+			$segments = explode('.', $spec['filepath']);
+			$ext = strtolower(array_pop($segments));
+			switch ($ext) {
+			case 'js'   : $this->contentType = 'application/x-javascript';
+						  break;
+			case 'css'  : $this->contentType = 'text/css';
+						  break;
+			case 'htm'  : // fallthrough
+			case 'html' : $this->contentType = 'text/html';
+						  break;
+			}
+			$this->filepath = $spec['filepath'];
+			$this->_id = $spec['filepath'];
+			$this->lastModified = filemtime($spec['filepath'])
+				// offset for Windows uploaders with out of sync clocks
+				+ round(Minify::$uploaderHoursBehind * 3600);
+		} elseif (isset($spec['id'])) {
+			$this->_id = 'id::' . $spec['id'];
+			if (isset($spec['content'])) {
+				$this->_content = $spec['content'];
+			} else {
+				$this->_getContentFunc = $spec['getContentFunc'];
+			}
+			$this->lastModified = isset($spec['lastModified'])
+				? $spec['lastModified']
+				: time();
+		}
+		if (isset($spec['contentType'])) {
+			$this->contentType = $spec['contentType'];
+		}
+		if (isset($spec['minifier'])) {
+			$this->minifier = $spec['minifier'];
+		}
+		if (isset($spec['minifyOptions'])) {
+			$this->minifyOptions = $spec['minifyOptions'];
+		}
+	}
 
-    /**
-     * Get content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        $content = (null !== $this->filepath)
-            ? file_get_contents($this->filepath)
-            : ((null !== $this->_content)
-                ? $this->_content
-                : call_user_func($this->_getContentFunc, $this->_id)
-            );
-        // remove UTF-8 BOM if present
-        return (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3))
-            ? substr($content, 3)
-            : $content;
-    }
+	/**
+	 * Get content
+	 *
+	 * @return string
+	 */
+	public function getContent()
+	{
+		$content = (null !== $this->filepath)
+			? file_get_contents($this->filepath)
+			: ((null !== $this->_content)
+				? $this->_content
+				: call_user_func($this->_getContentFunc, $this->_id)
+			);
+		// remove UTF-8 BOM if present
+		return (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3))
+			? substr($content, 3)
+			: $content;
+	}
 
-    /**
-     * Get id
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
+	/**
+	 * Get id
+	 *
+	 * @return string
+	 */
+	public function getId()
+	{
+		return $this->_id;
+	}
 
-    /**
-     * Verifies a single minification call can handle all sources
-     *
-     * @param array $sources Minify_Source instances
-     *
-     * @return bool true iff there no sources with specific minifier preferences.
-     */
-    public static function haveNoMinifyPrefs($sources)
-    {
-        foreach ($sources as $source) {
-            if (null !== $source->minifier
-                || null !== $source->minifyOptions) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Verifies a single minification call can handle all sources
+	 *
+	 * @param array $sources Minify_Source instances
+	 *
+	 * @return bool true iff there no sources with specific minifier preferences.
+	 */
+	public static function haveNoMinifyPrefs($sources)
+	{
+		foreach ($sources as $source) {
+			if (null !== $source->minifier
+				|| null !== $source->minifyOptions) {
+				return false;
+			}
+		}
+		return true;
+	}
 
-    /**
-     * Get unique string for a set of sources
-     *
-     * @param array $sources Minify_Source instances
-     *
-     * @return string
-     */
-    public static function getDigest($sources)
-    {
-        foreach ($sources as $source) {
-            $info[] = array(
-                $source->_id, $source->minifier, $source->minifyOptions
-            );
-        }
-        return md5(serialize($info));
-    }
+	/**
+	 * Get unique string for a set of sources
+	 *
+	 * @param array $sources Minify_Source instances
+	 *
+	 * @return string
+	 */
+	public static function getDigest($sources)
+	{
+		foreach ($sources as $source) {
+			$info[] = array(
+				$source->_id, $source->minifier, $source->minifyOptions
+			);
+		}
+		return md5(serialize($info));
+	}
 
-    /**
-     * Get content type from a group of sources
-     *
-     * This is called if the user doesn't pass in a 'contentType' options
-     *
-     * @param array $sources Minify_Source instances
-     *
-     * @return string content type. e.g. 'text/css'
-     */
-    public static function getContentType($sources)
-    {
-        foreach ($sources as $source) {
-            if ($source->contentType !== null) {
-                return $source->contentType;
-            }
-        }
-        return 'text/plain';
-    }
+	/**
+	 * Get content type from a group of sources
+	 *
+	 * This is called if the user doesn't pass in a 'contentType' options
+	 *
+	 * @param array $sources Minify_Source instances
+	 *
+	 * @return string content type. e.g. 'text/css'
+	 */
+	public static function getContentType($sources)
+	{
+		foreach ($sources as $source) {
+			if ($source->contentType !== null) {
+				return $source->contentType;
+			}
+		}
+		return 'text/plain';
+	}
 
-    protected $_content = null;
-    protected $_getContentFunc = null;
-    protected $_id = null;
+	protected $_content = null;
+	protected $_getContentFunc = null;
+	protected $_id = null;
 }
 

phpgwapi/inc/min/lib/Minify/CSS.php

Indentation +79 added lines, -79 removed lines

@@ -16,84 +16,84 @@
  */
 class Minify_CSS {
 
-    /**
-     * Minify a CSS string
-     *
-     * @param string $css
-     *
-     * @param array $options available options:
-     *
-     * 'preserveComments': (default true) multi-line comments that begin
-     * with "/*!" will be preserved with newlines before and after to
-     * enhance readability.
-     *
-     * 'removeCharsets': (default true) remove all @charset at-rules
-     *
-     * 'prependRelativePath': (default null) if given, this string will be
-     * prepended to all relative URIs in import/url declarations
-     *
-     * 'currentDir': (default null) if given, this is assumed to be the
-     * directory of the current CSS file. Using this, minify will rewrite
-     * all relative URIs in import/url declarations to correctly point to
-     * the desired files. For this to work, the files *must* exist and be
-     * visible by the PHP process.
-     *
-     * 'symlinks': (default = array()) If the CSS file is stored in
-     * a symlink-ed directory, provide an array of link paths to
-     * target paths, where the link paths are within the document root. Because
-     * paths need to be normalized for this to work, use "//" to substitute
-     * the doc root in the link paths (the array keys). E.g.:
-     * <code>
-     * array('//symlink' => '/real/target/path') // unix
-     * array('//static' => 'D:\\staticStorage')  // Windows
-     * </code>
-     *
-     * 'docRoot': (default = $_SERVER['DOCUMENT_ROOT'])
-     * see Minify_CSS_UriRewriter::rewrite
-     *
-     * @return string
-     */
-    public static function minify($css, $options = array())
-    {
-        $options = array_merge(array(
-            'compress' => true,
-            'removeCharsets' => true,
-            'preserveComments' => true,
-            'currentDir' => null,
-            'docRoot' => $_SERVER['DOCUMENT_ROOT'],
-            'prependRelativePath' => null,
-            'symlinks' => array(),
-        ), $options);
+	/**
+	 * Minify a CSS string
+	 *
+	 * @param string $css
+	 *
+	 * @param array $options available options:
+	 *
+	 * 'preserveComments': (default true) multi-line comments that begin
+	 * with "/*!" will be preserved with newlines before and after to
+	 * enhance readability.
+	 *
+	 * 'removeCharsets': (default true) remove all @charset at-rules
+	 *
+	 * 'prependRelativePath': (default null) if given, this string will be
+	 * prepended to all relative URIs in import/url declarations
+	 *
+	 * 'currentDir': (default null) if given, this is assumed to be the
+	 * directory of the current CSS file. Using this, minify will rewrite
+	 * all relative URIs in import/url declarations to correctly point to
+	 * the desired files. For this to work, the files *must* exist and be
+	 * visible by the PHP process.
+	 *
+	 * 'symlinks': (default = array()) If the CSS file is stored in
+	 * a symlink-ed directory, provide an array of link paths to
+	 * target paths, where the link paths are within the document root. Because
+	 * paths need to be normalized for this to work, use "//" to substitute
+	 * the doc root in the link paths (the array keys). E.g.:
+	 * <code>
+	 * array('//symlink' => '/real/target/path') // unix
+	 * array('//static' => 'D:\\staticStorage')  // Windows
+	 * </code>
+	 *
+	 * 'docRoot': (default = $_SERVER['DOCUMENT_ROOT'])
+	 * see Minify_CSS_UriRewriter::rewrite
+	 *
+	 * @return string
+	 */
+	public static function minify($css, $options = array())
+	{
+		$options = array_merge(array(
+			'compress' => true,
+			'removeCharsets' => true,
+			'preserveComments' => true,
+			'currentDir' => null,
+			'docRoot' => $_SERVER['DOCUMENT_ROOT'],
+			'prependRelativePath' => null,
+			'symlinks' => array(),
+		), $options);
 
-        if ($options['removeCharsets']) {
-            $css = preg_replace('/@charset[^;]+;\\s*/', '', $css);
-        }
-        if ($options['compress']) {
-            if (! $options['preserveComments']) {
-                $css = Minify_CSS_Compressor::process($css, $options);
-            } else {
-                $css = Minify_CommentPreserver::process(
-                    $css
-                    ,array('Minify_CSS_Compressor', 'process')
-                    ,array($options)
-                );
-            }
-        }
-        if (! $options['currentDir'] && ! $options['prependRelativePath']) {
-            return $css;
-        }
-        if ($options['currentDir']) {
-            return Minify_CSS_UriRewriter::rewrite(
-                $css
-                ,$options['currentDir']
-                ,$options['docRoot']
-                ,$options['symlinks']
-            );
-        } else {
-            return Minify_CSS_UriRewriter::prepend(
-                $css
-                ,$options['prependRelativePath']
-            );
-        }
-    }
+		if ($options['removeCharsets']) {
+			$css = preg_replace('/@charset[^;]+;\\s*/', '', $css);
+		}
+		if ($options['compress']) {
+			if (! $options['preserveComments']) {
+				$css = Minify_CSS_Compressor::process($css, $options);
+			} else {
+				$css = Minify_CommentPreserver::process(
+					$css
+					,array('Minify_CSS_Compressor', 'process')
+					,array($options)
+				);
+			}
+		}
+		if (! $options['currentDir'] && ! $options['prependRelativePath']) {
+			return $css;
+		}
+		if ($options['currentDir']) {
+			return Minify_CSS_UriRewriter::rewrite(
+				$css
+				,$options['currentDir']
+				,$options['docRoot']
+				,$options['symlinks']
+			);
+		} else {
+			return Minify_CSS_UriRewriter::prepend(
+				$css
+				,$options['prependRelativePath']
+			);
+		}
+	}
 }

phpgwapi/inc/min/lib/Minify/ImportProcessor.php

Indentation +184 added lines, -184 removed lines

@@ -20,60 +20,60 @@ 
  */
 class Minify_ImportProcessor {
 
-    public static $filesIncluded = array();
-
-    public static function process($file)
-    {
-        self::$filesIncluded = array();
-        self::$_isCss = (strtolower(substr($file, -4)) === '.css');
-        $obj = new Minify_ImportProcessor(dirname($file));
-        return $obj->_getContent($file);
-    }
-
-    // allows callback funcs to know the current directory
-    private $_currentDir = null;
-
-    // allows callback funcs to know the directory of the file that inherits this one
-    private $_previewsDir = null;
-
-    // allows _importCB to write the fetched content back to the obj
-    private $_importedContent = '';
-
-    private static $_isCss = null;
-
-    /**
-     * @param String $currentDir
-     * @param String $previewsDir Is only used internally
-     */
-    private function __construct($currentDir, $previewsDir = "")
-    {
-        $this->_currentDir = $currentDir;
-        $this->_previewsDir = $previewsDir;
-    }
-
-    private function _getContent($file, $is_imported = false)
-    {
-        $file = realpath($file);
-        if (! $file
-            || in_array($file, self::$filesIncluded)
-            || false === ($content = @file_get_contents($file))
-        ) {
-            // file missing, already included, or failed read
-            return '';
-        }
-        self::$filesIncluded[] = realpath($file);
-        $this->_currentDir = dirname($file);
-
-        // remove UTF-8 BOM if present
-        if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) {
-            $content = substr($content, 3);
-        }
-        // ensure uniform EOLs
-        $content = str_replace("\r\n", "\n", $content);
-
-        // process @imports
-        $content = preg_replace_callback(
-            '/
+	public static $filesIncluded = array();
+
+	public static function process($file)
+	{
+		self::$filesIncluded = array();
+		self::$_isCss = (strtolower(substr($file, -4)) === '.css');
+		$obj = new Minify_ImportProcessor(dirname($file));
+		return $obj->_getContent($file);
+	}
+
+	// allows callback funcs to know the current directory
+	private $_currentDir = null;
+
+	// allows callback funcs to know the directory of the file that inherits this one
+	private $_previewsDir = null;
+
+	// allows _importCB to write the fetched content back to the obj
+	private $_importedContent = '';
+
+	private static $_isCss = null;
+
+	/**
+	 * @param String $currentDir
+	 * @param String $previewsDir Is only used internally
+	 */
+	private function __construct($currentDir, $previewsDir = "")
+	{
+		$this->_currentDir = $currentDir;
+		$this->_previewsDir = $previewsDir;
+	}
+
+	private function _getContent($file, $is_imported = false)
+	{
+		$file = realpath($file);
+		if (! $file
+			|| in_array($file, self::$filesIncluded)
+			|| false === ($content = @file_get_contents($file))
+		) {
+			// file missing, already included, or failed read
+			return '';
+		}
+		self::$filesIncluded[] = realpath($file);
+		$this->_currentDir = dirname($file);
+
+		// remove UTF-8 BOM if present
+		if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) {
+			$content = substr($content, 3);
+		}
+		// ensure uniform EOLs
+		$content = str_replace("\r\n", "\n", $content);
+
+		// process @imports
+		$content = preg_replace_callback(
+			'/
                 @import\\s+
                 (?:url\\(\\s*)?      # maybe url(
                 [\'"]?               # maybe quote
@@ -83,134 +83,134 @@ 
                 ([a-zA-Z,\\s]*)?     # 2 = media list
                 ;                    # end token
             /x'
-            ,array($this, '_importCB')
-            ,$content
-        );
-
-        // You only need to rework the import-path if the script is imported
-        if (self::$_isCss && $is_imported) {
-            // rewrite remaining relative URIs
-            $content = preg_replace_callback(
-                '/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
-                ,array($this, '_urlCB')
-                ,$content
-            );
-        }
-
-        return $this->_importedContent . $content;
-    }
-
-    private function _importCB($m)
-    {
-        $url = $m[1];
-        $mediaList = preg_replace('/\\s+/', '', $m[2]);
-
-        if (strpos($url, '://') > 0) {
-            // protocol, leave in place for CSS, comment for JS
-            return self::$_isCss
-                ? $m[0]
-                : "/* Minify_ImportProcessor will not include remote content */";
-        }
-        if ('/' === $url[0]) {
-            // protocol-relative or root path
-            $url = ltrim($url, '/');
-            $file = realpath($_SERVER['DOCUMENT_ROOT']) . DIRECTORY_SEPARATOR
-                . strtr($url, '/', DIRECTORY_SEPARATOR);
-        } else {
-            // relative to current path
-            $file = $this->_currentDir . DIRECTORY_SEPARATOR
-                . strtr($url, '/', DIRECTORY_SEPARATOR);
-        }
-        $obj = new Minify_ImportProcessor(dirname($file), $this->_currentDir);
-        $content = $obj->_getContent($file, true);
-        if ('' === $content) {
-            // failed. leave in place for CSS, comment for JS
-            return self::$_isCss
-                ? $m[0]
-                : "/* Minify_ImportProcessor could not fetch '{$file}' */";
-        }
-        return (!self::$_isCss || preg_match('@(?:^$|\\ball\\b)@', $mediaList))
-            ? $content
-            : "@media {$mediaList} {\n{$content}\n}\n";
-    }
-
-    private function _urlCB($m)
-    {
-        // $m[1] is either quoted or not
-        $quote = ($m[1][0] === "'" || $m[1][0] === '"')
-            ? $m[1][0]
-            : '';
-        $url = ($quote === '')
-            ? $m[1]
-            : substr($m[1], 1, strlen($m[1]) - 2);
-        if ('/' !== $url[0]) {
-            if (strpos($url, '//') > 0) {
-                // probably starts with protocol, do not alter
-            } else {
-                // prepend path with current dir separator (OS-independent)
-                $path = $this->_currentDir
-                    . DIRECTORY_SEPARATOR . strtr($url, '/', DIRECTORY_SEPARATOR);
-                // update the relative path by the directory of the file that imported this one
-                $url = self::getPathDiff(realpath($this->_previewsDir), $path);
-            }
-        }
-        return "url({$quote}{$url}{$quote})";
-    }
-
-    /**
-     * @param string $from
-     * @param string $to
-     * @param string $ps
-     * @return string
-     */
-    private function getPathDiff($from, $to, $ps = DIRECTORY_SEPARATOR)
-    {
-        $realFrom = $this->truepath($from);
-        $realTo = $this->truepath($to);
-
-        $arFrom = explode($ps, rtrim($realFrom, $ps));
-        $arTo = explode($ps, rtrim($realTo, $ps));
-        while (count($arFrom) && count($arTo) && ($arFrom[0] == $arTo[0]))
-        {
-            array_shift($arFrom);
-            array_shift($arTo);
-        }
-        return str_pad("", count($arFrom) * 3, '..' . $ps) . implode($ps, $arTo);
-    }
-
-    /**
-     * This function is to replace PHP's extremely buggy realpath().
-     * @param string $path The original path, can be relative etc.
-     * @return string The resolved path, it might not exist.
-     * @see http://stackoverflow.com/questions/4049856/replace-phps-realpath
-     */
-    function truepath($path)
-    {
-        // whether $path is unix or not
-        $unipath = strlen($path) == 0 || $path{0} != '/';
-        // attempts to detect if path is relative in which case, add cwd
-        if (strpos($path, ':') === false && $unipath)
-            $path = $this->_currentDir . DIRECTORY_SEPARATOR . $path;
-
-        // resolve path parts (single dot, double dot and double delimiters)
-        $path = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
-        $parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen');
-        $absolutes = array();
-        foreach ($parts as $part) {
-            if ('.' == $part)
-                continue;
-            if ('..' == $part) {
-                array_pop($absolutes);
-            } else {
-                $absolutes[] = $part;
-            }
-        }
-        $path = implode(DIRECTORY_SEPARATOR, $absolutes);
-        // resolve any symlinks
-        if (file_exists($path) && linkinfo($path) > 0)
-            $path = readlink($path);
-        // put initial separator that could have been lost
-        $path = !$unipath ? '/' . $path : $path;
-        return $path;
-    }
+			,array($this, '_importCB')
+			,$content
+		);
+
+		// You only need to rework the import-path if the script is imported
+		if (self::$_isCss && $is_imported) {
+			// rewrite remaining relative URIs
+			$content = preg_replace_callback(
+				'/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
+				,array($this, '_urlCB')
+				,$content
+			);
+		}
+
+		return $this->_importedContent . $content;
+	}
+
+	private function _importCB($m)
+	{
+		$url = $m[1];
+		$mediaList = preg_replace('/\\s+/', '', $m[2]);
+
+		if (strpos($url, '://') > 0) {
+			// protocol, leave in place for CSS, comment for JS
+			return self::$_isCss
+				? $m[0]
+				: "/* Minify_ImportProcessor will not include remote content */";
+		}
+		if ('/' === $url[0]) {
+			// protocol-relative or root path
+			$url = ltrim($url, '/');
+			$file = realpath($_SERVER['DOCUMENT_ROOT']) . DIRECTORY_SEPARATOR
+				. strtr($url, '/', DIRECTORY_SEPARATOR);
+		} else {
+			// relative to current path
+			$file = $this->_currentDir . DIRECTORY_SEPARATOR
+				. strtr($url, '/', DIRECTORY_SEPARATOR);
+		}
+		$obj = new Minify_ImportProcessor(dirname($file), $this->_currentDir);
+		$content = $obj->_getContent($file, true);
+		if ('' === $content) {
+			// failed. leave in place for CSS, comment for JS
+			return self::$_isCss
+				? $m[0]
+				: "/* Minify_ImportProcessor could not fetch '{$file}' */";
+		}
+		return (!self::$_isCss || preg_match('@(?:^$|\\ball\\b)@', $mediaList))
+			? $content
+			: "@media {$mediaList} {\n{$content}\n}\n";
+	}
+
+	private function _urlCB($m)
+	{
+		// $m[1] is either quoted or not
+		$quote = ($m[1][0] === "'" || $m[1][0] === '"')
+			? $m[1][0]
+			: '';
+		$url = ($quote === '')
+			? $m[1]
+			: substr($m[1], 1, strlen($m[1]) - 2);
+		if ('/' !== $url[0]) {
+			if (strpos($url, '//') > 0) {
+				// probably starts with protocol, do not alter
+			} else {
+				// prepend path with current dir separator (OS-independent)
+				$path = $this->_currentDir
+					. DIRECTORY_SEPARATOR . strtr($url, '/', DIRECTORY_SEPARATOR);
+				// update the relative path by the directory of the file that imported this one
+				$url = self::getPathDiff(realpath($this->_previewsDir), $path);
+			}
+		}
+		return "url({$quote}{$url}{$quote})";
+	}
+
+	/**
+	 * @param string $from
+	 * @param string $to
+	 * @param string $ps
+	 * @return string
+	 */
+	private function getPathDiff($from, $to, $ps = DIRECTORY_SEPARATOR)
+	{
+		$realFrom = $this->truepath($from);
+		$realTo = $this->truepath($to);
+
+		$arFrom = explode($ps, rtrim($realFrom, $ps));
+		$arTo = explode($ps, rtrim($realTo, $ps));
+		while (count($arFrom) && count($arTo) && ($arFrom[0] == $arTo[0]))
+		{
+			array_shift($arFrom);
+			array_shift($arTo);
+		}
+		return str_pad("", count($arFrom) * 3, '..' . $ps) . implode($ps, $arTo);
+	}
+
+	/**
+	 * This function is to replace PHP's extremely buggy realpath().
+	 * @param string $path The original path, can be relative etc.
+	 * @return string The resolved path, it might not exist.
+	 * @see http://stackoverflow.com/questions/4049856/replace-phps-realpath
+	 */
+	function truepath($path)
+	{
+		// whether $path is unix or not
+		$unipath = strlen($path) == 0 || $path{0} != '/';
+		// attempts to detect if path is relative in which case, add cwd
+		if (strpos($path, ':') === false && $unipath)
+			$path = $this->_currentDir . DIRECTORY_SEPARATOR . $path;
+
+		// resolve path parts (single dot, double dot and double delimiters)
+		$path = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
+		$parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen');
+		$absolutes = array();
+		foreach ($parts as $part) {
+			if ('.' == $part)
+				continue;
+			if ('..' == $part) {
+				array_pop($absolutes);
+			} else {
+				$absolutes[] = $part;
+			}
+		}
+		$path = implode(DIRECTORY_SEPARATOR, $absolutes);
+		// resolve any symlinks
+		if (file_exists($path) && linkinfo($path) > 0)
+			$path = readlink($path);
+		// put initial separator that could have been lost
+		$path = !$unipath ? '/' . $path : $path;
+		return $path;
+	}
 }

phpgwapi/inc/min/lib/Minify/CommentPreserver.php

Indentation +71 added lines, -71 removed lines

@@ -12,78 +12,78 @@
  */
 class Minify_CommentPreserver {
 
-    /**
-     * String to be prepended to each preserved comment
-     *
-     * @var string
-     */
-    public static $prepend = "\n";
+	/**
+	 * String to be prepended to each preserved comment
+	 *
+	 * @var string
+	 */
+	public static $prepend = "\n";
 
-    /**
-     * String to be appended to each preserved comment
-     *
-     * @var string
-     */
-    public static $append = "\n";
+	/**
+	 * String to be appended to each preserved comment
+	 *
+	 * @var string
+	 */
+	public static $append = "\n";
 
-    /**
-     * Process a string outside of C-style comments that begin with "/*!"
-     *
-     * On each non-empty string outside these comments, the given processor
-     * function will be called. The comments will be surrounded by
-     * Minify_CommentPreserver::$preprend and Minify_CommentPreserver::$append.
-     *
-     * @param string $content
-     * @param callback $processor function
-     * @param array $args array of extra arguments to pass to the processor
-     * function (default = array())
-     * @return string
-     */
-    public static function process($content, $processor, $args = array())
-    {
-        $ret = '';
-        while (true) {
-            list($beforeComment, $comment, $afterComment) = self::_nextComment($content);
-            if ('' !== $beforeComment) {
-                $callArgs = $args;
-                array_unshift($callArgs, $beforeComment);
-                $ret .= call_user_func_array($processor, $callArgs);
-            }
-            if (false === $comment) {
-                break;
-            }
-            $ret .= $comment;
-            $content = $afterComment;
-        }
-        return $ret;
-    }
+	/**
+	 * Process a string outside of C-style comments that begin with "/*!"
+	 *
+	 * On each non-empty string outside these comments, the given processor
+	 * function will be called. The comments will be surrounded by
+	 * Minify_CommentPreserver::$preprend and Minify_CommentPreserver::$append.
+	 *
+	 * @param string $content
+	 * @param callback $processor function
+	 * @param array $args array of extra arguments to pass to the processor
+	 * function (default = array())
+	 * @return string
+	 */
+	public static function process($content, $processor, $args = array())
+	{
+		$ret = '';
+		while (true) {
+			list($beforeComment, $comment, $afterComment) = self::_nextComment($content);
+			if ('' !== $beforeComment) {
+				$callArgs = $args;
+				array_unshift($callArgs, $beforeComment);
+				$ret .= call_user_func_array($processor, $callArgs);
+			}
+			if (false === $comment) {
+				break;
+			}
+			$ret .= $comment;
+			$content = $afterComment;
+		}
+		return $ret;
+	}
 
-    /**
-     * Extract comments that YUI Compressor preserves.
-     *
-     * @param string $in input
-     *
-     * @return array 3 elements are returned. If a YUI comment is found, the
-     * 2nd element is the comment and the 1st and 3rd are the surrounding
-     * strings. If no comment is found, the entire string is returned as the
-     * 1st element and the other two are false.
-     */
-    private static function _nextComment($in)
-    {
-        if (
-            false === ($start = strpos($in, '/*!'))
-            || false === ($end = strpos($in, '*/', $start + 3))
-        ) {
-            return array($in, false, false);
-        }
-        $ret = array(
-            substr($in, 0, $start)
-            ,self::$prepend . '/*!' . substr($in, $start + 3, $end - $start - 1) . self::$append
-        );
-        $endChars = (strlen($in) - $end - 2);
-        $ret[] = (0 === $endChars)
-            ? ''
-            : substr($in, -$endChars);
-        return $ret;
-    }
+	/**
+	 * Extract comments that YUI Compressor preserves.
+	 *
+	 * @param string $in input
+	 *
+	 * @return array 3 elements are returned. If a YUI comment is found, the
+	 * 2nd element is the comment and the 1st and 3rd are the surrounding
+	 * strings. If no comment is found, the entire string is returned as the
+	 * 1st element and the other two are false.
+	 */
+	private static function _nextComment($in)
+	{
+		if (
+			false === ($start = strpos($in, '/*!'))
+			|| false === ($end = strpos($in, '*/', $start + 3))
+		) {
+			return array($in, false, false);
+		}
+		$ret = array(
+			substr($in, 0, $start)
+			,self::$prepend . '/*!' . substr($in, $start + 3, $end - $start - 1) . self::$append
+		);
+		$endChars = (strlen($in) - $end - 2);
+		$ret[] = (0 === $endChars)
+			? ''
+			: substr($in, -$endChars);
+		return $ret;
+	}
 }

phpgwapi/inc/min/lib/Minify/Cache/ZendPlatform.php

Indentation +119 added lines, -119 removed lines

@@ -20,123 +20,123 @@
 class Minify_Cache_ZendPlatform {
 
 
-    /**
-     * Create a Minify_Cache_ZendPlatform object, to be passed to
-     * Minify::setCache().
-     *
-     * @param int $expire seconds until expiration (default = 0
-     * meaning the item will not get an expiration date)
-     *
-     * @return null
-     */
-    public function __construct($expire = 0)
-    {
-        $this->_exp = $expire;
-    }
-
-
-    /**
-     * Write data to cache.
-     *
-     * @param string $id cache id
-     *
-     * @param string $data
-     *
-     * @return bool success
-     */
-    public function store($id, $data)
-    {
-        return output_cache_put($id, "{$_SERVER['REQUEST_TIME']}|{$data}");
-    }
-
-
-    /**
-     * Get the size of a cache entry
-     *
-     * @param string $id cache id
-     *
-     * @return int size in bytes
-     */
-    public function getSize($id)
-    {
-        return $this->_fetch($id)
-            ? strlen($this->_data)
-            : false;
-    }
-
-
-    /**
-     * Does a valid cache entry exist?
-     *
-     * @param string $id cache id
-     *
-     * @param int $srcMtime mtime of the original source file(s)
-     *
-     * @return bool exists
-     */
-    public function isValid($id, $srcMtime)
-    {
-        $ret = ($this->_fetch($id) && ($this->_lm >= $srcMtime));
-        return $ret;
-    }
-
-
-    /**
-     * Send the cached content to output
-     *
-     * @param string $id cache id
-     */
-    public function display($id)
-    {
-        echo $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
-
-
-    /**
-     * Fetch the cached content
-     *
-     * @param string $id cache id
-     *
-     * @return string
-     */
-    public function fetch($id)
-    {
-        return $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
-
-
-    private $_exp = null;
-
-
-    // cache of most recently fetched id
-    private $_lm = null;
-    private $_data = null;
-    private $_id = null;
-
-
-    /**
-     * Fetch data and timestamp from ZendPlatform, store in instance
-     *
-     * @param string $id
-     *
-     * @return bool success
-     */
-    private function _fetch($id)
-    {
-        if ($this->_id === $id) {
-            return true;
-        }
-        $ret = output_cache_get($id, $this->_exp);
-        if (false === $ret) {
-            $this->_id = null;
-            return false;
-        }
-        list($this->_lm, $this->_data) = explode('|', $ret, 2);
-        $this->_id = $id;
-        return true;
-    }
+	/**
+	 * Create a Minify_Cache_ZendPlatform object, to be passed to
+	 * Minify::setCache().
+	 *
+	 * @param int $expire seconds until expiration (default = 0
+	 * meaning the item will not get an expiration date)
+	 *
+	 * @return null
+	 */
+	public function __construct($expire = 0)
+	{
+		$this->_exp = $expire;
+	}
+
+
+	/**
+	 * Write data to cache.
+	 *
+	 * @param string $id cache id
+	 *
+	 * @param string $data
+	 *
+	 * @return bool success
+	 */
+	public function store($id, $data)
+	{
+		return output_cache_put($id, "{$_SERVER['REQUEST_TIME']}|{$data}");
+	}
+
+
+	/**
+	 * Get the size of a cache entry
+	 *
+	 * @param string $id cache id
+	 *
+	 * @return int size in bytes
+	 */
+	public function getSize($id)
+	{
+		return $this->_fetch($id)
+			? strlen($this->_data)
+			: false;
+	}
+
+
+	/**
+	 * Does a valid cache entry exist?
+	 *
+	 * @param string $id cache id
+	 *
+	 * @param int $srcMtime mtime of the original source file(s)
+	 *
+	 * @return bool exists
+	 */
+	public function isValid($id, $srcMtime)
+	{
+		$ret = ($this->_fetch($id) && ($this->_lm >= $srcMtime));
+		return $ret;
+	}
+
+
+	/**
+	 * Send the cached content to output
+	 *
+	 * @param string $id cache id
+	 */
+	public function display($id)
+	{
+		echo $this->_fetch($id)
+			? $this->_data
+			: '';
+	}
+
+
+	/**
+	 * Fetch the cached content
+	 *
+	 * @param string $id cache id
+	 *
+	 * @return string
+	 */
+	public function fetch($id)
+	{
+		return $this->_fetch($id)
+			? $this->_data
+			: '';
+	}
+
+
+	private $_exp = null;
+
+
+	// cache of most recently fetched id
+	private $_lm = null;
+	private $_data = null;
+	private $_id = null;
+
+
+	/**
+	 * Fetch data and timestamp from ZendPlatform, store in instance
+	 *
+	 * @param string $id
+	 *
+	 * @return bool success
+	 */
+	private function _fetch($id)
+	{
+		if ($this->_id === $id) {
+			return true;
+		}
+		$ret = output_cache_get($id, $this->_exp);
+		if (false === $ret) {
+			$this->_id = null;
+			return false;
+		}
+		list($this->_lm, $this->_data) = explode('|', $ret, 2);
+		$this->_id = $id;
+		return true;
+	}
 }

phpgwapi/inc/min/lib/Minify/Cache/Memcache.php

Indentation +107 added lines, -107 removed lines

@@ -19,122 +19,122 @@
  **/
 class Minify_Cache_Memcache {
 
-    /**
-     * Create a Minify_Cache_Memcache object, to be passed to
-     * Minify::setCache().
-     *
-     * @param Memcache $memcache already-connected instance
-     *
-     * @param int $expire seconds until expiration (default = 0
-     * meaning the item will not get an expiration date)
-     *
-     * @return null
-     */
-    public function __construct($memcache, $expire = 0)
-    {
-        $this->_mc = $memcache;
-        $this->_exp = $expire;
-    }
+	/**
+	 * Create a Minify_Cache_Memcache object, to be passed to
+	 * Minify::setCache().
+	 *
+	 * @param Memcache $memcache already-connected instance
+	 *
+	 * @param int $expire seconds until expiration (default = 0
+	 * meaning the item will not get an expiration date)
+	 *
+	 * @return null
+	 */
+	public function __construct($memcache, $expire = 0)
+	{
+		$this->_mc = $memcache;
+		$this->_exp = $expire;
+	}
 
-    /**
-     * Write data to cache.
-     *
-     * @param string $id cache id
-     *
-     * @param string $data
-     *
-     * @return bool success
-     */
-    public function store($id, $data)
-    {
-        return $this->_mc->set($id, "{$_SERVER['REQUEST_TIME']}|{$data}", 0, $this->_exp);
-    }
+	/**
+	 * Write data to cache.
+	 *
+	 * @param string $id cache id
+	 *
+	 * @param string $data
+	 *
+	 * @return bool success
+	 */
+	public function store($id, $data)
+	{
+		return $this->_mc->set($id, "{$_SERVER['REQUEST_TIME']}|{$data}", 0, $this->_exp);
+	}
 
 
-    /**
-     * Get the size of a cache entry
-     *
-     * @param string $id cache id
-     *
-     * @return int size in bytes
-     */
-    public function getSize($id)
-    {
-        if (! $this->_fetch($id)) {
-            return false;
-        }
-        return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
-            ? mb_strlen($this->_data, '8bit')
-            : strlen($this->_data);
-    }
+	/**
+	 * Get the size of a cache entry
+	 *
+	 * @param string $id cache id
+	 *
+	 * @return int size in bytes
+	 */
+	public function getSize($id)
+	{
+		if (! $this->_fetch($id)) {
+			return false;
+		}
+		return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
+			? mb_strlen($this->_data, '8bit')
+			: strlen($this->_data);
+	}
 
-    /**
-     * Does a valid cache entry exist?
-     *
-     * @param string $id cache id
-     *
-     * @param int $srcMtime mtime of the original source file(s)
-     *
-     * @return bool exists
-     */
-    public function isValid($id, $srcMtime)
-    {
-        return ($this->_fetch($id) && ($this->_lm >= $srcMtime));
-    }
+	/**
+	 * Does a valid cache entry exist?
+	 *
+	 * @param string $id cache id
+	 *
+	 * @param int $srcMtime mtime of the original source file(s)
+	 *
+	 * @return bool exists
+	 */
+	public function isValid($id, $srcMtime)
+	{
+		return ($this->_fetch($id) && ($this->_lm >= $srcMtime));
+	}
 
-    /**
-     * Send the cached content to output
-     *
-     * @param string $id cache id
-     */
-    public function display($id)
-    {
-        echo $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
+	/**
+	 * Send the cached content to output
+	 *
+	 * @param string $id cache id
+	 */
+	public function display($id)
+	{
+		echo $this->_fetch($id)
+			? $this->_data
+			: '';
+	}
 
 	/**
-     * Fetch the cached content
-     *
-     * @param string $id cache id
-     *
-     * @return string
-     */
-    public function fetch($id)
-    {
-        return $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
+	 * Fetch the cached content
+	 *
+	 * @param string $id cache id
+	 *
+	 * @return string
+	 */
+	public function fetch($id)
+	{
+		return $this->_fetch($id)
+			? $this->_data
+			: '';
+	}
 
-    private $_mc = null;
-    private $_exp = null;
+	private $_mc = null;
+	private $_exp = null;
 
-    // cache of most recently fetched id
-    private $_lm = null;
-    private $_data = null;
-    private $_id = null;
+	// cache of most recently fetched id
+	private $_lm = null;
+	private $_data = null;
+	private $_id = null;
 
 	/**
-     * Fetch data and timestamp from memcache, store in instance
-     *
-     * @param string $id
-     *
-     * @return bool success
-     */
-    private function _fetch($id)
-    {
-        if ($this->_id === $id) {
-            return true;
-        }
-        $ret = $this->_mc->get($id);
-        if (false === $ret) {
-            $this->_id = null;
-            return false;
-        }
-        list($this->_lm, $this->_data) = explode('|', $ret, 2);
-        $this->_id = $id;
-        return true;
-    }
+	 * Fetch data and timestamp from memcache, store in instance
+	 *
+	 * @param string $id
+	 *
+	 * @return bool success
+	 */
+	private function _fetch($id)
+	{
+		if ($this->_id === $id) {
+			return true;
+		}
+		$ret = $this->_mc->get($id);
+		if (false === $ret) {
+			$this->_id = null;
+			return false;
+		}
+		list($this->_lm, $this->_data) = explode('|', $ret, 2);
+		$this->_id = $id;
+		return true;
+	}
 }