inc/contrib -> inc/lib

184 files changed, 0 insertions, 22916 deletions

diff --git a/inc/contrib/Twig/Autoloader.php b/inc/contrib/Twig/Autoloader.php
deleted file mode 100644
index a93b8caf..00000000
--- a/inc/contrib/Twig/Autoloader.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Autoloads Twig classes.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Autoloader
-{
-    /**
-     * Registers Twig_Autoloader as an SPL autoloader.
-     */
-    static public function register()
-    {
-        ini_set('unserialize_callback_func', 'spl_autoload_call');
-        spl_autoload_register(array(new self, 'autoload'));
-    }
-
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param  string  $class  A class name.
-     *
-     * @return boolean Returns true if the class has been loaded
-     */
-    static public function autoload($class)
-    {
-        if (0 !== strpos($class, 'Twig')) {
-            return;
-        }
-
-        if (is_file($file = dirname(__FILE__).'/../'.str_replace(array('_', "\0"), array('/', ''), $class).'.php')) {
-            require $file;
-        }
-    }
-}
diff --git a/inc/contrib/Twig/Compiler.php b/inc/contrib/Twig/Compiler.php
deleted file mode 100644
index db2e8de4..00000000
--- a/inc/contrib/Twig/Compiler.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Compiles a node to PHP code.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Compiler implements Twig_CompilerInterface
-{
-    protected $lastLine;
-    protected $source;
-    protected $indentation;
-    protected $env;
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env The twig environment instance
-     */
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-    }
-
-    /**
-     * Returns the environment instance related to this compiler.
-     *
-     * @return Twig_Environment The environment instance
-     */
-    public function getEnvironment()
-    {
-        return $this->env;
-    }
-
-    /**
-     * Gets the current PHP code after compilation.
-     *
-     * @return string The PHP code
-     */
-    public function getSource()
-    {
-        return $this->source;
-    }
-
-    /**
-     * Compiles a node.
-     *
-     * @param Twig_NodeInterface $node   The node to compile
-     * @param integer            $indent The current indentation
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function compile(Twig_NodeInterface $node, $indentation = 0)
-    {
-        $this->lastLine = null;
-        $this->source = '';
-        $this->indentation = $indentation;
-
-        $node->compile($this);
-
-        return $this;
-    }
-
-    public function subcompile(Twig_NodeInterface $node, $raw = true)
-    {
-        if (false === $raw) {
-            $this->addIndentation();
-        }
-
-        $node->compile($this);
-
-        return $this;
-    }
-
-    /**
-     * Adds a raw string to the compiled code.
-     *
-     * @param  string $string The string
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function raw($string)
-    {
-        $this->source .= $string;
-
-        return $this;
-    }
-
-    /**
-     * Writes a string to the compiled code by adding indentation.
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function write()
-    {
-        $strings = func_get_args();
-        foreach ($strings as $string) {
-            $this->addIndentation();
-            $this->source .= $string;
-        }
-
-        return $this;
-    }
-
-    public function addIndentation()
-    {
-        $this->source .= str_repeat(' ', $this->indentation * 4);
-
-        return $this;
-    }
-
-    /**
-     * Adds a quoted string to the compiled code.
-     *
-     * @param  string $string The string
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function string($value)
-    {
-        $this->source .= sprintf('"%s"', addcslashes($value, "\0\t\"\$\\"));
-
-        return $this;
-    }
-
-    /**
-     * Returns a PHP representation of a given value.
-     *
-     * @param  mixed $value The value to convert
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function repr($value)
-    {
-        if (is_int($value) || is_float($value)) {
-            $this->raw($value);
-        } else if (null === $value) {
-            $this->raw('null');
-        } else if (is_bool($value)) {
-            $this->raw($value ? 'true' : 'false');
-        } else if (is_array($value)) {
-            $this->raw('array(');
-            $i = 0;
-            foreach ($value as $key => $value) {
-                if ($i++) {
-                    $this->raw(', ');
-                }
-                $this->repr($key);
-                $this->raw(' => ');
-                $this->repr($value);
-            }
-            $this->raw(')');
-        } else {
-            $this->string($value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds debugging information.
-     *
-     * @param Twig_NodeInterface $node The related twig node
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function addDebugInfo(Twig_NodeInterface $node)
-    {
-        if ($node->getLine() != $this->lastLine) {
-            $this->lastLine = $node->getLine();
-            $this->write("// line {$node->getLine()}\n");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Indents the generated code.
-     *
-     * @param integer $indent The number of indentation to add
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function indent($step = 1)
-    {
-        $this->indentation += $step;
-
-        return $this;
-    }
-
-    /**
-     * Outdents the generated code.
-     *
-     * @param integer $indent The number of indentation to remove
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function outdent($step = 1)
-    {
-        $this->indentation -= $step;
-
-        if ($this->indentation < 0) {
-            throw new Twig_Error('Unable to call outdent() as the indentation would become negative');
-        }
-
-        return $this;
-    }
-}
diff --git a/inc/contrib/Twig/CompilerInterface.php b/inc/contrib/Twig/CompilerInterface.php
deleted file mode 100644
index 0a13edf2..00000000
--- a/inc/contrib/Twig/CompilerInterface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by compiler classes.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_CompilerInterface
-{
-    /**
-     * Compiles a node.
-     *
-     * @param  Twig_NodeInterface $node The node to compile
-     *
-     * @return Twig_CompilerInterface The current compiler instance
-     */
-    function compile(Twig_NodeInterface $node);
-
-    /**
-     * Gets the current PHP code after compilation.
-     *
-     * @return string The PHP code
-     */
-    function getSource();
-}
diff --git a/inc/contrib/Twig/Environment.php b/inc/contrib/Twig/Environment.php
deleted file mode 100644
index b91c80c5..00000000
--- a/inc/contrib/Twig/Environment.php
+++ /dev/null
@@ -1,938 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stores the Twig configuration.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Environment
-{
-    const VERSION = '1.2.0';
-
-    protected $charset;
-    protected $loader;
-    protected $debug;
-    protected $autoReload;
-    protected $cache;
-    protected $lexer;
-    protected $parser;
-    protected $compiler;
-    protected $baseTemplateClass;
-    protected $extensions;
-    protected $parsers;
-    protected $visitors;
-    protected $filters;
-    protected $tests;
-    protected $functions;
-    protected $globals;
-    protected $runtimeInitialized;
-    protected $loadedTemplates;
-    protected $strictVariables;
-    protected $unaryOperators;
-    protected $binaryOperators;
-    protected $templateClassPrefix = '__TwigTemplate_';
-    protected $functionCallbacks;
-    protected $filterCallbacks;
-
-    /**
-     * Constructor.
-     *
-     * Available options:
-     *
-     *  * debug: When set to `true`, the generated templates have a __toString()
-     *           method that you can use to display the generated nodes (default to
-     *           false).
-     *
-     *  * charset: The charset used by the templates (default to utf-8).
-     *
-     *  * base_template_class: The base template class to use for generated
-     *                         templates (default to Twig_Template).
-     *
-     *  * cache: An absolute path where to store the compiled templates, or
-     *           false to disable compilation cache (default)
-     *
-     *  * auto_reload: Whether to reload the template is the original source changed.
-     *                 If you don't provide the auto_reload option, it will be
-     *                 determined automatically base on the debug value.
-     *
-     *  * strict_variables: Whether to ignore invalid variables in templates
-     *                      (default to false).
-     *
-     *  * autoescape: Whether to enable auto-escaping (default to true);
-     *
-     *  * optimizations: A flag that indicates which optimizations to apply
-     *                   (default to -1 which means that all optimizations are enabled;
-     *                   set it to 0 to disable)
-     *
-     * @param Twig_LoaderInterface   $loader  A Twig_LoaderInterface instance
-     * @param array                  $options An array of options
-     */
-    public function __construct(Twig_LoaderInterface $loader = null, $options = array())
-    {
-        if (null !== $loader) {
-            $this->setLoader($loader);
-        }
-
-        $options = array_merge(array(
-            'debug'               => false,
-            'charset'             => 'UTF-8',
-            'base_template_class' => 'Twig_Template',
-            'strict_variables'    => false,
-            'autoescape'          => true,
-            'cache'               => false,
-            'auto_reload'         => null,
-            'optimizations'       => -1,
-        ), $options);
-
-        $this->debug              = (bool) $options['debug'];
-        $this->charset            = $options['charset'];
-        $this->baseTemplateClass  = $options['base_template_class'];
-        $this->autoReload         = null === $options['auto_reload'] ? $this->debug : (bool) $options['auto_reload'];
-        $this->extensions         = array(
-            'core'      => new Twig_Extension_Core(),
-            'escaper'   => new Twig_Extension_Escaper((bool) $options['autoescape']),
-            'optimizer' => new Twig_Extension_Optimizer($options['optimizations']),
-        );
-        $this->strictVariables    = (bool) $options['strict_variables'];
-        $this->runtimeInitialized = false;
-        $this->setCache($options['cache']);
-        $this->functionCallbacks = array();
-        $this->filterCallbacks = array();
-    }
-
-    /**
-     * Gets the base template class for compiled templates.
-     *
-     * @return string The base template class name
-     */
-    public function getBaseTemplateClass()
-    {
-        return $this->baseTemplateClass;
-    }
-
-    /**
-     * Sets the base template class for compiled templates.
-     *
-     * @param string $class The base template class name
-     */
-    public function setBaseTemplateClass($class)
-    {
-        $this->baseTemplateClass = $class;
-    }
-
-    /**
-     * Enables debugging mode.
-     */
-    public function enableDebug()
-    {
-        $this->debug = true;
-    }
-
-    /**
-     * Disables debugging mode.
-     */
-    public function disableDebug()
-    {
-        $this->debug = false;
-    }
-
-    /**
-     * Checks if debug mode is enabled.
-     *
-     * @return Boolean true if debug mode is enabled, false otherwise
-     */
-    public function isDebug()
-    {
-        return $this->debug;
-    }
-
-    /**
-     * Enables the auto_reload option.
-     */
-    public function enableAutoReload()
-    {
-        $this->autoReload = true;
-    }
-
-    /**
-     * Disables the auto_reload option.
-     */
-    public function disableAutoReload()
-    {
-        $this->autoReload = false;
-    }
-
-    /**
-     * Checks if the auto_reload option is enabled.
-     *
-     * @return Boolean true if auto_reload is enabled, false otherwise
-     */
-    public function isAutoReload()
-    {
-        return $this->autoReload;
-    }
-
-    /**
-     * Enables the strict_variables option.
-     */
-    public function enableStrictVariables()
-    {
-        $this->strictVariables = true;
-    }
-
-    /**
-     * Disables the strict_variables option.
-     */
-    public function disableStrictVariables()
-    {
-        $this->strictVariables = false;
-    }
-
-    /**
-     * Checks if the strict_variables option is enabled.
-     *
-     * @return Boolean true if strict_variables is enabled, false otherwise
-     */
-    public function isStrictVariables()
-    {
-        return $this->strictVariables;
-    }
-
-    /**
-     * Gets the cache directory or false if cache is disabled.
-     *
-     * @return string|false
-     */
-    public function getCache()
-    {
-        return $this->cache;
-    }
-
-     /**
-      * Sets the cache directory or false if cache is disabled.
-      *
-      * @param string|false $cache The absolute path to the compiled templates,
-      *                            or false to disable cache
-      */
-    public function setCache($cache)
-    {
-        $this->cache = $cache ? $cache : false;
-    }
-
-    /**
-     * Gets the cache filename for a given template.
-     *
-     * @param string $name The template name
-     *
-     * @return string The cache file name
-     */
-    public function getCacheFilename($name)
-    {
-        if (false === $this->cache) {
-            return false;
-        }
-
-        $class = substr($this->getTemplateClass($name), strlen($this->templateClassPrefix));
-
-        return $this->getCache().'/'.substr($class, 0, 2).'/'.substr($class, 2, 2).'/'.substr($class, 4).'.php';
-    }
-
-    /**
-     * Gets the template class associated with the given string.
-     *
-     * @param string $name The name for which to calculate the template class name
-     *
-     * @return string The template class name
-     */
-    public function getTemplateClass($name)
-    {
-        return $this->templateClassPrefix.md5($this->loader->getCacheKey($name));
-    }
-
-    /**
-     * Gets the template class prefix.
-     *
-     * @return string The template class prefix
-     */
-    public function getTemplateClassPrefix()
-    {
-        return $this->templateClassPrefix;
-    }
-
-    /**
-     * Renders a template.
-     *
-     * @param string $name    The template name
-     * @param array  $context An array of parameters to pass to the template
-     *
-     * @return string The rendered template
-     */
-    public function render($name, array $context = array())
-    {
-        return $this->loadTemplate($name)->render($context);
-    }
-
-    /**
-     * Loads a template by name.
-     *
-     * @param  string  $name  The template name
-     *
-     * @return Twig_TemplateInterface A template instance representing the given template name
-     */
-    public function loadTemplate($name)
-    {
-        $cls = $this->getTemplateClass($name);
-
-        if (isset($this->loadedTemplates[$cls])) {
-            return $this->loadedTemplates[$cls];
-        }
-
-        if (!class_exists($cls, false)) {
-            if (false === $cache = $this->getCacheFilename($name)) {
-                eval('?>'.$this->compileSource($this->loader->getSource($name), $name));
-            } else {
-                if (!is_file($cache) || ($this->isAutoReload() && !$this->loader->isFresh($name, filemtime($cache)))) {
-                    $this->writeCacheFile($cache, $this->compileSource($this->loader->getSource($name), $name));
-                }
-
-                require_once $cache;
-            }
-        }
-
-        if (!$this->runtimeInitialized) {
-            $this->initRuntime();
-        }
-
-        return $this->loadedTemplates[$cls] = new $cls($this);
-    }
-
-    public function resolveTemplate($names)
-    {
-        if (!is_array($names)) {
-            $names = array($names);
-        }
-
-        foreach ($names as $name) {
-            if ($name instanceof Twig_Template) {
-                return $name;
-            }
-
-            try {
-                return $this->loadTemplate($name);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        if (1 === count($names)) {
-            throw $e;
-        }
-
-        throw new Twig_Error_Loader(sprintf('Unable to find one of the following templates: "%s".', implode('", "', $names)));
-    }
-
-    /**
-     * Clears the internal template cache.
-     */
-    public function clearTemplateCache()
-    {
-        $this->loadedTemplates = array();
-    }
-
-    /**
-     * Clears the template cache files on the filesystem.
-     */
-    public function clearCacheFiles()
-    {
-        if (false === $this->cache) {
-            return;
-        }
-
-        foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->cache), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
-            if ($file->isFile()) {
-                @unlink($file->getPathname());
-            }
-        }
-    }
-
-    /**
-     * Gets the Lexer instance.
-     *
-     * @return Twig_LexerInterface A Twig_LexerInterface instance
-     */
-    public function getLexer()
-    {
-        if (null === $this->lexer) {
-            $this->lexer = new Twig_Lexer($this);
-        }
-
-        return $this->lexer;
-    }
-
-    /**
-     * Sets the Lexer instance.
-     *
-     * @param Twig_LexerInterface A Twig_LexerInterface instance
-     */
-    public function setLexer(Twig_LexerInterface $lexer)
-    {
-        $this->lexer = $lexer;
-    }
-
-    /**
-     * Tokenizes a source code.
-     *
-     * @param string $source The template source code
-     * @param string $name   The template name
-     *
-     * @return Twig_TokenStream A Twig_TokenStream instance
-     */
-    public function tokenize($source, $name = null)
-    {
-        return $this->getLexer()->tokenize($source, $name);
-    }
-
-    /**
-     * Gets the Parser instance.
-     *
-     * @return Twig_ParserInterface A Twig_ParserInterface instance
-     */
-    public function getParser()
-    {
-        if (null === $this->parser) {
-            $this->parser = new Twig_Parser($this);
-        }
-
-        return $this->parser;
-    }
-
-    /**
-     * Sets the Parser instance.
-     *
-     * @param Twig_ParserInterface A Twig_ParserInterface instance
-     */
-    public function setParser(Twig_ParserInterface $parser)
-    {
-        $this->parser = $parser;
-    }
-
-    /**
-     * Parses a token stream.
-     *
-     * @param Twig_TokenStream $tokens A Twig_TokenStream instance
-     *
-     * @return Twig_Node_Module A Node tree
-     */
-    public function parse(Twig_TokenStream $tokens)
-    {
-        return $this->getParser()->parse($tokens);
-    }
-
-    /**
-     * Gets the Compiler instance.
-     *
-     * @return Twig_CompilerInterface A Twig_CompilerInterface instance
-     */
-    public function getCompiler()
-    {
-        if (null === $this->compiler) {
-            $this->compiler = new Twig_Compiler($this);
-        }
-
-        return $this->compiler;
-    }
-
-    /**
-     * Sets the Compiler instance.
-     *
-     * @param Twig_CompilerInterface $compiler A Twig_CompilerInterface instance
-     */
-    public function setCompiler(Twig_CompilerInterface $compiler)
-    {
-        $this->compiler = $compiler;
-    }
-
-    /**
-     * Compiles a Node.
-     *
-     * @param Twig_NodeInterface $node A Twig_NodeInterface instance
-     *
-     * @return string The compiled PHP source code
-     */
-    public function compile(Twig_NodeInterface $node)
-    {
-        return $this->getCompiler()->compile($node)->getSource();
-    }
-
-    /**
-     * Compiles a template source code.
-     *
-     * @param string $source The template source code
-     * @param string $name   The template name
-     *
-     * @return string The compiled PHP source code
-     */
-    public function compileSource($source, $name = null)
-    {
-        try {
-            return $this->compile($this->parse($this->tokenize($source, $name)));
-        } catch (Twig_Error $e) {
-            $e->setTemplateFile($name);
-            throw $e;
-        } catch (Exception $e) {
-            throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $name, $e);
-        }
-    }
-
-    /**
-     * Sets the Loader instance.
-     *
-     * @param Twig_LoaderInterface $loader A Twig_LoaderInterface instance
-     */
-    public function setLoader(Twig_LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-    /**
-     * Gets the Loader instance.
-     *
-     * @return Twig_LoaderInterface A Twig_LoaderInterface instance
-     */
-    public function getLoader()
-    {
-        return $this->loader;
-    }
-
-    /**
-     * Sets the default template charset.
-     *
-     * @param string $charset The default charset
-     */
-    public function setCharset($charset)
-    {
-        $this->charset = $charset;
-    }
-
-    /**
-     * Gets the default template charset.
-     *
-     * @return string The default charset
-     */
-    public function getCharset()
-    {
-        return $this->charset;
-    }
-
-    /**
-     * Initializes the runtime environment.
-     */
-    public function initRuntime()
-    {
-        $this->runtimeInitialized = true;
-
-        foreach ($this->getExtensions() as $extension) {
-            $extension->initRuntime($this);
-        }
-    }
-
-    /**
-     * Returns true if the given extension is registered.
-     *
-     * @param string $name The extension name
-     *
-     * @return Boolean Whether the extension is registered or not
-     */
-    public function hasExtension($name)
-    {
-        return isset($this->extensions[$name]);
-    }
-
-    /**
-     * Gets an extension by name.
-     *
-     * @param string $name The extension name
-     *
-     * @return Twig_ExtensionInterface A Twig_ExtensionInterface instance
-     */
-    public function getExtension($name)
-    {
-        if (!isset($this->extensions[$name])) {
-            throw new Twig_Error_Runtime(sprintf('The "%s" extension is not enabled.', $name));
-        }
-
-        return $this->extensions[$name];
-    }
-
-    /**
-     * Registers an extension.
-     *
-     * @param Twig_ExtensionInterface $extension A Twig_ExtensionInterface instance
-     */
-    public function addExtension(Twig_ExtensionInterface $extension)
-    {
-        $this->extensions[$extension->getName()] = $extension;
-    }
-
-    /**
-     * Removes an extension by name.
-     *
-     * @param string $name The extension name
-     */
-    public function removeExtension($name)
-    {
-        unset($this->extensions[$name]);
-    }
-
-    /**
-     * Registers an array of extensions.
-     *
-     * @param array $extensions An array of extensions
-     */
-    public function setExtensions(array $extensions)
-    {
-        foreach ($extensions as $extension) {
-            $this->addExtension($extension);
-        }
-    }
-
-    /**
-     * Returns all registered extensions.
-     *
-     * @return array An array of extensions
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * Registers a Token Parser.
-     *
-     * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
-     */
-    public function addTokenParser(Twig_TokenParserInterface $parser)
-    {
-        if (null === $this->parsers) {
-            $this->getTokenParsers();
-        }
-
-        $this->parsers->addTokenParser($parser);
-    }
-
-    /**
-     * Gets the registered Token Parsers.
-     *
-     * @return Twig_TokenParserInterface[] An array of Twig_TokenParserInterface instances
-     */
-    public function getTokenParsers()
-    {
-        if (null === $this->parsers) {
-            $this->parsers = new Twig_TokenParserBroker;
-            foreach ($this->getExtensions() as $extension) {
-                $parsers = $extension->getTokenParsers();
-                foreach($parsers as $parser) {
-                    if ($parser instanceof Twig_TokenParserInterface) {
-                        $this->parsers->addTokenParser($parser);
-                    } else if ($parser instanceof Twig_TokenParserBrokerInterface) {
-                        $this->parsers->addTokenParserBroker($parser);
-                    } else {
-                        throw new Twig_Error_Runtime('getTokenParsers() must return an array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances');
-                    }
-                }
-            }
-        }
-
-        return $this->parsers;
-    }
-
-    /**
-     * Registers a Node Visitor.
-     *
-     * @param Twig_NodeVisitorInterface $visitor A Twig_NodeVisitorInterface instance
-     */
-    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        if (null === $this->visitors) {
-            $this->getNodeVisitors();
-        }
-
-        $this->visitors[] = $visitor;
-    }
-
-    /**
-     * Gets the registered Node Visitors.
-     *
-     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors()
-    {
-        if (null === $this->visitors) {
-            $this->visitors = array();
-            foreach ($this->getExtensions() as $extension) {
-                $this->visitors = array_merge($this->visitors, $extension->getNodeVisitors());
-            }
-        }
-
-        return $this->visitors;
-    }
-
-    /**
-     * Registers a Filter.
-     *
-     * @param string               $name    The filter name
-     * @param Twig_FilterInterface $visitor A Twig_FilterInterface instance
-     */
-    public function addFilter($name, Twig_FilterInterface $filter)
-    {
-        if (null === $this->filters) {
-            $this->loadFilters();
-        }
-
-        $this->filters[$name] = $filter;
-    }
-
-    /**
-     * Get a filter by name.
-     *
-     * Subclasses may override this method and load filters differently;
-     * so no list of filters is available.
-     *
-     * @param string $name The filter name
-     *
-     * @return Twig_Filter|false A Twig_Filter instance or false if the filter does not exists
-     */
-    public function getFilter($name)
-    {
-        if (null === $this->filters) {
-            $this->loadFilters();
-        }
-
-        if (isset($this->filters[$name])) {
-            return $this->filters[$name];
-        }
-
-        foreach ($this->filterCallbacks as $callback) {
-            if (false !== $filter = call_user_func($callback, $name)) {
-                return $filter;
-            }
-        }
-
-        return false;
-    }
-
-    public function registerUndefinedFilterCallback($callable)
-    {
-        $this->filterCallbacks[] = $callable;
-    }
-
-    /**
-     * Gets the registered Filters.
-     *
-     * @return Twig_FilterInterface[] An array of Twig_FilterInterface instances
-     */
-    protected function loadFilters()
-    {
-        $this->filters = array();
-        foreach ($this->getExtensions() as $extension) {
-            $this->filters = array_merge($this->filters, $extension->getFilters());
-        }
-    }
-
-    /**
-     * Registers a Test.
-     *
-     * @param string             $name    The test name
-     * @param Twig_TestInterface $visitor A Twig_TestInterface instance
-     */
-    public function addTest($name, Twig_TestInterface $test)
-    {
-        if (null === $this->tests) {
-            $this->getTests();
-        }
-
-        $this->tests[$name] = $test;
-    }
-
-    /**
-     * Gets the registered Tests.
-     *
-     * @return Twig_TestInterface[] An array of Twig_TestInterface instances
-     */
-    public function getTests()
-    {
-        if (null === $this->tests) {
-            $this->tests = array();
-            foreach ($this->getExtensions() as $extension) {
-                $this->tests = array_merge($this->tests, $extension->getTests());
-            }
-        }
-
-        return $this->tests;
-    }
-
-    /**
-     * Registers a Function.
-     *
-     * @param string                 $name     The function name
-     * @param Twig_FunctionInterface $function A Twig_FunctionInterface instance
-     */
-    public function addFunction($name, Twig_FunctionInterface $function)
-    {
-        if (null === $this->functions) {
-            $this->loadFunctions();
-        }
-
-        $this->functions[$name] = $function;
-    }
-
-    /**
-     * Get a function by name.
-     *
-     * Subclasses may override this method and load functions differently;
-     * so no list of functions is available.
-     *
-     * @param string $name function name
-     *
-     * @return Twig_Function|false A Twig_Function instance or false if the function does not exists
-     */
-    public function getFunction($name)
-    {
-        if (null === $this->functions) {
-            $this->loadFunctions();
-        }
-
-        if (isset($this->functions[$name])) {
-            return $this->functions[$name];
-        }
-
-        foreach ($this->functionCallbacks as $callback) {
-            if (false !== $function = call_user_func($callback, $name)) {
-                return $function;
-            }
-        }
-
-        return false;
-    }
-
-    public function registerUndefinedFunctionCallback($callable)
-    {
-        $this->functionCallbacks[] = $callable;
-    }
-
-    protected function loadFunctions()
-    {
-        $this->functions = array();
-        foreach ($this->getExtensions() as $extension) {
-            $this->functions = array_merge($this->functions, $extension->getFunctions());
-        }
-    }
-
-    /**
-     * Registers a Global.
-     *
-     * @param string $name  The global name
-     * @param mixed  $value The global value
-     */
-    public function addGlobal($name, $value)
-    {
-        if (null === $this->globals) {
-            $this->getGlobals();
-        }
-
-        $this->globals[$name] = $value;
-    }
-
-    /**
-     * Gets the registered Globals.
-     *
-     * @return array An array of globals
-     */
-    public function getGlobals()
-    {
-        if (null === $this->globals) {
-            $this->globals = array();
-            foreach ($this->getExtensions() as $extension) {
-                $this->globals = array_merge($this->globals, $extension->getGlobals());
-            }
-        }
-
-        return $this->globals;
-    }
-
-    /**
-     * Gets the registered unary Operators.
-     *
-     * @return array An array of unary operators
-     */
-    public function getUnaryOperators()
-    {
-        if (null === $this->unaryOperators) {
-            $this->initOperators();
-        }
-
-        return $this->unaryOperators;
-    }
-
-    /**
-     * Gets the registered binary Operators.
-     *
-     * @return array An array of binary operators
-     */
-    public function getBinaryOperators()
-    {
-        if (null === $this->binaryOperators) {
-            $this->initOperators();
-        }
-
-        return $this->binaryOperators;
-    }
-
-    protected function initOperators()
-    {
-        $this->unaryOperators = array();
-        $this->binaryOperators = array();
-        foreach ($this->getExtensions() as $extension) {
-            $operators = $extension->getOperators();
-
-            if (!$operators) {
-                continue;
-            }
-
-            if (2 !== count($operators)) {
-                throw new InvalidArgumentException(sprintf('"%s::getOperators()" does not return a valid operators array.', get_class($extension)));
-            }
-
-            $this->unaryOperators = array_merge($this->unaryOperators, $operators[0]);
-            $this->binaryOperators = array_merge($this->binaryOperators, $operators[1]);
-        }
-    }
-
-    protected function writeCacheFile($file, $content)
-    {
-        if (!is_dir(dirname($file))) {
-            mkdir(dirname($file), 0777, true);
-        }
-
-        $tmpFile = tempnam(dirname($file), basename($file));
-        if (false !== @file_put_contents($tmpFile, $content)) {
-            // rename does not work on Win32 before 5.2.6
-            if (@rename($tmpFile, $file) || (@copy($tmpFile, $file) && unlink($tmpFile))) {
-                chmod($file, 0644);
-
-                return;
-            }
-        }
-
-        throw new Twig_Error_Runtime(sprintf('Failed to write cache file "%s".', $file));
-    }
-}
diff --git a/inc/contrib/Twig/Error.php b/inc/contrib/Twig/Error.php
deleted file mode 100644
index ed0836c4..00000000
--- a/inc/contrib/Twig/Error.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig base exception.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error extends Exception
-{
-    protected $lineno;
-    protected $filename;
-    protected $rawMessage;
-    protected $previous;
-
-    /**
-     * Constructor.
-     *
-     * @param string    $message  The error message
-     * @param integer   $lineno   The template line where the error occurred
-     * @param string    $filename The template file name where the error occurred
-     * @param Exception $previous The previous exception
-     */
-    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        if (-1 === $lineno || null === $filename) {
-            list($lineno, $filename) = $this->findTemplateInfo(null !== $previous ? $previous : $this, $lineno, $filename);
-        }
-
-        $this->lineno = $lineno;
-        $this->filename = $filename;
-        $this->rawMessage = $message;
-
-        $this->updateRepr();
-
-        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-            $this->previous = $previous;
-            parent::__construct($this->message);
-        } else {
-            parent::__construct($this->message, 0, $previous);
-        }
-    }
-
-    /**
-     * Gets the raw message.
-     *
-     * @return string The raw message
-     */
-    public function getRawMessage()
-    {
-        return $this->rawMessage;
-    }
-
-    /**
-     * Gets the filename where the error occurred.
-     *
-     * @return string The filename
-     */
-    public function getTemplateFile()
-    {
-        return $this->filename;
-    }
-
-    /**
-     * Sets the filename where the error occurred.
-     *
-     * @param string $filename The filename
-     */
-    public function setTemplateFile($filename)
-    {
-        $this->filename = $filename;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the template line where the error occurred.
-     *
-     * @return integer The template line
-     */
-    public function getTemplateLine()
-    {
-        return $this->lineno;
-    }
-
-    /**
-     * Sets the template line where the error occurred.
-     *
-     * @param integer $lineno The template line
-     */
-    public function setTemplateLine($lineno)
-    {
-        $this->lineno = $lineno;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * For PHP < 5.3.0, provides access to the getPrevious() method.
-     *
-     * @param  string $method    The method name
-     * @param  array  $arguments The parameters to be passed to the method
-     *
-     * @return Exception The previous exception or null
-     */
-    public function __call($method, $arguments)
-    {
-        if ('getprevious' == strtolower($method)) {
-            return $this->previous;
-        }
-
-        throw new BadMethodCallException(sprintf('Method "Twig_Error::%s()" does not exist.', $method));
-    }
-
-    protected function updateRepr()
-    {
-        $this->message = $this->rawMessage;
-
-        $dot = false;
-        if ('.' === substr($this->message, -1)) {
-            $this->message = substr($this->message, 0, -1);
-            $dot = true;
-        }
-
-        if (null !== $this->filename) {
-            $this->message .= sprintf(' in %s', json_encode($this->filename));
-        }
-
-        if ($this->lineno >= 0) {
-            $this->message .= sprintf(' at line %d', $this->lineno);
-        }
-
-        if ($dot) {
-            $this->message .= '.';
-        }
-    }
-
-    protected function findTemplateInfo(Exception $e, $currentLine, $currentFile)
-    {
-        if (!function_exists('token_get_all')) {
-            return array($currentLine, $currentFile);
-        }
-
-        $traces = $e->getTrace();
-        foreach ($traces as $i => $trace) {
-            if (!isset($trace['class']) || 'Twig_Template' === $trace['class']) {
-                continue;
-            }
-
-            $r = new ReflectionClass($trace['class']);
-            if (!$r->implementsInterface('Twig_TemplateInterface')) {
-                continue;
-            }
-
-            if (!is_file($r->getFilename())) {
-                // probably an eval()'d code
-                return array($currentLine, $currentFile);
-            }
-
-            if (0 === $i) {
-                $line = $e->getLine();
-            } else {
-                $line = isset($traces[$i - 1]['line']) ? $traces[$i - 1]['line'] : -log(0);
-            }
-
-            $tokens = token_get_all(file_get_contents($r->getFilename()));
-            $templateline = -1;
-            $template = null;
-            foreach ($tokens as $token) {
-                if (isset($token[2]) && $token[2] >= $line) {
-                    return array($templateline, $template);
-                }
-
-                if (T_COMMENT === $token[0] && null === $template && preg_match('#/\* +(.+) +\*/#', $token[1], $match)) {
-                    $template = $match[1];
-                } elseif (T_COMMENT === $token[0] && preg_match('#^//\s*line (\d+)\s*$#', $token[1], $match)) {
-                    $templateline = $match[1];
-                }
-            }
-
-            return array($currentLine, $template);
-        }
-
-        return array($currentLine, $currentFile);
-    }
-}
diff --git a/inc/contrib/Twig/Error/Loader.php b/inc/contrib/Twig/Error/Loader.php
deleted file mode 100644
index 418a7760..00000000
--- a/inc/contrib/Twig/Error/Loader.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when an error occurs during template loading.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error_Loader extends Twig_Error
-{
-}
diff --git a/inc/contrib/Twig/Error/Runtime.php b/inc/contrib/Twig/Error/Runtime.php
deleted file mode 100644
index 8a387fa8..00000000
--- a/inc/contrib/Twig/Error/Runtime.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when an error occurs at runtime.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error_Runtime extends Twig_Error
-{
-}
diff --git a/inc/contrib/Twig/Error/Syntax.php b/inc/contrib/Twig/Error/Syntax.php
deleted file mode 100644
index a2650c36..00000000
--- a/inc/contrib/Twig/Error/Syntax.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a syntax error occurs during lexing or parsing of a template.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error_Syntax extends Twig_Error
-{
-}
diff --git a/inc/contrib/Twig/ExpressionParser.php b/inc/contrib/Twig/ExpressionParser.php
deleted file mode 100644
index b4fc5d5d..00000000
--- a/inc/contrib/Twig/ExpressionParser.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Parses expressions.
- *
- * This parser implements a "Precedence climbing" algorithm.
- *
- * @see http://www.engr.mun.ca/~theo/Misc/exp_parsing.htm
- * @see http://en.wikipedia.org/wiki/Operator-precedence_parser
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_ExpressionParser
-{
-    const OPERATOR_LEFT = 1;
-    const OPERATOR_RIGHT = 2;
-
-    protected $parser;
-    protected $unaryOperators;
-    protected $binaryOperators;
-
-    public function __construct(Twig_Parser $parser, array $unaryOperators, array $binaryOperators)
-    {
-        $this->parser = $parser;
-        $this->unaryOperators = $unaryOperators;
-        $this->binaryOperators = $binaryOperators;
-    }
-
-    public function parseExpression($precedence = 0)
-    {
-        $expr = $this->getPrimary();
-        $token = $this->parser->getCurrentToken();
-        while ($this->isBinary($token) && $this->binaryOperators[$token->getValue()]['precedence'] >= $precedence) {
-            $op = $this->binaryOperators[$token->getValue()];
-            $this->parser->getStream()->next();
-
-            if (isset($op['callable'])) {
-                $expr = call_user_func($op['callable'], $this->parser, $expr);
-            } else {
-                $expr1 = $this->parseExpression(self::OPERATOR_LEFT === $op['associativity'] ? $op['precedence'] + 1 : $op['precedence']);
-                $class = $op['class'];
-                $expr = new $class($expr, $expr1, $token->getLine());
-            }
-
-            $token = $this->parser->getCurrentToken();
-        }
-
-        if (0 === $precedence) {
-            return $this->parseConditionalExpression($expr);
-        }
-
-        return $expr;
-    }
-
-    protected function getPrimary()
-    {
-        $token = $this->parser->getCurrentToken();
-
-        if ($this->isUnary($token)) {
-            $operator = $this->unaryOperators[$token->getValue()];
-            $this->parser->getStream()->next();
-            $expr = $this->parseExpression($operator['precedence']);
-            $class = $operator['class'];
-
-            return $this->parsePostfixExpression(new $class($expr, $token->getLine()));
-        } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-            $this->parser->getStream()->next();
-            $expr = $this->parseExpression();
-            $this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'An opened parenthesis is not properly closed');
-
-            return $this->parsePostfixExpression($expr);
-        }
-
-        return $this->parsePrimaryExpression();
-    }
-
-    protected function parseConditionalExpression($expr)
-    {
-        while ($this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '?')) {
-            $this->parser->getStream()->next();
-            $expr2 = $this->parseExpression();
-            $this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'The ternary operator must have a default value');
-            $expr3 = $this->parseExpression();
-
-            $expr = new Twig_Node_Expression_Conditional($expr, $expr2, $expr3, $this->parser->getCurrentToken()->getLine());
-        }
-
-        return $expr;
-    }
-
-    protected function isUnary(Twig_Token $token)
-    {
-        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->unaryOperators[$token->getValue()]);
-    }
-
-    protected function isBinary(Twig_Token $token)
-    {
-        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->binaryOperators[$token->getValue()]);
-    }
-
-    public function parsePrimaryExpression()
-    {
-        $token = $this->parser->getCurrentToken();
-        switch ($token->getType()) {
-            case Twig_Token::NAME_TYPE:
-                $this->parser->getStream()->next();
-                switch ($token->getValue()) {
-                    case 'true':
-                    case 'TRUE':
-                        $node = new Twig_Node_Expression_Constant(true, $token->getLine());
-                        break;
-
-                    case 'false':
-                    case 'FALSE':
-                        $node = new Twig_Node_Expression_Constant(false, $token->getLine());
-                        break;
-
-                    case 'none':
-                    case 'NONE':
-                    case 'null':
-                    case 'NULL':
-                        $node = new Twig_Node_Expression_Constant(null, $token->getLine());
-                        break;
-
-                    default:
-                        if ('(' === $this->parser->getCurrentToken()->getValue()) {
-                            $node = $this->getFunctionNode($token->getValue(), $token->getLine());
-                        } else {
-                            $node = new Twig_Node_Expression_Name($token->getValue(), $token->getLine());
-                        }
-                }
-                break;
-
-            case Twig_Token::NUMBER_TYPE:
-            case Twig_Token::STRING_TYPE:
-                $this->parser->getStream()->next();
-                $node = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-                break;
-
-            default:
-                if ($token->test(Twig_Token::PUNCTUATION_TYPE, '[')) {
-                    $node = $this->parseArrayExpression();
-                } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
-                    $node = $this->parseHashExpression();
-                } else {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($token->getType(), $token->getLine()), $token->getValue()), $token->getLine());
-                }
-        }
-
-        return $this->parsePostfixExpression($node);
-    }
-
-    public function parseArrayExpression()
-    {
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
-        $elements = array();
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-            if (!empty($elements)) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'An array element must be followed by a comma');
-
-                // trailing ,?
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-                    break;
-                }
-            }
-
-            $elements[] = $this->parseExpression();
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']', 'An opened array is not properly closed');
-
-        return new Twig_Node_Expression_Array($elements, $stream->getCurrent()->getLine());
-    }
-
-    public function parseHashExpression()
-    {
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
-        $elements = array();
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
-            if (!empty($elements)) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'A hash value must be followed by a comma');
-
-                // trailing ,?
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
-                    break;
-                }
-            }
-
-            if (!$stream->test(Twig_Token::STRING_TYPE) && !$stream->test(Twig_Token::NUMBER_TYPE)) {
-                $current = $stream->getCurrent();
-                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string or a number (unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($current->getType(), $current->getLine()), $current->getValue()), $current->getLine());
-            }
-
-            $key = $stream->next()->getValue();
-            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
-            $elements[$key] = $this->parseExpression();
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '}', 'An opened hash is not properly closed');
-
-        return new Twig_Node_Expression_Array($elements, $stream->getCurrent()->getLine());
-    }
-
-    public function parsePostfixExpression($node)
-    {
-        while (true) {
-            $token = $this->parser->getCurrentToken();
-            if ($token->getType() == Twig_Token::PUNCTUATION_TYPE) {
-                if ('.' == $token->getValue() || '[' == $token->getValue()) {
-                    $node = $this->parseSubscriptExpression($node);
-                } elseif ('|' == $token->getValue()) {
-                    $node = $this->parseFilterExpression($node);
-                } else {
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-
-        return $node;
-    }
-
-    public function getFunctionNode($name, $line)
-    {
-        $args = $this->parseArguments();
-        switch ($name) {
-            case 'parent':
-                if (!count($this->parser->getBlockStack())) {
-                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden', $line);
-                }
-
-                if (!$this->parser->getParent()) {
-                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend another one is forbidden', $line);
-                }
-
-                return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
-            case 'block':
-                return new Twig_Node_Expression_BlockReference($args->getNode(0), false, $line);
-            case 'attribute':
-                if (count($args) < 2) {
-                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attribute)', $line);
-                }
-
-                return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : new Twig_Node_Expression_Array(array(), $line), Twig_TemplateInterface::ANY_CALL, $line);
-            default:
-                if (null !== $alias = $this->parser->getImportedFunction($name)) {
-                    return new Twig_Node_Expression_GetAttr($alias['node'], new Twig_Node_Expression_Constant($alias['name'], $line), $args, Twig_TemplateInterface::METHOD_CALL, $line);
-                }
-
-                return new Twig_Node_Expression_Function($name, $args, $line);
-        }
-    }
-
-    public function parseSubscriptExpression($node)
-    {
-        $token = $this->parser->getStream()->next();
-        $lineno = $token->getLine();
-        $arguments = new Twig_Node();
-        $type = Twig_TemplateInterface::ANY_CALL;
-        if ($token->getValue() == '.') {
-            $token = $this->parser->getStream()->next();
-            if (
-                $token->getType() == Twig_Token::NAME_TYPE
-                ||
-                $token->getType() == Twig_Token::NUMBER_TYPE
-                ||
-                ($token->getType() == Twig_Token::OPERATOR_TYPE && preg_match(Twig_Lexer::REGEX_NAME, $token->getValue()))
-            ) {
-                $arg = new Twig_Node_Expression_Constant($token->getValue(), $lineno);
-
-                if ($this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                    $type = Twig_TemplateInterface::METHOD_CALL;
-                    $arguments = $this->parseArguments();
-                } else {
-                    $arguments = new Twig_Node();
-                }
-            } else {
-                throw new Twig_Error_Syntax('Expected name or number', $lineno);
-            }
-        } else {
-            $type = Twig_TemplateInterface::ARRAY_CALL;
-
-            $arg = $this->parseExpression();
-            $this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ']');
-        }
-
-        return new Twig_Node_Expression_GetAttr($node, $arg, $arguments, $type, $lineno);
-    }
-
-    public function parseFilterExpression($node)
-    {
-        $this->parser->getStream()->next();
-
-        return $this->parseFilterExpressionRaw($node);
-    }
-
-    public function parseFilterExpressionRaw($node, $tag = null)
-    {
-        while (true) {
-            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE);
-
-            $name = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                $arguments = new Twig_Node();
-            } else {
-                $arguments = $this->parseArguments();
-            }
-
-            $node = new Twig_Node_Expression_Filter($node, $name, $arguments, $token->getLine(), $tag);
-
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '|')) {
-                break;
-            }
-
-            $this->parser->getStream()->next();
-        }
-
-        return $node;
-    }
-
-    public function parseArguments()
-    {
-        $args = array();
-        $stream = $this->parser->getStream();
-
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '(', 'A list of arguments must be opened by a parenthesis');
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ')')) {
-            if (!empty($args)) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'Arguments must be separated by a comma');
-            }
-            $args[] = $this->parseExpression();
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'A list of arguments must be closed by a parenthesis');
-
-        return new Twig_Node($args);
-    }
-
-    public function parseAssignmentExpression()
-    {
-        $targets = array();
-        while (true) {
-            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
-            if (in_array($token->getValue(), array('true', 'false', 'none'))) {
-                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s"', $token->getValue()), $token->getLine());
-            }
-            $targets[] = new Twig_Node_Expression_AssignName($token->getValue(), $token->getLine());
-
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-            $this->parser->getStream()->next();
-        }
-
-        return new Twig_Node($targets);
-    }
-
-    public function parseMultitargetExpression()
-    {
-        $targets = array();
-        while (true) {
-            $targets[] = $this->parseExpression();
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-            $this->parser->getStream()->next();
-        }
-
-        return new Twig_Node($targets);
-    }
-}
diff --git a/inc/contrib/Twig/Extension.php b/inc/contrib/Twig/Extension.php
deleted file mode 100644
index ac289cb4..00000000
--- a/inc/contrib/Twig/Extension.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Extension implements Twig_ExtensionInterface
-{
-    /**
-     * Initializes the runtime environment.
-     *
-     * This is where you can load some file that contains filter functions for instance.
-     *
-     * @param Twig_Environment $environment The current Twig_Environment instance
-     */
-    public function initRuntime(Twig_Environment $environment)
-    {
-    }
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
-     */
-    public function getTokenParsers()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return array An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors()
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getFilters()
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of tests to add to the existing list.
-     *
-     * @return array An array of tests
-     */
-    public function getTests()
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of functions to add to the existing list.
-     *
-     * @return array An array of functions
-     */
-    public function getFunctions()
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of operators to add to the existing list.
-     *
-     * @return array An array of operators
-     */
-    public function getOperators()
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of global functions to add to the existing list.
-     *
-     * @return array An array of global functions
-     */
-    public function getGlobals()
-    {
-        return array();
-    }
-}
diff --git a/inc/contrib/Twig/Extension/Core.php b/inc/contrib/Twig/Extension/Core.php
deleted file mode 100644
index a4153245..00000000
--- a/inc/contrib/Twig/Extension/Core.php
+++ /dev/null
@@ -1,846 +0,0 @@
-<?php
-
-if (!defined('ENT_SUBSTITUTE')) {
-    define('ENT_SUBSTITUTE', 8);
-}
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_Core extends Twig_Extension
-{
-    /**
-     * Returns the token parser instance to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParser instances
-     */
-    public function getTokenParsers()
-    {
-        return array(
-            new Twig_TokenParser_For(),
-            new Twig_TokenParser_If(),
-            new Twig_TokenParser_Extends(),
-            new Twig_TokenParser_Include(),
-            new Twig_TokenParser_Block(),
-            new Twig_TokenParser_Use(),
-            new Twig_TokenParser_Filter(),
-            new Twig_TokenParser_Macro(),
-            new Twig_TokenParser_Import(),
-            new Twig_TokenParser_From(),
-            new Twig_TokenParser_Set(),
-            new Twig_TokenParser_Spaceless(),
-        );
-    }
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getFilters()
-    {
-        $filters = array(
-            // formatting filters
-            'date'    => new Twig_Filter_Function('twig_date_format_filter'),
-            'format'  => new Twig_Filter_Function('sprintf'),
-            'replace' => new Twig_Filter_Function('twig_strtr'),
-
-            // encoding
-            'url_encode'  => new Twig_Filter_Function('twig_urlencode_filter'),
-            'json_encode' => new Twig_Filter_Function('twig_jsonencode_filter'),
-
-            // string filters
-            'title'      => new Twig_Filter_Function('twig_title_string_filter', array('needs_environment' => true)),
-            'capitalize' => new Twig_Filter_Function('twig_capitalize_string_filter', array('needs_environment' => true)),
-            'upper'      => new Twig_Filter_Function('strtoupper'),
-            'lower'      => new Twig_Filter_Function('strtolower'),
-            'striptags'  => new Twig_Filter_Function('strip_tags'),
-
-            // array helpers
-            'join'    => new Twig_Filter_Function('twig_join_filter'),
-            'reverse' => new Twig_Filter_Function('twig_reverse_filter'),
-            'length'  => new Twig_Filter_Function('twig_length_filter', array('needs_environment' => true)),
-            'sort'    => new Twig_Filter_Function('twig_sort_filter'),
-            'merge'   => new Twig_Filter_Function('twig_array_merge'),
-
-            // iteration and runtime
-            'default' => new Twig_Filter_Function('twig_default_filter'),
-            'keys'    => new Twig_Filter_Function('twig_get_array_keys_filter'),
-
-            // escaping
-            'escape' => new Twig_Filter_Function('twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
-            'e'      => new Twig_Filter_Function('twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
-        );
-
-        if (function_exists('mb_get_info')) {
-            $filters['upper'] = new Twig_Filter_Function('twig_upper_filter', array('needs_environment' => true));
-            $filters['lower'] = new Twig_Filter_Function('twig_lower_filter', array('needs_environment' => true));
-        }
-
-        return $filters;
-    }
-
-    /**
-     * Returns a list of global functions to add to the existing list.
-     *
-     * @return array An array of global functions
-     */
-    public function getFunctions()
-    {
-        return array(
-            'range'    => new Twig_Function_Function('range'),
-            'constant' => new Twig_Function_Function('constant'),
-            'cycle'    => new Twig_Function_Function('twig_cycle'),
-        );
-    }
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getTests()
-    {
-        return array(
-            'even'        => new Twig_Test_Function('twig_test_even'),
-            'odd'         => new Twig_Test_Function('twig_test_odd'),
-            'defined'     => new Twig_Test_Function('twig_test_defined'),
-            'sameas'      => new Twig_Test_Function('twig_test_sameas'),
-            'none'        => new Twig_Test_Function('twig_test_none'),
-            'null'        => new Twig_Test_Function('twig_test_none'),
-            'divisibleby' => new Twig_Test_Function('twig_test_divisibleby'),
-            'constant'    => new Twig_Test_Function('twig_test_constant'),
-            'empty'       => new Twig_Test_Function('twig_test_empty'),
-        );
-    }
-
-    /**
-     * Returns a list of operators to add to the existing list.
-     *
-     * @return array An array of operators
-     */
-    public function getOperators()
-    {
-        return array(
-            array(
-                'not' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
-                '-'   => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Neg'),
-                '+'   => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Pos'),
-            ),
-            array(
-                'b-and'  => array('precedence' => 5, 'class' => 'Twig_Node_Expression_Binary_BitwiseAnd', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-xor'  => array('precedence' => 5, 'class' => 'Twig_Node_Expression_Binary_BitwiseXor', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-or'   => array('precedence' => 5, 'class' => 'Twig_Node_Expression_Binary_BitwiseOr', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'or'     => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'and'    => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '=='     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '!='     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '<'      => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '>'      => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '>='     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '<='     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'not in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotIn', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'in'     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_In', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '+'      => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Add', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '-'      => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Sub', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '~'      => array('precedence' => 40, 'class' => 'Twig_Node_Expression_Binary_Concat', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '*'      => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mul', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '/'      => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Div', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '//'     => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_FloorDiv', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '%'      => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is'     => array('precedence' => 100, 'callable' => array($this, 'parseTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is not' => array('precedence' => 100, 'callable' => array($this, 'parseNotTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '..'     => array('precedence' => 110, 'class' => 'Twig_Node_Expression_Binary_Range', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '**'     => array('precedence' => 200, 'class' => 'Twig_Node_Expression_Binary_Power', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
-            ),
-        );
-    }
-
-    public function parseNotTestExpression(Twig_Parser $parser, $node)
-    {
-        return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($parser, $node), $parser->getCurrentToken()->getLine());
-    }
-
-    public function parseTestExpression(Twig_Parser $parser, $node)
-    {
-        $stream = $parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE);
-        $arguments = null;
-        if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-            $arguments = $parser->getExpressionParser()->parseArguments();
-        }
-
-        return new Twig_Node_Expression_Test($node, $name->getValue(), $arguments, $parser->getCurrentToken()->getLine());
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'core';
-    }
-}
-
-/**
- * Cycles over a value.
- *
- * @param ArrayAccess|array $values An array or an ArrayAccess instance
- * @param integer           $i      The cycle value
- *
- * @return string The next value in the cycle
- */
-function twig_cycle($values, $i)
-{
-    if (!is_array($values) && !$values instanceof ArrayAccess) {
-        return $values;
-    }
-
-    return $values[$i % count($values)];
-}
-
-/**
- * Converts a date to the given format.
- *
- * <pre>
- *   {{ post.published_at|date("m/d/Y") }}
- * </pre>
- *
- * @param DateTime|string     $date     A date
- * @param string              $format   A format
- * @param DateTimeZone|string $timezone A timezone
- *
- * @return string The formatter date
- */
-function twig_date_format_filter($date, $format = 'F j, Y H:i', $timezone = null)
-{
-    if (!$date instanceof DateTime) {
-        if (ctype_digit((string) $date)) {
-            $date = new DateTime('@'.$date);
-            $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
-        } else {
-            $date = new DateTime($date);
-        }
-    }
-
-    if (null !== $timezone) {
-        if (!$timezone instanceof DateTimeZone) {
-            $timezone = new DateTimeZone($timezone);
-        }
-
-        $date->setTimezone($timezone);
-    }
-
-    return $date->format($format);
-}
-
-/**
- * URL encodes a string.
- *
- * @param string $url A URL
- * @param bool   $raw true to use rawurlencode() instead of urlencode
- *
- * @return string The URL encoded value
- */
-function twig_urlencode_filter($url, $raw = false)
-{
-    if ($raw) {
-        return rawurlencode($url);
-    }
-
-    return urlencode($url);
-}
-
-if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-    /**
-     * JSON encodes a PHP variable.
-     *
-     * @param mixed   $value   The value to encode.
-     * @param integer $options Not used on PHP 5.2.x
-     *
-     * @return mixed The JSON encoded value
-     */
-    function twig_jsonencode_filter($value, $options = 0)
-    {
-        if ($value instanceof Twig_Markup) {
-            $value = (string) $value;
-        } elseif (is_array($value)) {
-            array_walk_recursive($value, '_twig_markup2string');
-        }
-
-        return json_encode($value);
-    }
-} else {
-    /**
-     * JSON encodes a PHP variable.
-     *
-     * @param mixed   $value   The value to encode.
-     * @param integer $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
-     *
-     * @return mixed The JSON encoded value
-     */
-    function twig_jsonencode_filter($value, $options = 0)
-    {
-        if ($value instanceof Twig_Markup) {
-            $value = (string) $value;
-        } elseif (is_array($value)) {
-            array_walk_recursive($value, '_twig_markup2string');
-        }
-
-        return json_encode($value, $options);
-    }
-}
-
-function _twig_markup2string(&$value)
-{
-    if ($value instanceof Twig_Markup) {
-        $value = (string) $value;
-    }
-}
-
-/**
- * Merges an array with another one.
- *
- * <pre>
- *  {% set items = { 'apple': 'fruit', 'orange': 'fruit' } %}
- *
- *  {% set items = items|merge({ 'peugeot': 'car' }) %}
- *
- *  {# items now contains { 'apple': 'fruit', 'orange': 'fruit', 'peugeot': 'car' } #}
- * </pre>
- *
- * @param array $arr1 An array
- * @param array $arr2 An array
- *
- * @return array The merged array
- */
-function twig_array_merge($arr1, $arr2)
-{
-    if (!is_array($arr1) || !is_array($arr2)) {
-        throw new Twig_Error_Runtime('The merge filter only work with arrays or hashes.');
-    }
-
-    return array_merge($arr1, $arr2);
-}
-
-/**
- * Joins the values to a string.
- *
- * The separator between elements is an empty string per default, you can define it with the optional parameter.
- *
- * <pre>
- *  {{ [1, 2, 3]|join('|') }}
- *  {# returns 1|2|3 #}
- *
- *  {{ [1, 2, 3]|join }}
- *  {# returns 123 #}
- * </pre>
- *
- * @param array  $value An array
- * @param string $glue  The separator
- *
- * @return string The concatenated string
- */
-function twig_join_filter($value, $glue = '')
-{
-    return implode($glue, (array) $value);
-}
-
-/**
- * Returns the value or the default value when it is undefined or empty.
- *
- * <pre>
- *
- *  {{ var.foo|default('foo item on var is not defined') }}
- *
- * </pre>
- *
- * @param mixed $value   A value
- * @param mixed $default The default value
- *
- * @param mixed The value or the default value;
- */
-function twig_default_filter($value, $default = '')
-{
-    if (twig_test_empty($value)) {
-        return $default;
-    } else {
-        return $value;
-    }
-}
-
-/**
- * Returns the keys for the given array.
- *
- * It is useful when you want to iterate over the keys of an array:
- *
- * <pre>
- *  {% for key in array|keys %}
- *      {# ... #}
- *  {% endfor %}
- * </pre>
- *
- * @param array $array An array
- *
- * @return array The keys
- */
-function twig_get_array_keys_filter($array)
-{
-    if (is_object($array) && $array instanceof Traversable) {
-        return array_keys(iterator_to_array($array));
-    }
-
-    if (!is_array($array)) {
-        return array();
-    }
-
-    return array_keys($array);
-}
-
-/**
- * Reverses an array.
- *
- * @param array|Traversable $array An array or a Traversable instance
- *
- * return array The array reversed
- */
-function twig_reverse_filter($array)
-{
-    if (is_object($array) && $array instanceof Traversable) {
-        return array_reverse(iterator_to_array($array));
-    }
-
-    if (!is_array($array)) {
-        return array();
-    }
-
-    return array_reverse($array);
-}
-
-/**
- * Sorts an array.
- *
- * @param array $array An array
- */
-function twig_sort_filter($array)
-{
-    asort($array);
-
-    return $array;
-}
-
-/* used internally */
-function twig_in_filter($value, $compare)
-{
-    if (is_array($compare)) {
-        return in_array($value, $compare);
-    } elseif (is_string($compare)) {
-        return false !== strpos($compare, (string) $value);
-    } elseif (is_object($compare) && $compare instanceof Traversable) {
-        return in_array($value, iterator_to_array($compare, false));
-    }
-
-    return false;
-}
-
-/**
- * Replaces placeholders in a string.
- *
- * <pre>
- *  {{ "I like %this% and %that%."|replace({'%this%': foo, '%that%': "bar"}) }}
- * </pre>
- *
- * @param string $pattern      A string
- * @param string $replacements The values for the placeholders
- *
- * @return string The string where the placeholders have been replaced
- */
-function twig_strtr($pattern, $replacements)
-{
-    return str_replace(array_keys($replacements), array_values($replacements), $pattern);
-}
-
-/**
- * Escapes a string.
- *
- * @param Twig_Environment $env     A Twig_Environment instance
- * @param string           $string  The value to be escaped
- * @param string           $type    The escaping strategy
- * @param string           $charset The charset
- */
-function twig_escape_filter(Twig_Environment $env, $string, $type = 'html', $charset = null)
-{
-    if (is_object($string) && $string instanceof Twig_Markup) {
-        return $string;
-    }
-
-    if (!is_string($string) && !(is_object($string) && method_exists($string, '__toString'))) {
-        return $string;
-    }
-
-    if (null === $charset) {
-        $charset = $env->getCharset();
-    }
-
-    switch ($type) {
-        case 'js':
-            // escape all non-alphanumeric characters
-            // into their \xHH or \uHHHH representations
-            if ('UTF-8' != $charset) {
-                $string = _twig_convert_encoding($string, 'UTF-8', $charset);
-            }
-
-            if (null === $string = preg_replace_callback('#[^\p{L}\p{N} ]#u', '_twig_escape_js_callback', $string)) {
-                throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
-            }
-
-            if ('UTF-8' != $charset) {
-                $string = _twig_convert_encoding($string, $charset, 'UTF-8');
-            }
-
-            return $string;
-
-        case 'html':
-            return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
-
-        default:
-            throw new Twig_Error_Runtime(sprintf('Invalid escape type "%s".', $type));
-    }
-}
-
-/* used internally */
-function twig_escape_filter_is_safe(Twig_Node $filterArgs)
-{
-    foreach ($filterArgs as $arg) {
-        if ($arg instanceof Twig_Node_Expression_Constant) {
-            return array($arg->getAttribute('value'));
-        } else {
-            return array();
-        }
-
-        break;
-    }
-
-    return array('html');
-}
-
-if (function_exists('iconv')) {
-    function _twig_convert_encoding($string, $to, $from)
-    {
-        return iconv($from, $to, $string);
-    }
-} elseif (function_exists('mb_convert_encoding')) {
-    function _twig_convert_encoding($string, $to, $from)
-    {
-        return mb_convert_encoding($string, $to, $from);
-    }
-} else {
-    function _twig_convert_encoding($string, $to, $from)
-    {
-        throw new Twig_Error_Runtime('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).');
-    }
-}
-
-function _twig_escape_js_callback($matches)
-{
-    $char = $matches[0];
-
-    // \xHH
-    if (!isset($char[1])) {
-        return '\\x'.substr('00'.bin2hex($char), -2);
-    }
-
-    // \uHHHH
-    $char = _twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
-
-    return '\\u'.substr('0000'.bin2hex($char), -4);
-}
-
-// add multibyte extensions if possible
-if (function_exists('mb_get_info')) {
-    /**
-     * Returns the length of a PHP variable.
-     *
-     * @param Twig_Environment $env   A Twig_Environment instance
-     * @param mixed            $thing A PHP variable
-     *
-     * @return integer The length of the value
-     */
-    function twig_length_filter(Twig_Environment $env, $thing)
-    {
-        return is_scalar($thing) ? mb_strlen($thing, $env->getCharset()) : count($thing);
-    }
-
-    /**
-     * Converts a string to uppercase.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The uppercased string
-     */
-    function twig_upper_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_strtoupper($string, $charset);
-        }
-
-        return strtoupper($string);
-    }
-
-    /**
-     * Converts a string to lowercase.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The lowercased string
-     */
-    function twig_lower_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_strtolower($string, $charset);
-        }
-
-        return strtolower($string);
-    }
-
-    /**
-     * Returns a titlecased string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The titlecased string
-     */
-    function twig_title_string_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_convert_case($string, MB_CASE_TITLE, $charset);
-        }
-
-        return ucwords(strtolower($string));
-    }
-
-    /**
-     * Returns a capitalized string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The capitalized string
-     */
-    function twig_capitalize_string_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).
-                         mb_strtolower(mb_substr($string, 1, mb_strlen($string, $charset), $charset), $charset);
-        }
-
-        return ucfirst(strtolower($string));
-    }
-}
-// and byte fallback
-else
-{
-    /**
-     * Returns the length of a PHP variable.
-     *
-     * @param Twig_Environment $env   A Twig_Environment instance
-     * @param mixed            $thing A PHP variable
-     *
-     * @return integer The length of the value
-     */
-    function twig_length_filter(Twig_Environment $env, $thing)
-    {
-        return is_scalar($thing) ? strlen($thing) : count($thing);
-    }
-
-    /**
-     * Returns a titlecased string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The titlecased string
-     */
-    function twig_title_string_filter(Twig_Environment $env, $string)
-    {
-        return ucwords(strtolower($string));
-    }
-
-    /**
-     * Returns a capitalized string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The capitalized string
-     */
-    function twig_capitalize_string_filter(Twig_Environment $env, $string)
-    {
-        return ucfirst(strtolower($string));
-    }
-}
-
-/* used internally */
-function twig_ensure_traversable($seq)
-{
-    if (is_array($seq) || (is_object($seq) && $seq instanceof Traversable)) {
-        return $seq;
-    } else {
-        return array();
-    }
-}
-
-/**
- * Checks that a variable points to the same memory address than another one.
- *
- * <pre>
- * {% if foo.attribute is sameas(false) %}
- *    the foo attribute really is the ``false`` PHP value
- * {% endif %}
- * </pre>
- *
- * @param mixed $value A PHP variable
- * @param mixed $test  The PHP variable to test against
- *
- * @return Boolean true if the values are the same, false otherwise
- */
-function twig_test_sameas($value, $test)
-{
-    return $value === $test;
-}
-
-/**
- * Checks that a variable is null.
- *
- * <pre>
- *  {{ var is none }}
- * </pre>
- *
- * @param mixed $value a PHP variable.
- *
- * @return Boolean true if the value is null, false otherwise
- */
-function twig_test_none($value)
-{
-    return null === $value;
-}
-
-/**
- * Checks if a variable is divisible by a number.
- *
- * <pre>
- *  {% if loop.index is divisibleby(3) %}
- * </pre>
- *
- * @param integer $value A PHP value
- * @param integer $num   A number
- *
- * @return Boolean true if the value is divisible by the number, false otherwise
- */
-function twig_test_divisibleby($value, $num)
-{
-    return 0 == $value % $num;
-}
-
-/**
- * Checks if a number is even.
- *
- * <pre>
- *  {{ var is even }}
- * </pre>
- *
- * @param integer $value An integer
- *
- * @return Boolean true if the value is even, false otherwise
- */
-function twig_test_even($value)
-{
-    return $value % 2 == 0;
-}
-
-/**
- * Checks if a number is odd.
- *
- * <pre>
- *  {{ var is odd }}
- * </pre>
- *
- * @param integer $value An integer
- *
- * @return Boolean true if the value is odd, false otherwise
- */
-function twig_test_odd($value)
-{
-    return $value % 2 == 1;
-}
-
-/**
- * Checks if a variable is the exact same value as a constant.
- *
- * <pre>
- *  {% if post.status is constant('Post::PUBLISHED') %}
- *    the status attribute is exactly the same as Post::PUBLISHED
- *  {% endif %}
- * </pre>
- *
- * @param mixed $value    A PHP value
- * @param mixed $constant The constant to test against
- *
- * @return Boolean true if the value is the same as the constant, false otherwise
- */
-function twig_test_constant($value, $constant)
-{
-    return constant($constant) === $value;
-}
-
-/**
- * Checks if a variable is defined in the current context.
- *
- * <pre>
- * {# defined works with variable names #}
- * {% if foo is defined %}
- *     {# ... #}
- * {% endif %}
- * </pre>
- *
- * @param mixed $name    A PHP variable
- * @param array $context The current context
- *
- * @return Boolean true if the value is defined, false otherwise
- */
-function twig_test_defined($name, $context)
-{
-    return array_key_exists($name, $context);
-}
-
-/**
- * Checks if a variable is empty.
- *
- * <pre>
- * {# evaluates to true if the foo variable is null, false, or the empty string #}
- * {% if foo is empty %}
- *     {# ... #}
- * {% endif %}
- * </pre>
- *
- * @param mixed $value A PHP variable
- *
- * @return Boolean true if the value is empty, false otherwise
- */
-function twig_test_empty($value)
-{
-    if ($value instanceof Countable) {
-        return 0 == count($value);
-    }
-    return false === $value || (empty($value) && '0' != $value);
-}
diff --git a/inc/contrib/Twig/Extension/Escaper.php b/inc/contrib/Twig/Extension/Escaper.php
deleted file mode 100644
index 43ae1113..00000000
--- a/inc/contrib/Twig/Extension/Escaper.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_Escaper extends Twig_Extension
-{
-    protected $autoescape;
-
-    public function __construct($autoescape = true)
-    {
-        $this->autoescape = $autoescape;
-    }
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
-     */
-    public function getTokenParsers()
-    {
-        return array(new Twig_TokenParser_AutoEscape());
-    }
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return array An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Escaper());
-    }
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getFilters()
-    {
-        return array(
-            'raw' => new Twig_Filter_Function('twig_raw_filter', array('is_safe' => array('all'))),
-        );
-    }
-
-    public function isGlobal()
-    {
-        return $this->autoescape;
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'escaper';
-    }
-}
-
-/**
- * Marks a variable as being safe.
- *
- * @param string $string A PHP variable
- */
-function twig_raw_filter($string)
-{
-    return $string;
-}
-
diff --git a/inc/contrib/Twig/Extension/Optimizer.php b/inc/contrib/Twig/Extension/Optimizer.php
deleted file mode 100644
index 013fcb62..00000000
--- a/inc/contrib/Twig/Extension/Optimizer.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_Optimizer extends Twig_Extension
-{
-    protected $optimizers;
-
-    public function __construct($optimizers = -1)
-    {
-        $this->optimizers = $optimizers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Optimizer($this->optimizers));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'optimizer';
-    }
-}
diff --git a/inc/contrib/Twig/Extension/Sandbox.php b/inc/contrib/Twig/Extension/Sandbox.php
deleted file mode 100644
index bf76c11a..00000000
--- a/inc/contrib/Twig/Extension/Sandbox.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_Sandbox extends Twig_Extension
-{
-    protected $sandboxedGlobally;
-    protected $sandboxed;
-    protected $policy;
-
-    public function __construct(Twig_Sandbox_SecurityPolicyInterface $policy, $sandboxed = false)
-    {
-        $this->policy            = $policy;
-        $this->sandboxedGlobally = $sandboxed;
-    }
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
-     */
-    public function getTokenParsers()
-    {
-        return array(new Twig_TokenParser_Sandbox());
-    }
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return array An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Sandbox());
-    }
-
-    public function enableSandbox()
-    {
-        $this->sandboxed = true;
-    }
-
-    public function disableSandbox()
-    {
-        $this->sandboxed = false;
-    }
-
-    public function isSandboxed()
-    {
-        return $this->sandboxedGlobally || $this->sandboxed;
-    }
-
-    public function isSandboxedGlobally()
-    {
-        return $this->sandboxedGlobally;
-    }
-
-    public function setSecurityPolicy(Twig_Sandbox_SecurityPolicyInterface $policy)
-    {
-        $this->policy = $policy;
-    }
-
-    public function getSecurityPolicy()
-    {
-        return $this->policy;
-    }
-
-    public function checkSecurity($tags, $filters, $functions)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkSecurity($tags, $filters, $functions);
-        }
-    }
-
-    public function checkMethodAllowed($obj, $method)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkMethodAllowed($obj, $method);
-        }
-    }
-
-    public function checkPropertyAllowed($obj, $method)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkPropertyAllowed($obj, $method);
-        }
-    }
-
-    public function ensureToStringAllowed($obj)
-    {
-        if (is_object($obj)) {
-            $this->policy->checkMethodAllowed($obj, '__toString');
-        }
-
-        return $obj;
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'sandbox';
-    }
-}
diff --git a/inc/contrib/Twig/ExtensionInterface.php b/inc/contrib/Twig/ExtensionInterface.php
deleted file mode 100644
index f8b232a5..00000000
--- a/inc/contrib/Twig/ExtensionInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by extension classes.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_ExtensionInterface
-{
-    /**
-     * Initializes the runtime environment.
-     *
-     * This is where you can load some file that contains filter functions for instance.
-     *
-     * @param Twig_Environment $environment The current Twig_Environment instance
-     */
-    function initRuntime(Twig_Environment $environment);
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
-     */
-    function getTokenParsers();
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return array An array of Twig_NodeVisitorInterface instances
-     */
-    function getNodeVisitors();
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    function getFilters();
-
-    /**
-     * Returns a list of tests to add to the existing list.
-     *
-     * @return array An array of tests
-     */
-    function getTests();
-
-    /**
-     * Returns a list of functions to add to the existing list.
-     *
-     * @return array An array of functions
-     */
-    function getFunctions();
-
-    /**
-     * Returns a list of operators to add to the existing list.
-     *
-     * @return array An array of operators
-     */
-    function getOperators();
-
-    /**
-     * Returns a list of global functions to add to the existing list.
-     *
-     * @return array An array of global functions
-     */
-    function getGlobals();
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    function getName();
-}
diff --git a/inc/contrib/Twig/Extensions/Extension/I18n.php b/inc/contrib/Twig/Extensions/Extension/I18n.php
deleted file mode 100644
index 1f795490..00000000
--- a/inc/contrib/Twig/Extensions/Extension/I18n.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extensions_Extension_I18n extends Twig_Extension
-{
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
-     */
-    public function getTokenParsers()
-    {
-        return array(new Twig_Extensions_TokenParser_Trans());
-    }
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getFilters()
-    {
-        return array(
-            'trans' => new Twig_Filter_Function('gettext'),
-        );
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'i18n';
-    }
-}
-
diff --git a/inc/contrib/Twig/Extensions/Extension/Tinyboard.php b/inc/contrib/Twig/Extensions/Extension/Tinyboard.php
deleted file mode 100644
index 0cf7705a..00000000
--- a/inc/contrib/Twig/Extensions/Extension/Tinyboard.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
-{
-	/**
-	* Returns a list of filters to add to the existing list.
-	*
-	* @return array An array of filters
-	*/
-	public function getFilters()
-	{
-		return Array(
-			'filesize' => new Twig_Filter_Function('format_bytes', Array('needs_environment' => false)),
-			'truncate' => new Twig_Filter_Function('twig_truncate_filter', array('needs_environment' => false)),
-			'truncate_body' => new Twig_Filter_Function('truncate', array('needs_environment' => false)),
-			'extension' => new Twig_Filter_Function('twig_extension_filter', array('needs_environment' => false)),
-			'sprintf' => new Twig_Filter_Function('sprintf', array('needs_environment' => false)),
-			'capcode' => new Twig_Filter_Function('capcode', array('needs_environment' => false)),
-			'hasPermission' => new Twig_Filter_Function('twig_hasPermission_filter', array('needs_environment' => false)),
-			'date' => new Twig_Filter_Function('twig_date_filter', array('needs_environment' => false)),
-			'poster_id' => new Twig_Filter_Function('poster_id', array('needs_environment' => false)),
-			'remove_whitespace' => new Twig_Filter_Function('twig_remove_whitespace_filter', array('needs_environment' => false)),
-			'count' => new Twig_Filter_Function('count', array('needs_environment' => false)),
-			'until' => new Twig_Filter_Function('until', array('needs_environment' => false))
-		);
-	}
-	
-	/**
-	* Returns a list of functions to add to the existing list.
-	*
-	* @return array An array of filters
-	*/
-	public function getFunctions()
-	{
-		return Array(
-			'time' => new Twig_Filter_Function('time', array('needs_environment' => false)),
-			'timezone' => new Twig_Filter_Function('twig_timezone_function', array('needs_environment' => false)),
-			'createHiddenInputs' => new Twig_Filter_Function('createHiddenInputs', array('needs_environment' => false))
-		);
-	}
-	
-	/**
-	* Returns the name of the extension.
-	*
-	* @return string The extension name
-	*/
-	public function getName()
-	{
-		return 'tinyboard';
-	}
-}
-
-function twig_timezone_function() {
-	// there's probably a much easier way of doing this
-	return sprintf("%s%02d", ($hr = (int)floor(($tz = date('Z')) / 3600)) > 0 ? '+' : '-', abs($hr)) . ':' . sprintf("%02d", (($tz / 3600) - $hr) * 60);
-}
-
-function twig_remove_whitespace_filter($data) {
-	return preg_replace('/[\t\r\n]/', '', $data);
-}
-
-function twig_date_filter($date, $format) {
-	return strftime($format, $date);
-}
-
-function twig_hasPermission_filter($mod, $permission, $board) {
-	return hasPermission($permission, $board, $mod);
-}
-
-function twig_extension_filter($value, $case_insensitive = true) {
-	$ext = substr($value, strrpos($value, '.') + 1);
-	if($case_insensitive)
-		$ext = strtolower($ext);		
-	return $ext;
-}
-
-function twig_sprintf_filter( $value, $var) {
-	return sprintf($value, $var);
-}
-
-function twig_truncate_filter($value, $length = 30, $preserve = false, $separator = '&hellip;') {
-	if (mb_strlen($value) > $length) {
-		if ($preserve) {
-			if (false !== ($breakpoint = strpos($value, ' ', $length))) {
-				$length = $breakpoint;
-			}
-		}
-		return substr($value, 0, $length) . $separator;
-	}
-	return $value;
-}
-
diff --git a/inc/contrib/Twig/Extensions/Node/Trans.php b/inc/contrib/Twig/Extensions/Node/Trans.php
deleted file mode 100644
index 18087e77..00000000
--- a/inc/contrib/Twig/Extensions/Node/Trans.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a trans node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- */
-class Twig_Extensions_Node_Trans extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $body, Twig_NodeInterface $plural = null, Twig_Node_Expression $count = null, $lineno, $tag = null)
-    {
-        parent::__construct(array('count' => $count, 'body' => $body, 'plural' => $plural), array(), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-        list($msg, $vars) = $this->compileString($this->getNode('body'));
-
-        if (null !== $this->getNode('plural')) {
-            list($msg1, $vars1) = $this->compileString($this->getNode('plural'));
-
-            $vars = array_merge($vars, $vars1);
-        }
-
-        $function = null === $this->getNode('plural') ? 'gettext' : 'ngettext';
-
-        if ($vars) {
-            $compiler
-                ->write('echo strtr('.$function.'(')
-                ->subcompile($msg)
-            ;
-
-            if (null !== $this->getNode('plural')) {
-                $compiler
-                    ->raw(', ')
-                    ->subcompile($msg1)
-                    ->raw(', abs(')
-                    ->subcompile($this->getNode('count'))
-                    ->raw(')')
-                ;
-            }
-
-            $compiler->raw('), array(');
-
-            foreach ($vars as $var) {
-                if ('count' === $var->getAttribute('name')) {
-                    $compiler
-                        ->string('%count%')
-                        ->raw(' => abs(')
-                        ->subcompile($this->getNode('count'))
-                        ->raw('), ')
-                    ;
-                } else {
-                    $compiler
-                        ->string('%'.$var->getAttribute('name').'%')
-                        ->raw(' => ')
-                        ->subcompile($var)
-                        ->raw(', ')
-                    ;
-                }
-            }
-
-            $compiler->raw("));\n");
-        } else {
-            $compiler
-                ->write('echo '.$function.'(')
-                ->subcompile($msg)
-            ;
-
-            if (null !== $this->getNode('plural')) {
-                $compiler
-                    ->raw(', ')
-                    ->subcompile($msg1)
-                    ->raw(', abs(')
-                    ->subcompile($this->getNode('count'))
-                    ->raw(')')
-                ;
-            }
-
-            $compiler->raw(');');
-        }
-    }
-
-    protected function compileString(Twig_NodeInterface $body)
-    {
-        if ($body instanceof Twig_Node_Expression_Name || $body instanceof Twig_Node_Expression_Constant) {
-            return array($body, array());
-        }
-
-        $vars = array();
-
-        if (count($body)) {
-            $msg = '';
-
-            foreach ($body as $node) {
-                if ($node instanceof Twig_Node_Print) {
-                    $n = $node->getNode('expr');
-                    while ($n instanceof Twig_Node_Expression_Filter) {
-                        $n = $n->getNode('node');
-                    }
-                    $msg .= sprintf('%%%s%%', $n->getAttribute('name'));
-                    $vars[] = new Twig_Node_Expression_Name($n->getAttribute('name'), $n->getLine());
-                } else {
-                    $msg .= $node->getAttribute('data');
-                }
-            }
-        } else {
-            $msg = $body->getAttribute('data');
-        }
-
-        return array(new Twig_Node(array(new Twig_Node_Expression_Constant(trim($msg), $body->getLine()))), $vars);
-    }
-}
diff --git a/inc/contrib/Twig/Extensions/TokenParser/Trans.php b/inc/contrib/Twig/Extensions/TokenParser/Trans.php
deleted file mode 100644
index 5b2d93b6..00000000
--- a/inc/contrib/Twig/Extensions/TokenParser/Trans.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extensions_TokenParser_Trans extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $count = null;
-        $plural = null;
-
-        if (!$stream->test(Twig_Token::BLOCK_END_TYPE)) {
-            $body = $this->parser->getExpressionParser()->parseExpression();
-        } else {
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-            $body = $this->parser->subparse(array($this, 'decideForFork'));
-            if ('plural' === $stream->next()->getValue()) {
-                $count = $this->parser->getExpressionParser()->parseExpression();
-                $stream->expect(Twig_Token::BLOCK_END_TYPE);
-                $plural = $this->parser->subparse(array($this, 'decideForEnd'), true);
-            }
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $this->checkTransString($body, $lineno);
-
-        return new Twig_Extensions_Node_Trans($body, $plural, $count, $lineno, $this->getTag());
-    }
-
-    public function decideForFork($token)
-    {
-        return $token->test(array('plural', 'endtrans'));
-    }
-
-    public function decideForEnd($token)
-    {
-        return $token->test('endtrans');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'trans';
-    }
-
-    protected function checkTransString(Twig_NodeInterface $body, $lineno)
-    {
-        foreach ($body as $i => $node) {
-            if (
-                $node instanceof Twig_Node_Text
-                ||
-                ($node instanceof Twig_Node_Print && $node->getNode('expr') instanceof Twig_Node_Expression_Name)
-            ) {
-                continue;
-            }
-
-            throw new Twig_Error_Syntax(sprintf('The text to be translated with "trans" can only contain references to simple variables'), $lineno);
-        }
-    }
-}
diff --git a/inc/contrib/Twig/Filter.php b/inc/contrib/Twig/Filter.php
deleted file mode 100644
index 9595a1a8..00000000
--- a/inc/contrib/Twig/Filter.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template filter.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_Filter implements Twig_FilterInterface
-{
-    protected $options;
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context'     => false,
-            'pre_escape'        => null,
-        ), $options);
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $filterArgs)
-    {
-        if (isset($this->options['is_safe'])) {
-            return $this->options['is_safe'];
-        }
-
-        if (isset($this->options['is_safe_callback'])) {
-            return call_user_func($this->options['is_safe_callback'], $filterArgs);
-        }
-
-        return array();
-    }
-
-    public function getPreEscape()
-    {
-        return $this->options['pre_escape'];
-    }
-}
diff --git a/inc/contrib/Twig/Filter/Function.php b/inc/contrib/Twig/Filter/Function.php
deleted file mode 100644
index 1de078b2..00000000
--- a/inc/contrib/Twig/Filter/Function.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a function template filter.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Filter_Function extends Twig_Filter
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/inc/contrib/Twig/Filter/Method.php b/inc/contrib/Twig/Filter/Method.php
deleted file mode 100644
index d831e0f2..00000000
--- a/inc/contrib/Twig/Filter/Method.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a method template filter.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Filter_Method extends Twig_Filter
-{
-    protected $extension, $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
-    }
-}
diff --git a/inc/contrib/Twig/FilterInterface.php b/inc/contrib/Twig/FilterInterface.php
deleted file mode 100644
index 4ac19ceb..00000000
--- a/inc/contrib/Twig/FilterInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template filter.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_FilterInterface
-{
-    /**
-     * Compiles a filter.
-     *
-     * @return string The PHP code for the filter
-     */
-    function compile();
-
-    function needsEnvironment();
-
-    function needsContext();
-
-    function getSafe(Twig_Node $filterArgs);
-
-    function getPreEscape();
-}
diff --git a/inc/contrib/Twig/Function.php b/inc/contrib/Twig/Function.php
deleted file mode 100644
index 1197924a..00000000
--- a/inc/contrib/Twig/Function.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template function.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_Function implements Twig_FunctionInterface
-{
-    protected $options;
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context'     => false,
-        ), $options);
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $functionArgs)
-    {
-        if (isset($this->options['is_safe'])) {
-            return $this->options['is_safe'];
-        }
-
-        if (isset($this->options['is_safe_callback'])) {
-            return call_user_func($this->options['is_safe_callback'], $functionArgs);
-        }
-
-        return array();
-    }
-}
diff --git a/inc/contrib/Twig/Function/Function.php b/inc/contrib/Twig/Function/Function.php
deleted file mode 100644
index 3237d8c5..00000000
--- a/inc/contrib/Twig/Function/Function.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a function template function.
- *
- * @package    twig
- * @author     Arnaud Le Blanc <arnaud.lb@gmail.com>
- */
-class Twig_Function_Function extends Twig_Function
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/inc/contrib/Twig/Function/Method.php b/inc/contrib/Twig/Function/Method.php
deleted file mode 100644
index 7328566e..00000000
--- a/inc/contrib/Twig/Function/Method.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a method template function.
- *
- * @package    twig
- * @author     Arnaud Le Blanc <arnaud.lb@gmail.com>
- */
-class Twig_Function_Method extends Twig_Function
-{
-    protected $extension, $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
-    }
-}
diff --git a/inc/contrib/Twig/FunctionInterface.php b/inc/contrib/Twig/FunctionInterface.php
deleted file mode 100644
index ccc9fd93..00000000
--- a/inc/contrib/Twig/FunctionInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template function.
- *
- * @package    twig
- * @author     Arnaud Le Blanc <arnaud.lb@gmail.com>
- */
-interface Twig_FunctionInterface
-{
-    /**
-     * Compiles a function.
-     *
-     * @return string The PHP code for the function
-     */
-    function compile();
-
-    function needsEnvironment();
-
-    function needsContext();
-
-    function getSafe(Twig_Node $filterArgs);
-}
diff --git a/inc/contrib/Twig/Lexer.php b/inc/contrib/Twig/Lexer.php
deleted file mode 100644
index 868a814e..00000000
--- a/inc/contrib/Twig/Lexer.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Lexes a template string.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Lexer implements Twig_LexerInterface
-{
-    protected $tokens;
-    protected $code;
-    protected $cursor;
-    protected $lineno;
-    protected $end;
-    protected $state;
-    protected $brackets;
-
-    protected $env;
-    protected $filename;
-    protected $options;
-    protected $operatorRegex;
-
-    const STATE_DATA  = 0;
-    const STATE_BLOCK = 1;
-    const STATE_VAR   = 2;
-
-    const REGEX_NAME   = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
-    const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?/A';
-    const REGEX_STRING = '/"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
-    const PUNCTUATION  = '()[]{}?:.,|';
-
-    public function __construct(Twig_Environment $env, array $options = array())
-    {
-        $this->env = $env;
-
-        $this->options = array_merge(array(
-            'tag_comment'     => array('{#', '#}'),
-            'tag_block'       => array('{%', '%}'),
-            'tag_variable'    => array('{{', '}}'),
-            'whitespace_trim' => '-',
-        ), $options);
-    }
-
-    /**
-     * Tokenizes a source code.
-     *
-     * @param  string $code     The source code
-     * @param  string $filename A unique identifier for the source code
-     *
-     * @return Twig_TokenStream A token stream instance
-     */
-    public function tokenize($code, $filename = null)
-    {
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        }
-
-        $this->code = str_replace(array("\r\n", "\r"), "\n", $code);
-        $this->filename = $filename;
-        $this->cursor = 0;
-        $this->lineno = 1;
-        $this->end = strlen($this->code);
-        $this->tokens = array();
-        $this->state = self::STATE_DATA;
-        $this->brackets = array();
-
-        while ($this->cursor < $this->end) {
-            // dispatch to the lexing functions depending
-            // on the current state
-            switch ($this->state) {
-                case self::STATE_DATA:
-                    $this->lexData();
-                    break;
-
-                case self::STATE_BLOCK:
-                    $this->lexBlock();
-                    break;
-
-                case self::STATE_VAR:
-                    $this->lexVar();
-                    break;
-            }
-        }
-
-        $this->pushToken(Twig_Token::EOF_TYPE);
-
-        if (!empty($this->brackets)) {
-            list($expect, $lineno) = array_pop($this->brackets);
-            throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $expect), $lineno, $this->filename);
-        }
-
-        if (isset($mbEncoding)) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        return new Twig_TokenStream($this->tokens, $this->filename);
-    }
-
-    protected function lexData()
-    {
-        $pos = $this->end;
-        $append = '';
-
-        // Find the first token after the cursor
-        foreach (array('tag_comment', 'tag_variable', 'tag_block') as $type) {
-            $tmpPos = strpos($this->code, $this->options[$type][0], $this->cursor);
-            if (false !== $tmpPos && $tmpPos < $pos) {
-                $trimBlock = false;
-                $append = '';
-                $pos = $tmpPos;
-                $token = $this->options[$type][0];
-                if (strpos($this->code, $this->options['whitespace_trim'], $pos) === ($pos + strlen($token))) {
-                    $trimBlock = true;
-                    $append = $this->options['whitespace_trim'];
-                }
-            }
-        }
-
-        // if no matches are left we return the rest of the template as simple text token
-        if ($pos === $this->end) {
-            $this->pushToken(Twig_Token::TEXT_TYPE, substr($this->code, $this->cursor));
-            $this->cursor = $this->end;
-            return;
-        }
-
-        // push the template text first
-        $text = $textContent = substr($this->code, $this->cursor, $pos - $this->cursor);
-        if (true === $trimBlock) {
-            $text = rtrim($text);
-        }
-        $this->pushToken(Twig_Token::TEXT_TYPE, $text);
-        $this->moveCursor($textContent.$token.$append);
-
-        switch ($token) {
-            case $this->options['tag_comment'][0]:
-                $this->lexComment();
-                break;
-
-            case $this->options['tag_block'][0]:
-                // raw data?
-                if (preg_match('/\s*raw\s*'.preg_quote($this->options['tag_block'][1], '/').'/As', $this->code, $match, null, $this->cursor)) {
-                    $this->moveCursor($match[0]);
-                    $this->lexRawData();
-                    $this->state = self::STATE_DATA;
-                // {% line \d+ %}
-                } else if (preg_match('/\s*line\s+(\d+)\s*'.preg_quote($this->options['tag_block'][1], '/').'/As', $this->code, $match, null, $this->cursor)) {
-                    $this->moveCursor($match[0]);
-                    $this->lineno = (int) $match[1];
-                    $this->state = self::STATE_DATA;
-                } else {
-                    $this->pushToken(Twig_Token::BLOCK_START_TYPE);
-                    $this->state = self::STATE_BLOCK;
-                }
-                break;
-
-            case $this->options['tag_variable'][0]:
-                $this->pushToken(Twig_Token::VAR_START_TYPE);
-                $this->state = self::STATE_VAR;
-                break;
-        }
-    }
-
-    protected function lexBlock()
-    {
-        $trimTag = preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/');
-        $endTag = preg_quote($this->options['tag_block'][1], '/');
-
-        if (empty($this->brackets) && preg_match('/\s*(?:'.$trimTag.'\s*|\s*'.$endTag.')\n?/A', $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::BLOCK_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->state = self::STATE_DATA;
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function lexVar()
-    {
-        $trimTag = preg_quote($this->options['whitespace_trim'].$this->options['tag_variable'][1], '/');
-        $endTag = preg_quote($this->options['tag_variable'][1], '/');
-
-        if (empty($this->brackets) && preg_match('/\s*'.$trimTag.'\s*|\s*'.$endTag.'/A', $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::VAR_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->state = self::STATE_DATA;
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function lexExpression()
-    {
-        // whitespace
-        if (preg_match('/\s+/A', $this->code, $match, null, $this->cursor)) {
-            $this->moveCursor($match[0]);
-
-            if ($this->cursor >= $this->end) {
-                throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s"', $this->state === self::STATE_BLOCK ? 'block' : 'variable'));
-            }
-        }
-
-        // operators
-        if (preg_match($this->getOperatorRegex(), $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::OPERATOR_TYPE, $match[0]);
-            $this->moveCursor($match[0]);
-        }
-        // names
-        elseif (preg_match(self::REGEX_NAME, $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::NAME_TYPE, $match[0]);
-            $this->moveCursor($match[0]);
-        }
-        // numbers
-        elseif (preg_match(self::REGEX_NUMBER, $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::NUMBER_TYPE, ctype_digit($match[0]) ? (int) $match[0] : (float) $match[0]);
-            $this->moveCursor($match[0]);
-        }
-        // punctuation
-        elseif (false !== strpos(self::PUNCTUATION, $this->code[$this->cursor])) {
-            // opening bracket
-            if (false !== strpos('([{', $this->code[$this->cursor])) {
-                $this->brackets[] = array($this->code[$this->cursor], $this->lineno);
-            }
-            // closing bracket
-            elseif (false !== strpos(')]}', $this->code[$this->cursor])) {
-                if (empty($this->brackets)) {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected "%s"', $this->code[$this->cursor]), $this->lineno, $this->filename);
-                }
-
-                list($expect, $lineno) = array_pop($this->brackets);
-                if ($this->code[$this->cursor] != strtr($expect, '([{', ')]}')) {
-                    throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $expect), $lineno, $this->filename);
-                }
-            }
-
-            $this->pushToken(Twig_Token::PUNCTUATION_TYPE, $this->code[$this->cursor]);
-            ++$this->cursor;
-        }
-        // strings
-        elseif (preg_match(self::REGEX_STRING, $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes(substr($match[0], 1, -1)));
-            $this->moveCursor($match[0]);
-        }
-        // unlexable
-        else {
-            throw new Twig_Error_Syntax(sprintf('Unexpected character "%s"', $this->code[$this->cursor]), $this->lineno, $this->filename);
-        }
-    }
-
-    protected function lexRawData()
-    {
-        if (!preg_match('/'.preg_quote($this->options['tag_block'][0], '/').'\s*endraw\s*'.preg_quote($this->options['tag_block'][1], '/').'/s', $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "block"'));
-        }
-        $text = substr($this->code, $this->cursor, $match[0][1] - $this->cursor);
-        $this->pushToken(Twig_Token::TEXT_TYPE, $text);
-        $this->moveCursor($text.$match[0][0]);
-    }
-
-    protected function lexComment()
-    {
-        $commentEndRegex = '/(?:'.preg_quote($this->options['whitespace_trim'], '/')
-                           .preg_quote($this->options['tag_comment'][1], '/').'\s*|'
-                           .preg_quote($this->options['tag_comment'][1], '/').')\n?/s';
-
-        if (!preg_match($commentEndRegex, $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax('Unclosed comment', $this->lineno, $this->filename);
-        }
-
-        $this->moveCursor(substr($this->code, $this->cursor, $match[0][1] - $this->cursor).$match[0][0]);
-    }
-
-    protected function pushToken($type, $value = '')
-    {
-        // do not push empty text tokens
-        if (Twig_Token::TEXT_TYPE === $type && '' === $value) {
-            return;
-        }
-
-        $this->tokens[] = new Twig_Token($type, $value, $this->lineno);
-    }
-
-    protected function moveCursor($text)
-    {
-        $this->cursor += strlen($text);
-        $this->lineno += substr_count($text, "\n");
-    }
-
-    protected function getOperatorRegex()
-    {
-        if (null !== $this->operatorRegex) {
-            return $this->operatorRegex;
-        }
-
-        $operators = array_merge(
-            array('='),
-            array_keys($this->env->getUnaryOperators()),
-            array_keys($this->env->getBinaryOperators())
-        );
-
-        $operators = array_combine($operators, array_map('strlen', $operators));
-        arsort($operators);
-
-        $regex = array();
-        foreach ($operators as $operator => $length) {
-            // an operator that ends with a character must be followed by
-            // a whitespace or a parenthesis
-            if (ctype_alpha($operator[$length - 1])) {
-                $regex[] = preg_quote($operator, '/').'(?=[ ()])';
-            } else {
-                $regex[] = preg_quote($operator, '/');
-            }
-        }
-
-        return $this->operatorRegex = '/'.implode('|', $regex).'/A';
-    }
-}
diff --git a/inc/contrib/Twig/LexerInterface.php b/inc/contrib/Twig/LexerInterface.php
deleted file mode 100644
index 02233849..00000000
--- a/inc/contrib/Twig/LexerInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by lexer classes.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_LexerInterface
-{
-    /**
-     * Tokenizes a source code.
-     *
-     * @param  string $code     The source code
-     * @param  string $filename A unique identifier for the source code
-     *
-     * @return Twig_TokenStream A token stream instance
-     */
-    function tokenize($code, $filename = null);
-}
diff --git a/inc/contrib/Twig/Loader/Array.php b/inc/contrib/Twig/Loader/Array.php
deleted file mode 100644
index e8dc1605..00000000
--- a/inc/contrib/Twig/Loader/Array.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads a template from an array.
- *
- * When using this loader with a cache mechanism, you should know that a new cache
- * key is generated each time a template content "changes" (the cache key being the
- * source code of the template). If you don't want to see your cache grows out of
- * control, you need to take care of clearing the old cache file by yourself.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_Array implements Twig_LoaderInterface
-{
-    protected $templates;
-
-    /**
-     * Constructor.
-     *
-     * @param array $templates An array of templates (keys are the names, and values are the source code)
-     *
-     * @see Twig_Loader
-     */
-    public function __construct(array $templates)
-    {
-        $this->templates = array();
-        foreach ($templates as $name => $template) {
-            $this->templates[$name] = $template;
-        }
-    }
-
-    /**
-     * Adds or overrides a template.
-     *
-     * @param string $name     The template name
-     * @param string $template The template source
-     */
-    public function setTemplate($name, $template)
-    {
-        $this->templates[$name] = $template;
-    }
-
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     */
-    public function getSource($name)
-    {
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return $this->templates[$name];
-    }
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     */
-    public function getCacheKey($name)
-    {
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return $this->templates[$name];
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     */
-    public function isFresh($name, $time)
-    {
-        return true;
-    }
-}
diff --git a/inc/contrib/Twig/Loader/Chain.php b/inc/contrib/Twig/Loader/Chain.php
deleted file mode 100644
index 48dd8b84..00000000
--- a/inc/contrib/Twig/Loader/Chain.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads templates from other loaders.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_Chain implements Twig_LoaderInterface
-{
-    protected $loaders;
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_LoaderInterface[] $loaders An array of loader instances
-     */
-    public function __construct(array $loaders = array())
-    {
-        $this->loaders = array();
-        foreach ($loaders as $loader) {
-            $this->addLoader($loader);
-        }
-    }
-
-    /**
-     * Adds a loader instance.
-     *
-     * @param Twig_LoaderInterface $loader A Loader instance
-     */
-    public function addLoader(Twig_LoaderInterface $loader)
-    {
-        $this->loaders[] = $loader;
-    }
-
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     */
-    public function getSource($name)
-    {
-        foreach ($this->loaders as $loader) {
-            try {
-                return $loader->getSource($name);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-    }
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     */
-    public function getCacheKey($name)
-    {
-        foreach ($this->loaders as $loader) {
-            try {
-                return $loader->getCacheKey($name);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     */
-    public function isFresh($name, $time)
-    {
-        foreach ($this->loaders as $loader) {
-            try {
-                return $loader->isFresh($name, $time);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-    }
-}
diff --git a/inc/contrib/Twig/Loader/Filesystem.php b/inc/contrib/Twig/Loader/Filesystem.php
deleted file mode 100644
index be348aa3..00000000
--- a/inc/contrib/Twig/Loader/Filesystem.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads template from the filesystem.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_Filesystem implements Twig_LoaderInterface
-{
-    protected $paths;
-    protected $cache;
-
-    /**
-     * Constructor.
-     *
-     * @param string|array $paths A path or an array of paths where to look for templates
-     */
-    public function __construct($paths)
-    {
-        $this->setPaths($paths);
-    }
-
-    /**
-     * Returns the paths to the templates.
-     *
-     * @return array The array of paths where to look for templates
-     */
-    public function getPaths()
-    {
-        return $this->paths;
-    }
-
-    /**
-     * Sets the paths where templates are stored.
-     *
-     * @param string|array $paths A path or an array of paths where to look for templates
-     */
-    public function setPaths($paths)
-    {
-        if (!is_array($paths)) {
-            $paths = array($paths);
-        }
-
-        $this->paths = array();
-        foreach ($paths as $path) {
-            $this->addPath($path);
-        }
-    }
-
-    /**
-     * Adds a path where templates are stored.
-     *
-     * @param string $path A path where to look for templates
-     */
-    public function addPath($path)
-    {
-        // invalidate the cache
-        $this->cache = array();
-
-        if (!is_dir($path)) {
-            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
-        }
-
-        $this->paths[] = $path;
-    }
-
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     */
-    public function getSource($name)
-    {
-        return file_get_contents($this->findTemplate($name));
-    }
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     */
-    public function getCacheKey($name)
-    {
-        return $this->findTemplate($name);
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     */
-    public function isFresh($name, $time)
-    {
-        return filemtime($this->findTemplate($name)) < $time;
-    }
-
-    protected function findTemplate($name)
-    {
-        // normalize name
-        $name = preg_replace('#/{2,}#', '/', strtr($name, '\\', '/'));
-
-        if (isset($this->cache[$name])) {
-            return $this->cache[$name];
-        }
-
-        $this->validateName($name);
-
-        foreach ($this->paths as $path) {
-            if (is_file($path.'/'.$name)) {
-                return $this->cache[$name] = $path.'/'.$name;
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths)));
-    }
-
-    protected function validateName($name)
-    {
-        if (false !== strpos($name, "\0")) {
-            throw new Twig_Error_Loader('A template name cannot contain NUL bytes.');
-        }
-
-        $parts = explode('/', $name);
-        $level = 0;
-        foreach ($parts as $part) {
-            if ('..' === $part) {
-                --$level;
-            } elseif ('.' !== $part) {
-                ++$level;
-            }
-
-            if ($level < 0) {
-                throw new Twig_Error_Loader(sprintf('Looks like you try to load a template outside configured directories (%s).', $name));
-            }
-        }
-    }
-}
diff --git a/inc/contrib/Twig/Loader/String.php b/inc/contrib/Twig/Loader/String.php
deleted file mode 100644
index 26eb0096..00000000
--- a/inc/contrib/Twig/Loader/String.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads a template from a string.
- *
- * When using this loader with a cache mechanism, you should know that a new cache
- * key is generated each time a template content "changes" (the cache key being the
- * source code of the template). If you don't want to see your cache grows out of
- * control, you need to take care of clearing the old cache file by yourself.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_String implements Twig_LoaderInterface
-{
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     */
-    public function getSource($name)
-    {
-        return $name;
-    }
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     */
-    public function getCacheKey($name)
-    {
-        return $name;
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     */
-    public function isFresh($name, $time)
-    {
-        return true;
-    }
-}
diff --git a/inc/contrib/Twig/LoaderInterface.php b/inc/contrib/Twig/LoaderInterface.php
deleted file mode 100644
index f0bd3a5b..00000000
--- a/inc/contrib/Twig/LoaderInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface all loaders must implement.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_LoaderInterface
-{
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     */
-    function getSource($name);
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     */
-    function getCacheKey($name);
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     */
-    function isFresh($name, $time);
-}
diff --git a/inc/contrib/Twig/Markup.php b/inc/contrib/Twig/Markup.php
deleted file mode 100644
index c1a1469c..00000000
--- a/inc/contrib/Twig/Markup.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a content as safe.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Markup
-{
-    protected $content;
-
-    public function __construct($content)
-    {
-        $this->content = (string) $content;
-    }
-
-    public function __toString()
-    {
-        return $this->content;
-    }
-}
diff --git a/inc/contrib/Twig/Node.php b/inc/contrib/Twig/Node.php
deleted file mode 100644
index 22e65d45..00000000
--- a/inc/contrib/Twig/Node.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node in the AST.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node implements Twig_NodeInterface, Countable, IteratorAggregate
-{
-    protected $nodes;
-    protected $attributes;
-    protected $lineno;
-    protected $tag;
-
-    /**
-     * Constructor.
-     *
-     * The nodes are automatically made available as properties ($this->node).
-     * The attributes are automatically made available as array items ($this['name']).
-     *
-     * @param array   $nodes      An array of named nodes
-     * @param array   $attributes An array of attributes (should not be nodes)
-     * @param integer $lineno     The line number
-     * @param string  $tag        The tag name associated with the Node
-     */
-    public function __construct(array $nodes = array(), array $attributes = array(), $lineno = 0, $tag = null)
-    {
-        $this->nodes = $nodes;
-        $this->attributes = $attributes;
-        $this->lineno = $lineno;
-        $this->tag = $tag;
-    }
-
-    public function __toString()
-    {
-        $attributes = array();
-        foreach ($this->attributes as $name => $value) {
-            $attributes[] = sprintf('%s: %s', $name, str_replace("\n", '', var_export($value, true)));
-        }
-
-        $repr = array(get_class($this).'('.implode(', ', $attributes));
-
-        if (count($this->nodes)) {
-            foreach ($this->nodes as $name => $node) {
-                $len = strlen($name) + 4;
-                $noderepr = array();
-                foreach (explode("\n", (string) $node) as $line) {
-                    $noderepr[] = str_repeat(' ', $len).$line;
-                }
-
-                $repr[] = sprintf('  %s: %s', $name, ltrim(implode("\n", $noderepr)));
-            }
-
-            $repr[] = ')';
-        } else {
-            $repr[0] .= ')';
-        }
-
-        return implode("\n", $repr);
-    }
-
-    public function toXml($asDom = false)
-    {
-        $dom = new DOMDocument('1.0', 'UTF-8');
-        $dom->formatOutput = true;
-        $dom->appendChild($xml = $dom->createElement('twig'));
-
-        $xml->appendChild($node = $dom->createElement('node'));
-        $node->setAttribute('class', get_class($this));
-
-        foreach ($this->attributes as $name => $value) {
-            $node->appendChild($attribute = $dom->createElement('attribute'));
-            $attribute->setAttribute('name', $name);
-            $attribute->appendChild($dom->createTextNode($value));
-        }
-
-        foreach ($this->nodes as $name => $n) {
-            if (null === $n) {
-                continue;
-            }
-
-            $child = $n->toXml(true)->getElementsByTagName('node')->item(0);
-            $child = $dom->importNode($child, true);
-            $child->setAttribute('name', $name);
-
-            $node->appendChild($child);
-        }
-
-        return $asDom ? $dom : $dom->saveXml();
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        foreach ($this->nodes as $node) {
-            $node->compile($compiler);
-        }
-    }
-
-    public function getLine()
-    {
-        return $this->lineno;
-    }
-
-    public function getNodeTag()
-    {
-        return $this->tag;
-    }
-
-    /**
-     * Returns true if the attribute is defined.
-     *
-     * @param  string  The attribute name
-     *
-     * @return Boolean true if the attribute is defined, false otherwise
-     */
-    public function hasAttribute($name)
-    {
-        return array_key_exists($name, $this->attributes);
-    }
-
-    /**
-     * Gets an attribute.
-     *
-     * @param  string The attribute name
-     *
-     * @return mixed  The attribute value
-     */
-    public function getAttribute($name)
-    {
-        if (!array_key_exists($name, $this->attributes)) {
-            throw new Twig_Error_Runtime(sprintf('Attribute "%s" does not exist for Node "%s".', $name, get_class($this)));
-        }
-
-        return $this->attributes[$name];
-    }
-
-    /**
-     * Sets an attribute.
-     *
-     * @param string The attribute name
-     * @param mixed  The attribute value
-     */
-    public function setAttribute($name, $value)
-    {
-        $this->attributes[$name] = $value;
-    }
-
-    /**
-     * Removes an attribute.
-     *
-     * @param string The attribute name
-     */
-    public function removeAttribute($name)
-    {
-        unset($this->attributes[$name]);
-    }
-
-    /**
-     * Returns true if the node with the given identifier exists.
-     *
-     * @param  string  The node name
-     *
-     * @return Boolean true if the node with the given name exists, false otherwise
-     */
-    public function hasNode($name)
-    {
-        return array_key_exists($name, $this->nodes);
-    }
-
-    /**
-     * Gets a node by name.
-     *
-     * @param  string The node name
-     *
-     * @return Twig_Node A Twig_Node instance
-     */
-    public function getNode($name)
-    {
-        if (!array_key_exists($name, $this->nodes)) {
-            throw new Twig_Error_Runtime(sprintf('Node "%s" does not exist for Node "%s".', $name, get_class($this)));
-        }
-
-        return $this->nodes[$name];
-    }
-
-    /**
-     * Sets a node.
-     *
-     * @param string    The node name
-     * @param Twig_Node A Twig_Node instance
-     */
-    public function setNode($name, $node = null)
-    {
-        $this->nodes[$name] = $node;
-    }
-
-    /**
-     * Removes a node by name.
-     *
-     * @param string The node name
-     */
-    public function removeNode($name)
-    {
-        unset($this->nodes[$name]);
-    }
-
-    public function count()
-    {
-        return count($this->nodes);
-    }
-
-    public function getIterator()
-    {
-        return new ArrayIterator($this->nodes);
-    }
-}
diff --git a/inc/contrib/Twig/Node/AutoEscape.php b/inc/contrib/Twig/Node/AutoEscape.php
deleted file mode 100644
index a0c2ee6d..00000000
--- a/inc/contrib/Twig/Node/AutoEscape.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an autoescape node.
- *
- * The value is the escaping strategy (can be html, js, ...)
- *
- * The true value is equivalent to html.
- *
- * If autoescaping is disabled, then the value is false.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_AutoEscape extends Twig_Node
-{
-    public function __construct($value, Twig_NodeInterface $body, $lineno, $tag = 'autoescape')
-    {
-        parent::__construct(array('body' => $body), array('value' => $value), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('body'));
-    }
-}
diff --git a/inc/contrib/Twig/Node/Block.php b/inc/contrib/Twig/Node/Block.php
deleted file mode 100644
index 5548ad06..00000000
--- a/inc/contrib/Twig/Node/Block.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a block node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Block extends Twig_Node
-{
-    public function __construct($name, Twig_NodeInterface $body, $lineno, $tag = null)
-    {
-        parent::__construct(array('body' => $body), array('name' => $name), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf("public function block_%s(\$context, array \$blocks = array())\n", $this->getAttribute('name')), "{\n")
-            ->indent()
-        ;
-
-        $compiler
-            ->subcompile($this->getNode('body'))
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/Node/BlockReference.php b/inc/contrib/Twig/Node/BlockReference.php
deleted file mode 100644
index 53f6287c..00000000
--- a/inc/contrib/Twig/Node/BlockReference.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a block call node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf("\$this->displayBlock('%s', \$context, \$blocks);\n", $this->getAttribute('name')))
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression.php b/inc/contrib/Twig/Node/Expression.php
deleted file mode 100644
index 13b170e5..00000000
--- a/inc/contrib/Twig/Node/Expression.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Abstract class for all nodes that represents an expression.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_Node_Expression extends Twig_Node
-{
-}
diff --git a/inc/contrib/Twig/Node/Expression/Array.php b/inc/contrib/Twig/Node/Expression/Array.php
deleted file mode 100644
index 2d860823..00000000
--- a/inc/contrib/Twig/Node/Expression/Array.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Array extends Twig_Node_Expression
-{
-    public function __construct(array $elements, $lineno)
-    {
-        parent::__construct($elements, array(), $lineno);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('array(');
-        $first = true;
-        foreach ($this->nodes as $name => $node) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $first = false;
-
-            $compiler
-                ->repr($name)
-                ->raw(' => ')
-                ->subcompile($node)
-            ;
-        }
-        $compiler->raw(')');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/AssignName.php b/inc/contrib/Twig/Node/Expression/AssignName.php
deleted file mode 100644
index 67f12509..00000000
--- a/inc/contrib/Twig/Node/Expression/AssignName.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class Twig_Node_Expression_AssignName extends Twig_Node_Expression_Name
-{
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw(sprintf('$context[\'%s\']', $this->getAttribute('name')));
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary.php b/inc/contrib/Twig/Node/Expression/Binary.php
deleted file mode 100644
index 9dd5de2c..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Node_Expression_Binary extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $left, Twig_NodeInterface $right, $lineno)
-    {
-        parent::__construct(array('left' => $left, 'right' => $right), array(), $lineno);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('left'))
-            ->raw(' ')
-        ;
-        $this->operator($compiler);
-        $compiler
-            ->raw(' ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    abstract public function operator(Twig_Compiler $compiler);
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Add.php b/inc/contrib/Twig/Node/Expression/Binary/Add.php
deleted file mode 100644
index 0ef8e117..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Add.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Add extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('+');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/And.php b/inc/contrib/Twig/Node/Expression/Binary/And.php
deleted file mode 100644
index d5752ebb..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/And.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_And extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('&&');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/BitwiseAnd.php b/inc/contrib/Twig/Node/Expression/Binary/BitwiseAnd.php
deleted file mode 100644
index 9a46d845..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/BitwiseAnd.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_BitwiseAnd extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('&');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/BitwiseOr.php b/inc/contrib/Twig/Node/Expression/Binary/BitwiseOr.php
deleted file mode 100644
index 058a20bf..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/BitwiseOr.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_BitwiseOr extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('|');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/BitwiseXor.php b/inc/contrib/Twig/Node/Expression/Binary/BitwiseXor.php
deleted file mode 100644
index f4da73d4..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/BitwiseXor.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_BitwiseXor extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('^');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Concat.php b/inc/contrib/Twig/Node/Expression/Binary/Concat.php
deleted file mode 100644
index f9a64627..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Concat.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Concat extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('.');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Div.php b/inc/contrib/Twig/Node/Expression/Binary/Div.php
deleted file mode 100644
index e0797a61..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Div.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Div extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('/');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Equal.php b/inc/contrib/Twig/Node/Expression/Binary/Equal.php
deleted file mode 100644
index 7b1236d0..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Equal.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Equal extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('==');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/FloorDiv.php b/inc/contrib/Twig/Node/Expression/Binary/FloorDiv.php
deleted file mode 100644
index e86b1ea0..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/FloorDiv.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_FloorDiv extends Twig_Node_Expression_Binary
-{
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('floor(');
-        parent::compile($compiler);
-        $compiler->raw(')');
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('/');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Greater.php b/inc/contrib/Twig/Node/Expression/Binary/Greater.php
deleted file mode 100644
index a110bd92..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Greater.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Greater extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('>');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/GreaterEqual.php b/inc/contrib/Twig/Node/Expression/Binary/GreaterEqual.php
deleted file mode 100644
index 3754fed2..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/GreaterEqual.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_GreaterEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('>=');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/In.php b/inc/contrib/Twig/Node/Expression/Binary/In.php
deleted file mode 100644
index 788f9377..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/In.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_In extends Twig_Node_Expression_Binary
-{
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('twig_in_filter(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('in');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Less.php b/inc/contrib/Twig/Node/Expression/Binary/Less.php
deleted file mode 100644
index 45fd3004..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Less.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Less extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('<');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/LessEqual.php b/inc/contrib/Twig/Node/Expression/Binary/LessEqual.php
deleted file mode 100644
index e38e257c..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/LessEqual.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_LessEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('<=');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Mod.php b/inc/contrib/Twig/Node/Expression/Binary/Mod.php
deleted file mode 100644
index 9924114f..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Mod.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Mod extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('%');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Mul.php b/inc/contrib/Twig/Node/Expression/Binary/Mul.php
deleted file mode 100644
index c91529ca..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Mul.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Mul extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('*');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/NotEqual.php b/inc/contrib/Twig/Node/Expression/Binary/NotEqual.php
deleted file mode 100644
index 26867ba2..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/NotEqual.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_NotEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('!=');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/NotIn.php b/inc/contrib/Twig/Node/Expression/Binary/NotIn.php
deleted file mode 100644
index f347b7b6..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/NotIn.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_NotIn extends Twig_Node_Expression_Binary
-{
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('!twig_in_filter(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('not in');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Or.php b/inc/contrib/Twig/Node/Expression/Binary/Or.php
deleted file mode 100644
index adba49c6..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Or.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Or extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('||');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Power.php b/inc/contrib/Twig/Node/Expression/Binary/Power.php
deleted file mode 100644
index b2c59040..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Power.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Power extends Twig_Node_Expression_Binary
-{
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('pow(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('**');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Range.php b/inc/contrib/Twig/Node/Expression/Binary/Range.php
deleted file mode 100644
index bea4f2a6..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Range.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Range extends Twig_Node_Expression_Binary
-{
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('range(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('..');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Sub.php b/inc/contrib/Twig/Node/Expression/Binary/Sub.php
deleted file mode 100644
index d4463991..00000000
--- a/inc/contrib/Twig/Node/Expression/Binary/Sub.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Sub extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('-');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/BlockReference.php b/inc/contrib/Twig/Node/Expression/BlockReference.php
deleted file mode 100644
index 174d9097..00000000
--- a/inc/contrib/Twig/Node/Expression/BlockReference.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a block call node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $name, $asString = false, $lineno, $tag = null)
-    {
-        parent::__construct(array('name' => $name), array('as_string' => $asString, 'output' => false), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('as_string')) {
-            $compiler->raw('(string) ');
-        }
-
-        if ($this->getAttribute('output')) {
-            $compiler
-                ->addDebugInfo($this)
-                ->write("\$this->displayBlock(")
-                ->subcompile($this->getNode('name'))
-                ->raw(", \$context, \$blocks);\n")
-            ;
-        } else {
-            $compiler
-                ->raw("\$this->renderBlock(")
-                ->subcompile($this->getNode('name'))
-                ->raw(", \$context, \$blocks)")
-            ;
-        }
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Conditional.php b/inc/contrib/Twig/Node/Expression/Conditional.php
deleted file mode 100644
index edcb1e2d..00000000
--- a/inc/contrib/Twig/Node/Expression/Conditional.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Conditional extends Twig_Node_Expression
-{
-    public function __construct(Twig_Node_Expression $expr1, Twig_Node_Expression $expr2, Twig_Node_Expression $expr3, $lineno)
-    {
-        parent::__construct(array('expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3), array(), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('((')
-            ->subcompile($this->getNode('expr1'))
-            ->raw(') ? (')
-            ->subcompile($this->getNode('expr2'))
-            ->raw(') : (')
-            ->subcompile($this->getNode('expr3'))
-            ->raw('))')
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Constant.php b/inc/contrib/Twig/Node/Expression/Constant.php
deleted file mode 100644
index a91dc698..00000000
--- a/inc/contrib/Twig/Node/Expression/Constant.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Constant extends Twig_Node_Expression
-{
-    public function __construct($value, $lineno)
-    {
-        parent::__construct(array(), array('value' => $value), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->repr($this->getAttribute('value'));
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/ExtensionReference.php b/inc/contrib/Twig/Node/Expression/ExtensionReference.php
deleted file mode 100644
index cb4efad0..00000000
--- a/inc/contrib/Twig/Node/Expression/ExtensionReference.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an extension call node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_ExtensionReference extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw(sprintf("\$this->env->getExtension('%s')", $this->getAttribute('name')));
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Filter.php b/inc/contrib/Twig/Node/Expression/Filter.php
deleted file mode 100644
index 101e6df0..00000000
--- a/inc/contrib/Twig/Node/Expression/Filter.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Filter extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
-    {
-        parent::__construct(array('node' => $node, 'filter' => $filterName, 'arguments' => $arguments), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getNode('filter')->getAttribute('value');
-        if (false === $filter = $compiler->getEnvironment()->getFilter($name)) {
-            throw new Twig_Error_Syntax(sprintf('The filter "%s" does not exist', $name), $this->getLine());
-        }
-
-        $node = $this->getNode('node');
-
-        // The default filter is intercepted when the filtered value
-        // is a name (like obj) or an attribute (like obj.attr)
-        // In such a case, it's compiled to {{ obj is defined ? obj|default('bar') : 'bar' }}
-        if ('default' === $name && ($node instanceof Twig_Node_Expression_Name || $node instanceof Twig_Node_Expression_GetAttr)) {
-            $compiler
-                ->raw('((')
-                ->subcompile(new Twig_Node_Expression_Test($node, 'defined', new Twig_Node(), $this->getLine()))
-                ->raw(') ? (')
-            ;
-
-            $this->compileFilter($compiler, $filter);
-
-            $compiler->raw(') : (');
-
-            if ($this->getNode('arguments')->hasNode(0)) {
-                $compiler->subcompile($this->getNode('arguments')->getNode(0));
-            } else {
-                $compiler->string('');
-            }
-
-            $compiler->raw('))');
-        } else {
-            $this->compileFilter($compiler, $filter);
-        }
-    }
-
-    protected function compileFilter(Twig_Compiler $compiler, Twig_FilterInterface $filter)
-    {
-        $compiler
-            ->raw($filter->compile().'(')
-            ->raw($filter->needsEnvironment() ? '$this->env, ' : '')
-            ->raw($filter->needsContext() ? '$context, ' : '')
-            ->subcompile($this->getNode('node'))
-        ;
-
-        foreach ($this->getNode('arguments') as $node) {
-            $compiler
-                ->raw(', ')
-                ->subcompile($node)
-            ;
-        }
-
-        $compiler->raw(')');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Function.php b/inc/contrib/Twig/Node/Expression/Function.php
deleted file mode 100644
index 3f457199..00000000
--- a/inc/contrib/Twig/Node/Expression/Function.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Function extends Twig_Node_Expression
-{
-    public function __construct($name, Twig_NodeInterface $arguments, $lineno)
-    {
-        parent::__construct(array('arguments' => $arguments), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $function = $compiler->getEnvironment()->getFunction($this->getAttribute('name'));
-        if (false === $function) {
-            throw new Twig_Error_Syntax(sprintf('The function "%s" does not exist', $this->getAttribute('name')), $this->getLine());
-        }
-
-        $compiler
-            ->raw($function->compile().'(')
-            ->raw($function->needsEnvironment() ? '$this->env' : '')
-        ;
-
-        if ($function->needsContext()) {
-            $compiler->raw($function->needsEnvironment() ? ', $context' : '$context');
-        }
-
-        $first = true;
-        foreach ($this->getNode('arguments') as $node) {
-            if (!$first) {
-                $compiler->raw(', ');
-            } else {
-                if ($function->needsEnvironment() || $function->needsContext()) {
-                    $compiler->raw(', ');
-                }
-                $first = false;
-            }
-            $compiler->subcompile($node);
-        }
-
-        $compiler->raw(')');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/GetAttr.php b/inc/contrib/Twig/Node/Expression/GetAttr.php
deleted file mode 100644
index eb9e6050..00000000
--- a/inc/contrib/Twig/Node/Expression/GetAttr.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
-{
-    public function __construct(Twig_Node_Expression $node, Twig_Node_Expression $attribute, Twig_NodeInterface $arguments, $type, $lineno)
-    {
-        parent::__construct(array('node' => $node, 'attribute' => $attribute, 'arguments' => $arguments), array('type' => $type), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('$this->getAttribute(');
-
-        if ($this->hasAttribute('is_defined_test') && $compiler->getEnvironment()->isStrictVariables()) {
-            $compiler->subcompile(new Twig_Node_Expression_Filter(
-                $this->getNode('node'),
-                new Twig_Node_Expression_Constant('default', $this->getLine()),
-                new Twig_Node(),
-                $this->getLine()
-            ));
-        } else {
-            $compiler->subcompile($this->getNode('node'));
-        }
-
-        $compiler
-            ->raw(', ')
-            ->subcompile($this->getNode('attribute'))
-            ->raw(', array(')
-        ;
-
-        foreach ($this->getNode('arguments') as $node) {
-            $compiler
-                ->subcompile($node)
-                ->raw(', ')
-            ;
-        }
-
-        $compiler
-            ->raw('), ')
-            ->repr($this->getAttribute('type'))
-            ->raw($this->hasAttribute('is_defined_test') ? ', true' : ', false')
-            ->raw(')');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Name.php b/inc/contrib/Twig/Node/Expression/Name.php
deleted file mode 100644
index fceda2b7..00000000
--- a/inc/contrib/Twig/Node/Expression/Name.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Name extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        static $specialVars = array(
-            '_self'    => '$this',
-            '_context' => '$context',
-            '_charset' => '$this->env->getCharset()',
-        );
-
-        $name = $this->getAttribute('name');
-
-        if ($this->hasAttribute('is_defined_test')) {
-            if (isset($specialVars[$name])) {
-                $compiler->repr(true);
-            } else {
-                $compiler->raw('array_key_exists(')->repr($name)->raw(', $context)');
-            }
-        } elseif (isset($specialVars[$name])) {
-            $compiler->raw($specialVars[$name]);
-        } else {
-            $compiler->raw(sprintf('$this->getContext($context, \'%s\')', $name));
-        }
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Parent.php b/inc/contrib/Twig/Node/Expression/Parent.php
deleted file mode 100644
index 5689fe45..00000000
--- a/inc/contrib/Twig/Node/Expression/Parent.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a parent node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Parent extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw("\$this->renderParentBlock(")
-            ->string($this->getAttribute('name'))
-            ->raw(", \$context, \$blocks)")
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Test.php b/inc/contrib/Twig/Node/Expression/Test.php
deleted file mode 100644
index ef35df6b..00000000
--- a/inc/contrib/Twig/Node/Expression/Test.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Test extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno)
-    {
-        parent::__construct(array('node' => $node, 'arguments' => $arguments), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $testMap = $compiler->getEnvironment()->getTests();
-        if (!isset($testMap[$this->getAttribute('name')])) {
-            throw new Twig_Error_Syntax(sprintf('The test "%s" does not exist', $this->getAttribute('name')), $this->getLine());
-        }
-
-        $name = $this->getAttribute('name');
-        $node = $this->getNode('node');
-
-        // defined is a special case
-        if ('defined' === $name) {
-            if ($node instanceof Twig_Node_Expression_Name || $node instanceof Twig_Node_Expression_GetAttr) {
-                $node->setAttribute('is_defined_test', true);
-                $compiler->subcompile($node);
-                $node->removeAttribute('is_defined_test');
-            } else {
-                throw new Twig_Error_Syntax('The "defined" test only works with simple variables', $this->getLine());
-            }
-            return;
-        }
-
-        $compiler
-            ->raw($testMap[$name]->compile().'(')
-            ->subcompile($node)
-        ;
-
-        if (null !== $this->getNode('arguments')) {
-            $compiler->raw(', ');
-
-            $max = count($this->getNode('arguments')) - 1;
-            foreach ($this->getNode('arguments') as $i => $arg) {
-                $compiler->subcompile($arg);
-
-                if ($i != $max) {
-                    $compiler->raw(', ');
-                }
-            }
-        }
-
-        $compiler->raw(')');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Unary.php b/inc/contrib/Twig/Node/Expression/Unary.php
deleted file mode 100644
index c514388e..00000000
--- a/inc/contrib/Twig/Node/Expression/Unary.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Node_Expression_Unary extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $node, $lineno)
-    {
-        parent::__construct(array('node' => $node), array(), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('(');
-        $this->operator($compiler);
-        $compiler
-            ->subcompile($this->getNode('node'))
-            ->raw(')')
-        ;
-    }
-
-    abstract public function operator(Twig_Compiler $compiler);
-}
diff --git a/inc/contrib/Twig/Node/Expression/Unary/Neg.php b/inc/contrib/Twig/Node/Expression/Unary/Neg.php
deleted file mode 100644
index 2a3937ec..00000000
--- a/inc/contrib/Twig/Node/Expression/Unary/Neg.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Unary_Neg extends Twig_Node_Expression_Unary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        $compiler->raw('-');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Unary/Not.php b/inc/contrib/Twig/Node/Expression/Unary/Not.php
deleted file mode 100644
index f94073cf..00000000
--- a/inc/contrib/Twig/Node/Expression/Unary/Not.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Unary_Not extends Twig_Node_Expression_Unary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        $compiler->raw('!');
-    }
-}
diff --git a/inc/contrib/Twig/Node/Expression/Unary/Pos.php b/inc/contrib/Twig/Node/Expression/Unary/Pos.php
deleted file mode 100644
index 04edb52a..00000000
--- a/inc/contrib/Twig/Node/Expression/Unary/Pos.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Unary_Pos extends Twig_Node_Expression_Unary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        $compiler->raw('+');
-    }
-}
diff --git a/inc/contrib/Twig/Node/For.php b/inc/contrib/Twig/Node/For.php
deleted file mode 100644
index eb204e28..00000000
--- a/inc/contrib/Twig/Node/For.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a for node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_For extends Twig_Node
-{
-    public function __construct(Twig_Node_Expression_AssignName $keyTarget, Twig_Node_Expression_AssignName $valueTarget, Twig_Node_Expression $seq, Twig_Node_Expression $ifexpr = null, Twig_NodeInterface $body, Twig_NodeInterface $else = null, $lineno, $tag = null)
-    {
-        parent::__construct(array('key_target' => $keyTarget, 'value_target' => $valueTarget, 'seq' => $seq, 'ifexpr' => $ifexpr, 'body' => $body, 'else' => $else), array('with_loop' => true), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            // the (array) cast bypasses a PHP 5.2.6 bug
-            ->write("\$context['_parent'] = (array) \$context;\n")
-            ->write("\$context['_seq'] = twig_ensure_traversable(")
-            ->subcompile($this->getNode('seq'))
-            ->raw(");\n")
-        ;
-
-        if (null !== $this->getNode('else')) {
-            $compiler->write("\$context['_iterated'] = false;\n");
-        }
-
-        if ($this->getAttribute('with_loop')) {
-            $compiler
-                ->write("\$context['loop'] = array(\n")
-                ->write("  'parent' => \$context['_parent'],\n")
-                ->write("  'index0' => 0,\n")
-                ->write("  'index'  => 1,\n")
-                ->write("  'first'  => true,\n")
-                ->write(");\n")
-            ;
-
-            if (null === $this->getNode('ifexpr')) {
-                $compiler
-                    ->write("if (is_array(\$context['_seq']) || (is_object(\$context['_seq']) && \$context['_seq'] instanceof Countable)) {\n")
-                    ->indent()
-                    ->write("\$length = count(\$context['_seq']);\n")
-                    ->write("\$context['loop']['revindex0'] = \$length - 1;\n")
-                    ->write("\$context['loop']['revindex'] = \$length;\n")
-                    ->write("\$context['loop']['length'] = \$length;\n")
-                    ->write("\$context['loop']['last'] = 1 === \$length;\n")
-                    ->outdent()
-                    ->write("}\n")
-                ;
-            }
-        }
-
-        $compiler
-            ->write("foreach (\$context['_seq'] as ")
-            ->subcompile($this->getNode('key_target'))
-            ->raw(" => ")
-            ->subcompile($this->getNode('value_target'))
-            ->raw(") {\n")
-            ->indent()
-        ;
-
-        if (null !== $this->getNode('ifexpr')) {
-            $compiler
-                ->write("if (!(")
-                ->subcompile($this->getNode('ifexpr'))
-                ->raw(")) {\n")
-                ->indent()
-                ->write("continue;\n")
-                ->outdent()
-                ->write("}\n\n")
-            ;
-        }
-
-        $compiler->subcompile($this->getNode('body'));
-
-        if (null !== $this->getNode('else')) {
-            $compiler->write("\$context['_iterated'] = true;\n");
-        }
-
-        if ($this->getAttribute('with_loop')) {
-            $compiler
-                ->write("++\$context['loop']['index0'];\n")
-                ->write("++\$context['loop']['index'];\n")
-                ->write("\$context['loop']['first'] = false;\n")
-            ;
-
-            if (null === $this->getNode('ifexpr')) {
-                $compiler
-                    ->write("if (isset(\$context['loop']['length'])) {\n")
-                    ->indent()
-                    ->write("--\$context['loop']['revindex0'];\n")
-                    ->write("--\$context['loop']['revindex'];\n")
-                    ->write("\$context['loop']['last'] = 0 === \$context['loop']['revindex0'];\n")
-                    ->outdent()
-                    ->write("}\n")
-                ;
-            }
-        }
-
-        $compiler
-            ->outdent()
-            ->write("}\n")
-        ;
-
-        if (null !== $this->getNode('else')) {
-            $compiler
-                ->write("if (!\$context['_iterated']) {\n")
-                ->indent()
-                ->subcompile($this->getNode('else'))
-                ->outdent()
-                ->write("}\n")
-            ;
-        }
-
-        $compiler->write("\$_parent = \$context['_parent'];\n");
-
-        // remove some "private" loop variables (needed for nested loops)
-        $compiler->write('unset($context[\'_seq\'], $context[\'_iterated\'], $context[\''.$this->getNode('key_target')->getAttribute('name').'\'], $context[\''.$this->getNode('value_target')->getAttribute('name').'\'], $context[\'_parent\'], $context[\'loop\']);'."\n");
-
-        // keep the values set in the inner context for variables defined in the outer context
-        $compiler->write("\$context = array_merge(\$_parent, array_intersect_key(\$context, \$_parent));\n");
-    }
-}
diff --git a/inc/contrib/Twig/Node/If.php b/inc/contrib/Twig/Node/If.php
deleted file mode 100644
index aa12efbe..00000000
--- a/inc/contrib/Twig/Node/If.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an if node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_If extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $tests, Twig_NodeInterface $else = null, $lineno, $tag = null)
-    {
-        parent::__construct(array('tests' => $tests, 'else' => $else), array(), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-        for ($i = 0; $i < count($this->getNode('tests')); $i += 2) {
-            if ($i > 0) {
-                $compiler
-                    ->outdent()
-                    ->write("} elseif (")
-                ;
-            } else {
-                $compiler
-                    ->write('if (')
-                ;
-            }
-
-            $compiler
-                ->subcompile($this->getNode('tests')->getNode($i))
-                ->raw(") {\n")
-                ->indent()
-                ->subcompile($this->getNode('tests')->getNode($i + 1))
-            ;
-        }
-
-        if ($this->hasNode('else') && null !== $this->getNode('else')) {
-            $compiler
-                ->outdent()
-                ->write("} else {\n")
-                ->indent()
-                ->subcompile($this->getNode('else'))
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write("}\n");
-    }
-}
diff --git a/inc/contrib/Twig/Node/Import.php b/inc/contrib/Twig/Node/Import.php
deleted file mode 100644
index a327411d..00000000
--- a/inc/contrib/Twig/Node/Import.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an import node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Import extends Twig_Node
-{
-    public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $var, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr, 'var' => $var), array(), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('')
-            ->subcompile($this->getNode('var'))
-            ->raw(' = ')
-        ;
-
-        if ($this->getNode('expr') instanceof Twig_Node_Expression_Name && '_self' === $this->getNode('expr')->getAttribute('name')) {
-            $compiler->raw("\$this");
-        } else {
-            $compiler
-                ->raw('$this->env->loadTemplate(')
-                ->subcompile($this->getNode('expr'))
-                ->raw(")")
-            ;
-        }
-
-        $compiler->raw(";\n");
-    }
-}
diff --git a/inc/contrib/Twig/Node/Include.php b/inc/contrib/Twig/Node/Include.php
deleted file mode 100644
index 467749b5..00000000
--- a/inc/contrib/Twig/Node/Include.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an include node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr, 'variables' => $variables), array('only' => (Boolean) $only, 'ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-        if ($this->getAttribute('ignore_missing')) {
-            $compiler
-                ->write("try {\n")
-                ->indent()
-            ;
-        }
-
-        if ($this->getNode('expr') instanceof Twig_Node_Expression_Constant) {
-            $compiler
-                ->write("\$this->env->loadTemplate(")
-                ->subcompile($this->getNode('expr'))
-                ->raw(")->display(")
-            ;
-        } else {
-            $compiler
-                ->write("\$template = \$this->env->resolveTemplate(")
-                ->subcompile($this->getNode('expr'))
-                ->raw(");\n")
-                ->write('$template->display(')
-            ;
-        }
-
-        if (false === $this->getAttribute('only')) {
-            if (null === $this->getNode('variables')) {
-                $compiler->raw('$context');
-            } else {
-                $compiler
-                    ->raw('array_merge($context, ')
-                    ->subcompile($this->getNode('variables'))
-                    ->raw(')')
-                ;
-            }
-        } else {
-            if (null === $this->getNode('variables')) {
-                $compiler->raw('array()');
-            } else {
-                $compiler->subcompile($this->getNode('variables'));
-            }
-        }
-
-        $compiler->raw(");\n");
-
-        if ($this->getAttribute('ignore_missing')) {
-            $compiler
-                ->outdent()
-                ->write("} catch (Twig_Error_Loader \$e) {\n")
-                ->indent()
-                ->write("// ignore missing template\n")
-                ->outdent()
-                ->write("}\n\n")
-            ;
-        }
-    }
-}
diff --git a/inc/contrib/Twig/Node/Macro.php b/inc/contrib/Twig/Node/Macro.php
deleted file mode 100644
index 9f95570f..00000000
--- a/inc/contrib/Twig/Node/Macro.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a macro node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Macro extends Twig_Node
-{
-    public function __construct($name, Twig_NodeInterface $body, Twig_NodeInterface $arguments, $lineno, $tag = null)
-    {
-        parent::__construct(array('body' => $body, 'arguments' => $arguments), array('name' => $name), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $arguments = array();
-        foreach ($this->getNode('arguments') as $argument) {
-            $arguments[] = '$'.$argument->getAttribute('name').' = null';
-        }
-
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf("public function get%s(%s)\n", $this->getAttribute('name'), implode(', ', $arguments)), "{\n")
-            ->indent()
-            ->write("\$context = array_merge(\$this->env->getGlobals(), array(\n")
-            ->indent()
-        ;
-
-        foreach ($this->getNode('arguments') as $argument) {
-            $compiler
-                ->write('')
-                ->string($argument->getAttribute('name'))
-                ->raw(' => $'.$argument->getAttribute('name'))
-                ->raw(",\n")
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write("));\n\n")
-            ->write("ob_start();\n")
-            ->write("try {\n")
-            ->indent()
-            ->subcompile($this->getNode('body'))
-            ->outdent()
-            ->write("} catch(Exception \$e) {\n")
-            ->indent()
-            ->write("ob_end_clean();\n\n")
-            ->write("throw \$e;\n")
-            ->outdent()
-            ->write("}\n\n")
-            ->write("return ob_get_clean();\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/Node/Module.php b/inc/contrib/Twig/Node/Module.php
deleted file mode 100644
index 9b8c55e3..00000000
--- a/inc/contrib/Twig/Node/Module.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a module node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Module extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $parent = null, Twig_NodeInterface $blocks, Twig_NodeInterface $macros, Twig_NodeInterface $traits, $filename)
-    {
-        parent::__construct(array('parent' => $parent, 'body' => $body, 'blocks' => $blocks, 'macros' => $macros, 'traits' => $traits), array('filename' => $filename), 1);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $this->compileTemplate($compiler);
-    }
-
-    protected function compileTemplate(Twig_Compiler $compiler)
-    {
-        $this->compileClassHeader($compiler);
-
-        if (count($this->getNode('blocks')) || count($this->getNode('traits'))) {
-            $this->compileConstructor($compiler);
-        }
-
-        $this->compileGetParent($compiler);
-
-        $this->compileDisplayHeader($compiler);
-
-        $this->compileDisplayBody($compiler);
-
-        $this->compileDisplayFooter($compiler);
-
-        $compiler->subcompile($this->getNode('blocks'));
-
-        $this->compileMacros($compiler);
-
-        $this->compileGetTemplateName($compiler);
-
-        $this->compileIsTraitable($compiler);
-
-        $this->compileClassFooter($compiler);
-    }
-
-    protected function compileGetParent(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("protected function doGetParent(array \$context)\n", "{\n")
-            ->indent()
-            ->write("return ")
-        ;
-
-        if (null === $this->getNode('parent')) {
-            $compiler->raw("false");
-        } else {
-            if ($this->getNode('parent') instanceof Twig_Node_Expression_Constant) {
-                $compiler->subcompile($this->getNode('parent'));
-            } else {
-                $compiler
-                    ->raw("\$this->env->resolveTemplate(")
-                    ->subcompile($this->getNode('parent'))
-                    ->raw(")")
-                ;
-            }
-        }
-
-        $compiler
-            ->raw(";\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileDisplayBody(Twig_Compiler $compiler)
-    {
-        $compiler->write("\$context = array_merge(\$this->env->getGlobals(), \$context);\n\n");
-        $compiler->subcompile($this->getNode('body'));
-
-        if (null !== $this->getNode('parent')) {
-            $compiler->write("\$this->getParent(\$context)->display(\$context, array_merge(\$this->blocks, \$blocks));\n");
-        }
-    }
-
-    protected function compileClassHeader(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("<?php\n\n")
-            // if the filename contains */, add a blank to avoid a PHP parse error
-            ->write("/* ".str_replace('*/', '* /', $this->getAttribute('filename'))." */\n")
-            ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getAttribute('filename')))
-            ->raw(sprintf(" extends %s\n", $compiler->getEnvironment()->getBaseTemplateClass()))
-            ->write("{\n")
-            ->indent()
-        ;
-    }
-
-    protected function compileConstructor(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("public function __construct(Twig_Environment \$env)\n", "{\n")
-            ->indent()
-            ->write("parent::__construct(\$env);\n\n")
-        ;
-
-        $countTraits = count($this->getNode('traits'));
-        if ($countTraits) {
-            // traits
-            foreach ($this->getNode('traits') as $i => $trait) {
-                $this->compileLoadTemplate($compiler, $trait->getNode('template'), sprintf('$_trait_%s', $i));
-
-                $compiler
-                    ->addDebugInfo($trait->getNode('template'))
-                    ->write(sprintf("if (!\$_trait_%s->isTraitable()) {\n", $i))
-                    ->indent()
-                    ->write("throw new Twig_Error_Runtime('Template \"'.")
-                    ->subcompile($trait->getNode('template'))
-                    ->raw(".'\" cannot be used as a trait.');\n")
-                    ->outdent()
-                    ->write("}\n")
-                    ->write(sprintf("\$_trait_%s_blocks = \$_trait_%s->getBlocks();\n\n", $i, $i))
-                ;
-
-                foreach ($trait->getNode('targets') as $key => $value) {
-                    $compiler
-                        ->write(sprintf("\$_trait_%s_blocks[", $i))
-                        ->subcompile($value)
-                        ->raw(sprintf("] = \$_trait_%s_blocks[", $i))
-                        ->string($key)
-                        ->raw(sprintf("]; unset(\$_trait_%s_blocks[", $i))
-                        ->string($key)
-                        ->raw("]);\n\n")
-                    ;
-                }
-            }
-
-            $compiler
-                ->write("\$this->blocks = array_merge(\n")
-                ->indent()
-            ;
-
-            for ($i = 0; $i < $countTraits; $i++) {
-                $compiler
-                    ->write(sprintf("\$_trait_%s_blocks,\n", $i))
-                ;
-            }
-
-            $compiler
-                ->write("array(\n")
-            ;
-        } else {
-            $compiler
-                ->write("\$this->blocks = array(\n")
-            ;
-        }
-
-        // blocks
-        $compiler
-            ->indent()
-        ;
-
-        foreach ($this->getNode('blocks') as $name => $node) {
-            $compiler
-                ->write(sprintf("'%s' => array(\$this, 'block_%s'),\n", $name, $name))
-            ;
-        }
-
-        if ($countTraits) {
-            $compiler
-                ->outdent()
-                ->write(")\n")
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write(");\n")
-            ->outdent()
-            ->write("}\n\n");
-        ;
-    }
-
-    protected function compileDisplayHeader(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("protected function doDisplay(array \$context, array \$blocks = array())\n", "{\n")
-            ->indent()
-        ;
-    }
-
-    protected function compileDisplayFooter(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileClassFooter(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->outdent()
-            ->write("}\n")
-        ;
-    }
-
-    protected function compileMacros(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('macros'));
-    }
-
-    protected function compileGetTemplateName(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("public function getTemplateName()\n", "{\n")
-            ->indent()
-            ->write('return ')
-            ->repr($this->getAttribute('filename'))
-            ->raw(";\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileIsTraitable(Twig_Compiler $compiler)
-    {
-        // A template can be used as a trait if:
-        //   * it has no parent
-        //   * it has no macros
-        //   * it has no body
-        //
-        // Put another way, a template can be used as a trait if it
-        // only contains blocks and use statements.
-        $traitable = null === $this->getNode('parent') && 0 === count($this->getNode('macros'));
-        if ($traitable) {
-            if (!count($nodes = $this->getNode('body'))) {
-                $nodes = new Twig_Node(array($this->getNode('body')));
-            }
-
-            foreach ($nodes as $node) {
-                if ($node instanceof Twig_Node_Text && ctype_space($node->getAttribute('data'))) {
-                    continue;
-                }
-
-                if ($node instanceof Twig_Node_BlockReference) {
-                    continue;
-                }
-
-                $traitable = false;
-                break;
-            }
-        }
-
-        $compiler
-            ->write("public function isTraitable()\n", "{\n")
-            ->indent()
-            ->write(sprintf("return %s;\n", $traitable ? 'true' : 'false'))
-            ->outdent()
-            ->write("}\n")
-        ;
-    }
-
-    public function compileLoadTemplate(Twig_Compiler $compiler, $node, $var)
-    {
-        if ($node instanceof Twig_Node_Expression_Constant) {
-            $compiler
-                ->write(sprintf("%s = \$this->env->loadTemplate(", $var))
-                ->subcompile($node)
-                ->raw(");\n")
-            ;
-        } else {
-            $compiler
-                ->write(sprintf("%s = ", $var))
-                ->subcompile($node)
-                ->raw(";\n")
-                ->write(sprintf("if (!%s", $var))
-                ->raw(" instanceof Twig_Template) {\n")
-                ->indent()
-                ->write(sprintf("%s = \$this->env->loadTemplate(%s);\n", $var, $var))
-                ->outdent()
-                ->write("}\n")
-            ;
-        }
-    }
-}
diff --git a/inc/contrib/Twig/Node/Print.php b/inc/contrib/Twig/Node/Print.php
deleted file mode 100644
index 766725ff..00000000
--- a/inc/contrib/Twig/Node/Print.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node that outputs an expression.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Print extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('echo ')
-            ->subcompile($this->getNode('expr'))
-            ->raw(";\n")
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/Node/Sandbox.php b/inc/contrib/Twig/Node/Sandbox.php
deleted file mode 100644
index cbfcb411..00000000
--- a/inc/contrib/Twig/Node/Sandbox.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a sandbox node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Sandbox extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $body, $lineno, $tag = null)
-    {
-        parent::__construct(array('body' => $body), array(), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("\$sandbox = \$this->env->getExtension('sandbox');\n")
-            ->write("if (!\$alreadySandboxed = \$sandbox->isSandboxed()) {\n")
-            ->indent()
-            ->write("\$sandbox->enableSandbox();\n")
-            ->outdent()
-            ->write("}\n")
-            ->subcompile($this->getNode('body'))
-            ->write("if (!\$alreadySandboxed) {\n")
-            ->indent()
-            ->write("\$sandbox->disableSandbox();\n")
-            ->outdent()
-            ->write("}\n")
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/Node/SandboxedModule.php b/inc/contrib/Twig/Node/SandboxedModule.php
deleted file mode 100644
index 36d9f198..00000000
--- a/inc/contrib/Twig/Node/SandboxedModule.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a module node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_SandboxedModule extends Twig_Node_Module
-{
-    protected $usedFilters;
-    protected $usedTags;
-    protected $usedFunctions;
-
-    public function __construct(Twig_Node_Module $node, array $usedFilters, array $usedTags, array $usedFunctions)
-    {
-        parent::__construct($node->getNode('body'), $node->getNode('parent'), $node->getNode('blocks'), $node->getNode('macros'), $node->getNode('traits'), $node->getAttribute('filename'), $node->getLine(), $node->getNodeTag());
-
-        $this->usedFilters = $usedFilters;
-        $this->usedTags = $usedTags;
-        $this->usedFunctions = $usedFunctions;
-    }
-
-    protected function compileDisplayBody(Twig_Compiler $compiler)
-    {
-        if (null === $this->getNode('parent')) {
-            $compiler->write("\$this->checkSecurity();\n");
-        }
-
-        parent::compileDisplayBody($compiler);
-    }
-
-    protected function compileDisplayFooter(Twig_Compiler $compiler)
-    {
-        parent::compileDisplayFooter($compiler);
-
-        $compiler
-            ->write("protected function checkSecurity() {\n")
-            ->indent()
-            ->write("\$this->env->getExtension('sandbox')->checkSecurity(\n")
-            ->indent()
-            ->write(!$this->usedTags ? "array(),\n" : "array('".implode('\', \'', $this->usedTags)."'),\n")
-            ->write(!$this->usedFilters ? "array(),\n" : "array('".implode('\', \'', $this->usedFilters)."'),\n")
-            ->write(!$this->usedFunctions ? "array()\n" : "array('".implode('\', \'', $this->usedFunctions)."')\n")
-            ->outdent()
-            ->write(");\n")
-        ;
-
-        if (null !== $this->getNode('parent')) {
-            $compiler
-                ->raw("\n")
-                ->write("\$this->parent->checkSecurity();\n")
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/Node/SandboxedPrint.php b/inc/contrib/Twig/Node/SandboxedPrint.php
deleted file mode 100644
index 77730d8c..00000000
--- a/inc/contrib/Twig/Node/SandboxedPrint.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_Node_SandboxedPrint adds a check for the __toString() method
- * when the variable is an object and the sandbox is activated.
- *
- * When there is a simple Print statement, like {{ article }},
- * and if the sandbox is enabled, we need to check that the __toString()
- * method is allowed if 'article' is an object.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_SandboxedPrint extends Twig_Node_Print
-{
-    public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
-    {
-        parent::__construct($expr, $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('echo $this->env->getExtension(\'sandbox\')->ensureToStringAllowed(')
-            ->subcompile($this->getNode('expr'))
-            ->raw(");\n")
-        ;
-    }
-
-    /**
-     * Removes node filters.
-     *
-     * This is mostly needed when another visitor adds filters (like the escaper one).
-     *
-     * @param Twig_Node $node A Node
-     */
-    protected function removeNodeFilter($node)
-    {
-        if ($node instanceof Twig_Node_Expression_Filter) {
-            return $this->removeNodeFilter($node->getNode('node'));
-        }
-
-        return $node;
-    }
-}
diff --git a/inc/contrib/Twig/Node/Set.php b/inc/contrib/Twig/Node/Set.php
deleted file mode 100644
index 9913664f..00000000
--- a/inc/contrib/Twig/Node/Set.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a set node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Set extends Twig_Node
-{
-    public function __construct($capture, Twig_NodeInterface $names, Twig_NodeInterface $values, $lineno, $tag = null)
-    {
-        parent::__construct(array('names' => $names, 'values' => $values), array('capture' => $capture, 'safe' => false), $lineno, $tag);
-
-        /*
-         * Optimizes the node when capture is used for a large block of text.
-         *
-         * {% set foo %}foo{% endset %} is compiled to $context['foo'] = new Twig_Markup("foo");
-         */
-        if ($this->getAttribute('capture')) {
-            $this->setAttribute('safe', true);
-
-            $values = $this->getNode('values');
-            if ($values instanceof Twig_Node_Text) {
-                $this->setNode('values', new Twig_Node_Expression_Constant($values->getAttribute('data'), $values->getLine()));
-                $this->setAttribute('capture', false);
-            }
-        }
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-        if (count($this->getNode('names')) > 1) {
-            $compiler->write('list(');
-            foreach ($this->getNode('names') as $idx => $node) {
-                if ($idx) {
-                    $compiler->raw(', ');
-                }
-
-                $compiler->subcompile($node);
-            }
-            $compiler->raw(')');
-        } else {
-            if ($this->getAttribute('capture')) {
-                $compiler
-                    ->write("ob_start();\n")
-                    ->subcompile($this->getNode('values'))
-                ;
-            }
-
-            $compiler->subcompile($this->getNode('names'), false);
-
-            if ($this->getAttribute('capture')) {
-                $compiler->raw(" = new Twig_Markup(ob_get_clean())");
-            }
-        }
-
-        if (!$this->getAttribute('capture')) {
-            $compiler->raw(' = ');
-
-            if (count($this->getNode('names')) > 1) {
-                $compiler->write('array(');
-                foreach ($this->getNode('values') as $idx => $value) {
-                    if ($idx) {
-                        $compiler->raw(', ');
-                    }
-
-                    $compiler->subcompile($value);
-                }
-                $compiler->raw(')');
-            } else {
-                if ($this->getAttribute('safe')) {
-                    $compiler
-                        ->raw("new Twig_Markup(")
-                        ->subcompile($this->getNode('values'))
-                        ->raw(")")
-                    ;
-                } else {
-                    $compiler->subcompile($this->getNode('values'));
-                }
-            }
-        }
-
-        $compiler->raw(";\n");
-    }
-}
diff --git a/inc/contrib/Twig/Node/Spaceless.php b/inc/contrib/Twig/Node/Spaceless.php
deleted file mode 100644
index 46013466..00000000
--- a/inc/contrib/Twig/Node/Spaceless.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a spaceless node.
- *
- * It removes spaces between HTML tags.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Spaceless extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $body, $lineno, $tag = 'spaceless')
-    {
-        parent::__construct(array('body' => $body), array(), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("ob_start();\n")
-            ->subcompile($this->getNode('body'))
-            ->write("echo trim(preg_replace('/>\s+</', '><', ob_get_clean()));\n")
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/Node/Text.php b/inc/contrib/Twig/Node/Text.php
deleted file mode 100644
index 0c1c0928..00000000
--- a/inc/contrib/Twig/Node/Text.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a text node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Text extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct($data, $lineno)
-    {
-        parent::__construct(array(), array('data' => $data), $lineno);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('echo ')
-            ->string($this->getAttribute('data'))
-            ->raw(";\n")
-        ;
-    }
-}
diff --git a/inc/contrib/Twig/NodeInterface.php b/inc/contrib/Twig/NodeInterface.php
deleted file mode 100644
index 165aed4d..00000000
--- a/inc/contrib/Twig/NodeInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node in the AST.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_NodeInterface
-{
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    function compile(Twig_Compiler $compiler);
-
-    function getLine();
-
-    function getNodeTag();
-}
diff --git a/inc/contrib/Twig/NodeOutputInterface.php b/inc/contrib/Twig/NodeOutputInterface.php
deleted file mode 100644
index 71839569..00000000
--- a/inc/contrib/Twig/NodeOutputInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a displayable node in the AST.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_NodeOutputInterface
-{
-}
diff --git a/inc/contrib/Twig/NodeTraverser.php b/inc/contrib/Twig/NodeTraverser.php
deleted file mode 100644
index 1e82b032..00000000
--- a/inc/contrib/Twig/NodeTraverser.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeTraverser is a node traverser.
- *
- * It visits all nodes and their children and call the given visitor for each.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeTraverser
-{
-    protected $env;
-    protected $visitors;
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env      A Twig_Environment instance
-     * @param array            $visitors An array of Twig_NodeVisitorInterface instances
-     */
-    public function __construct(Twig_Environment $env, array $visitors = array())
-    {
-        $this->env = $env;
-        $this->visitors = array();
-        foreach ($visitors as $visitor) {
-            $this->addVisitor($visitor);
-        }
-    }
-
-    /**
-     * Adds a visitor.
-     *
-     * @param Twig_NodeVisitorInterface $visitor A Twig_NodeVisitorInterface instance
-     */
-    public function addVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        if (!isset($this->visitors[$visitor->getPriority()])) {
-            $this->visitors[$visitor->getPriority()] = array();
-        }
-
-        $this->visitors[$visitor->getPriority()][] = $visitor;
-    }
-
-    /**
-     * Traverses a node and calls the registered visitors.
-     *
-     * @param Twig_NodeInterface $node A Twig_NodeInterface instance
-     */
-    public function traverse(Twig_NodeInterface $node)
-    {
-        ksort($this->visitors);
-        foreach ($this->visitors as $visitors) {
-            foreach ($visitors as $visitor) {
-                $node = $this->traverseForVisitor($visitor, $node);
-            }
-        }
-
-        return $node;
-    }
-
-    protected function traverseForVisitor(Twig_NodeVisitorInterface $visitor, Twig_NodeInterface $node = null)
-    {
-        if (null === $node) {
-            return null;
-        }
-
-        $node = $visitor->enterNode($node, $this->env);
-
-        foreach ($node as $k => $n) {
-            if (false !== $n = $this->traverseForVisitor($visitor, $n)) {
-                $node->setNode($k, $n);
-            } else {
-                $node->removeNode($k);
-            }
-        }
-
-        return $visitor->leaveNode($node, $this->env);
-    }
-}
diff --git a/inc/contrib/Twig/NodeVisitor/Escaper.php b/inc/contrib/Twig/NodeVisitor/Escaper.php
deleted file mode 100644
index 049ce96a..00000000
--- a/inc/contrib/Twig/NodeVisitor/Escaper.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitor_Escaper implements output escaping.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface
-{
-    protected $statusStack = array();
-    protected $blocks = array();
-
-    protected $safeAnalysis;
-    protected $traverser;
-
-    function __construct()
-    {
-        $this->safeAnalysis = new Twig_NodeVisitor_SafeAnalysis();
-    }
-
-    /**
-     * Called before child nodes are visited.
-     *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
-     * @param Twig_NodeInterface The modified node
-     */
-    public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_AutoEscape) {
-            $this->statusStack[] = $node->getAttribute('value');
-        } elseif ($node instanceof Twig_Node_Block) {
-            $this->statusStack[] = isset($this->blocks[$node->getAttribute('name')]) ? $this->blocks[$node->getAttribute('name')] : $this->needEscaping($env);
-        }
-
-        return $node;
-    }
-
-    /**
-     * Called after child nodes are visited.
-     *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
-     * @param Twig_NodeInterface The modified node
-     */
-    public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Expression_Filter) {
-            return $this->preEscapeFilterNode($node, $env);
-        } elseif ($node instanceof Twig_Node_Print) {
-            return $this->escapePrintNode($node, $env, $this->needEscaping($env));
-        }
-
-        if ($node instanceof Twig_Node_AutoEscape || $node instanceof Twig_Node_Block) {
-            array_pop($this->statusStack);
-        } elseif ($node instanceof Twig_Node_BlockReference) {
-            $this->blocks[$node->getAttribute('name')] = $this->needEscaping($env);
-        }
-
-        return $node;
-    }
-
-    protected function escapePrintNode(Twig_Node_Print $node, Twig_Environment $env, $type)
-    {
-        if (false === $type) {
-            return $node;
-        }
-
-        $expression = $node->getNode('expr');
-
-        if ($this->isSafeFor($type, $expression, $env)) {
-            return $node;
-        }
-
-        $class = get_class($node);
-
-        return new $class(
-            $this->getEscaperFilter($type, $expression),
-            $node->getLine()
-        );
-    }
-
-    protected function preEscapeFilterNode(Twig_Node_Expression_Filter $filter, Twig_Environment $env)
-    {
-        $name = $filter->getNode('filter')->getAttribute('value');
-
-        if (false !== $f = $env->getFilter($name)) {
-            $type = $f->getPreEscape();
-            if (null === $type) {
-                return $filter;
-            }
-
-            $node = $filter->getNode('node');
-            if ($this->isSafeFor($type, $node, $env)) {
-                return $filter;
-            }
-
-            $filter->setNode('node', $this->getEscaperFilter($type, $node));
-
-            return $filter;
-        }
-
-        return $filter;
-    }
-
-    protected function isSafeFor($type, Twig_NodeInterface $expression, $env)
-    {
-        $safe = $this->safeAnalysis->getSafe($expression);
-
-        if (null === $safe) {
-            if (null === $this->traverser) {
-                $this->traverser = new Twig_NodeTraverser($env, array($this->safeAnalysis));
-            }
-            $this->traverser->traverse($expression);
-            $safe = $this->safeAnalysis->getSafe($expression);
-        }
-
-        return in_array($type, $safe) || in_array('all', $safe);
-    }
-
-    protected function needEscaping(Twig_Environment $env)
-    {
-        if (count($this->statusStack)) {
-            return $this->statusStack[count($this->statusStack) - 1];
-        }
-
-        if ($env->hasExtension('escaper') && $env->getExtension('escaper')->isGlobal()) {
-            return 'html';
-        }
-
-        return false;
-    }
-
-    protected function getEscaperFilter($type, Twig_NodeInterface $node)
-    {
-        $line = $node->getLine();
-        $name = new Twig_Node_Expression_Constant('escape', $line);
-        $args = new Twig_Node(array(new Twig_Node_Expression_Constant((string) $type, $line)));
-        return new Twig_Node_Expression_Filter($node, $name, $args, $line);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return 0;
-    }
-}
diff --git a/inc/contrib/Twig/NodeVisitor/Optimizer.php b/inc/contrib/Twig/NodeVisitor/Optimizer.php
deleted file mode 100644
index 3679746e..00000000
--- a/inc/contrib/Twig/NodeVisitor/Optimizer.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitor_Optimizer tries to optimizes the AST.
- *
- * This visitor is always the last registered one.
- *
- * You can configure which optimizations you want to activate via the
- * optimizer mode.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
-{
-    const OPTIMIZE_ALL         = -1;
-    const OPTIMIZE_NONE        = 0;
-    const OPTIMIZE_FOR         = 2;
-    const OPTIMIZE_RAW_FILTER  = 4;
-
-    protected $loops = array();
-    protected $optimizers;
-
-    /**
-     * Constructor.
-     *
-     * @param integer $optimizers The optimizer mode
-     */
-    public function __construct($optimizers = -1)
-    {
-        if (!is_int($optimizers) || $optimizers > 2) {
-            throw new InvalidArgumentException(sprintf('Optimizer mode "%s" is not valid.', $optimizers));
-        }
-
-        $this->optimizers = $optimizers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) {
-            $this->enterOptimizeFor($node, $env);
-        }
-
-        return $node;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) {
-            $this->leaveOptimizeFor($node, $env);
-        }
-
-        if (self::OPTIMIZE_RAW_FILTER === (self::OPTIMIZE_RAW_FILTER & $this->optimizers)) {
-            $node = $this->optimizeRawFilter($node, $env);
-        }
-
-        $node = $this->optimizeRenderBlock($node, $env);
-
-        return $node;
-    }
-
-    /**
-     * Replaces "echo $this->renderBlock()" with "$this->displayBlock()".
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     */
-    protected function optimizeRenderBlock($node, $env)
-    {
-        if ($node instanceof Twig_Node_Print && $node->getNode('expr') instanceof Twig_Node_Expression_BlockReference) {
-            $node->getNode('expr')->setAttribute('output', true);
-
-            return $node->getNode('expr');
-        }
-
-        return $node;
-    }
-
-    /**
-     * Removes "raw" filters.
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     */
-    protected function optimizeRawFilter($node, $env)
-    {
-        if ($node instanceof Twig_Node_Expression_Filter && 'raw' == $node->getNode('filter')->getAttribute('value')) {
-            return $node->getNode('node');
-        }
-
-        return $node;
-    }
-
-    /**
-     * Optimizes "for" tag by removing the "loop" variable creation whenever possible.
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     */
-    protected function enterOptimizeFor($node, $env)
-    {
-        if ($node instanceof Twig_Node_For) {
-            // disable the loop variable by default
-            $node->setAttribute('with_loop', false);
-            array_unshift($this->loops, $node);
-        } elseif (!$this->loops) {
-            // we are outside a loop
-            return;
-        }
-
-        // when do we need to add the loop variable back?
-
-        // the loop variable is referenced for the current loop
-        elseif ($node instanceof Twig_Node_Expression_Name && 'loop' === $node->getAttribute('name')) {
-            $this->addLoopToCurrent();
-        }
-
-        // block reference
-        elseif ($node instanceof Twig_Node_BlockReference || $node instanceof Twig_Node_Expression_BlockReference) {
-            $this->addLoopToCurrent();
-        }
-
-        // include without the only attribute
-        elseif ($node instanceof Twig_Node_Include && !$node->getAttribute('only')) {
-            $this->addLoopToAll();
-        }
-
-        // the loop variable is referenced via an attribute
-        elseif ($node instanceof Twig_Node_Expression_GetAttr
-            && (!$node->getNode('attribute') instanceof Twig_Node_Expression_Constant
-                || 'parent' === $node->getNode('attribute')->getAttribute('value')
-               )
-            && (true === $this->loops[0]->getAttribute('with_loop')
-                || ($node->getNode('node') instanceof Twig_Node_Expression_Name
-                    && 'loop' === $node->getNode('node')->getAttribute('name')
-                   )
-               )
-        ) {
-            $this->addLoopToAll();
-        }
-    }
-
-    /**
-     * Optimizes "for" tag by removing the "loop" variable creation whenever possible.
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     */
-    protected function leaveOptimizeFor($node, $env)
-    {
-        if ($node instanceof Twig_Node_For) {
-            array_shift($this->loops);
-        }
-    }
-
-    protected function addLoopToCurrent()
-    {
-        $this->loops[0]->setAttribute('with_loop', true);
-    }
-
-    protected function addLoopToAll()
-    {
-        foreach ($this->loops as $loop) {
-            $loop->setAttribute('with_loop', true);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return 255;
-    }
-}
diff --git a/inc/contrib/Twig/NodeVisitor/SafeAnalysis.php b/inc/contrib/Twig/NodeVisitor/SafeAnalysis.php
deleted file mode 100644
index 5961ba29..00000000
--- a/inc/contrib/Twig/NodeVisitor/SafeAnalysis.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-class Twig_NodeVisitor_SafeAnalysis implements Twig_NodeVisitorInterface
-{
-    protected $data = array();
-
-    public function getSafe(Twig_NodeInterface $node)
-    {
-        $hash = spl_object_hash($node);
-        if (isset($this->data[$hash])) {
-            foreach($this->data[$hash] as $bucket) {
-                if ($bucket['key'] === $node) {
-                    return $bucket['value'];
-                }
-            }
-        }
-        return null;
-    }
-
-    protected function setSafe(Twig_NodeInterface $node, array $safe)
-    {
-        $hash = spl_object_hash($node);
-        if (isset($this->data[$hash])) {
-            foreach($this->data[$hash] as &$bucket) {
-                if ($bucket['key'] === $node) {
-                    $bucket['value'] = $safe;
-                    return;
-                }
-            }
-        }
-        $this->data[$hash][] = array(
-            'key' => $node,
-            'value' => $safe,
-        );
-    }
-
-    public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        return $node;
-    }
-
-    public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Expression_Constant) {
-            // constants are marked safe for all
-            $this->setSafe($node, array('all'));
-        } elseif ($node instanceof Twig_Node_Expression_BlockReference) {
-            // blocks are safe by definition
-            $this->setSafe($node, array('all'));
-        } elseif ($node instanceof Twig_Node_Expression_Parent) {
-            // parent block is safe by definition
-            $this->setSafe($node, array('all'));
-        } elseif ($node instanceof Twig_Node_Expression_Conditional) {
-            // intersect safeness of both operands
-            $safe = $this->intersectSafe($this->getSafe($node->getNode('expr2')), $this->getSafe($node->getNode('expr3')));
-            $this->setSafe($node, $safe);
-        } elseif ($node instanceof Twig_Node_Expression_Filter) {
-            // filter expression is safe when the filter is safe
-            $name = $node->getNode('filter')->getAttribute('value');
-            $args = $node->getNode('arguments');
-            if (false !== $filter = $env->getFilter($name)) {
-                $this->setSafe($node, $filter->getSafe($args));
-            } else {
-                $this->setSafe($node, array());
-            }
-        } elseif ($node instanceof Twig_Node_Expression_Function) {
-            // function expression is safe when the function is safe
-            $name = $node->getAttribute('name');
-            $args = $node->getNode('arguments');
-            $function = $env->getFunction($name);
-            if (false !== $function) {
-                $this->setSafe($node, $function->getSafe($args));
-            } else {
-                $this->setSafe($node, array());
-            }
-        } else {
-            $this->setSafe($node, array());
-        }
-
-        return $node;
-    }
-
-    protected function intersectSafe(array $a = null, array $b = null)
-    {
-        if (null === $a || null === $b) {
-            return array();
-        }
-
-        if (in_array('all', $a)) {
-            return $b;
-        }
-
-        if (in_array('all', $b)) {
-            return $a;
-        }
-
-        return array_intersect($a, $b);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return 0;
-    }
-}
diff --git a/inc/contrib/Twig/NodeVisitor/Sandbox.php b/inc/contrib/Twig/NodeVisitor/Sandbox.php
deleted file mode 100644
index 356b661f..00000000
--- a/inc/contrib/Twig/NodeVisitor/Sandbox.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitor_Sandbox implements sandboxing.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeVisitor_Sandbox implements Twig_NodeVisitorInterface
-{
-    protected $inAModule = false;
-    protected $tags;
-    protected $filters;
-    protected $functions;
-
-    /**
-     * Called before child nodes are visited.
-     *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
-     * @param Twig_NodeInterface The modified node
-     */
-    public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $this->inAModule = true;
-            $this->tags = array();
-            $this->filters = array();
-            $this->functions = array();
-
-            return $node;
-        } elseif ($this->inAModule) {
-            // look for tags
-            if ($node->getNodeTag()) {
-                $this->tags[] = $node->getNodeTag();
-            }
-
-            // look for filters
-            if ($node instanceof Twig_Node_Expression_Filter) {
-                $this->filters[] = $node->getNode('filter')->getAttribute('value');
-            }
-
-            // look for functions
-            if ($node instanceof Twig_Node_Expression_Function) {
-                $this->functions[] = $node->getAttribute('name');
-            }
-
-            // wrap print to check __toString() calls
-            if ($node instanceof Twig_Node_Print) {
-                return new Twig_Node_SandboxedPrint($node->getNode('expr'), $node->getLine(), $node->getNodeTag());
-            }
-        }
-
-        return $node;
-    }
-
-    /**
-     * Called after child nodes are visited.
-     *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
-     * @param Twig_NodeInterface The modified node
-     */
-    public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $this->inAModule = false;
-
-            return new Twig_Node_SandboxedModule($node, array_unique($this->filters), array_unique($this->tags), array_unique($this->functions));
-        }
-
-        return $node;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return 0;
-    }
-}
diff --git a/inc/contrib/Twig/NodeVisitorInterface.php b/inc/contrib/Twig/NodeVisitorInterface.php
deleted file mode 100644
index d44e510c..00000000
--- a/inc/contrib/Twig/NodeVisitorInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitorInterface is the interface the all node visitor classes must implement.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_NodeVisitorInterface
-{
-    /**
-     * Called before child nodes are visited.
-     *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
-     * @param Twig_NodeInterface The modified node
-     */
-    function enterNode(Twig_NodeInterface $node, Twig_Environment $env);
-
-    /**
-     * Called after child nodes are visited.
-     *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
-     * @param Twig_NodeInterface The modified node
-     */
-    function leaveNode(Twig_NodeInterface $node, Twig_Environment $env);
-
-    /**
-     * Returns the priority for this visitor.
-     *
-     * Priority should be between -10 and 10 (0 is the default).
-     *
-     * @return integer The priority level
-     */
-    function getPriority();
-}
diff --git a/inc/contrib/Twig/Parser.php b/inc/contrib/Twig/Parser.php
deleted file mode 100644
index 8c982887..00000000
--- a/inc/contrib/Twig/Parser.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default parser implementation.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Parser implements Twig_ParserInterface
-{
-    protected $stream;
-    protected $parent;
-    protected $handlers;
-    protected $visitors;
-    protected $expressionParser;
-    protected $blocks;
-    protected $blockStack;
-    protected $macros;
-    protected $env;
-    protected $reservedMacroNames;
-    protected $importedFunctions;
-    protected $tmpVarCount;
-    protected $traits;
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env A Twig_Environment instance
-     */
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-    }
-
-    public function getVarName()
-    {
-        return sprintf('__internal_%s_%d', substr($this->env->getTemplateClass($this->stream->getFilename()), strlen($this->env->getTemplateClassPrefix())), ++$this->tmpVarCount);
-    }
-
-    /**
-     * Converts a token stream to a node tree.
-     *
-     * @param  Twig_TokenStream $stream A token stream instance
-     *
-     * @return Twig_Node_Module A node tree
-     */
-    public function parse(Twig_TokenStream $stream)
-    {
-        $this->tmpVarCount = 0;
-
-        // tag handlers
-        $this->handlers = $this->env->getTokenParsers();
-        $this->handlers->setParser($this);
-
-        // node visitors
-        $this->visitors = $this->env->getNodeVisitors();
-
-        if (null === $this->expressionParser) {
-            $this->expressionParser = new Twig_ExpressionParser($this, $this->env->getUnaryOperators(), $this->env->getBinaryOperators());
-        }
-
-        $this->stream = $stream;
-        $this->parent = null;
-        $this->blocks = array();
-        $this->macros = array();
-        $this->traits = array();
-        $this->blockStack = array();
-        $this->importedFunctions = array(array());
-
-        try {
-            $body = $this->subparse(null);
-
-            if (null !== $this->parent) {
-                if (null === $body = $this->filterBodyNodes($body)) {
-                    $body = new Twig_Node();
-                }
-            }
-        } catch (Twig_Error_Syntax $e) {
-            if (null === $e->getTemplateFile()) {
-                $e->setTemplateFile($this->stream->getFilename());
-            }
-
-            throw $e;
-        }
-
-        $node = new Twig_Node_Module($body, $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->stream->getFilename());
-
-        $traverser = new Twig_NodeTraverser($this->env, $this->visitors);
-
-        return $traverser->traverse($node);
-    }
-
-    public function subparse($test, $dropNeedle = false)
-    {
-        $lineno = $this->getCurrentToken()->getLine();
-        $rv = array();
-        while (!$this->stream->isEOF()) {
-            switch ($this->getCurrentToken()->getType()) {
-                case Twig_Token::TEXT_TYPE:
-                    $token = $this->stream->next();
-                    $rv[] = new Twig_Node_Text($token->getValue(), $token->getLine());
-                    break;
-
-                case Twig_Token::VAR_START_TYPE:
-                    $token = $this->stream->next();
-                    $expr = $this->expressionParser->parseExpression();
-                    $this->stream->expect(Twig_Token::VAR_END_TYPE);
-                    $rv[] = new Twig_Node_Print($expr, $token->getLine());
-                    break;
-
-                case Twig_Token::BLOCK_START_TYPE:
-                    $this->stream->next();
-                    $token = $this->getCurrentToken();
-
-                    if ($token->getType() !== Twig_Token::NAME_TYPE) {
-                        throw new Twig_Error_Syntax('A block must start with a tag name', $token->getLine(), $this->stream->getFilename());
-                    }
-
-                    if (null !== $test && call_user_func($test, $token)) {
-                        if ($dropNeedle) {
-                            $this->stream->next();
-                        }
-
-                        if (1 === count($rv)) {
-                            return $rv[0];
-                        }
-
-                        return new Twig_Node($rv, array(), $lineno);
-                    }
-
-                    $subparser = $this->handlers->getTokenParser($token->getValue());
-                    if (null === $subparser) {
-                        if (null !== $test) {
-                            throw new Twig_Error_Syntax(sprintf('Unexpected tag name "%s" (expecting closing tag for the "%s" tag defined near line %s)', $token->getValue(), $test[0]->getTag(), $lineno), $token->getLine(), $this->stream->getFilename());
-                        }
-
-                        throw new Twig_Error_Syntax(sprintf('Unknown tag name "%s"', $token->getValue()), $token->getLine(), $this->stream->getFilename());
-                    }
-
-                    $this->stream->next();
-
-                    $node = $subparser->parse($token);
-                    if (null !== $node) {
-                        $rv[] = $node;
-                    }
-                    break;
-
-                default:
-                    throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', -1, $this->stream->getFilename());
-            }
-        }
-
-        if (1 === count($rv)) {
-            return $rv[0];
-        }
-
-        return new Twig_Node($rv, array(), $lineno);
-    }
-
-    public function addHandler($name, $class)
-    {
-        $this->handlers[$name] = $class;
-    }
-
-    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        $this->visitors[] = $visitor;
-    }
-
-    public function getBlockStack()
-    {
-        return $this->blockStack;
-    }
-
-    public function peekBlockStack()
-    {
-        return $this->blockStack[count($this->blockStack) - 1];
-    }
-
-    public function popBlockStack()
-    {
-        array_pop($this->blockStack);
-    }
-
-    public function pushBlockStack($name)
-    {
-        $this->blockStack[] = $name;
-    }
-
-    public function hasBlock($name)
-    {
-        return isset($this->blocks[$name]);
-    }
-
-    public function setBlock($name, $value)
-    {
-        $this->blocks[$name] = $value;
-    }
-
-    public function hasMacro($name)
-    {
-        return isset($this->macros[$name]);
-    }
-
-    public function setMacro($name, Twig_Node_Macro $node)
-    {
-        if (null === $this->reservedMacroNames) {
-            $this->reservedMacroNames = array();
-            $r = new ReflectionClass($this->env->getBaseTemplateClass());
-            foreach ($r->getMethods() as $method) {
-                $this->reservedMacroNames[] = $method->getName();
-            }
-        }
-
-        if (in_array($name, $this->reservedMacroNames)) {
-            throw new Twig_Error_Syntax(sprintf('"%s" cannot be used as a macro name as it is a reserved keyword', $name), $node->getLine());
-        }
-
-        $this->macros[$name] = $node;
-    }
-
-    public function addTrait($trait)
-    {
-        $this->traits[] = $trait;
-    }
-
-    public function addImportedFunction($alias, $name, Twig_Node_Expression $node)
-    {
-        $this->importedFunctions[0][$alias] = array('name' => $name, 'node' => $node);
-    }
-
-    public function getImportedFunction($alias)
-    {
-        foreach ($this->importedFunctions as $functions) {
-            if (isset($functions[$alias])) {
-                return $functions[$alias];
-            }
-        }
-    }
-
-    public function isMainScope()
-    {
-        return 1 === count($this->importedFunctions);
-    }
-
-    public function pushLocalScope()
-    {
-        array_unshift($this->importedFunctions, array());
-    }
-
-    public function popLocalScope()
-    {
-        array_shift($this->importedFunctions);
-    }
-
-    /**
-     * Gets the expression parser.
-     *
-     * @return Twig_ExpressionParser The expression parser
-     */
-    public function getExpressionParser()
-    {
-        return $this->expressionParser;
-    }
-
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    public function setParent($parent)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * Gets the token stream.
-     *
-     * @return Twig_TokenStream The token stream
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-
-    /**
-     * Gets the current token.
-     *
-     * @return Twig_Token The current token
-     */
-    public function getCurrentToken()
-    {
-        return $this->stream->getCurrent();
-    }
-
-    protected function filterBodyNodes(Twig_NodeInterface $node)
-    {
-        // check that the body does not contain non-empty output nodes
-        if (
-            ($node instanceof Twig_Node_Text && !ctype_space($node->getAttribute('data')))
-            ||
-            (!$node instanceof Twig_Node_Text && !$node instanceof Twig_Node_BlockReference && $node instanceof Twig_NodeOutputInterface)
-        ) {
-            throw new Twig_Error_Syntax('A template that extends another one cannot have a body.', $node->getLine(), $this->stream->getFilename());
-        }
-
-        // bypass "set" nodes as they "capture" the output
-        if ($node instanceof Twig_Node_Set) {
-            return $node;
-        }
-
-        if ($node instanceof Twig_NodeOutputInterface) {
-            return;
-        }
-
-        foreach ($node as $k => $n) {
-            if (null !== $n && null === $n = $this->filterBodyNodes($n)) {
-                $node->removeNode($k);
-            }
-        }
-
-        return $node;
-    }
-}
diff --git a/inc/contrib/Twig/ParserInterface.php b/inc/contrib/Twig/ParserInterface.php
deleted file mode 100644
index c7a34418..00000000
--- a/inc/contrib/Twig/ParserInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by parser classes.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_ParserInterface
-{
-    /**
-     * Converts a token stream to a node tree.
-     *
-     * @param  Twig_TokenStream $stream A token stream instance
-     *
-     * @return Twig_Node_Module A node tree
-     */
-    function parse(Twig_TokenStream $code);
-}
diff --git a/inc/contrib/Twig/Sandbox/SecurityError.php b/inc/contrib/Twig/Sandbox/SecurityError.php
deleted file mode 100644
index debabb79..00000000
--- a/inc/contrib/Twig/Sandbox/SecurityError.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a security error occurs at runtime.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Sandbox_SecurityError extends Twig_Error
-{
-}
diff --git a/inc/contrib/Twig/Sandbox/SecurityPolicy.php b/inc/contrib/Twig/Sandbox/SecurityPolicy.php
deleted file mode 100644
index ba912ef4..00000000
--- a/inc/contrib/Twig/Sandbox/SecurityPolicy.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a security policy which need to be enforced when sandbox mode is enabled.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterface
-{
-    protected $allowedTags;
-    protected $allowedFilters;
-    protected $allowedMethods;
-    protected $allowedProperties;
-    protected $allowedFunctions;
-
-    public function __construct(array $allowedTags = array(), array $allowedFilters = array(), array $allowedMethods = array(), array $allowedProperties = array(), array $allowedFunctions = array())
-    {
-        $this->allowedTags = $allowedTags;
-        $this->allowedFilters = $allowedFilters;
-        $this->setAllowedMethods($allowedMethods);
-        $this->allowedProperties = $allowedProperties;
-        $this->allowedFunctions = $allowedFunctions;
-    }
-
-    public function setAllowedTags(array $tags)
-    {
-        $this->allowedTags = $tags;
-    }
-
-    public function setAllowedFilters(array $filters)
-    {
-        $this->allowedFilters = $filters;
-    }
-
-    public function setAllowedMethods(array $methods)
-    {
-        $this->allowedMethods = array();
-        foreach ($methods as $class => $m) {
-            $this->allowedMethods[$class] = array_map('strtolower', is_array($m) ? $m : array($m));
-        }
-    }
-
-    public function setAllowedProperties(array $properties)
-    {
-        $this->allowedProperties = $properties;
-    }
-
-    public function setAllowedFunctions(array $functions)
-    {
-        $this->allowedFunctions = $functions;
-    }
-
-    public function checkSecurity($tags, $filters, $functions)
-    {
-        foreach ($tags as $tag) {
-            if (!in_array($tag, $this->allowedTags)) {
-                throw new Twig_Sandbox_SecurityError(sprintf('Tag "%s" is not allowed.', $tag));
-            }
-        }
-
-        foreach ($filters as $filter) {
-            if (!in_array($filter, $this->allowedFilters)) {
-                throw new Twig_Sandbox_SecurityError(sprintf('Filter "%s" is not allowed.', $filter));
-            }
-        }
-
-        foreach ($functions as $function) {
-            if (!in_array($function, $this->allowedFunctions)) {
-                throw new Twig_Sandbox_SecurityError(sprintf('Function "%s" is not allowed.', $function));
-            }
-        }
-    }
-
-    public function checkMethodAllowed($obj, $method)
-    {
-        if ($obj instanceof Twig_TemplateInterface || $obj instanceof Twig_Markup) {
-            return true;
-        }
-
-        $allowed = false;
-        $method = strtolower($method);
-        foreach ($this->allowedMethods as $class => $methods) {
-            if ($obj instanceof $class) {
-                $allowed = in_array($method, $methods);
-
-                break;
-            }
-        }
-
-        if (!$allowed) {
-            throw new Twig_Sandbox_SecurityError(sprintf('Calling "%s" method on a "%s" object is not allowed.', $method, get_class($obj)));
-        }
-    }
-
-    public function checkPropertyAllowed($obj, $property)
-    {
-        $allowed = false;
-        foreach ($this->allowedProperties as $class => $properties) {
-            if ($obj instanceof $class) {
-                $allowed = in_array($property, is_array($properties) ? $properties : array($properties));
-
-                break;
-            }
-        }
-
-        if (!$allowed) {
-            throw new Twig_Sandbox_SecurityError(sprintf('Calling "%s" property on a "%s" object is not allowed.', $property, get_class($obj)));
-        }
-    }
-}
diff --git a/inc/contrib/Twig/Sandbox/SecurityPolicyInterface.php b/inc/contrib/Twig/Sandbox/SecurityPolicyInterface.php
deleted file mode 100644
index d5015aff..00000000
--- a/inc/contrib/Twig/Sandbox/SecurityPolicyInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interfaces that all security policy classes must implements.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_Sandbox_SecurityPolicyInterface
-{
-    function checkSecurity($tags, $filters, $functions);
-
-    function checkMethodAllowed($obj, $method);
-
-    function checkPropertyAllowed($obj, $method);
-}
diff --git a/inc/contrib/Twig/Template.php b/inc/contrib/Twig/Template.php
deleted file mode 100644
index a129fd73..00000000
--- a/inc/contrib/Twig/Template.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default base class for compiled templates.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_Template implements Twig_TemplateInterface
-{
-    static protected $cache = array();
-
-    protected $parents;
-    protected $env;
-    protected $blocks;
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env A Twig_Environment instance
-     */
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-        $this->blocks = array();
-    }
-
-    /**
-     * Returns the template name.
-     *
-     * @return string The template name
-     */
-    abstract public function getTemplateName();
-
-    /**
-     * Returns the Twig environment.
-     *
-     * @return Twig_Environment The Twig environment
-     */
-    public function getEnvironment()
-    {
-        return $this->env;
-    }
-
-    /**
-     * Returns the parent template.
-     *
-     * @return Twig_TemplateInterface|false The parent template or false if there is no parent
-     */
-    public function getParent(array $context)
-    {
-        $parent = $this->doGetParent($context);
-        if (false === $parent) {
-            return false;
-        } elseif ($parent instanceof Twig_Template) {
-            $name = $parent->getTemplateName();
-            $this->parents[$name] = $parent;
-            $parent = $name;
-        } elseif (!isset($this->parents[$parent])) {
-            $this->parents[$parent] = $this->env->loadTemplate($parent);
-        }
-
-        return $this->parents[$parent];
-    }
-
-    abstract protected function doGetParent(array $context);
-
-    /**
-     * Displays a parent block.
-     *
-     * @param string $name    The block name to display from the parent
-     * @param array  $context The context
-     * @param array  $blocks  The current set of blocks
-     */
-    public function displayParentBlock($name, array $context, array $blocks = array())
-    {
-        if (false !== $parent = $this->getParent($context)) {
-            $parent->displayBlock($name, $context, $blocks);
-        } else {
-            throw new Twig_Error_Runtime('This template has no parent', -1, $this->getTemplateName());
-        }
-    }
-
-    /**
-     * Displays a block.
-     *
-     * @param string $name    The block name to display
-     * @param array  $context The context
-     * @param array  $blocks  The current set of blocks
-     */
-    public function displayBlock($name, array $context, array $blocks = array())
-    {
-        if (isset($blocks[$name])) {
-            $b = $blocks;
-            unset($b[$name]);
-            call_user_func($blocks[$name], $context, $b);
-        } elseif (isset($this->blocks[$name])) {
-            call_user_func($this->blocks[$name], $context, $blocks);
-        } elseif (false !== $parent = $this->getParent($context)) {
-            $parent->displayBlock($name, $context, array_merge($this->blocks, $blocks));
-        }
-    }
-
-    /**
-     * Renders a parent block.
-     *
-     * @param string $name    The block name to render from the parent
-     * @param array  $context The context
-     * @param array  $blocks  The current set of blocks
-     *
-     * @return string The rendered block
-     */
-    public function renderParentBlock($name, array $context, array $blocks = array())
-    {
-        ob_start();
-        $this->displayParentBlock($name, $context, $blocks);
-
-        return ob_get_clean();
-    }
-
-    /**
-     * Renders a block.
-     *
-     * @param string $name    The block name to render
-     * @param array  $context The context
-     * @param array  $blocks  The current set of blocks
-     *
-     * @return string The rendered block
-     */
-    public function renderBlock($name, array $context, array $blocks = array())
-    {
-        ob_start();
-        $this->displayBlock($name, $context, $blocks);
-
-        return ob_get_clean();
-    }
-
-    /**
-     * Returns whether a block exists or not.
-     *
-     * @param string $name The block name
-     *
-     * @return Boolean true if the block exists, false otherwise
-     */
-    public function hasBlock($name)
-    {
-        return isset($this->blocks[$name]);
-    }
-
-    /**
-     * Returns all block names.
-     *
-     * @return array An array of block names
-     */
-    public function getBlockNames()
-    {
-        return array_keys($this->blocks);
-    }
-
-    /**
-     * Returns all blocks.
-     *
-     * @return array An array of blocks
-     */
-    public function getBlocks()
-    {
-        return $this->blocks;
-    }
-
-    /**
-     * Displays the template with the given context.
-     *
-     * @param array $context An array of parameters to pass to the template
-     * @param array $blocks  An array of blocks to pass to the template
-     */
-    public function display(array $context, array $blocks = array())
-    {
-        try {
-            $this->doDisplay($context, $blocks);
-        } catch (Twig_Error $e) {
-            throw $e;
-        } catch (Exception $e) {
-            throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, null, $e);
-        }
-    }
-
-    /**
-     * Renders the template with the given context and returns it as string.
-     *
-     * @param array $context An array of parameters to pass to the template
-     *
-     * @return string The rendered template
-     */
-    public function render(array $context)
-    {
-        $level = ob_get_level();
-        ob_start();
-        try {
-            $this->display($context);
-        } catch (Exception $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-
-            throw $e;
-        }
-
-        return ob_get_clean();
-    }
-
-    /**
-     * Auto-generated method to display the template with the given context.
-     *
-     * @param array $context An array of parameters to pass to the template
-     * @param array $blocks  An array of blocks to pass to the template
-     */
-    abstract protected function doDisplay(array $context, array $blocks = array());
-
-    /**
-     * Returns a variable from the context.
-     *
-     * @param array   $context The context
-     * @param string  $item    The variable to return from the context
-     *
-     * @return The content of the context variable
-     *
-     * @throws Twig_Error_Runtime if the variable does not exist and Twig is running in strict mode
-     */
-    protected function getContext($context, $item)
-    {
-        if (!array_key_exists($item, $context)) {
-            if (!$this->env->isStrictVariables()) {
-                return null;
-            }
-
-            throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist', $item));
-        }
-
-        return $context[$item];
-    }
-
-    /**
-     * Returns the attribute value for a given array/object.
-     *
-     * @param mixed   $object        The object or array from where to get the item
-     * @param mixed   $item          The item to get from the array or object
-     * @param array   $arguments     An array of arguments to pass if the item is an object method
-     * @param string  $type          The type of attribute (@see Twig_TemplateInterface)
-     * @param Boolean $isDefinedTest Whether this is only a defined check
-     */
-    protected function getAttribute($object, $item, array $arguments = array(), $type = Twig_TemplateInterface::ANY_CALL, $isDefinedTest = false)
-    {
-        // array
-        if (Twig_TemplateInterface::METHOD_CALL !== $type) {
-            if ((is_array($object) && array_key_exists($item, $object))
-                || ($object instanceof ArrayAccess && isset($object[$item]))
-            ) {
-                if ($isDefinedTest) {
-                    return true;
-                }
-
-                return $object[$item];
-            }
-
-            if (Twig_TemplateInterface::ARRAY_CALL === $type) {
-                if ($isDefinedTest) {
-                    return false;
-                }
-
-                if (!$this->env->isStrictVariables()) {
-                    return null;
-                }
-
-                if (is_object($object)) {
-                    throw new Twig_Error_Runtime(sprintf('Key "%s" in object (with ArrayAccess) of type "%s" does not exist', $item, get_class($object)));
-                // array
-                } else {
-                    throw new Twig_Error_Runtime(sprintf('Key "%s" for array with keys "%s" does not exist', $item, implode(', ', array_keys($object))));
-                }
-            }
-        }
-
-        if (!is_object($object)) {
-            if ($isDefinedTest) {
-                return false;
-            }
-
-            if (!$this->env->isStrictVariables()) {
-                return null;
-            }
-
-            throw new Twig_Error_Runtime(sprintf('Item "%s" for "%s" does not exist', $item, $object));
-        }
-
-        // get some information about the object
-        $class = get_class($object);
-        if (!isset(self::$cache[$class])) {
-            $r = new ReflectionClass($class);
-            self::$cache[$class] = array('methods' => array(), 'properties' => array());
-            foreach ($r->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-                self::$cache[$class]['methods'][strtolower($method->getName())] = true;
-            }
-
-            foreach ($r->getProperties(ReflectionProperty::IS_PUBLIC) as $property) {
-                self::$cache[$class]['properties'][$property->getName()] = true;
-            }
-        }
-
-        // object property
-        if (Twig_TemplateInterface::METHOD_CALL !== $type) {
-            if (isset(self::$cache[$class]['properties'][$item])
-                || isset($object->$item) || array_key_exists($item, $object)
-            ) {
-                if ($isDefinedTest) {
-                    return true;
-                }
-
-                if ($this->env->hasExtension('sandbox')) {
-                    $this->env->getExtension('sandbox')->checkPropertyAllowed($object, $item);
-                }
-
-                return $object->$item;
-            }
-        }
-
-        // object method
-        $lcItem = strtolower($item);
-        if (isset(self::$cache[$class]['methods'][$lcItem])) {
-            $method = $item;
-        } elseif (isset(self::$cache[$class]['methods']['get'.$lcItem])) {
-            $method = 'get'.$item;
-        } elseif (isset(self::$cache[$class]['methods']['is'.$lcItem])) {
-            $method = 'is'.$item;
-        } elseif (isset(self::$cache[$class]['methods']['__call'])) {
-            $method = $item;
-        } else {
-            if ($isDefinedTest) {
-                return false;
-            }
-
-            if (!$this->env->isStrictVariables()) {
-                return null;
-            }
-
-            throw new Twig_Error_Runtime(sprintf('Method "%s" for object "%s" does not exist', $item, get_class($object)));
-        }
-
-        if ($isDefinedTest) {
-            return true;
-        }
-
-        if ($this->env->hasExtension('sandbox')) {
-            $this->env->getExtension('sandbox')->checkMethodAllowed($object, $method);
-        }
-
-        $ret = call_user_func_array(array($object, $method), $arguments);
-
-        if ($object instanceof Twig_TemplateInterface) {
-            return new Twig_Markup($ret);
-        }
-
-        return $ret;
-    }
-}
diff --git a/inc/contrib/Twig/TemplateInterface.php b/inc/contrib/Twig/TemplateInterface.php
deleted file mode 100644
index 08da1163..00000000
--- a/inc/contrib/Twig/TemplateInterface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by all compiled templates.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_TemplateInterface
-{
-    const ANY_CALL    = 'any';
-    const ARRAY_CALL  = 'array';
-    const METHOD_CALL = 'method';
-
-    /**
-     * Renders the template with the given context and returns it as string.
-     *
-     * @param array $context An array of parameters to pass to the template
-     *
-     * @return string The rendered template
-     */
-    function render(array $context);
-
-    /**
-     * Displays the template with the given context.
-     *
-     * @param array $context An array of parameters to pass to the template
-     * @param array $blocks  An array of blocks to pass to the template
-     */
-    function display(array $context, array $blocks = array());
-
-    /**
-     * Returns the bound environment for this template.
-     *
-     * @return Twig_Environment The current environment
-     */
-    function getEnvironment();
-}
diff --git a/inc/contrib/Twig/Test/Function.php b/inc/contrib/Twig/Test/Function.php
deleted file mode 100644
index 1240a0f1..00000000
--- a/inc/contrib/Twig/Test/Function.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a function template test.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Test_Function implements Twig_TestInterface
-{
-    protected $function;
-
-    public function __construct($function)
-    {
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/inc/contrib/Twig/Test/Method.php b/inc/contrib/Twig/Test/Method.php
deleted file mode 100644
index a3b39483..00000000
--- a/inc/contrib/Twig/Test/Method.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a method template test.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Test_Method implements Twig_TestInterface
-{
-    protected $extension, $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method)
-    {
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
-    }
-}
diff --git a/inc/contrib/Twig/TestInterface.php b/inc/contrib/Twig/TestInterface.php
deleted file mode 100644
index c2ff7258..00000000
--- a/inc/contrib/Twig/TestInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template test.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_TestInterface
-{
-    /**
-     * Compiles a test.
-     *
-     * @return string The PHP code for the test
-     */
-    function compile();
-}
diff --git a/inc/contrib/Twig/Token.php b/inc/contrib/Twig/Token.php
deleted file mode 100644
index 79a10030..00000000
--- a/inc/contrib/Twig/Token.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a Token.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Token
-{
-    protected $value;
-    protected $type;
-    protected $lineno;
-
-    const EOF_TYPE         = -1;
-    const TEXT_TYPE        = 0;
-    const BLOCK_START_TYPE = 1;
-    const VAR_START_TYPE   = 2;
-    const BLOCK_END_TYPE   = 3;
-    const VAR_END_TYPE     = 4;
-    const NAME_TYPE        = 5;
-    const NUMBER_TYPE      = 6;
-    const STRING_TYPE      = 7;
-    const OPERATOR_TYPE    = 8;
-    const PUNCTUATION_TYPE = 9;
-
-    /**
-     * Constructor.
-     *
-     * @param integer $type   The type of the token
-     * @param string  $value  The token value
-     * @param integer $lineno The line position in the source
-     */
-    public function __construct($type, $value, $lineno)
-    {
-        $this->type   = $type;
-        $this->value  = $value;
-        $this->lineno = $lineno;
-    }
-
-    /**
-     * Returns a string representation of the token.
-     *
-     * @return string A string representation of the token
-     */
-    public function __toString()
-    {
-        return sprintf('%s(%s)', self::typeToString($this->type, true, $this->lineno), $this->value);
-    }
-
-    /**
-     * Tests the current token for a type and/or a value.
-     *
-     * Parameters may be:
-     * * just type
-     * * type and value (or array of possible values)
-     * * just value (or array of possible values) (NAME_TYPE is used as type)
-     *
-     * @param array|integer     $type   The type to test
-     * @param array|string|null $values The token value
-     *
-     * @return Boolean
-     */
-    public function test($type, $values = null)
-    {
-        if (null === $values && !is_int($type)) {
-            $values = $type;
-            $type = self::NAME_TYPE;
-        }
-
-        return ($this->type === $type) && (
-            null === $values ||
-            (is_array($values) && in_array($this->value, $values)) ||
-            $this->value == $values
-        );
-    }
-
-    /**
-     * Gets the line.
-     *
-     * @return integer The source line
-     */
-    public function getLine()
-    {
-        return $this->lineno;
-    }
-
-    /**
-     * Gets the token type.
-     *
-     * @return integer The token type
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Gets the token value.
-     *
-     * @return string The token value
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns the constant representation (internal) of a given type.
-     *
-     * @param integer $type  The type as an integer
-     * @param Boolean $short Whether to return a short representation or not
-     *
-     * @return string The string representation
-     */
-    static public function typeToString($type, $short = false, $line = -1)
-    {
-        switch ($type) {
-            case self::EOF_TYPE:
-                $name = 'EOF_TYPE';
-                break;
-            case self::TEXT_TYPE:
-                $name = 'TEXT_TYPE';
-                break;
-            case self::BLOCK_START_TYPE:
-                $name = 'BLOCK_START_TYPE';
-                break;
-            case self::VAR_START_TYPE:
-                $name = 'VAR_START_TYPE';
-                break;
-            case self::BLOCK_END_TYPE:
-                $name = 'BLOCK_END_TYPE';
-                break;
-            case self::VAR_END_TYPE:
-                $name = 'VAR_END_TYPE';
-                break;
-            case self::NAME_TYPE:
-                $name = 'NAME_TYPE';
-                break;
-            case self::NUMBER_TYPE:
-                $name = 'NUMBER_TYPE';
-                break;
-            case self::STRING_TYPE:
-                $name = 'STRING_TYPE';
-                break;
-            case self::OPERATOR_TYPE:
-                $name = 'OPERATOR_TYPE';
-                break;
-            case self::PUNCTUATION_TYPE:
-                $name = 'PUNCTUATION_TYPE';
-                break;
-            default:
-                throw new Twig_Error_Syntax(sprintf('Token of type "%s" does not exist.', $type), $line);
-        }
-
-        return $short ? $name : 'Twig_Token::'.$name;
-    }
-
-    /**
-     * Returns the english representation of a given type.
-     *
-     * @param integer $type  The type as an integer
-     * @param Boolean $short Whether to return a short representation or not
-     *
-     * @return string The string representation
-     */
-    static public function typeToEnglish($type, $line = -1)
-    {
-        switch ($type) {
-            case self::EOF_TYPE:
-                return 'end of template';
-            case self::TEXT_TYPE:
-                return 'text';
-            case self::BLOCK_START_TYPE:
-                return 'begin of statement block';
-            case self::VAR_START_TYPE:
-                return 'begin of print statement';
-            case self::BLOCK_END_TYPE:
-                return 'end of statement block';
-            case self::VAR_END_TYPE:
-                return 'end of print statement';
-            case self::NAME_TYPE:
-                return 'name';
-            case self::NUMBER_TYPE:
-                return 'number';
-            case self::STRING_TYPE:
-                return 'string';
-            case self::OPERATOR_TYPE:
-                return 'operator';
-            case self::PUNCTUATION_TYPE:
-                return 'punctuation';
-            default:
-                throw new Twig_Error_Syntax(sprintf('Token of type "%s" does not exist.', $type), $line);
-        }
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser.php b/inc/contrib/Twig/TokenParser.php
deleted file mode 100644
index 6c9e6935..00000000
--- a/inc/contrib/Twig/TokenParser.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for all token parsers.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_TokenParser implements Twig_TokenParserInterface
-{
-    protected $parser;
-
-    /**
-     * Sets the parser associated with this token parser
-     *
-     * @param $parser A Twig_Parser instance
-     */
-    public function setParser(Twig_Parser $parser)
-    {
-        $this->parser = $parser;
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/AutoEscape.php b/inc/contrib/Twig/TokenParser/AutoEscape.php
deleted file mode 100644
index 3b4b96e3..00000000
--- a/inc/contrib/Twig/TokenParser/AutoEscape.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a section of a template to be escaped or not.
- *
- * <pre>
- * {% autoescape true %}
- *   Everything will be automatically escaped in this block
- * {% endautoescape %}
- *
- * {% autoescape false %}
- *   Everything will be outputed as is in this block
- * {% endautoescape %}
- *
- * {% autoescape true js %}
- *   Everything will be automatically escaped in this block
- *   using the js escaping strategy
- * {% endautoescape %}
- * </pre>
- */
-class Twig_TokenParser_AutoEscape extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $value = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue();
-        if (!in_array($value, array('true', 'false'))) {
-            throw new Twig_Error_Syntax("Autoescape value must be 'true' or 'false'", $lineno);
-        }
-        $value = 'true' === $value ? 'html' : false;
-
-        if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE)) {
-            if (false === $value) {
-                throw new Twig_Error_Syntax('Unexpected escaping strategy as you set autoescaping to false.', $lineno);
-            }
-
-            $value = $this->parser->getStream()->next()->getValue();
-        }
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_AutoEscape($value, $body, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endautoescape');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'autoescape';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Block.php b/inc/contrib/Twig/TokenParser/Block.php
deleted file mode 100644
index b31f7ed6..00000000
--- a/inc/contrib/Twig/TokenParser/Block.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a section of a template as being reusable.
- *
- * <pre>
- *  {% block head %}
- *    <link rel="stylesheet" href="style.css" />
- *    <title>{% block title %}{% endblock %} - My Webpage</title>
- *  {% endblock %}
- * </pre>
- */
-class Twig_TokenParser_Block extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-        if ($this->parser->hasBlock($name)) {
-            throw new Twig_Error_Syntax("The block '$name' has already been defined", $lineno);
-        }
-        $this->parser->pushLocalScope();
-        $this->parser->pushBlockStack($name);
-
-        if ($stream->test(Twig_Token::BLOCK_END_TYPE)) {
-            $stream->next();
-
-            $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-            if ($stream->test(Twig_Token::NAME_TYPE)) {
-                $value = $stream->next()->getValue();
-
-                if ($value != $name) {
-                    throw new Twig_Error_Syntax(sprintf("Expected endblock for block '$name' (but %s given)", $value), $lineno);
-                }
-            }
-        } else {
-            $body = new Twig_Node(array(
-                new Twig_Node_Print($this->parser->getExpressionParser()->parseExpression(), $lineno),
-            ));
-        }
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $block = new Twig_Node_Block($name, $body, $lineno);
-        $this->parser->setBlock($name, $block);
-        $this->parser->popBlockStack();
-        $this->parser->popLocalScope();
-
-        return new Twig_Node_BlockReference($name, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endblock');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'block';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Extends.php b/inc/contrib/Twig/TokenParser/Extends.php
deleted file mode 100644
index 67eacda0..00000000
--- a/inc/contrib/Twig/TokenParser/Extends.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extends a template by another one.
- *
- * <pre>
- *  {% extends "base.html" %}
- * </pre>
- */
-class Twig_TokenParser_Extends extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        if (!$this->parser->isMainScope()) {
-            throw new Twig_Error_Syntax('Cannot extend from a block', $token->getLine());
-        }
-
-        if (null !== $this->parser->getParent()) {
-            throw new Twig_Error_Syntax('Multiple extends tags are forbidden', $token->getLine());
-        }
-        $this->parser->setParent($this->parser->getExpressionParser()->parseExpression());
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return null;
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'extends';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Filter.php b/inc/contrib/Twig/TokenParser/Filter.php
deleted file mode 100644
index 0969ab1e..00000000
--- a/inc/contrib/Twig/TokenParser/Filter.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Filters a section of a template by applying filters.
- *
- * <pre>
- * {% filter upper %}
- *  This text becomes uppercase
- * {% endfilter %}
- * </pre>
- */
-class Twig_TokenParser_Filter extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $name = $this->parser->getVarName();
-        $ref = new Twig_Node_Expression_BlockReference(new Twig_Node_Expression_Constant($name, $token->getLine()), true, $token->getLine(), $this->getTag());
-
-        $filter = $this->parser->getExpressionParser()->parseFilterExpressionRaw($ref, $this->getTag());
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $block = new Twig_Node_Block($name, $body, $token->getLine());
-        $this->parser->setBlock($name, $block);
-
-        return new Twig_Node_Print($filter, $token->getLine(), $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endfilter');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'filter';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/For.php b/inc/contrib/Twig/TokenParser/For.php
deleted file mode 100644
index 5ce82979..00000000
--- a/inc/contrib/Twig/TokenParser/For.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loops over each item of a sequence.
- *
- * <pre>
- * <ul>
- *  {% for user in users %}
- *    <li>{{ user.username|e }}</li>
- *  {% endfor %}
- * </ul>
- * </pre>
- */
-class Twig_TokenParser_For extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $targets = $this->parser->getExpressionParser()->parseAssignmentExpression();
-        $this->parser->getStream()->expect(Twig_Token::OPERATOR_TYPE, 'in');
-        $seq = $this->parser->getExpressionParser()->parseExpression();
-
-        $ifexpr = null;
-        if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE, 'if')) {
-            $this->parser->getStream()->next();
-            $ifexpr = $this->parser->getExpressionParser()->parseExpression();
-        }
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideForFork'));
-        if ($this->parser->getStream()->next()->getValue() == 'else') {
-            $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-            $else = $this->parser->subparse(array($this, 'decideForEnd'), true);
-        } else {
-            $else = null;
-        }
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        if (count($targets) > 1) {
-            $keyTarget = $targets->getNode(0);
-            $valueTarget = $targets->getNode(1);
-        } else {
-            $keyTarget = new Twig_Node_Expression_AssignName('_key', $lineno);
-            $valueTarget = $targets->getNode(0);
-        }
-
-        return new Twig_Node_For($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, $lineno, $this->getTag());
-    }
-
-    public function decideForFork(Twig_Token $token)
-    {
-        return $token->test(array('else', 'endfor'));
-    }
-
-    public function decideForEnd(Twig_Token $token)
-    {
-        return $token->test('endfor');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'for';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/From.php b/inc/contrib/Twig/TokenParser/From.php
deleted file mode 100644
index 87aceb4d..00000000
--- a/inc/contrib/Twig/TokenParser/From.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Imports macros.
- *
- * <pre>
- *   {% from 'forms.html' import forms %}
- * </pre>
- */
-class Twig_TokenParser_From extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $macro = $this->parser->getExpressionParser()->parseExpression();
-        $stream = $this->parser->getStream();
-        $stream->expect('import');
-
-        $targets = array();
-        do {
-            $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-
-            $alias = $name;
-            if ($stream->test('as')) {
-                $stream->next();
-
-                $alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-            }
-
-            $targets[$name] = $alias;
-
-            if (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-
-            $stream->next();
-        } while (true);
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $node = new Twig_Node_Import($macro, new Twig_Node_Expression_AssignName($this->parser->getVarName(), $token->getLine()), $token->getLine(), $this->getTag());
-
-        foreach($targets as $name => $alias) {
-            $this->parser->addImportedFunction($alias, $name, $node->getNode('var'));
-        }
-
-        return $node;
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'from';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/If.php b/inc/contrib/Twig/TokenParser/If.php
deleted file mode 100644
index 65a1a8b2..00000000
--- a/inc/contrib/Twig/TokenParser/If.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Tests a condition.
- *
- * <pre>
- * {% if users %}
- *  <ul>
- *    {% for user in users %}
- *      <li>{{ user.username|e }}</li>
- *    {% endfor %}
- *  </ul>
- * {% endif %}
- * </pre>
- */
-class Twig_TokenParser_If extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $expr = $this->parser->getExpressionParser()->parseExpression();
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideIfFork'));
-        $tests = array($expr, $body);
-        $else = null;
-
-        $end = false;
-        while (!$end) {
-            switch ($this->parser->getStream()->next()->getValue()) {
-                case 'else':
-                    $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-                    $else = $this->parser->subparse(array($this, 'decideIfEnd'));
-                    break;
-
-                case 'elseif':
-                    $expr = $this->parser->getExpressionParser()->parseExpression();
-                    $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-                    $body = $this->parser->subparse(array($this, 'decideIfFork'));
-                    $tests[] = $expr;
-                    $tests[] = $body;
-                    break;
-
-                case 'endif':
-                    $end = true;
-                    break;
-
-                default:
-                    throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d)', $lineno), -1);
-            }
-        }
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
-    }
-
-    public function decideIfFork(Twig_Token $token)
-    {
-        return $token->test(array('elseif', 'else', 'endif'));
-    }
-
-    public function decideIfEnd(Twig_Token $token)
-    {
-        return $token->test(array('endif'));
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'if';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Import.php b/inc/contrib/Twig/TokenParser/Import.php
deleted file mode 100644
index d0a88cde..00000000
--- a/inc/contrib/Twig/TokenParser/Import.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Imports macros.
- *
- * <pre>
- *   {% import 'forms.html' as forms %}
- * </pre>
- */
-class Twig_TokenParser_Import extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $macro = $this->parser->getExpressionParser()->parseExpression();
-        $this->parser->getStream()->expect('as');
-        $var = new Twig_Node_Expression_AssignName($this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue(), $token->getLine());
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Import($macro, $var, $token->getLine(), $this->getTag());
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'import';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Include.php b/inc/contrib/Twig/TokenParser/Include.php
deleted file mode 100644
index 54154559..00000000
--- a/inc/contrib/Twig/TokenParser/Include.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Includes a template.
- *
- * <pre>
- *   {% include 'header.html' %}
- *     Body
- *   {% include 'footer.html' %}
- * </pre>
- */
-class Twig_TokenParser_Include extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
-
-        $ignoreMissing = false;
-        if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE, 'ignore')) {
-            $this->parser->getStream()->next();
-            $this->parser->getStream()->expect(Twig_Token::NAME_TYPE, 'missing');
-
-            $ignoreMissing = true;
-        }
-
-        $variables = null;
-        if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE, 'with')) {
-            $this->parser->getStream()->next();
-
-            $variables = $this->parser->getExpressionParser()->parseExpression();
-        }
-
-        $only = false;
-        if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE, 'only')) {
-            $this->parser->getStream()->next();
-
-            $only = true;
-        }
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'include';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Macro.php b/inc/contrib/Twig/TokenParser/Macro.php
deleted file mode 100644
index da1ac55c..00000000
--- a/inc/contrib/Twig/TokenParser/Macro.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Defines a macro.
- *
- * <pre>
- * {% macro input(name, value, type, size) %}
- *    <input type="{{ type|default('text') }}" name="{{ name }}" value="{{ value|e }}" size="{{ size|default(20) }}" />
- * {% endmacro %}
- * </pre>
- */
-class Twig_TokenParser_Macro extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $name = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue();
-
-        $arguments = $this->parser->getExpressionParser()->parseArguments();
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-        $this->parser->pushLocalScope();
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE)) {
-            $value = $this->parser->getStream()->next()->getValue();
-
-            if ($value != $name) {
-                throw new Twig_Error_Syntax(sprintf("Expected endmacro for macro '$name' (but %s given)", $value), $lineno);
-            }
-        }
-        $this->parser->popLocalScope();
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $this->parser->setMacro($name, new Twig_Node_Macro($name, $body, $arguments, $lineno, $this->getTag()));
-
-        return null;
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endmacro');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'macro';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Sandbox.php b/inc/contrib/Twig/TokenParser/Sandbox.php
deleted file mode 100644
index 62e7f8f7..00000000
--- a/inc/contrib/Twig/TokenParser/Sandbox.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a section of a template as untrusted code that must be evaluated in the sandbox mode.
- *
- * <pre>
- * {% sandbox %}
- *     {% include 'user.html' %}
- * {% endsandbox %}
- * </pre>
- *
- * @see http://www.twig-project.org/doc/api.html#sandbox-extension for details
- */
-class Twig_TokenParser_Sandbox extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Sandbox($body, $token->getLine(), $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endsandbox');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'sandbox';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Set.php b/inc/contrib/Twig/TokenParser/Set.php
deleted file mode 100644
index 489e1d30..00000000
--- a/inc/contrib/Twig/TokenParser/Set.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Defines a variable.
- *
- * <pre>
- *  {% set foo = 'foo' %}
- *
- *  {% set foo = [1, 2] %}
- *
- *  {% set foo = {'foo': 'bar'} %}
- *
- *  {% set foo = 'foo' ~ 'bar' %}
- *
- *  {% set foo, bar = 'foo', 'bar' %}
- *
- *  {% set foo %}Some content{% endset %}
- * </pre>
- */
-class Twig_TokenParser_Set extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $names = $this->parser->getExpressionParser()->parseAssignmentExpression();
-
-        $capture = false;
-        if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
-            $stream->next();
-            $values = $this->parser->getExpressionParser()->parseMultitargetExpression();
-
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-            if (count($names) !== count($values)) {
-                throw new Twig_Error_Syntax("When using set, you must have the same number of variables and assignements.", $lineno);
-            }
-        } else {
-            $capture = true;
-
-            if (count($names) > 1) {
-                throw new Twig_Error_Syntax("When using set with a block, you cannot have a multi-target.", $lineno);
-            }
-
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-            $values = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        }
-
-        return new Twig_Node_Set($capture, $names, $values, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endset');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'set';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Spaceless.php b/inc/contrib/Twig/TokenParser/Spaceless.php
deleted file mode 100644
index aa7ffbc4..00000000
--- a/inc/contrib/Twig/TokenParser/Spaceless.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Remove whitespaces between HTML tags.
- *
- * <pre>
- * {% spaceless %}
- *      <div>
- *          <strong>foo</strong>
- *      </div>
- * {% endspaceless %}
- *
- * {# output will be <div><strong>foo</strong></div> #}
- * </pre>
- */
-class Twig_TokenParser_Spaceless extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideSpacelessEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Spaceless($body, $lineno, $this->getTag());
-    }
-
-    public function decideSpacelessEnd(Twig_Token $token)
-    {
-        return $token->test('endspaceless');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'spaceless';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParser/Use.php b/inc/contrib/Twig/TokenParser/Use.php
deleted file mode 100644
index 16c47e3e..00000000
--- a/inc/contrib/Twig/TokenParser/Use.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Imports blocks defined in another template into the current template.
- *
- * <pre>
- * {% extends "base.html" %}
- *
- * {% use "blocks.html" %}
- *
- * {% block title %}{% endblock %}
- * {% block content %}{% endblock %}
- * </pre>
- *
- * @see http://www.twig-project.org/doc/templates.html#horizontal-reuse for details.
- */
-class Twig_TokenParser_Use extends Twig_TokenParser
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $template = $this->parser->getExpressionParser()->parseExpression();
-
-        if (!$template instanceof Twig_Node_Expression_Constant) {
-            throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $token->getLine());
-        }
-
-        $stream = $this->parser->getStream();
-
-        $targets = array();
-        if ($stream->test('with')) {
-            $stream->next();
-
-            do {
-                $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-
-                $alias = $name;
-                if ($stream->test('as')) {
-                    $stream->next();
-
-                    $alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-                }
-
-                $targets[$name] = new Twig_Node_Expression_Constant($alias, -1);
-
-                if (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                    break;
-                }
-
-                $stream->next();
-            } while (true);
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $this->parser->addTrait(new Twig_Node(array('template' => $template, 'targets' => new Twig_Node($targets))));
-
-        return null;
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    public function getTag()
-    {
-        return 'use';
-    }
-}
diff --git a/inc/contrib/Twig/TokenParserBroker.php b/inc/contrib/Twig/TokenParserBroker.php
deleted file mode 100644
index 34fcdfbf..00000000
--- a/inc/contrib/Twig/TokenParserBroker.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default implementation of a token parser broker.
- *
- * @package twig
- * @author  Arnaud Le Blanc <arnaud.lb@gmail.com>
- */
-class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
-{
-    protected $parser;
-    protected $parsers = array();
-    protected $brokers = array();
-
-    /**
-     * Constructor.
-     *
-     * @param array|Traversable $parsers A Traversable of Twig_TokenParserInterface instances
-     * @param array|Traversable $brokers A Traversable of Twig_TokenParserBrokerInterface instances
-     */
-    public function __construct($parsers = array(), $brokers = array())
-    {
-        foreach ($parsers as $parser) {
-            if (!$parser instanceof Twig_TokenParserInterface) {
-                throw new Twig_Error('$parsers must a an array of Twig_TokenParserInterface');
-            }
-            $this->parsers[$parser->getTag()] = $parser;
-        }
-        foreach ($brokers as $broker) {
-            if (!$broker instanceof Twig_TokenParserBrokerInterface) {
-                throw new Twig_Error('$brokers must a an array of Twig_TokenParserBrokerInterface');
-            }
-            $this->brokers[] = $broker;
-        }
-    }
-
-    /**
-     * Adds a TokenParser.
-     *
-     * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
-     */
-    public function addTokenParser(Twig_TokenParserInterface $parser)
-    {
-        $this->parsers[$parser->getTag()] = $parser;
-    }
-
-    /**
-     * Adds a TokenParserBroker.
-     *
-     * @param Twig_TokenParserBroker $broker A Twig_TokenParserBroker instance
-     */
-    public function addTokenParserBroker(Twig_TokenParserBroker $broker)
-    {
-        $this->brokers[] = $broker;
-    }
-
-    /**
-     * Gets a suitable TokenParser for a tag.
-     *
-     * First looks in parsers, then in brokers.
-     *
-     * @param string $tag A tag name
-     *
-     * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found
-     */
-    public function getTokenParser($tag)
-    {
-        if (isset($this->parsers[$tag])) {
-            return $this->parsers[$tag];
-        }
-        $broker = end($this->brokers);
-        while (false !== $broker) {
-            $parser = $broker->getTokenParser($tag);
-            if (null !== $parser) {
-                return $parser;
-            }
-            $broker = prev($this->brokers);
-        }
-        return null;
-    }
-
-    public function getParser()
-    {
-        return $this->parser;
-    }
-
-    public function setParser(Twig_ParserInterface $parser)
-    {
-        $this->parser = $parser;
-        foreach ($this->parsers as $tokenParser) {
-            $tokenParser->setParser($parser);
-        }
-        foreach ($this->brokers as $broker) {
-            $broker->setParser($parser);
-        }
-    }
-}
diff --git a/inc/contrib/Twig/TokenParserBrokerInterface.php b/inc/contrib/Twig/TokenParserBrokerInterface.php
deleted file mode 100644
index 3ce8ca26..00000000
--- a/inc/contrib/Twig/TokenParserBrokerInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by token parser brokers.
- *
- * Token parser brokers allows to implement custom logic in the process of resolving a token parser for a given tag name.
- *
- * @package twig
- * @author  Arnaud Le Blanc <arnaud.lb@gmail.com>
- */
-interface Twig_TokenParserBrokerInterface
-{
-    /**
-     * Gets a TokenParser suitable for a tag.
-     *
-     * @param  string $tag A tag name
-     *
-     * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found
-     */
-    function getTokenParser($tag);
-
-    /**
-     * Calls Twig_TokenParserInterface::setParser on all parsers the implementation knows of.
-     *
-     * @param Twig_ParserInterface $parser A Twig_ParserInterface interface
-     */
-    function setParser(Twig_ParserInterface $parser);
-
-    /**
-     * Gets the Twig_ParserInterface.
-     *
-     * @return null|Twig_ParserInterface A Twig_ParserInterface instance of null
-     */
-    function getParser();
-}
diff --git a/inc/contrib/Twig/TokenParserInterface.php b/inc/contrib/Twig/TokenParserInterface.php
deleted file mode 100644
index 114a939e..00000000
--- a/inc/contrib/Twig/TokenParserInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by token parsers.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_TokenParserInterface
-{
-    /**
-     * Sets the parser associated with this token parser
-     *
-     * @param $parser A Twig_Parser instance
-     */
-    function setParser(Twig_Parser $parser);
-
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    function parse(Twig_Token $token);
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @param string The tag name
-     */
-    function getTag();
-}
diff --git a/inc/contrib/Twig/TokenStream.php b/inc/contrib/Twig/TokenStream.php
deleted file mode 100644
index a2002b42..00000000
--- a/inc/contrib/Twig/TokenStream.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a token stream.
- *
- * @package twig
- * @author  Fabien Potencier <fabien@symfony.com>
- */
-class Twig_TokenStream
-{
-    protected $tokens;
-    protected $current;
-    protected $filename;
-
-    /**
-     * Constructor.
-     *
-     * @param array  $tokens   An array of tokens
-     * @param string $filename The name of the filename which tokens are associated with
-     */
-    public function __construct(array $tokens, $filename = null)
-    {
-        $this->tokens     = $tokens;
-        $this->current    = 0;
-        $this->filename   = $filename;
-    }
-
-    /**
-     * Returns a string representation of the token stream.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return implode("\n", $this->tokens);
-    }
-
-    /**
-     * Sets the pointer to the next token and returns the old one.
-     *
-     * @return Twig_Token
-     */
-    public function next()
-    {
-        if (!isset($this->tokens[++$this->current])) {
-            throw new Twig_Error_Syntax('Unexpected end of template', -1, $this->filename);
-        }
-
-        return $this->tokens[$this->current - 1];
-    }
-
-    /**
-     * Tests a token and returns it or throws a syntax error.
-     *
-     * @return Twig_Token
-     */
-    public function expect($type, $value = null, $message = null)
-    {
-        $token = $this->tokens[$this->current];
-        if (!$token->test($type, $value)) {
-            $line = $token->getLine();
-            throw new Twig_Error_Syntax(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s)',
-                $message ? $message.'. ' : '',
-                Twig_Token::typeToEnglish($token->getType(), $line), $token->getValue(),
-                Twig_Token::typeToEnglish($type, $line), $value ? sprintf(' with value "%s"', $value) : ''),
-                $line,
-                $this->filename
-            );
-        }
-        $this->next();
-
-        return $token;
-    }
-
-    /**
-     * Looks at the next token.
-     *
-     * @param integer $number
-     *
-     * @return Twig_Token
-     */
-    public function look($number = 1)
-    {
-        if (!isset($this->tokens[$this->current + $number])) {
-            throw new Twig_Error_Syntax('Unexpected end of template', -1, $this->filename);
-        }
-
-        return $this->tokens[$this->current + $number];
-    }
-
-    /**
-     * Tests the current token
-     *
-     * @return bool
-     */
-    public function test($primary, $secondary = null)
-    {
-        return $this->tokens[$this->current]->test($primary, $secondary);
-    }
-
-    /**
-     * Checks if end of stream was reached
-     *
-     * @return bool
-     */
-    public function isEOF()
-    {
-        return $this->tokens[$this->current]->getType() === Twig_Token::EOF_TYPE;
-    }
-
-    /**
-     * Gets the current token
-     *
-     * @return Twig_Token
-     */
-    public function getCurrent()
-    {
-        return $this->tokens[$this->current];
-    }
-
-    /**
-     * Gets the filename associated with this stream
-     *
-     * @return string
-     */
-    public function getFilename()
-    {
-        return $this->filename;
-    }
-}
diff --git a/inc/contrib/gettext/AUTHORS b/inc/contrib/gettext/AUTHORS
deleted file mode 100644
index da6ade7b..00000000
--- a/inc/contrib/gettext/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Danilo Segan <danilo@kvota.net>
-Nico Kaiser <nico@siriux.net> (contributed most changes between 1.0.2 and 1.0.3, bugfix for 1.0.5)
-Steven Armstrong <sa@c-area.ch> (gettext.inc, leading to 1.0.6)
diff --git a/inc/contrib/gettext/COPYING b/inc/contrib/gettext/COPYING
deleted file mode 100644
index 5b6e7c66..00000000
--- a/inc/contrib/gettext/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/inc/contrib/gettext/Makefile b/inc/contrib/gettext/Makefile
deleted file mode 100644
index f389de51..00000000
--- a/inc/contrib/gettext/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-PACKAGE = php-gettext-$(VERSION)
-VERSION = 1.0.11
-
-DIST_FILES = \
-	gettext.php \
-	gettext.inc \
-	streams.php \
-	AUTHORS     \
-	README      \
-	COPYING     \
-	Makefile    \
-	examples/index.php    \
-	examples/pigs_dropin.php    \
-	examples/pigs_fallback.php    \
-	examples/locale/sr_CS/LC_MESSAGES/messages.po \
-	examples/locale/sr_CS/LC_MESSAGES/messages.mo \
-	examples/locale/de_CH/LC_MESSAGES/messages.po \
-	examples/locale/de_CH/LC_MESSAGES/messages.mo \
-	examples/update \
-	tests/LocalesTest.php \
-	tests/ParsingTest.php
-
-check:
-	phpunit --verbose tests
-
-dist: check
-	if [ -d $(PACKAGE) ]; then \
-	    rm -rf $(PACKAGE); \
-	fi; \
-	mkdir $(PACKAGE); \
-	if [ -d $(PACKAGE) ]; then \
-	    cp -rp --parents $(DIST_FILES) $(PACKAGE); \
-	    tar cvzf $(PACKAGE).tar.gz $(PACKAGE); \
-	    rm -rf $(PACKAGE); \
-	fi;
-
-clean:
-	rm -f $(PACKAGE).tar.gz
diff --git a/inc/contrib/gettext/README b/inc/contrib/gettext/README
deleted file mode 100644
index bca4f916..00000000
--- a/inc/contrib/gettext/README
+++ /dev/null
@@ -1,161 +0,0 @@
-PHP-gettext 1.0 (https://launchpad.net/php-gettext)
-
-Copyright 2003, 2006, 2009 -- Danilo "angry with PHP[1]" Segan
-Licensed under GPLv2 (or any later version, see COPYING)
-
-[1] PHP is actually cyrillic, and translates roughly to
-    "works-doesn't-work" (UTF-8: Ради-Не-Ради)
-
-
-Introduction
-
-    How many times did you look for a good translation tool, and
-    found out that gettext is best for the job? Many times.
-
-    How many times did you try to use gettext in PHP, but failed
-    miserably, because either your hosting provider didn't support
-    it, or the server didn't have adequate locale? Many times.
-
-    Well, this is a solution to your needs. It allows using gettext
-    tools for managing translations, yet it doesn't require gettext
-    library at all. It parses generated MO files directly, and thus
-    might be a bit slower than the (maybe provided) gettext library.
-
-    PHP-gettext is a simple reader for GNU gettext MO files. Those
-    are binary containers for translations, produced by GNU msgfmt.
-
-Why?
-
-    I got used to having gettext work even without gettext
-    library. It's there in my favourite language Python, so I was
-    surprised that I couldn't find it in PHP. I even Googled for it,
-    but to no avail.
-
-    So, I said, what the heck, I'm going to write it for this
-    disguisting language of PHP, because I'm often constrained to it.
-
-Features
-
-  o Support for simple translations
-    Just define a simple alias for translate() function (suggested
-    use of _() or gettext(); see provided example).
-
-  o Support for ngettext calls (plural forms, see a note under bugs)
-    You may also use plural forms. Translations in MO files need to
-    provide this, and they must also provide "plural-forms" header.
-    Please see 'info gettext' for more details.
-
-  o Support for reading straight files, or strings (!!!)
-    Since I can imagine many different backends for reading in the MO
-    file data, I used imaginary abstract class StreamReader to do all
-    the input (check streams.php). For your convenience, I've already
-    provided two classes for reading files: FileReader and
-    StringReader (CachedFileReader is a combination of the two: it
-    loads entire file contents into a string, and then works on that).
-    See example below for usage. You can for instance use StringReader
-    when you read in data from a database, or you can create your own
-    derivative of StreamReader for anything you like.
-
-
-Bugs
-
-    Report them on https://bugs.launchpad.net/php-gettext
-
-Usage
-
-    Put files streams.php and gettext.php somewhere you can load them
-    from, and require 'em in where you want to use them.
-
-    Then, create one 'stream reader' (a class that provides functions
-    like read(), seekto(), currentpos() and length()) which will
-    provide data for the 'gettext_reader', with eg.
-      $streamer = new FileStream('data.mo');
-
-    Then, use that as a parameter to gettext_reader constructor:
-      $wohoo = new gettext_reader($streamer);
-
-    If you want to disable pre-loading of entire message catalog in
-    memory (if, for example, you have a multi-thousand message catalog
-    which you'll use only occasionally), use "false" for second
-    parameter to gettext_reader constructor:
-      $wohoo = new gettext_reader($streamer, false);
-
-    From now on, you have all the benefits of gettext data at your
-    disposal, so may run:
-      print $wohoo->translate("This is a test");
-      print $wohoo->ngettext("%d bird", "%d birds", $birds);
-
-    You might need to pass parameter "-k" to xgettext to make it
-    extract all the strings. In above example, try with
-      xgettext -ktranslate -kngettext:1,2 file.php
-    what should create messages.po which contains two messages for
-    translation.
-
-    I suggest creating simple aliases for these functions (see
-    example/pigs.php for how do I do it, which means it's probably a
-    bad way).
-
-
-Usage with gettext.inc (standard gettext interfaces emulation)
-
-    Check example in examples/pig_dropin.php, basically you include
-    gettext.inc and use all the standard gettext interfaces as
-    documented on:
-
-       http://www.php.net/gettext
-
-    The only catch is that you can check return value of setlocale()
-    to see if your locale is system supported or not.
-
-
-Example
-
-    See in examples/ subdirectory. There are a couple of files.
-    pigs.php is an example, serbian.po is a translation to Serbian
-    language, and serbian.mo is generated with
-       msgfmt -o serbian.mo serbian.po
-    There is also simple "update" script that can be used to generate
-    POT file and to update the translation using msgmerge.
-
-TODO:
-
-  o Improve speed to be even more comparable to the native gettext
-    implementation.
-
-  o Try to use hash tables in MO files: with pre-loading, would it
-    be useful at all?
-
-Never-asked-questions:
-
-  o Why did you mark this as version 1.0 when this is the first code
-    release?
-
-    Well, it's quite simple. I consider that the first released thing
-    should be labeled "version 1" (first, right?). Zero is there to
-    indicate that there's zero improvement and/or change compared to
-    "version 1".
-
-    I plan to use version numbers 1.0.* for small bugfixes, and to
-    release 1.1 as "first stable release of version 1".
-
-    This may trick someone that this is actually useful software, but
-    as with any other free software, I take NO RESPONSIBILITY for
-    creating such a masterpiece that will smoke crack, trash your
-    hard disk, and make lasers in your CD device dance to the tune of
-    Mozart's 40th Symphony (there is one like that, right?).
-
-  o Can I...?
-
-    Yes, you can. This is free software (as in freedom, free speech),
-    and you might do whatever you wish with it, provided you do not
-    limit freedom of others (GPL).
-
-    I'm considering licensing this under LGPL, but I *do* want
-    *every* PHP-gettext user to contribute and respect ideas of free
-    software, so don't count on it happening anytime soon.
-
-    I'm sorry that I'm taking away your freedom of taking others'
-    freedom away, but I believe that's neglible as compared to what
-    freedoms you could take away. ;-)
-
-    Uhm, whatever.
diff --git a/inc/contrib/gettext/examples/index.php b/inc/contrib/gettext/examples/index.php
deleted file mode 100644
index 263cd3d3..00000000
--- a/inc/contrib/gettext/examples/index.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-<title>PHP-gettext examples</title>
-</head>
-<body>
-<h1>PHP-gettext</h1>
-
-<h2>Introduction</h2>
-<p>PHP-gettext provides a simple gettext replacement that works independently from the system's gettext abilities.
-It can read MO files and use them for translating strings.</p>
-<p>This version has the ability to cache all strings and translations to speed up the string lookup. 
-While the cache is enabled by default, it can be switched off with the second parameter in the constructor (e.g. when using very large MO files 
-that you don't want to keep in memory)</p>
-
-
-<h2>Examples</h2>
-<ul>
-	<li><a href="pigs_dropin.php">PHP-gettext as a dropin replacement</a></li>
-	<li><a href="pigs_fallback.php">PHP-gettext as a fallback solution</a></li>
-</ul>
-
-<hr />
-<p>Copyright (c) 2003-2006 Danilo Segan</p>
-<p>Copyright (c) 2005-2006 Steven Armstrong</p>
-
-</body>
-</html>
diff --git a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo b/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo
deleted file mode 100644
index 91930376..00000000
--- a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo
+++ /dev/null
diff --git a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po b/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po
deleted file mode 100644
index 6e4886b5..00000000
--- a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Sample translation for PHP-gettext 1.0
-# Copyright (c) 2003 Danilo Segan <danilo@kvota.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: pigs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-23 04:50+0200\n"
-"PO-Revision-Date: 2003-11-01 23:40+0100\n"
-"Last-Translator: Danilo Segan <danilo@kvota.net>\n"
-"Language-Team: Serbian (sr) <danilo@kvota.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-#"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: pigs.php:19
-msgid ""
-"This is how the story goes.\n"
-"\n"
-msgstr ""
-"Und so geht die Geschichte.\n"
-"\n"
-
-#: pigs.php:21
-#, php-format
-msgid "%d pig went to the market\n"
-msgid_plural "%d pigs went to the market\n"
-msgstr[0] "%d Schwein ging zum Markt\n"
-msgstr[1] "%d Schweine gingen zum Markt\n"
diff --git a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo b/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo
deleted file mode 100644
index 497c8830..00000000
--- a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo
+++ /dev/null
diff --git a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po b/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po
deleted file mode 100644
index e5da0e94..00000000
--- a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Sample translation for PHP-gettext 1.0
-# Copyright (c) 2003,2006 Danilo Segan <danilo@kvota.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: pigs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-23 04:50+0200\n"
-"PO-Revision-Date: 2006-02-02 21:06+0100\n"
-"Last-Translator: Danilo Segan <danilo@kvota.net>\n"
-"Language-Team: Serbian (sr) <danilo@kvota.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-#: pigs.php:19
-msgid ""
-"This is how the story goes.\n"
-"\n"
-msgstr "Овако иде прича.\n\n"
-
-#: pigs.php:21
-#, php-format
-msgid "%d pig went to the market\n"
-msgid_plural "%d pigs went to the market\n"
-msgstr[0] "%d мало прасе је отишло на пијац\n"
-msgstr[1] "%d мала прасета су отишла на пијац\n"
-msgstr[2] "%d малих прасића је отишло на пијац\n"
diff --git a/inc/contrib/gettext/examples/pigs_dropin.php b/inc/contrib/gettext/examples/pigs_dropin.php
deleted file mode 100644
index 94fd8507..00000000
--- a/inc/contrib/gettext/examples/pigs_dropin.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*
-   Copyright (c) 2003,2004,2005,2009 Danilo Segan <danilo@kvota.net>.
-   Copyright (c) 2005,2006 Steven Armstrong <sa@c-area.ch>
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-error_reporting(E_ALL | E_STRICT);
-
-// define constants
-define('PROJECT_DIR', realpath('./'));
-define('LOCALE_DIR', PROJECT_DIR .'/locale');
-define('DEFAULT_LOCALE', 'en_US');
-
-require_once('../gettext.inc');
-
-$supported_locales = array('en_US', 'sr_CS', 'de_CH');
-$encoding = 'UTF-8';
-
-$locale = (isset($_GET['lang']))? $_GET['lang'] : DEFAULT_LOCALE;
-
-// gettext setup
-T_setlocale(LC_MESSAGES, $locale);
-// Set the text domain as 'messages'
-$domain = 'messages';
-bindtextdomain($domain, LOCALE_DIR);
-// bind_textdomain_codeset is supported only in PHP 4.2.0+
-if (function_exists('bind_textdomain_codeset')) 
-  bind_textdomain_codeset($domain, $encoding);
-textdomain($domain);
-
-header("Content-type: text/html; charset=$encoding");
-?>
-<html>
-<head>
-<title>PHP-gettext dropin example</title>
-</head>
-<body>
-<h1>PHP-gettext as a dropin replacement</h1>
-<p>Example showing how to use PHP-gettext as a dropin replacement for the native gettext library.</p>
-<?php
-print "<p>";
-foreach($supported_locales as $l) {
-	print "[<a href=\"?lang=$l\">$l</a>] ";
-}
-print "</p>\n";
-
-if (!locale_emulation()) {
-	print "<p>locale '$locale' is supported by your system, using native gettext implementation.</p>\n";
-}
-else {
-	print "<p>locale '$locale' is _not_ supported on your system, using the default locale '". DEFAULT_LOCALE ."'.</p>\n";
-}
-?>
-
-<hr />
-
-<?php
-// using PHP-gettext
-print "<pre>";
-print _("This is how the story goes.\n\n");
-for ($number=6; $number>=0; $number--) {
-  print sprintf(T_ngettext("%d pig went to the market\n", 
-			  "%d pigs went to the market\n", $number), 
-		 $number );
-}
-print "</pre>\n";
-?>
-
-<hr />
-<p>&laquo; <a href="./">back</a></p>
-</body>
-</html>
diff --git a/inc/contrib/gettext/examples/pigs_fallback.php b/inc/contrib/gettext/examples/pigs_fallback.php
deleted file mode 100644
index 353190da..00000000
--- a/inc/contrib/gettext/examples/pigs_fallback.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/*
-   Copyright (c) 2003,2004,2005,2009 Danilo Segan <danilo@kvota.net>.
-   Copyright (c) 2005,2006 Steven Armstrong <sa@c-area.ch>
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-error_reporting(E_ALL | E_STRICT);
-
-// define constants
-define('PROJECT_DIR', realpath('./'));
-define('LOCALE_DIR', PROJECT_DIR .'/locale');
-define('DEFAULT_LOCALE', 'en_US');
-
-require_once('../gettext.inc');
-
-$supported_locales = array('en_US', 'sr_CS', 'de_CH');
-$encoding = 'UTF-8';
-
-$locale = (isset($_GET['lang']))? $_GET['lang'] : DEFAULT_LOCALE;
-
-// gettext setup
-T_setlocale(LC_MESSAGES, $locale);
-// Set the text domain as 'messages'
-$domain = 'messages';
-T_bindtextdomain($domain, LOCALE_DIR);
-T_bind_textdomain_codeset($domain, $encoding);
-T_textdomain($domain);
-
-header("Content-type: text/html; charset=$encoding");
-?>
-<html>
-<head>
-<title>PHP-gettext fallback example</title>
-</head>
-<body>
-<h1>PHP-gettext as a fallback solution</h1>
-<p>Example showing how to use PHP-gettext as a fallback solution if the native gettext library is not available or the system does not support the requested locale.</p>
-
-<?php
-print "<p>";
-foreach($supported_locales as $l) {
-	print "[<a href=\"?lang=$l\">$l</a>] ";
-}
-print "</p>\n";
-
-if (!locale_emulation()) {
-	print "<p>locale '$locale' is supported by your system, using native gettext implementation.</p>\n";
-}
-else {
-	print "<p>locale '$locale' is <strong>not</strong> supported on your system, using custom gettext implementation.</p>\n";
-}
-?>
-
-<hr />
-
-<?php
-// using PHP-gettext
-print "<pre>";
-print T_("This is how the story goes.\n\n");
-for ($number=6; $number>=0; $number--) {
-  print sprintf( T_ngettext("%d pig went to the market\n", 
-			  "%d pigs went to the market\n", $number), 
-		 $number );
-}
-print "</pre>\n";
-?>
-
-<hr />
-<p>&laquo; <a href="./">back</a></p>
-</body>
-</html>
diff --git a/inc/contrib/gettext/examples/update b/inc/contrib/gettext/examples/update
deleted file mode 100755
index 76b4308a..00000000
--- a/inc/contrib/gettext/examples/update
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-TEMPLATE=pigs.pot
-xgettext -kT_ngettext:1,2 -kT_ -L PHP -o $TEMPLATE pigs_dropin.php
-if [ "x$1" = "x-p" ]; then
-    msgfmt --statistics $TEMPLATE
-else
-    if [ -f $1.po ]; then
-	msgmerge -o .tmp$1.po $1.po $TEMPLATE
-	mv .tmp$1.po $1.po
-	msgfmt --statistics $1.po
-    else
-	echo "Usage: $0 [-p|<basename>]"
-    fi
-fi
diff --git a/inc/contrib/gettext/gettext.inc b/inc/contrib/gettext/gettext.inc
deleted file mode 100644
index 00b96669..00000000
--- a/inc/contrib/gettext/gettext.inc
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-/*
-   Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
-   Copyright (c) 2009 Danilo Segan <danilo@kvota.net>
-
-   Drop in replacement for native gettext.
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-/*
-LC_CTYPE        0
-LC_NUMERIC      1
-LC_TIME         2
-LC_COLLATE      3
-LC_MONETARY     4
-LC_MESSAGES     5
-LC_ALL          6
-*/
-
-// LC_MESSAGES is not available if php-gettext is not loaded
-// while the other constants are already available from session extension.
-if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
-}
-
-require('streams.php');
-require('gettext.php');
-
-
-// Variables
-
-global $text_domains, $default_domain, $LC_CATEGORIES, $EMULATEGETTEXT, $CURRENTLOCALE;
-$text_domains = array();
-$default_domain = 'messages';
-$LC_CATEGORIES = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', 'LC_MESSAGES', 'LC_ALL');
-$EMULATEGETTEXT = 0;
-$CURRENTLOCALE = '';
-
-/* Class to hold a single domain included in $text_domains. */
-class domain {
-  var $l10n;
-  var $path;
-  var $codeset;
-}
-
-// Utility functions
-
-/**
- * Return a list of locales to try for any POSIX-style locale specification.
- */
-function get_list_of_locales($locale) {
-  /* Figure out all possible locale names and start with the most
-   * specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
-   * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
-   */
-  $locale_names = array();
-  $lang = NULL;
-  $country = NULL;
-  $charset = NULL;
-  $modifier = NULL;
-  if ($locale) {
-    if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
-                   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
-                   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
-                   $locale, $matches)) {
-
-      if (isset($matches["lang"])) $lang = $matches["lang"];
-      if (isset($matches["country"])) $country = $matches["country"];
-      if (isset($matches["charset"])) $charset = $matches["charset"];
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
-
-      if ($modifier) {
-        if ($country) {
-          if ($charset)
-            array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          array_push($locale_names, "${lang}_$country@$modifier");
-        } elseif ($charset)
-            array_push($locale_names, "${lang}.$charset@$modifier");
-        array_push($locale_names, "$lang@$modifier");
-      }
-      if ($country) {
-        if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
-        array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
-      array_push($locale_names, $lang);
-    }
-
-    // If the locale name doesn't match POSIX style, just include it as-is.
-    if (!in_array($locale, $locale_names))
-      array_push($locale_names, $locale);
-  }
-  return $locale_names;
-}
-
-/**
- * Utility function to get a StreamReader for the given text domain.
- */
-function _get_reader($domain=null, $category=5, $enable_cache=true) {
-    global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
-    if (!isset($text_domains[$domain]->l10n)) {
-        // get the current locale
-        $locale = _setlocale(LC_MESSAGES, 0);
-        $bound_path = isset($text_domains[$domain]->path) ?
-          $text_domains[$domain]->path : './';
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
-
-        $locale_names = get_list_of_locales($locale);
-        $input = null;
-        foreach ($locale_names as $locale) {
-          $full_path = $bound_path . $locale . "/" . $subpath;
-          if (file_exists($full_path)) {
-            $input = new FileReader($full_path);
-            break;
-          }
-        }
-
-        if (!array_key_exists($domain, $text_domains)) {
-          // Initialize an empty domain object.
-          $text_domains[$domain] = new domain();
-        }
-        $text_domains[$domain]->l10n = new gettext_reader($input,
-                                                          $enable_cache);
-    }
-    return $text_domains[$domain]->l10n;
-}
-
-/**
- * Returns whether we are using our emulated gettext API or PHP built-in one.
- */
-function locale_emulation() {
-    global $EMULATEGETTEXT;
-    return $EMULATEGETTEXT;
-}
-
-/**
- * Checks if the current locale is supported on this system.
- */
-function _check_locale_and_function($function=false) {
-    global $EMULATEGETTEXT;
-    if ($function and !function_exists($function))
-        return false;
-    return !$EMULATEGETTEXT;
-}
-
-/**
- * Get the codeset for the given domain.
- */
-function _get_codeset($domain=null) {
-    global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
-    return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
-}
-
-/**
- * Convert the given string to the encoding set by bind_textdomain_codeset.
- */
-function _encode($text) {
-    $source_encoding = mb_detect_encoding($text);
-    $target_encoding = _get_codeset();
-    if ($source_encoding != $target_encoding) {
-        return mb_convert_encoding($text, $target_encoding, $source_encoding);
-    }
-    else {
-        return $text;
-    }
-}
-
-
-// Custom implementation of the standard gettext related functions
-
-/**
- * Returns passed in $locale, or environment variable $LANG if $locale == ''.
- */
-function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
-    return getenv('LANG');
-  else
-    return $locale;
-}
-
-/**
- * Sets a requested locale, if needed emulates it.
- */
-function _setlocale($category, $locale) {
-    global $CURRENTLOCALE, $EMULATEGETTEXT;
-    if ($locale === 0) { // use === to differentiate between string "0"
-        if ($CURRENTLOCALE != '')
-            return $CURRENTLOCALE;
-        else
-            // obey LANG variable, maybe extend to support all of LC_* vars
-            // even if we tried to read locale without setting it first
-            return _setlocale($category, $CURRENTLOCALE);
-    } else {
-        if (function_exists('setlocale')) {
-          $ret = setlocale($category, $locale);
-          if (($locale == '' and !$ret) or // failed setting it by env
-              ($locale != '' and $ret != $locale)) { // failed setting it
-            // Failed setting it according to environment.
-            $CURRENTLOCALE = _get_default_locale($locale);
-            $EMULATEGETTEXT = 1;
-          } else {
-            $CURRENTLOCALE = $ret;
-            $EMULATEGETTEXT = 0;
-          }
-        } else {
-          // No function setlocale(), emulate it all.
-          $CURRENTLOCALE = _get_default_locale($locale);
-          $EMULATEGETTEXT = 1;
-        }
-        // Allow locale to be changed on the go for one translation domain.
-        global $text_domains, $default_domain;
-        if (array_key_exists($default_domain, $text_domains)) {
-            unset($text_domains[$default_domain]->l10n);
-        }
-        return $CURRENTLOCALE;
-    }
-}
-
-/**
- * Sets the path for a domain.
- */
-function _bindtextdomain($domain, $path) {
-    global $text_domains;
-    // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
-    if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
-        $path .= '\\';
-    } else {
-      if ($path[strlen($path)-1] != '/')
-        $path .= '/';
-    }
-    if (!array_key_exists($domain, $text_domains)) {
-      // Initialize an empty domain object.
-      $text_domains[$domain] = new domain();
-    }
-    $text_domains[$domain]->path = $path;
-}
-
-/**
- * Specify the character encoding in which the messages from the DOMAIN message catalog will be returned.
- */
-function _bind_textdomain_codeset($domain, $codeset) {
-    global $text_domains;
-    $text_domains[$domain]->codeset = $codeset;
-}
-
-/**
- * Sets the default domain.
- */
-function _textdomain($domain) {
-    global $default_domain;
-    $default_domain = $domain;
-}
-
-/**
- * Lookup a message in the current domain.
- */
-function _gettext($msgid) {
-    $l10n = _get_reader();
-    return _encode($l10n->translate($msgid));
-}
-
-/**
- * Alias for gettext.
- */
-function __($msgid) {
-    return _gettext($msgid);
-}
-
-/**
- * Plural version of gettext.
- */
-function _ngettext($singular, $plural, $number) {
-    $l10n = _get_reader();
-    return _encode($l10n->ngettext($singular, $plural, $number));
-}
-
-/**
- * Override the current domain.
- */
-function _dgettext($domain, $msgid) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->translate($msgid));
-}
-
-/**
- * Plural version of dgettext.
- */
-function _dngettext($domain, $singular, $plural, $number) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->ngettext($singular, $plural, $number));
-}
-
-/**
- * Overrides the domain and category for a single lookup.
- */
-function _dcgettext($domain, $msgid, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->translate($msgid));
-}
-/**
- * Plural version of dcgettext.
- */
-function _dcngettext($domain, $singular, $plural, $number, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->ngettext($singular, $plural, $number));
-}
-
-/**
- * Context version of gettext.
- */
-function _pgettext($context, $msgid) {
-    $l10n = _get_reader();
-    return _encode($l10n->pgettext($context, $msgid));
-}
-
-/**
- * Override the current domain in a context gettext call.
- */
-function _dpgettext($domain, $context, $msgid) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->pgettext($context, $msgid));
-}
-
-/**
- * Overrides the domain and category for a single context-based lookup.
- */
-function _dcpgettext($domain, $context, $msgid, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->pgettext($context, $msgid));
-}
-
-/**
- * Context version of ngettext.
- */
-function _npgettext($context, $singular, $plural) {
-    $l10n = _get_reader();
-    return _encode($l10n->npgettext($context, $singular, $plural));
-}
-
-/**
- * Override the current domain in a context ngettext call.
- */
-function _dnpgettext($domain, $context, $singular, $plural) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->npgettext($context, $singular, $plural));
-}
-
-/**
- * Overrides the domain and category for a plural context-based lookup.
- */
-function _dcnpgettext($domain, $context, $singular, $plural, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->npgettext($context, $singular, $plural));
-}
-
-
-
-// Wrappers to use if the standard gettext functions are available,
-// but the current locale is not supported by the system.
-// Use the standard impl if the current locale is supported, use the
-// custom impl otherwise.
-
-function T_setlocale($category, $locale) {
-    return _setlocale($category, $locale);
-}
-
-function T_bindtextdomain($domain, $path) {
-    if (_check_locale_and_function()) return bindtextdomain($domain, $path);
-    else return _bindtextdomain($domain, $path);
-}
-function T_bind_textdomain_codeset($domain, $codeset) {
-    // bind_textdomain_codeset is available only in PHP 4.2.0+
-    if (_check_locale_and_function('bind_textdomain_codeset'))
-        return bind_textdomain_codeset($domain, $codeset);
-    else return _bind_textdomain_codeset($domain, $codeset);
-}
-function T_textdomain($domain) {
-    if (_check_locale_and_function()) return textdomain($domain);
-    else return _textdomain($domain);
-}
-function T_gettext($msgid) {
-    if (_check_locale_and_function()) return gettext($msgid);
-    else return _gettext($msgid);
-}
-function T_($msgid) {
-    if (_check_locale_and_function()) return _($msgid);
-    return __($msgid);
-}
-function T_ngettext($singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return ngettext($singular, $plural, $number);
-    else return _ngettext($singular, $plural, $number);
-}
-function T_dgettext($domain, $msgid) {
-    if (_check_locale_and_function()) return dgettext($domain, $msgid);
-    else return _dgettext($domain, $msgid);
-}
-function T_dngettext($domain, $singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return dngettext($domain, $singular, $plural, $number);
-    else return _dngettext($domain, $singular, $plural, $number);
-}
-function T_dcgettext($domain, $msgid, $category) {
-    if (_check_locale_and_function())
-        return dcgettext($domain, $msgid, $category);
-    else return _dcgettext($domain, $msgid, $category);
-}
-function T_dcngettext($domain, $singular, $plural, $number, $category) {
-    if (_check_locale_and_function())
-      return dcngettext($domain, $singular, $plural, $number, $category);
-    else return _dcngettext($domain, $singular, $plural, $number, $category);
-}
-
-function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext'))
-      return pgettext($context, $msgid);
-  else
-      return _pgettext($context, $msgid);
-}
-
-function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
-  else
-      return _dpgettext($domain, $context, $msgid);
-}
-
-function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
-  else
-      return _dcpgettext($domain, $context, $msgid, $category);
-}
-
-function T_npgettext($context, $singular, $plural, $number) {
-    if (_check_locale_and_function('npgettext'))
-        return npgettext($context, $singular, $plural, $number);
-    else
-        return _npgettext($context, $singular, $plural, $number);
-}
-
-function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
-}
-
-function T_dcnpgettext($domain, $context, $singular, $plural,
-                       $number, $category) {
-    if (_check_locale_and_function('dcnpgettext'))
-        return dcnpgettext($domain, $context, $singular,
-                           $plural, $number, $category);
-    else
-        return _dcnpgettext($domain, $context, $singular,
-                            $plural, $number, $category);
-}
-
-
-
-// Wrappers used as a drop in replacement for the standard gettext functions
-
-if (!function_exists('gettext')) {
-    function bindtextdomain($domain, $path) {
-        return _bindtextdomain($domain, $path);
-    }
-    function bind_textdomain_codeset($domain, $codeset) {
-        return _bind_textdomain_codeset($domain, $codeset);
-    }
-    function textdomain($domain) {
-        return _textdomain($domain);
-    }
-    function gettext($msgid) {
-        return _gettext($msgid);
-    }
-    function _($msgid) {
-        return __($msgid);
-    }
-    function ngettext($singular, $plural, $number) {
-        return _ngettext($singular, $plural, $number);
-    }
-    function dgettext($domain, $msgid) {
-        return _dgettext($domain, $msgid);
-    }
-    function dngettext($domain, $singular, $plural, $number) {
-        return _dngettext($domain, $singular, $plural, $number);
-    }
-    function dcgettext($domain, $msgid, $category) {
-        return _dcgettext($domain, $msgid, $category);
-    }
-    function dcngettext($domain, $singular, $plural, $number, $category) {
-        return _dcngettext($domain, $singular, $plural, $number, $category);
-    }
-    function pgettext($context, $msgid) {
-        return _pgettext($context, $msgid);
-    }
-    function npgettext($context, $singular, $plural, $number) {
-        return _npgettext($context, $singular, $plural, $number);
-    }
-    function dpgettext($domain, $context, $msgid) {
-        return _dpgettext($domain, $context, $msgid);
-    }
-    function dnpgettext($domain, $context, $singular, $plural, $number) {
-        return _dnpgettext($domain, $context, $singular, $plural, $number);
-    }
-    function dcpgettext($domain, $context, $msgid, $category) {
-        return _dcpgettext($domain, $context, $msgid, $category);
-    }
-    function dcnpgettext($domain, $context, $singular, $plural,
-                         $number, $category) {
-      return _dcnpgettext($domain, $context, $singular, $plural,
-                          $number, $category);
-    }
-}
-
-?>
diff --git a/inc/contrib/gettext/gettext.php b/inc/contrib/gettext/gettext.php
deleted file mode 100755
index 5064047c..00000000
--- a/inc/contrib/gettext/gettext.php
+++ /dev/null
@@ -1,432 +0,0 @@
-<?php
-/*
-   Copyright (c) 2003, 2009 Danilo Segan <danilo@kvota.net>.
-   Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-/**
- * Provides a simple gettext replacement that works independently from
- * the system's gettext abilities.
- * It can read MO files and use them for translating strings.
- * The files are passed to gettext_reader as a Stream (see streams.php)
- *
- * This version has the ability to cache all strings and translations to
- * speed up the string lookup.
- * While the cache is enabled by default, it can be switched off with the
- * second parameter in the constructor (e.g. whenusing very large MO files
- * that you don't want to keep in memory)
- */
-class gettext_reader {
-  //public:
-   var $error = 0; // public variable that holds error code (0 if no error)
-
-   //private:
-  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
-  var $STREAM = NULL;
-  var $short_circuit = false;
-  var $enable_cache = false;
-  var $originals = NULL;      // offset of original table
-  var $translations = NULL;    // offset of translation table
-  var $pluralheader = NULL;    // cache header field for plural forms
-  var $total = 0;          // total string count
-  var $table_originals = NULL;  // table for original strings (offsets)
-  var $table_translations = NULL;  // table for translated strings (offsets)
-  var $cache_translations = NULL;  // original -> translation mapping
-
-
-  /* Methods */
-
-
-  /**
-   * Reads a 32bit Integer from the Stream
-   *
-   * @access private
-   * @return Integer from the Stream
-   */
-  function readint() {
-      if ($this->BYTEORDER == 0) {
-        // low endian
-        $input=unpack('V', $this->STREAM->read(4));
-        return array_shift($input);
-      } else {
-        // big endian
-        $input=unpack('N', $this->STREAM->read(4));
-        return array_shift($input);
-      }
-    }
-
-  function read($bytes) {
-    return $this->STREAM->read($bytes);
-  }
-
-  /**
-   * Reads an array of Integers from the Stream
-   *
-   * @param int count How many elements should be read
-   * @return Array of Integers
-   */
-  function readintarray($count) {
-    if ($this->BYTEORDER == 0) {
-        // low endian
-        return unpack('V'.$count, $this->STREAM->read(4 * $count));
-      } else {
-        // big endian
-        return unpack('N'.$count, $this->STREAM->read(4 * $count));
-      }
-  }
-
-  /**
-   * Constructor
-   *
-   * @param object Reader the StreamReader object
-   * @param boolean enable_cache Enable or disable caching of strings (default on)
-   */
-  function gettext_reader($Reader, $enable_cache = true) {
-    // If there isn't a StreamReader, turn on short circuit mode.
-    if (! $Reader || isset($Reader->error) ) {
-      $this->short_circuit = true;
-      return;
-    }
-
-    // Caching can be turned off
-    $this->enable_cache = $enable_cache;
-
-    $MAGIC1 = "\x95\x04\x12\xde";
-    $MAGIC2 = "\xde\x12\x04\x95";
-
-    $this->STREAM = $Reader;
-    $magic = $this->read(4);
-    if ($magic == $MAGIC1) {
-      $this->BYTEORDER = 1;
-    } elseif ($magic == $MAGIC2) {
-      $this->BYTEORDER = 0;
-    } else {
-      $this->error = 1; // not MO file
-      return false;
-    }
-
-    // FIXME: Do we care about revision? We should.
-    $revision = $this->readint();
-
-    $this->total = $this->readint();
-    $this->originals = $this->readint();
-    $this->translations = $this->readint();
-  }
-
-  /**
-   * Loads the translation tables from the MO file into the cache
-   * If caching is enabled, also loads all strings into a cache
-   * to speed up translation lookups
-   *
-   * @access private
-   */
-  function load_tables() {
-    if (is_array($this->cache_translations) &&
-      is_array($this->table_originals) &&
-      is_array($this->table_translations))
-      return;
-
-    /* get original and translations tables */
-    if (!is_array($this->table_originals)) {
-      $this->STREAM->seekto($this->originals);
-      $this->table_originals = $this->readintarray($this->total * 2);
-    }
-    if (!is_array($this->table_translations)) {
-      $this->STREAM->seekto($this->translations);
-      $this->table_translations = $this->readintarray($this->total * 2);
-    }
-
-    if ($this->enable_cache) {
-      $this->cache_translations = array ();
-      /* read all strings in the cache */
-      for ($i = 0; $i < $this->total; $i++) {
-        $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
-        $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
-        $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
-        $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
-        $this->cache_translations[$original] = $translation;
-      }
-    }
-  }
-
-  /**
-   * Returns a string from the "originals" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_original_string($num) {
-    $length = $this->table_originals[$num * 2 + 1];
-    $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
-  }
-
-  /**
-   * Returns a string from the "translations" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_translation_string($num) {
-    $length = $this->table_translations[$num * 2 + 1];
-    $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
-  }
-
-  /**
-   * Binary search for string
-   *
-   * @access private
-   * @param string string
-   * @param int start (internally used in recursive function)
-   * @param int end (internally used in recursive function)
-   * @return int string number (offset in originals table)
-   */
-  function find_string($string, $start = -1, $end = -1) {
-    if (($start == -1) or ($end == -1)) {
-      // find_string is called with only one parameter, set start end end
-      $start = 0;
-      $end = $this->total;
-    }
-    if (abs($start - $end) <= 1) {
-      // We're done, now we either found the string, or it doesn't exist
-      $txt = $this->get_original_string($start);
-      if ($string == $txt)
-        return $start;
-      else
-        return -1;
-    } else if ($start > $end) {
-      // start > end -> turn around and start over
-      return $this->find_string($string, $end, $start);
-    } else {
-      // Divide table in two parts
-      $half = (int)(($start + $end) / 2);
-      $cmp = strcmp($string, $this->get_original_string($half));
-      if ($cmp == 0)
-        // string is exactly in the middle => return it
-        return $half;
-      else if ($cmp < 0)
-        // The string is in the upper half
-        return $this->find_string($string, $start, $half);
-      else
-        // The string is in the lower half
-        return $this->find_string($string, $half, $end);
-    }
-  }
-
-  /**
-   * Translates a string
-   *
-   * @access public
-   * @param string string to be translated
-   * @return string translated string (or original, if not found)
-   */
-  function translate($string) {
-    if ($this->short_circuit)
-      return $string;
-    $this->load_tables();
-
-    if ($this->enable_cache) {
-      // Caching enabled, get translated string from cache
-      if (array_key_exists($string, $this->cache_translations))
-        return $this->cache_translations[$string];
-      else
-        return $string;
-    } else {
-      // Caching not enabled, try to find string
-      $num = $this->find_string($string);
-      if ($num == -1)
-        return $string;
-      else
-        return $this->get_translation_string($num);
-    }
-  }
-
-  /**
-   * Sanitize plural form expression for use in PHP eval call.
-   *
-   * @access private
-   * @return string sanitized plural form expression
-   */
-  function sanitize_plural_expression($expr) {
-    // Get rid of disallowed characters.
-    $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
-
-    // Add parenthesis for tertiary '?' operator.
-    $expr .= ';';
-    $res = '';
-    $p = 0;
-    for ($i = 0; $i < strlen($expr); $i++) {
-      $ch = $expr[$i];
-      switch ($ch) {
-      case '?':
-        $res .= ' ? (';
-        $p++;
-        break;
-      case ':':
-        $res .= ') : (';
-        break;
-      case ';':
-        $res .= str_repeat( ')', $p) . ';';
-        $p = 0;
-        break;
-      default:
-        $res .= $ch;
-      }
-    }
-    return $res;
-  }
-
-  /**
-   * Parse full PO header and extract only plural forms line.
-   *
-   * @access private
-   * @return string verbatim plural form header field
-   */
-  function extract_plural_forms_header_from_po_header($header) {
-    if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs))
-      $expr = $regs[2];
-    else
-      $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
-    return $expr;
-  }
-
-  /**
-   * Get possible plural forms from MO header
-   *
-   * @access private
-   * @return string plural form header
-   */
-  function get_plural_forms() {
-    // lets assume message number 0 is header
-    // this is true, right?
-    $this->load_tables();
-
-    // cache header field for plural forms
-    if (! is_string($this->pluralheader)) {
-      if ($this->enable_cache) {
-        $header = $this->cache_translations[""];
-      } else {
-        $header = $this->get_translation_string(0);
-      }
-      $expr = $this->extract_plural_forms_header_from_po_header($header);
-      $this->pluralheader = $this->sanitize_plural_expression($expr);
-    }
-    return $this->pluralheader;
-  }
-
-  /**
-   * Detects which plural form to take
-   *
-   * @access private
-   * @param n count
-   * @return int array index of the right plural form
-   */
-  function select_string($n) {
-    $string = $this->get_plural_forms();
-    $string = str_replace('nplurals',"\$total",$string);
-    $string = str_replace("n",$n,$string);
-    $string = str_replace('plural',"\$plural",$string);
-
-    $total = 0;
-    $plural = 0;
-
-    eval("$string");
-    if ($plural >= $total) $plural = $total - 1;
-    return $plural;
-  }
-
-  /**
-   * Plural version of gettext
-   *
-   * @access public
-   * @param string single
-   * @param string plural
-   * @param string number
-   * @return translated plural form
-   */
-  function ngettext($single, $plural, $number) {
-    if ($this->short_circuit) {
-      if ($number != 1)
-        return $plural;
-      else
-        return $single;
-    }
-
-    // find out the appropriate form
-    $select = $this->select_string($number);
-
-    // this should contains all strings separated by NULLs
-    $key = $single . chr(0) . $plural;
-
-
-    if ($this->enable_cache) {
-      if (! array_key_exists($key, $this->cache_translations)) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->cache_translations[$key];
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    } else {
-      $num = $this->find_string($key);
-      if ($num == -1) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->get_translation_string($num);
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    }
-  }
-
-  function pgettext($context, $msgid) {
-    $key = $context . chr(4) . $msgid;
-    $ret = $this->translate($key);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $msgid;
-    } else {
-      return $ret;
-    }
-  }
-
-  function npgettext($context, $singular, $plural, $number) {
-    $key = $context . chr(4) . $singular;
-    $ret = $this->ngettext($key, $plural, $number);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $singular;
-    } else {
-      return $ret;
-    }
-
-  }
-}
-
-?>
diff --git a/inc/contrib/gettext/streams.php b/inc/contrib/gettext/streams.php
deleted file mode 100644
index 3cdc1584..00000000
--- a/inc/contrib/gettext/streams.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/*
-   Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-
-  // Simple class to wrap file streams, string streams, etc.
-  // seek is essential, and it should be byte stream
-class StreamReader {
-  // should return a string [FIXME: perhaps return array of bytes?]
-  function read($bytes) {
-    return false;
-  }
-
-  // should return new position
-  function seekto($position) {
-    return false;
-  }
-
-  // returns current position
-  function currentpos() {
-    return false;
-  }
-
-  // returns length of entire stream (limit for seekto()s)
-  function length() {
-    return false;
-  }
-};
-
-class StringReader {
-  var $_pos;
-  var $_str;
-
-  function StringReader($str='') {
-    $this->_str = $str;
-    $this->_pos = 0;
-  }
-
-  function read($bytes) {
-    $data = substr($this->_str, $this->_pos, $bytes);
-    $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
-
-    return $data;
-  }
-
-  function seekto($pos) {
-    $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
-    return $this->_pos;
-  }
-
-  function currentpos() {
-    return $this->_pos;
-  }
-
-  function length() {
-    return strlen($this->_str);
-  }
-
-};
-
-
-class FileReader {
-  var $_pos;
-  var $_fd;
-  var $_length;
-
-  function FileReader($filename) {
-    if (file_exists($filename)) {
-
-      $this->_length=filesize($filename);
-      $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
-      if (!$this->_fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
-  }
-
-  function read($bytes) {
-    if ($bytes) {
-      fseek($this->_fd, $this->_pos);
-
-      // PHP 5.1.1 does not read more than 8192 bytes in one fread()
-      // the discussions at PHP Bugs suggest it's the intended behaviour
-      $data = '';
-      while ($bytes > 0) {
-        $chunk  = fread($this->_fd, $bytes);
-        $data  .= $chunk;
-        $bytes -= strlen($chunk);
-      }
-      $this->_pos = ftell($this->_fd);
-
-      return $data;
-    } else return '';
-  }
-
-  function seekto($pos) {
-    fseek($this->_fd, $pos);
-    $this->_pos = ftell($this->_fd);
-    return $this->_pos;
-  }
-
-  function currentpos() {
-    return $this->_pos;
-  }
-
-  function length() {
-    return $this->_length;
-  }
-
-  function close() {
-    fclose($this->_fd);
-  }
-
-};
-
-// Preloads entire file in memory first, then creates a StringReader
-// over it (it assumes knowledge of StringReader internals)
-class CachedFileReader extends StringReader {
-  function CachedFileReader($filename) {
-    if (file_exists($filename)) {
-
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
-
-      if (!$fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-      $this->_str = fread($fd, $length);
-      fclose($fd);
-
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
-  }
-};
-
-
-?>
diff --git a/inc/contrib/gettext/tests/LocalesTest.php b/inc/contrib/gettext/tests/LocalesTest.php
deleted file mode 100644
index fab21f86..00000000
--- a/inc/contrib/gettext/tests/LocalesTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-require_once('PHPUnit/Framework.php');
-require_once('gettext.inc');
-
-class LocaleTest extends PHPUnit_Framework_TestCase
-{
-  public function test_setlocale()
-  {
-    putenv("LC_ALL=");
-    // _setlocale defaults to a locale name from environment variable LANG.
-    putenv("LANG=sr_RS");
-    $this->assertEquals('sr_RS', _setlocale(LC_MESSAGES, 0));
-  }
-
-  public function test_setlocale_system()
-  {
-    putenv("LC_ALL=");
-    // For an existing locale, it never needs emulation.
-    putenv("LANG=C");
-    _setlocale(LC_MESSAGES, "");
-    $this->assertEquals(0, locale_emulation());
-  }
-
-  public function test_setlocale_emulation()
-  {
-    putenv("LC_ALL=");
-    // If we set it to a non-existent locale, it still works, but uses
-    // emulation.
-    _setlocale(LC_MESSAGES, "xxx_XXX");
-    $this->assertEquals('xxx_XXX', _setlocale(LC_MESSAGES, 0));
-    $this->assertEquals(1, locale_emulation());
-  }
-
-  public function test_get_list_of_locales()
-  {
-    // For a locale containing country code, we prefer
-    // full locale name, but if that's not found, fall back
-    // to the language only locale name.
-    $this->assertEquals(array("sr_RS", "sr"),
-                        get_list_of_locales("sr_RS"));
-
-    // If language code is used, it's the only thing returned.
-    $this->assertEquals(array("sr"),
-                        get_list_of_locales("sr"));
-
-    // There is support for language and charset only.
-    $this->assertEquals(array("sr.UTF-8", "sr"),
-                        get_list_of_locales("sr.UTF-8"));
-
-    // It can also split out character set from the full locale name.
-    $this->assertEquals(array("sr_RS.UTF-8", "sr_RS", "sr"),
-                        get_list_of_locales("sr_RS.UTF-8"));
-
-    // There is support for @modifier in locale names as well.
-    $this->assertEquals(array("sr_RS.UTF-8@latin", "sr_RS@latin", "sr@latin",
-                              "sr_RS.UTF-8", "sr_RS", "sr"),
-                        get_list_of_locales("sr_RS.UTF-8@latin"));
-
-    // We can pass in only language and modifier.
-    $this->assertEquals(array("sr@latin", "sr"),
-                        get_list_of_locales("sr@latin"));
-
-
-    // If locale name is not following the regular POSIX pattern,
-    // it's used verbatim.
-    $this->assertEquals(array("something"),
-                        get_list_of_locales("something"));
-
-    // Passing in an empty string returns an empty array.
-    $this->assertEquals(array(),
-                        get_list_of_locales(""));
-  }
-}
-
-?>
diff --git a/inc/contrib/gettext/tests/ParsingTest.php b/inc/contrib/gettext/tests/ParsingTest.php
deleted file mode 100644
index ff561989..00000000
--- a/inc/contrib/gettext/tests/ParsingTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-require_once('PHPUnit/Framework.php');
-//require_once('gettext.php');
-
-class ParsingTest extends PHPUnit_Framework_TestCase
-{
-  public function test_extract_plural_forms_header_from_po_header()
-  {
-    $parser = new gettext_reader(NULL);
-    // It defaults to a "Western-style" plural header.
-    $this->assertEquals(
-      'nplurals=2; plural=n == 1 ? 0 : 1;',
-      $parser->extract_plural_forms_header_from_po_header(""));
-
-    // Extracting it from the middle of the header works.
-    $this->assertEquals(
-      'nplurals=1; plural=0;',
-      $parser->extract_plural_forms_header_from_po_header(
-        "Content-type: text/html; charset=UTF-8\n"
-        ."Plural-Forms: nplurals=1; plural=0;\n"
-        ."Last-Translator: nobody\n"
-      ));
-
-    // It's also case-insensitive.
-    $this->assertEquals(
-      'nplurals=1; plural=0;',
-      $parser->extract_plural_forms_header_from_po_header(
-        "PLURAL-forms: nplurals=1; plural=0;\n"
-      ));
-
-    // It falls back to default if it's not on a separate line.
-    $this->assertEquals(
-      'nplurals=2; plural=n == 1 ? 0 : 1;',
-      $parser->extract_plural_forms_header_from_po_header(
-       "Content-type: text/html; charset=UTF-8" // note the missing \n here
-        ."Plural-Forms: nplurals=1; plural=0;\n"
-        ."Last-Translator: nobody\n"
-      ));
-  }
-
-  /**
-   * @dataProvider data_provider_test_npgettext
-   */
-  public function test_npgettext($number, $expected) {
-    $parser = new gettext_reader(NULL);
-    $result = $parser->npgettext("context",
-                                 "%d pig went to the market\n",
-                                 "%d pigs went to the market\n",
-                                 $number);
-    $this->assertSame($expected, $result);
-  }
-  public static function data_provider_test_npgettext() {
-    return array(
-                 array(1, "%d pig went to the market\n"),
-                 array(2, "%d pigs went to the market\n"),
-                 );
-  }
-
-}
-?>
diff --git a/inc/contrib/minify/FirePHP.php b/inc/contrib/minify/FirePHP.php
deleted file mode 100755
index d301a641..00000000
--- a/inc/contrib/minify/FirePHP.php
+++ /dev/null
@@ -1,1370 +0,0 @@
-<?php
-/**
- * *** BEGIN LICENSE BLOCK *****
- *  
- * This file is part of FirePHP (http://www.firephp.org/).
- * 
- * Software License Agreement (New BSD License)
- * 
- * Copyright (c) 2006-2008, Christoph Dorn
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- * 
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- * 
- *     * Neither the name of Christoph Dorn nor the names of its
- *       contributors may be used to endorse or promote products derived from this
- *       software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * ***** END LICENSE BLOCK *****
- * 
- * @copyright   Copyright (C) 2007-2008 Christoph Dorn
- * @author      Christoph Dorn <christoph@christophdorn.com>
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @package     FirePHP
- */
- 
- 
-/**
- * Sends the given data to the FirePHP Firefox Extension.
- * The data can be displayed in the Firebug Console or in the
- * "Server" request tab.
- * 
- * For more information see: http://www.firephp.org/
- * 
- * @copyright   Copyright (C) 2007-2008 Christoph Dorn
- * @author      Christoph Dorn <christoph@christophdorn.com>
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @package     FirePHP
- */
-class FirePHP {
-  
-  /**
-   * FirePHP version
-   *
-   * @var string
-   */
-  const VERSION = '0.2.0';
-  
-  /**
-   * Firebug LOG level
-   *
-   * Logs a message to firebug console.
-   * 
-   * @var string
-   */
-  const LOG = 'LOG';
-  
-  /**
-   * Firebug INFO level
-   *
-   * Logs a message to firebug console and displays an info icon before the message.
-   * 
-   * @var string
-   */
-  const INFO = 'INFO';
-  
-  /**
-   * Firebug WARN level
-   *
-   * Logs a message to firebug console, displays an warning icon before the message and colors the line turquoise.
-   * 
-   * @var string
-   */
-  const WARN = 'WARN';
-  
-  /**
-   * Firebug ERROR level
-   *
-   * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count.
-   * 
-   * @var string
-   */
-  const ERROR = 'ERROR';
-  
-  /**
-   * Dumps a variable to firebug's server panel
-   *
-   * @var string
-   */
-  const DUMP = 'DUMP';
-  
-  /**
-   * Displays a stack trace in firebug console
-   *
-   * @var string
-   */
-  const TRACE = 'TRACE';
-  
-  /**
-   * Displays an exception in firebug console
-   * 
-   * Increments the firebug error count.
-   *
-   * @var string
-   */
-  const EXCEPTION = 'EXCEPTION';
-  
-  /**
-   * Displays an table in firebug console
-   *
-   * @var string
-   */
-  const TABLE = 'TABLE';
-  
-  /**
-   * Starts a group in firebug console
-   * 
-   * @var string
-   */
-  const GROUP_START = 'GROUP_START';
-  
-  /**
-   * Ends a group in firebug console
-   * 
-   * @var string
-   */
-  const GROUP_END = 'GROUP_END';
-  
-  /**
-   * Singleton instance of FirePHP
-   *
-   * @var FirePHP
-   */
-  protected static $instance = null;
-  
-  /**
-   * Wildfire protocol message index
-   *
-   * @var int
-   */
-  protected $messageIndex = 1;
-    
-  /**
-   * Options for the library
-   * 
-   * @var array
-   */
-  protected $options = array();
-  
-  /**
-   * Filters used to exclude object members when encoding
-   * 
-   * @var array
-   */
-  protected $objectFilters = array();
-  
-  /**
-   * A stack of objects used to detect recursion during object encoding
-   * 
-   * @var object
-   */
-  protected $objectStack = array();
-  
-  /**
-   * Flag to enable/disable logging
-   * 
-   * @var boolean
-   */
-  protected $enabled = true;
-  
-  /**
-   * The object constructor
-   */
-  function __construct() {
-    $this->options['maxObjectDepth'] = 10;
-    $this->options['maxArrayDepth'] = 20;
-    $this->options['useNativeJsonEncode'] = true;
-    $this->options['includeLineNumbers'] = true;
-  }
-    
-  /**
-   * When the object gets serialized only include specific object members.
-   * 
-   * @return array
-   */  
-  public function __sleep() {
-    return array('options','objectFilters','enabled');
-  }
-    
-  /**
-   * Gets singleton instance of FirePHP
-   *
-   * @param boolean $AutoCreate
-   * @return FirePHP
-   */
-  public static function getInstance($AutoCreate=false) {
-    if($AutoCreate===true && !self::$instance) {
-      self::init();
-    }
-    return self::$instance;
-  }
-   
-  /**
-   * Creates FirePHP object and stores it for singleton access
-   *
-   * @return FirePHP
-   */
-  public static function init() {
-    return self::$instance = new self();
-  }
-  
-  /**
-   * Enable and disable logging to Firebug
-   * 
-   * @param boolean $Enabled TRUE to enable, FALSE to disable
-   * @return void
-   */
-  public function setEnabled($Enabled) {
-    $this->enabled = $Enabled;
-  }
-  
-  /**
-   * Check if logging is enabled
-   * 
-   * @return boolean TRUE if enabled
-   */
-  public function getEnabled() {
-    return $this->enabled;
-  }
-  
-  /**
-   * Specify a filter to be used when encoding an object
-   * 
-   * Filters are used to exclude object members.
-   * 
-   * @param string $Class The class name of the object
-   * @param array $Filter An array or members to exclude
-   * @return void
-   */
-  public function setObjectFilter($Class, $Filter) {
-    $this->objectFilters[$Class] = $Filter;
-  }
-  
-  /**
-   * Set some options for the library
-   * 
-   * Options:
-   *  - maxObjectDepth: The maximum depth to traverse objects (default: 10)
-   *  - maxArrayDepth: The maximum depth to traverse arrays (default: 20)
-   *  - useNativeJsonEncode: If true will use json_encode() (default: true)
-   *  - includeLineNumbers: If true will include line numbers and filenames (default: true)
-   * 
-   * @param array $Options The options to be set
-   * @return void
-   */
-  public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);
-  }
-  
-  /**
-   * Register FirePHP as your error handler
-   * 
-   * Will throw exceptions for each php error.
-   */
-  public function registerErrorHandler()
-  {
-    //NOTE: The following errors will not be caught by this error handler:
-    //      E_ERROR, E_PARSE, E_CORE_ERROR,
-    //      E_CORE_WARNING, E_COMPILE_ERROR,
-    //      E_COMPILE_WARNING, E_STRICT
-    
-    set_error_handler(array($this,'errorHandler'));     
-  }
-
-  /**
-   * FirePHP's error handler
-   * 
-   * Throws exception for each php error that will occur.
-   *
-   * @param int $errno
-   * @param string $errstr
-   * @param string $errfile
-   * @param int $errline
-   * @param array $errcontext
-   */
-  public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
-  {
-    // Don't throw exception if error reporting is switched off
-    if (error_reporting() == 0) {
-      return;
-    }
-    // Only throw exceptions for errors we are asking for
-    if (error_reporting() & $errno) {
-      throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-    }
-  }
-  
-  /**
-   * Register FirePHP as your exception handler
-   */
-  public function registerExceptionHandler()
-  {
-    set_exception_handler(array($this,'exceptionHandler'));     
-  }
-  
-  /**
-   * FirePHP's exception handler
-   * 
-   * Logs all exceptions to your firebug console and then stops the script.
-   *
-   * @param Exception $Exception
-   * @throws Exception
-   */
-  function exceptionHandler($Exception) {
-    $this->fb($Exception);
-  }
-  
-  /**
-   * Set custom processor url for FirePHP
-   *
-   * @param string $URL
-   */    
-  public function setProcessorUrl($URL)
-  {
-    $this->setHeader('X-FirePHP-ProcessorURL', $URL);
-  }
-
-  /**
-   * Set custom renderer url for FirePHP
-   *
-   * @param string $URL
-   */
-  public function setRendererUrl($URL)
-  {
-    $this->setHeader('X-FirePHP-RendererURL', $URL);
-  }
-  
-  /**
-   * Start a group for following messages
-   *
-   * @param string $Name
-   * @return true
-   * @throws Exception
-   */
-  public function group($Name) {
-    return $this->fb(null, $Name, FirePHP::GROUP_START);
-  }
-  
-  /**
-   * Ends a group you have started before
-   *
-   * @return true
-   * @throws Exception
-   */
-  public function groupEnd() {
-    return $this->fb(null, null, FirePHP::GROUP_END);
-  }
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::LOG
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function log($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::LOG);
-  } 
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::INFO
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function info($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::INFO);
-  } 
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::WARN
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function warn($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::WARN);
-  } 
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::ERROR
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function error($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::ERROR);
-  } 
-
-  /**
-   * Dumps key and variable to firebug server panel
-   *
-   * @see FirePHP::DUMP
-   * @param string $Key
-   * @param mixed $Variable
-   * @return true
-   * @throws Exception
-   */
-  public function dump($Key, $Variable) {
-    return $this->fb($Variable, $Key, FirePHP::DUMP);
-  }
-  
-  /**
-   * Log a trace in the firebug console
-   *
-   * @see FirePHP::TRACE
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function trace($Label) {
-    return $this->fb($Label, FirePHP::TRACE);
-  } 
-
-  /**
-   * Log a table in the firebug console
-   *
-   * @see FirePHP::TABLE
-   * @param string $Label
-   * @param string $Table
-   * @return true
-   * @throws Exception
-   */
-  public function table($Label, $Table) {
-    return $this->fb($Table, $Label, FirePHP::TABLE);
-  }
-  
-  /**
-   * Check if FirePHP is installed on client
-   *
-   * @return boolean
-   */
-  public function detectClientExtension() {
-    /* Check if FirePHP is installed on client */
-    if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
-       !version_compare($m[1][0],'0.0.6','>=')) {
-      return false;
-    }
-    return true;    
-  }
- 
-  /**
-   * Log varible to Firebug
-   * 
-   * @see http://www.firephp.org/Wiki/Reference/Fb
-   * @param mixed $Object The variable to be logged
-   * @return true Return TRUE if message was added to headers, FALSE otherwise
-   * @throws Exception
-   */
-  public function fb($Object) {
-  
-    if(!$this->enabled) {
-      return false;
-    }
-  
-    if (headers_sent($filename, $linenum)) {
-        throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
-    }
-  
-    $Type = null;
-    $Label = null;
-  
-    if(func_num_args()==1) {
-    } else
-    if(func_num_args()==2) {
-      switch(func_get_arg(1)) {
-        case self::LOG:
-        case self::INFO:
-        case self::WARN:
-        case self::ERROR:
-        case self::DUMP:
-        case self::TRACE:
-        case self::EXCEPTION:
-        case self::TABLE:
-        case self::GROUP_START:
-        case self::GROUP_END:
-          $Type = func_get_arg(1);
-          break;
-        default:
-          $Label = func_get_arg(1);
-          break;
-      }
-    } else
-    if(func_num_args()==3) {
-      $Type = func_get_arg(2);
-      $Label = func_get_arg(1);
-    } else {
-      throw $this->newException('Wrong number of arguments to fb() function!');
-    }
-  
-  
-    if(!$this->detectClientExtension()) {
-      return false;
-    }
-  
-    $meta = array();
-    $skipFinalObjectEncode = false;
-  
-    if($Object instanceof Exception) {
-
-      $meta['file'] = $this->_escapeTraceFile($Object->getFile());
-      $meta['line'] = $Object->getLine();
-      
-      $trace = $Object->getTrace();
-      if($Object instanceof ErrorException
-         && isset($trace[0]['function'])
-         && $trace[0]['function']=='errorHandler'
-         && isset($trace[0]['class'])
-         && $trace[0]['class']=='FirePHP') {
-           
-        $severity = false;
-        switch($Object->getSeverity()) {
-          case E_WARNING: $severity = 'E_WARNING'; break;
-          case E_NOTICE: $severity = 'E_NOTICE'; break;
-          case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
-          case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
-          case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
-          case E_STRICT: $severity = 'E_STRICT'; break;
-          case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
-          case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
-          case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
-        }
-           
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$severity.': '.$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'trigger',
-                        'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
-        $skipFinalObjectEncode = true;
-      } else {
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'throw',
-                        'Trace'=>$this->_escapeTrace($trace));
-        $skipFinalObjectEncode = true;
-      }
-      $Type = self::EXCEPTION;
-      
-    } else
-    if($Type==self::TRACE) {
-      
-      $trace = debug_backtrace();
-      if(!$trace) return false;
-      for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
-
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i]['file'])
-           && ($trace[$i]['class']=='FirePHP'
-               || $trace[$i]['class']=='FB')
-           && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-               || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-          /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-        } else
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i+1]['file'])
-           && $trace[$i]['class']=='FirePHP'
-           && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-          /* Skip fb() */
-        } else
-        if($trace[$i]['function']=='fb'
-           || $trace[$i]['function']=='trace'
-           || $trace[$i]['function']=='send') {
-          $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
-                          'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
-                          'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
-                          'Message'=>$trace[$i]['args'][0],
-                          'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
-                          'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
-                          'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
-                          'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
-
-          $skipFinalObjectEncode = true;
-          $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-          $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-          break;
-        }
-      }
-
-    } else
-    if($Type==self::TABLE) {
-      
-      if(isset($Object[0]) && is_string($Object[0])) {
-        $Object[1] = $this->encodeTable($Object[1]);
-      } else {
-        $Object = $this->encodeTable($Object);
-      }
-
-      $skipFinalObjectEncode = true;
-      
-    } else {
-      if($Type===null) {
-        $Type = self::LOG;
-      }
-    }
-    
-    if($this->options['includeLineNumbers']) {
-      if(!isset($meta['file']) || !isset($meta['line'])) {
-
-        $trace = debug_backtrace();
-        for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
-  
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i]['file'])
-             && ($trace[$i]['class']=='FirePHP'
-                 || $trace[$i]['class']=='FB')
-             && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-                 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-            /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-          } else
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i+1]['file'])
-             && $trace[$i]['class']=='FirePHP'
-             && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip fb() */
-          } else
-          if(isset($trace[$i]['file'])
-             && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip FB::fb() */
-          } else {
-            $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-            $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-            break;
-          }
-        }      
-      
-      }
-    } else {
-      unset($meta['file']);
-      unset($meta['line']);
-    }
-
-  	$this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
-  	$this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
- 
-    $structure_index = 1;
-    if($Type==self::DUMP) {
-      $structure_index = 2;
-    	$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
-    } else {
-    	$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
-    }
-  
-    if($Type==self::DUMP) {
-    	$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
-    } else {
-      $msg_meta = array('Type'=>$Type);
-      if($Label!==null) {
-        $msg_meta['Label'] = $Label;
-      }
-      if(isset($meta['file'])) {
-        $msg_meta['File'] = $meta['file'];
-      }
-      if(isset($meta['line'])) {
-        $msg_meta['Line'] = $meta['line'];
-      }
-    	$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
-    }
-    
-    $parts = explode("\n",chunk_split($msg, 5000, "\n"));
-
-    for( $i=0 ; $i<count($parts) ; $i++) {
-        
-        $part = $parts[$i];
-        if ($part) {
-            
-            if(count($parts)>2) {
-              // Message needs to be split into multiple parts
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               (($i==0)?strlen($msg):'')
-                               . '|' . $part . '|'
-                               . (($i<count($parts)-2)?'\\':''));
-            } else {
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               strlen($part) . '|' . $part . '|');
-            }
-            
-            $this->messageIndex++;
-            
-            if ($this->messageIndex > 99999) {
-                throw new Exception('Maximum number (99,999) of messages reached!');             
-            }
-        }
-    }
-
-  	$this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
-
-    return true;
-  }
-  
-  /**
-   * Standardizes path for windows systems.
-   *
-   * @param string $Path
-   * @return string
-   */
-  protected function _standardizePath($Path) {
-    return preg_replace('/\\\\+/','/',$Path);    
-  }
-  
-  /**
-   * Escape trace path for windows systems
-   *
-   * @param array $Trace
-   * @return array
-   */
-  protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
-    for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
-      if(isset($Trace[$i]['file'])) {
-        $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
-      }
-      if(isset($Trace[$i]['args'])) {
-        $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
-      }
-    }
-    return $Trace;    
-  }
-  
-  /**
-   * Escape file information of trace for windows systems
-   *
-   * @param string $File
-   * @return string
-   */
-  protected function _escapeTraceFile($File) {
-    /* Check if we have a windows filepath */
-    if(strpos($File,'\\')) {
-      /* First strip down to single \ */
-      
-      $file = preg_replace('/\\\\+/','\\',$File);
-      
-      return $file;
-    }
-    return $File;
-  }
-
-  /**
-   * Send header
-   *
-   * @param string $Name
-   * @param string_type $Value
-   */
-  protected function setHeader($Name, $Value) {
-    return header($Name.': '.$Value);
-  }
-
-  /**
-   * Get user agent
-   *
-   * @return string|false
-   */
-  protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
-    return $_SERVER['HTTP_USER_AGENT'];
-  }
-
-  /**
-   * Returns a new exception
-   *
-   * @param string $Message
-   * @return Exception
-   */
-  protected function newException($Message) {
-    return new Exception($Message);
-  }
-  
-  /**
-   * Encode an object into a JSON string
-   * 
-   * Uses PHP's jeson_encode() if available
-   * 
-   * @param object $Object The object to be encoded
-   * @return string The JSON string
-   */
-  protected function jsonEncode($Object, $skipObjectEncode=false)
-  {
-    if(!$skipObjectEncode) {
-      $Object = $this->encodeObject($Object);
-    }
-    
-    if(function_exists('json_encode')
-       && $this->options['useNativeJsonEncode']!=false) {
-
-      return json_encode($Object);
-    } else {
-      return $this->json_encode($Object);
-    }
-  }
-  
-  /**
-   * Encodes a table by encoding each row and column with encodeObject()
-   * 
-   * @param array $Table The table to be encoded
-   * @return array
-   */  
-  protected function encodeTable($Table) {
-    if(!$Table) return $Table;
-    for( $i=0 ; $i<count($Table) ; $i++ ) {
-      if(is_array($Table[$i])) {
-        for( $j=0 ; $j<count($Table[$i]) ; $j++ ) {
-          $Table[$i][$j] = $this->encodeObject($Table[$i][$j]);
-        }
-      }
-    }
-    return $Table;
-  }
-  
-  /**
-   * Encodes an object including members with
-   * protected and private visibility
-   * 
-   * @param Object $Object The object to be encoded
-   * @param int $Depth The current traversal depth
-   * @return array All members of the object
-   */
-  protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)
-  {
-    $return = array();
-    
-    if (is_object($Object)) {
-
-        if ($ObjectDepth > $this->options['maxObjectDepth']) {
-          return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
-        }
-        
-        foreach ($this->objectStack as $refVal) {
-            if ($refVal === $Object) {
-                return '** Recursion ('.get_class($Object).') **';
-            }
-        }
-        array_push($this->objectStack, $Object);
-                
-        $return['__className'] = $class = get_class($Object);
-
-        $reflectionClass = new ReflectionClass($class);  
-        $properties = array();
-        foreach( $reflectionClass->getProperties() as $property) {
-          $properties[$property->getName()] = $property;
-        }
-            
-        $members = (array)$Object;
-            
-        foreach( $properties as $raw_name => $property ) {
-          
-          $name = $raw_name;
-          if($property->isStatic()) {
-            $name = 'static:'.$name;
-          }
-          if($property->isPublic()) {
-            $name = 'public:'.$name;
-          } else
-          if($property->isPrivate()) {
-            $name = 'private:'.$name;
-            $raw_name = "\0".$class."\0".$raw_name;
-          } else
-          if($property->isProtected()) {
-            $name = 'protected:'.$name;
-            $raw_name = "\0".'*'."\0".$raw_name;
-          }
-          
-          if(!(isset($this->objectFilters[$class])
-               && is_array($this->objectFilters[$class])
-               && in_array($raw_name,$this->objectFilters[$class]))) {
-
-            if(array_key_exists($raw_name,$members)
-               && !$property->isStatic()) {
-              
-              $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
-            
-            } else {
-              if(method_exists($property,'setAccessible')) {
-                $property->setAccessible(true);
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else
-              if($property->isPublic()) {
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else {
-                $return[$name] = '** Need PHP 5.3 to get value **';
-              }
-            }
-          } else {
-            $return[$name] = '** Excluded by Filter **';
-          }
-        }
-        
-        // Include all members that are not defined in the class
-        // but exist in the object
-        foreach( $members as $raw_name => $value ) {
-          
-          $name = $raw_name;
-          
-          if ($name{0} == "\0") {
-            $parts = explode("\0", $name);
-            $name = $parts[2];
-          }
-          
-          if(!isset($properties[$name])) {
-            $name = 'undeclared:'.$name;
-              
-            if(!(isset($this->objectFilters[$class])
-                 && is_array($this->objectFilters[$class])
-                 && in_array($raw_name,$this->objectFilters[$class]))) {
-              
-              $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
-            } else {
-              $return[$name] = '** Excluded by Filter **';
-            }
-          }
-        }
-        
-        array_pop($this->objectStack);
-        
-    } elseif (is_array($Object)) {
-
-        if ($ArrayDepth > $this->options['maxArrayDepth']) {
-          return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
-        }
-      
-        foreach ($Object as $key => $val) {
-          
-          // Encoding the $GLOBALS PHP array causes an infinite loop
-          // if the recursion is not reset here as it contains
-          // a reference to itself. This is the only way I have come up
-          // with to stop infinite recursion in this case.
-          if($key=='GLOBALS'
-             && is_array($val)
-             && array_key_exists('GLOBALS',$val)) {
-            $val['GLOBALS'] = '** Recursion (GLOBALS) **';
-          }
-          
-          $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
-        }
-    } else {
-      if(self::is_utf8($Object)) {
-        return $Object;
-      } else {
-        return utf8_encode($Object);
-      }
-    }
-    return $return;
-  }
-
-  /**
-   * Returns true if $string is valid UTF-8 and false otherwise.
-   *
-   * @param mixed $str String to be tested
-   * @return boolean
-   */
-  protected static function is_utf8($str) {
-    $c=0; $b=0;
-    $bits=0;
-    $len=strlen($str);
-    for($i=0; $i<$len; $i++){
-        $c=ord($str[$i]);
-        if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
-            else return false;
-            if(($i+$bits) > $len) return false;
-            while($bits > 1){
-                $i++;
-                $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
-                $bits--;
-            }
-        }
-    }
-    return true;
-  } 
-
-  /**
-   * Converts to and from JSON format.
-   *
-   * JSON (JavaScript Object Notation) is a lightweight data-interchange
-   * format. It is easy for humans to read and write. It is easy for machines
-   * to parse and generate. It is based on a subset of the JavaScript
-   * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
-   * This feature can also be found in  Python. JSON is a text format that is
-   * completely language independent but uses conventions that are familiar
-   * to programmers of the C-family of languages, including C, C++, C#, Java,
-   * JavaScript, Perl, TCL, and many others. These properties make JSON an
-   * ideal data-interchange language.
-   *
-   * This package provides a simple encoder and decoder for JSON notation. It
-   * is intended for use with client-side Javascript applications that make
-   * use of HTTPRequest to perform server communication functions - data can
-   * be encoded into JSON notation for use in a client-side javascript, or
-   * decoded from incoming Javascript requests. JSON format is native to
-   * Javascript, and can be directly eval()'ed with no further parsing
-   * overhead
-   *
-   * All strings should be in ASCII or UTF-8 format!
-   *
-   * LICENSE: Redistribution and use in source and binary forms, with or
-   * without modification, are permitted provided that the following
-   * conditions are met: Redistributions of source code must retain the
-   * above copyright notice, this list of conditions and the following
-   * disclaimer. Redistributions in binary form must reproduce the above
-   * copyright notice, this list of conditions and the following disclaimer
-   * in the documentation and/or other materials provided with the
-   * distribution.
-   *
-   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-   * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-   * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-   * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-   * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-   * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-   * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-   * DAMAGE.
-   *
-   * @category
-   * @package     Services_JSON
-   * @author      Michal Migurski <mike-json@teczno.com>
-   * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
-   * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
-   * @author      Christoph Dorn <christoph@christophdorn.com>
-   * @copyright   2005 Michal Migurski
-   * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
-   * @license     http://www.opensource.org/licenses/bsd-license.php
-   * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
-   */
-   
-     
-  /**
-   * Keep a list of objects as we descend into the array so we can detect recursion.
-   */
-  private $json_objectStack = array();
-
-
- /**
-  * convert a string from one UTF-8 char to one UTF-16 char
-  *
-  * Normally should be handled by mb_convert_encoding, but
-  * provides a slower PHP-only method for installations
-  * that lack the multibye string extension.
-  *
-  * @param    string  $utf8   UTF-8 character
-  * @return   string  UTF-16 character
-  * @access   private
-  */
-  private function json_utf82utf16($utf8)
-  {
-      // oh please oh please oh please oh please oh please
-      if(function_exists('mb_convert_encoding')) {
-          return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-      }
-
-      switch(strlen($utf8)) {
-          case 1:
-              // this case should never be reached, because we are in ASCII range
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return $utf8;
-
-          case 2:
-              // return a UTF-16 character from a 2-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr(0x07 & (ord($utf8{0}) >> 2))
-                   . chr((0xC0 & (ord($utf8{0}) << 6))
-                       | (0x3F & ord($utf8{1})));
-
-          case 3:
-              // return a UTF-16 character from a 3-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr((0xF0 & (ord($utf8{0}) << 4))
-                       | (0x0F & (ord($utf8{1}) >> 2)))
-                   . chr((0xC0 & (ord($utf8{1}) << 6))
-                       | (0x7F & ord($utf8{2})));
-      }
-
-      // ignoring UTF-32 for now, sorry
-      return '';
-  }
-
- /**
-  * encodes an arbitrary variable into JSON format
-  *
-  * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-  *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-  *                           if var is a strng, note that encode() always expects it
-  *                           to be in ASCII or UTF-8 format!
-  *
-  * @return   mixed   JSON string representation of input var or an error if a problem occurs
-  * @access   public
-  */
-  private function json_encode($var)
-  {
-    
-    if(is_object($var)) {
-      if(in_array($var,$this->json_objectStack)) {
-        return '"** Recursion **"';
-      }
-    }
-          
-      switch (gettype($var)) {
-          case 'boolean':
-              return $var ? 'true' : 'false';
-
-          case 'NULL':
-              return 'null';
-
-          case 'integer':
-              return (int) $var;
-
-          case 'double':
-          case 'float':
-              return (float) $var;
-
-          case 'string':
-              // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-              $ascii = '';
-              $strlen_var = strlen($var);
-
-             /*
-              * Iterate over every character in the string,
-              * escaping with a slash or encoding to UTF-8 where necessary
-              */
-              for ($c = 0; $c < $strlen_var; ++$c) {
-
-                  $ord_var_c = ord($var{$c});
-
-                  switch (true) {
-                      case $ord_var_c == 0x08:
-                          $ascii .= '\b';
-                          break;
-                      case $ord_var_c == 0x09:
-                          $ascii .= '\t';
-                          break;
-                      case $ord_var_c == 0x0A:
-                          $ascii .= '\n';
-                          break;
-                      case $ord_var_c == 0x0C:
-                          $ascii .= '\f';
-                          break;
-                      case $ord_var_c == 0x0D:
-                          $ascii .= '\r';
-                          break;
-
-                      case $ord_var_c == 0x22:
-                      case $ord_var_c == 0x2F:
-                      case $ord_var_c == 0x5C:
-                          // double quote, slash, slosh
-                          $ascii .= '\\'.$var{$c};
-                          break;
-
-                      case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                          // characters U-00000000 - U-0000007F (same as ASCII)
-                          $ascii .= $var{$c};
-                          break;
-
-                      case (($ord_var_c & 0xE0) == 0xC0):
-                          // characters U-00000080 - U-000007FF, mask 110XXXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                          $c += 1;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF0) == 0xE0):
-                          // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}));
-                          $c += 2;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF8) == 0xF0):
-                          // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}));
-                          $c += 3;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFC) == 0xF8):
-                          // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}));
-                          $c += 4;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFE) == 0xFC):
-                          // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}),
-                                       ord($var{$c + 5}));
-                          $c += 5;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-                  }
-              }
-
-              return '"'.$ascii.'"';
-
-          case 'array':
-             /*
-              * As per JSON spec if any array key is not an integer
-              * we must treat the the whole array as an object. We
-              * also try to catch a sparsely populated associative
-              * array with numeric keys here because some JS engines
-              * will create an array with empty indexes up to
-              * max_index which can cause memory issues and because
-              * the keys, which may be relevant, will be remapped
-              * otherwise.
-              *
-              * As per the ECMA and JSON specification an object may
-              * have any string as a property. Unfortunately due to
-              * a hole in the ECMA specification if the key is a
-              * ECMA reserved word or starts with a digit the
-              * parameter is only accessible using ECMAScript's
-              * bracket notation.
-              */
-
-              // treat as a JSON object
-              if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                  
-                  $this->json_objectStack[] = $var;
-
-                  $properties = array_map(array($this, 'json_name_value'),
-                                          array_keys($var),
-                                          array_values($var));
-
-                  array_pop($this->json_objectStack);
-
-                  foreach($properties as $property) {
-                      if($property instanceof Exception) {
-                          return $property;
-                      }
-                  }
-
-                  return '{' . join(',', $properties) . '}';
-              }
-
-              $this->json_objectStack[] = $var;
-
-              // treat it like a regular array
-              $elements = array_map(array($this, 'json_encode'), $var);
-
-              array_pop($this->json_objectStack);
-
-              foreach($elements as $element) {
-                  if($element instanceof Exception) {
-                      return $element;
-                  }
-              }
-
-              return '[' . join(',', $elements) . ']';
-
-          case 'object':
-              $vars = self::encodeObject($var);
-
-              $this->json_objectStack[] = $var;
-
-              $properties = array_map(array($this, 'json_name_value'),
-                                      array_keys($vars),
-                                      array_values($vars));
-
-              array_pop($this->json_objectStack);
-              
-              foreach($properties as $property) {
-                  if($property instanceof Exception) {
-                      return $property;
-                  }
-              }
-                     
-              return '{' . join(',', $properties) . '}';
-
-          default:
-              return null;
-      }
-  }
-
- /**
-  * array-walking function for use in generating JSON-formatted name-value pairs
-  *
-  * @param    string  $name   name of key to use
-  * @param    mixed   $value  reference to an array element to be encoded
-  *
-  * @return   string  JSON-formatted name-value pair, like '"name":value'
-  * @access   private
-  */
-  private function json_name_value($name, $value)
-  {
-      // Encoding the $GLOBALS PHP array causes an infinite loop
-      // if the recursion is not reset here as it contains
-      // a reference to itself. This is the only way I have come up
-      // with to stop infinite recursion in this case.
-      if($name=='GLOBALS'
-         && is_array($value)
-         && array_key_exists('GLOBALS',$value)) {
-        $value['GLOBALS'] = '** Recursion **';
-      }
-    
-      $encoded_value = $this->json_encode($value);
-
-      if($encoded_value instanceof Exception) {
-          return $encoded_value;
-      }
-
-      return $this->json_encode(strval($name)) . ':' . $encoded_value;
-  }
-}
diff --git a/inc/contrib/minify/HTTP/ConditionalGet.php b/inc/contrib/minify/HTTP/ConditionalGet.php
deleted file mode 100755
index 93b7e75d..00000000
--- a/inc/contrib/minify/HTTP/ConditionalGet.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-/**
- * Class HTTP_ConditionalGet  
- * @package Minify
- * @subpackage HTTP
- */
-
-/**
- * Implement conditional GET via a timestamp or hash of content
- *
- * E.g. Content from DB with update time:
- * <code>
- * list($updateTime, $content) = getDbUpdateAndContent();
- * $cg = new HTTP_ConditionalGet(array(
- *     'lastModifiedTime' => $updateTime
- *     ,'isPublic' => true
- * ));
- * $cg->sendHeaders();
- * if ($cg->cacheIsValid) {
- *     exit();
- * }
- * echo $content;
- * </code>
- * 
- * E.g. Shortcut for the above
- * <code>
- * HTTP_ConditionalGet::check($updateTime, true); // exits if client has cache
- * echo $content;
- * </code>
- *
- * E.g. Content from DB with no update time:
- * <code>
- * $content = getContentFromDB();
- * $cg = new HTTP_ConditionalGet(array(
- *     'contentHash' => md5($content)
- * ));
- * $cg->sendHeaders();
- * if ($cg->cacheIsValid) {
- *     exit();
- * }
- * echo $content;
- * </code>
- * 
- * E.g. Static content with some static includes:
- * <code>
- * // before content
- * $cg = new HTTP_ConditionalGet(array(
- *     'lastUpdateTime' => max(
- *         filemtime(__FILE__)
- *         ,filemtime('/path/to/header.inc')
- *         ,filemtime('/path/to/footer.inc')
- *     )
- * ));
- * $cg->sendHeaders();
- * if ($cg->cacheIsValid) {
- *     exit();
- * }
- * </code>
- * @package Minify
- * @subpackage HTTP
- * @author Stephen Clay <steve@mrclay.org>
- */
-class HTTP_ConditionalGet {
-
-    /**
-     * Does the client have a valid copy of the requested resource?
-     * 
-     * You'll want to check this after instantiating the object. If true, do
-     * not send content, just call sendHeaders() if you haven't already.
-     *
-     * @var bool
-     */
-    public $cacheIsValid = null;
-
-    /**
-     * @param array $spec options
-     * 
-     * 'isPublic': (bool) if false, the Cache-Control header will contain
-     * "private", allowing only browser caching. (default false)
-     * 
-     * 'lastModifiedTime': (int) if given, both ETag AND Last-Modified headers
-     * will be sent with content. This is recommended.
-     *
-     * 'encoding': (string) if set, the header "Vary: Accept-Encoding" will
-     * always be sent and a truncated version of the encoding will be appended
-     * to the ETag. E.g. "pub123456;gz". This will also trigger a more lenient 
-     * checking of the client's If-None-Match header, as the encoding portion of
-     * the ETag will be stripped before comparison.
-     * 
-     * 'contentHash': (string) if given, only the ETag header can be sent with
-     * content (only HTTP1.1 clients can conditionally GET). The given string 
-     * should be short with no quote characters and always change when the 
-     * resource changes (recommend md5()). This is not needed/used if 
-     * lastModifiedTime is given.
-     * 
-     * 'eTag': (string) if given, this will be used as the ETag header rather
-     * than values based on lastModifiedTime or contentHash. Also the encoding
-     * string will not be appended to the given value as described above.
-     * 
-     * 'invalidate': (bool) if true, the client cache will be considered invalid
-     * without testing. Effectively this disables conditional GET. 
-     * (default false)
-     * 
-     * 'maxAge': (int) if given, this will set the Cache-Control max-age in 
-     * seconds, and also set the Expires header to the equivalent GMT date. 
-     * After the max-age period has passed, the browser will again send a 
-     * conditional GET to revalidate its cache.
-     */
-    public function __construct($spec)
-    {
-        $scope = (isset($spec['isPublic']) && $spec['isPublic'])
-            ? 'public'
-            : 'private';
-        $maxAge = 0;
-        // backwards compatibility (can be removed later)
-        if (isset($spec['setExpires']) 
-            && is_numeric($spec['setExpires'])
-            && ! isset($spec['maxAge'])) {
-            $spec['maxAge'] = $spec['setExpires'] - $_SERVER['REQUEST_TIME'];
-        }
-        if (isset($spec['maxAge'])) {
-            $maxAge = $spec['maxAge'];
-            $this->_headers['Expires'] = self::gmtDate(
-                $_SERVER['REQUEST_TIME'] + $spec['maxAge'] 
-            );
-        }
-        $etagAppend = '';
-        if (isset($spec['encoding'])) {
-            $this->_stripEtag = true;
-            $this->_headers['Vary'] = 'Accept-Encoding';
-            if ('' !== $spec['encoding']) {
-                if (0 === strpos($spec['encoding'], 'x-')) {
-                    $spec['encoding'] = substr($spec['encoding'], 2);
-                }
-                $etagAppend = ';' . substr($spec['encoding'], 0, 2);
-            }
-        }
-        if (isset($spec['lastModifiedTime'])) {
-            $this->_setLastModified($spec['lastModifiedTime']);
-            if (isset($spec['eTag'])) { // Use it
-                $this->_setEtag($spec['eTag'], $scope);
-            } else { // base both headers on time
-                $this->_setEtag($spec['lastModifiedTime'] . $etagAppend, $scope);
-            }
-        } elseif (isset($spec['eTag'])) { // Use it
-            $this->_setEtag($spec['eTag'], $scope);
-        } elseif (isset($spec['contentHash'])) { // Use the hash as the ETag
-            $this->_setEtag($spec['contentHash'] . $etagAppend, $scope);
-        }
-        $privacy = ($scope === 'private')
-            ? ', private'
-            : '';
-        $this->_headers['Cache-Control'] = "max-age={$maxAge}{$privacy}";
-        // invalidate cache if disabled, otherwise check
-        $this->cacheIsValid = (isset($spec['invalidate']) && $spec['invalidate'])
-            ? false
-            : $this->_isCacheValid();
-    }
-    
-    /**
-     * Get array of output headers to be sent
-     * 
-     * In the case of 304 responses, this array will only contain the response
-     * code header: array('_responseCode' => 'HTTP/1.0 304 Not Modified')
-     * 
-     * Otherwise something like: 
-     * <code>
-     * array(
-     *     'Cache-Control' => 'max-age=0, public'
-     *     ,'ETag' => '"foobar"'
-     * )
-     * </code>
-     *
-     * @return array 
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Set the Content-Length header in bytes
-     * 
-     * With most PHP configs, as long as you don't flush() output, this method
-     * is not needed and PHP will buffer all output and set Content-Length for 
-     * you. Otherwise you'll want to call this to let the client know up front.
-     * 
-     * @param int $bytes
-     * 
-     * @return int copy of input $bytes
-     */
-    public function setContentLength($bytes)
-    {
-        return $this->_headers['Content-Length'] = $bytes;
-    }
-
-    /**
-     * Send headers
-     * 
-     * @see getHeaders()
-     * 
-     * Note this doesn't "clear" the headers. Calling sendHeaders() will
-     * call header() again (but probably have not effect) and getHeaders() will
-     * still return the headers.
-     *
-     * @return null
-     */
-    public function sendHeaders()
-    {
-        $headers = $this->_headers;
-        if (array_key_exists('_responseCode', $headers)) {
-            // FastCGI environments require 3rd arg to header() to be set
-            list(, $code) = explode(' ', $headers['_responseCode'], 3);
-            header($headers['_responseCode'], true, $code);
-            unset($headers['_responseCode']);
-        }
-        foreach ($headers as $name => $val) {
-            header($name . ': ' . $val);
-        }
-    }
-    
-    /**
-     * Exit if the client's cache is valid for this resource
-     *
-     * This is a convenience method for common use of the class
-     *
-     * @param int $lastModifiedTime if given, both ETag AND Last-Modified headers
-     * will be sent with content. This is recommended.
-     *
-     * @param bool $isPublic (default false) if true, the Cache-Control header 
-     * will contain "public", allowing proxies to cache the content. Otherwise 
-     * "private" will be sent, allowing only browser caching.
-     *
-     * @param array $options (default empty) additional options for constructor
-     */
-    public static function check($lastModifiedTime = null, $isPublic = false, $options = array())
-    {
-        if (null !== $lastModifiedTime) {
-            $options['lastModifiedTime'] = (int)$lastModifiedTime;
-        }
-        $options['isPublic'] = (bool)$isPublic;
-        $cg = new HTTP_ConditionalGet($options);
-        $cg->sendHeaders();
-        if ($cg->cacheIsValid) {
-            exit();
-        }
-    }
-    
-    
-    /**
-     * Get a GMT formatted date for use in HTTP headers
-     * 
-     * <code>
-     * header('Expires: ' . HTTP_ConditionalGet::gmtdate($time));
-     * </code>  
-     *
-     * @param int $time unix timestamp
-     * 
-     * @return string
-     */
-    public static function gmtDate($time)
-    {
-        return gmdate('D, d M Y H:i:s \G\M\T', $time);
-    }
-    
-    protected $_headers = array();
-    protected $_lmTime = null;
-    protected $_etag = null;
-    protected $_stripEtag = false;
-
-    /**
-     * @param string $hash
-     *
-     * @param string $scope
-     */
-    protected function _setEtag($hash, $scope)
-    {
-        $this->_etag = '"' . substr($scope, 0, 3) . $hash . '"';
-        $this->_headers['ETag'] = $this->_etag;
-    }
-
-    /**
-     * @param int $time
-     */
-    protected function _setLastModified($time)
-    {
-        $this->_lmTime = (int)$time;
-        $this->_headers['Last-Modified'] = self::gmtDate($time);
-    }
-
-    /**
-     * Determine validity of client cache and queue 304 header if valid
-     *
-     * @return bool
-     */
-    protected function _isCacheValid()
-    {
-        if (null === $this->_etag) {
-            // lmTime is copied to ETag, so this condition implies that the
-            // server sent neither ETag nor Last-Modified, so the client can't 
-            // possibly has a valid cache.
-            return false;
-        }
-        $isValid = ($this->resourceMatchedEtag() || $this->resourceNotModified());
-        if ($isValid) {
-            $this->_headers['_responseCode'] = 'HTTP/1.0 304 Not Modified';
-        }
-        return $isValid;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function resourceMatchedEtag()
-    {
-        if (!isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
-            return false;
-        }
-        $clientEtagList = get_magic_quotes_gpc()
-            ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])
-            : $_SERVER['HTTP_IF_NONE_MATCH'];
-        $clientEtags = explode(',', $clientEtagList);
-        
-        $compareTo = $this->normalizeEtag($this->_etag);
-        foreach ($clientEtags as $clientEtag) {
-            if ($this->normalizeEtag($clientEtag) === $compareTo) {
-                // respond with the client's matched ETag, even if it's not what
-                // we would've sent by default
-                $this->_headers['ETag'] = trim($clientEtag);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param string $etag
-     *
-     * @return string
-     */
-    protected function normalizeEtag($etag) {
-        $etag = trim($etag);
-        return $this->_stripEtag
-            ? preg_replace('/;\\w\\w"$/', '"', $etag)
-            : $etag;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function resourceNotModified()
-    {
-        if (!isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-            return false;
-        }
-        // strip off IE's extra data (semicolon)
-        list($ifModifiedSince) = explode(';', $_SERVER['HTTP_IF_MODIFIED_SINCE'], 2);
-        if (strtotime($ifModifiedSince) >= $this->_lmTime) {
-            // Apache 2.2's behavior. If there was no ETag match, send the 
-            // non-encoded version of the ETag value.
-            $this->_headers['ETag'] = $this->normalizeEtag($this->_etag);
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/inc/contrib/minify/HTTP/Encoder.php b/inc/contrib/minify/HTTP/Encoder.php
deleted file mode 100755
index 8f347793..00000000
--- a/inc/contrib/minify/HTTP/Encoder.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/**
- * Class HTTP_Encoder  
- * @package Minify
- * @subpackage HTTP
- */
- 
-/**
- * Encode and send gzipped/deflated content
- *
- * The "Vary: Accept-Encoding" header is sent. If the client allows encoding, 
- * Content-Encoding and Content-Length are added.
- *
- * <code>
- * // Send a CSS file, compressed if possible
- * $he = new HTTP_Encoder(array(
- *     'content' => file_get_contents($cssFile)
- *     ,'type' => 'text/css'
- * ));
- * $he->encode();
- * $he->sendAll();
- * </code>
- *
- * <code>
- * // Shortcut to encoding output
- * header('Content-Type: text/css'); // needed if not HTML
- * HTTP_Encoder::output($css);
- * </code>
- * 
- * <code>
- * // Just sniff for the accepted encoding
- * $encoding = HTTP_Encoder::getAcceptedEncoding();
- * </code>
- *
- * For more control over headers, use getHeaders() and getData() and send your
- * own output.
- * 
- * Note: If you don't need header mgmt, use PHP's native gzencode, gzdeflate, 
- * and gzcompress functions for gzip, deflate, and compress-encoding
- * respectively.
- * 
- * @package Minify
- * @subpackage HTTP
- * @author Stephen Clay <steve@mrclay.org>
- */
-class HTTP_Encoder {
-
-    /**
-     * Should the encoder allow HTTP encoding to IE6? 
-     * 
-     * If you have many IE6 users and the bandwidth savings is worth troubling 
-     * some of them, set this to true.
-     * 
-     * By default, encoding is only offered to IE7+. When this is true,
-     * getAcceptedEncoding() will return an encoding for IE6 if its user agent
-     * string contains "SV1". This has been documented in many places as "safe",
-     * but there seem to be remaining, intermittent encoding bugs in patched 
-     * IE6 on the wild web.
-     * 
-     * @var bool
-     */
-    public static $encodeToIe6 = true;
-    
-    
-    /**
-     * Default compression level for zlib operations
-     * 
-     * This level is used if encode() is not given a $compressionLevel
-     * 
-     * @var int
-     */
-    public static $compressionLevel = 6;
-    
-
-    /**
-     * Get an HTTP Encoder object
-     * 
-     * @param array $spec options
-     * 
-     * 'content': (string required) content to be encoded
-     * 
-     * 'type': (string) if set, the Content-Type header will have this value.
-     * 
-     * 'method: (string) only set this if you are forcing a particular encoding
-     * method. If not set, the best method will be chosen by getAcceptedEncoding()
-     * The available methods are 'gzip', 'deflate', 'compress', and '' (no
-     * encoding)
-     */
-    public function __construct($spec) 
-    {
-        $this->_useMbStrlen = (function_exists('mb_strlen')
-                               && (ini_get('mbstring.func_overload') !== '')
-                               && ((int)ini_get('mbstring.func_overload') & 2));
-        $this->_content = $spec['content'];
-        $this->_headers['Content-Length'] = $this->_useMbStrlen
-            ? (string)mb_strlen($this->_content, '8bit')
-            : (string)strlen($this->_content);
-        if (isset($spec['type'])) {
-            $this->_headers['Content-Type'] = $spec['type'];
-        }
-        if (isset($spec['method'])
-            && in_array($spec['method'], array('gzip', 'deflate', 'compress', '')))
-        {
-            $this->_encodeMethod = array($spec['method'], $spec['method']);
-        } else {
-            $this->_encodeMethod = self::getAcceptedEncoding();
-        }
-    }
-
-    /**
-     * Get content in current form
-     * 
-     * Call after encode() for encoded content.
-     * 
-     * @return string
-     */
-    public function getContent() 
-    {
-        return $this->_content;
-    }
-    
-    /**
-     * Get array of output headers to be sent
-     * 
-     * E.g.
-     * <code>
-     * array(
-     *     'Content-Length' => '615'
-     *     ,'Content-Encoding' => 'x-gzip'
-     *     ,'Vary' => 'Accept-Encoding'
-     * )
-     * </code>
-     *
-     * @return array 
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Send output headers
-     * 
-     * You must call this before headers are sent and it probably cannot be
-     * used in conjunction with zlib output buffering / mod_gzip. Errors are
-     * not handled purposefully.
-     * 
-     * @see getHeaders()
-     */
-    public function sendHeaders()
-    {
-        foreach ($this->_headers as $name => $val) {
-            header($name . ': ' . $val);
-        }
-    }
-    
-    /**
-     * Send output headers and content
-     * 
-     * A shortcut for sendHeaders() and echo getContent()
-     *
-     * You must call this before headers are sent and it probably cannot be
-     * used in conjunction with zlib output buffering / mod_gzip. Errors are
-     * not handled purposefully.
-     */
-    public function sendAll()
-    {
-        $this->sendHeaders();
-        echo $this->_content;
-    }
-
-    /**
-     * Determine the client's best encoding method from the HTTP Accept-Encoding 
-     * header.
-     * 
-     * If no Accept-Encoding header is set, or the browser is IE before v6 SP2,
-     * this will return ('', ''), the "identity" encoding.
-     * 
-     * A syntax-aware scan is done of the Accept-Encoding, so the method must
-     * be non 0. The methods are favored in order of gzip, deflate, then 
-     * compress. Deflate is always smallest and generally faster, but is 
-     * rarely sent by servers, so client support could be buggier.
-     * 
-     * @param bool $allowCompress allow the older compress encoding
-     * 
-     * @param bool $allowDeflate allow the more recent deflate encoding
-     * 
-     * @return array two values, 1st is the actual encoding method, 2nd is the
-     * alias of that method to use in the Content-Encoding header (some browsers
-     * call gzip "x-gzip" etc.)
-     */
-    public static function getAcceptedEncoding($allowCompress = true, $allowDeflate = true)
-    {
-        // @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
-        
-        if (! isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-            || self::isBuggyIe())
-        {
-            return array('', '');
-        }
-        $ae = $_SERVER['HTTP_ACCEPT_ENCODING'];
-        // gzip checks (quick)
-        if (0 === strpos($ae, 'gzip,')             // most browsers
-            || 0 === strpos($ae, 'deflate, gzip,') // opera
-        ) {
-            return array('gzip', 'gzip');
-        }
-        // gzip checks (slow)
-        if (preg_match(
-                '@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
-                ,$ae
-                ,$m)) {
-            return array('gzip', $m[1]);
-        }
-        if ($allowDeflate) {
-            // deflate checks    
-            $aeRev = strrev($ae);
-            if (0 === strpos($aeRev, 'etalfed ,') // ie, webkit
-                || 0 === strpos($aeRev, 'etalfed,') // gecko
-                || 0 === strpos($ae, 'deflate,') // opera
-                // slow parsing
-                || preg_match(
-                    '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', $ae)) {
-                return array('deflate', 'deflate');
-            }
-        }
-        if ($allowCompress && preg_match(
-                '@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
-                ,$ae
-                ,$m)) {
-            return array('compress', $m[1]);
-        }
-        return array('', '');
-    }
-
-    /**
-     * Encode (compress) the content
-     * 
-     * If the encode method is '' (none) or compression level is 0, or the 'zlib'
-     * extension isn't loaded, we return false.
-     * 
-     * Then the appropriate gz_* function is called to compress the content. If
-     * this fails, false is returned.
-     * 
-     * The header "Vary: Accept-Encoding" is added. If encoding is successful, 
-     * the Content-Length header is updated, and Content-Encoding is also added.
-     * 
-     * @param int $compressionLevel given to zlib functions. If not given, the
-     * class default will be used.
-     * 
-     * @return bool success true if the content was actually compressed
-     */
-    public function encode($compressionLevel = null)
-    {
-        if (! self::isBuggyIe()) {
-            $this->_headers['Vary'] = 'Accept-Encoding';
-        }
-        if (null === $compressionLevel) {
-            $compressionLevel = self::$compressionLevel;
-        }
-        if ('' === $this->_encodeMethod[0]
-            || ($compressionLevel == 0)
-            || !extension_loaded('zlib'))
-        {
-            return false;
-        }
-        if ($this->_encodeMethod[0] === 'deflate') {
-            $encoded = gzdeflate($this->_content, $compressionLevel);
-        } elseif ($this->_encodeMethod[0] === 'gzip') {
-            $encoded = gzencode($this->_content, $compressionLevel);
-        } else {
-            $encoded = gzcompress($this->_content, $compressionLevel);
-        }
-        if (false === $encoded) {
-            return false;
-        }
-        $this->_headers['Content-Length'] = $this->_useMbStrlen
-            ? (string)mb_strlen($encoded, '8bit')
-            : (string)strlen($encoded);
-        $this->_headers['Content-Encoding'] = $this->_encodeMethod[1];
-        $this->_content = $encoded;
-        return true;
-    }
-    
-    /**
-     * Encode and send appropriate headers and content
-     *
-     * This is a convenience method for common use of the class
-     * 
-     * @param string $content
-     * 
-     * @param int $compressionLevel given to zlib functions. If not given, the
-     * class default will be used.
-     * 
-     * @return bool success true if the content was actually compressed
-     */
-    public static function output($content, $compressionLevel = null)
-    {
-        if (null === $compressionLevel) {
-            $compressionLevel = self::$compressionLevel;
-        }
-        $he = new HTTP_Encoder(array('content' => $content));
-        $ret = $he->encode($compressionLevel);
-        $he->sendAll();
-        return $ret;
-    }
-
-    /**
-     * Is the browser an IE version earlier than 6 SP2?
-     *
-     * @return bool
-     */
-    public static function isBuggyIe()
-    {
-        if (empty($_SERVER['HTTP_USER_AGENT'])) {
-            return false;
-        }
-        $ua = $_SERVER['HTTP_USER_AGENT'];
-        // quick escape for non-IEs
-        if (0 !== strpos($ua, 'Mozilla/4.0 (compatible; MSIE ')
-            || false !== strpos($ua, 'Opera')) {
-            return false;
-        }
-        // no regex = faaast
-        $version = (float)substr($ua, 30);
-        return self::$encodeToIe6
-            ? ($version < 6 || ($version == 6 && false === strpos($ua, 'SV1')))
-            : ($version < 7);
-    }
-    
-    protected $_content = '';
-    protected $_headers = array();
-    protected $_encodeMethod = array('', '');
-    protected $_useMbStrlen = false;
-}
diff --git a/inc/contrib/minify/JSMin.php b/inc/contrib/minify/JSMin.php
deleted file mode 100755
index b6879f37..00000000
--- a/inc/contrib/minify/JSMin.php
+++ /dev/null
@@ -1,385 +0,0 @@
-<?php
-/**
- * JSMin.php - modified PHP implementation of Douglas Crockford's JSMin.
- *
- * <code>
- * $minifiedJs = JSMin::minify($js);
- * </code>
- *
- * This is a modified port of jsmin.c. Improvements:
- * 
- * Does not choke on some regexp literals containing quote characters. E.g. /'/
- * 
- * Spaces are preserved after some add/sub operators, so they are not mistakenly 
- * converted to post-inc/dec. E.g. a + ++b -> a+ ++b
- *
- * Preserves multi-line comments that begin with /*!
- * 
- * PHP 5 or higher is required.
- *
- * Permission is hereby granted to use this version of the library under the
- * same terms as jsmin.c, which has the following license:
- *
- * --
- * Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * The Software shall be used for Good, not Evil.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- * --
- *
- * @package JSMin
- * @author Ryan Grove <ryan@wonko.com> (PHP port)
- * @author Steve Clay <steve@mrclay.org> (modifications + cleanup)
- * @author Andrea Giammarchi <http://www.3site.eu> (spaceBeforeRegExp)
- * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c)
- * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port)
- * @license http://opensource.org/licenses/mit-license.php MIT License
- * @link http://code.google.com/p/jsmin-php/
- */
-
-class JSMin {
-    const ORD_LF            = 10;
-    const ORD_SPACE         = 32;
-    const ACTION_KEEP_A     = 1;
-    const ACTION_DELETE_A   = 2;
-    const ACTION_DELETE_A_B = 3;
-
-    protected $a           = "\n";
-    protected $b           = '';
-    protected $input       = '';
-    protected $inputIndex  = 0;
-    protected $inputLength = 0;
-    protected $lookAhead   = null;
-    protected $output      = '';
-    protected $lastByteOut  = '';
-
-    /**
-     * Minify Javascript.
-     *
-     * @param string $js Javascript to be minified
-     *
-     * @return string
-     */
-    public static function minify($js)
-    {
-        $jsmin = new JSMin($js);
-        return $jsmin->min();
-    }
-
-    /**
-     * @param string $input
-     */
-    public function __construct($input)
-    {
-        $this->input = $input;
-    }
-
-    /**
-     * Perform minification, return result
-     *
-     * @return string
-     */
-    public function min()
-    {
-        if ($this->output !== '') { // min already run
-            return $this->output;
-        }
-
-        $mbIntEnc = null;
-        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
-            $mbIntEnc = mb_internal_encoding();
-            mb_internal_encoding('8bit');
-        }
-        $this->input = str_replace("\r\n", "\n", $this->input);
-        $this->inputLength = strlen($this->input);
-
-        $this->action(self::ACTION_DELETE_A_B);
-
-        while ($this->a !== null) {
-            // determine next command
-            $command = self::ACTION_KEEP_A; // default
-            if ($this->a === ' ') {
-                if (($this->lastByteOut === '+' || $this->lastByteOut === '-') 
-                    && ($this->b === $this->lastByteOut)) {
-                    // Don't delete this space. If we do, the addition/subtraction
-                    // could be parsed as a post-increment
-                } elseif (! $this->isAlphaNum($this->b)) {
-                    $command = self::ACTION_DELETE_A;
-                }
-            } elseif ($this->a === "\n") {
-                if ($this->b === ' ') {
-                    $command = self::ACTION_DELETE_A_B;
-                // in case of mbstring.func_overload & 2, must check for null b,
-                // otherwise mb_strpos will give WARNING
-                } elseif ($this->b === null
-                          || (false === strpos('{[(+-', $this->b)
-                              && ! $this->isAlphaNum($this->b))) {
-                    $command = self::ACTION_DELETE_A;
-                }
-            } elseif (! $this->isAlphaNum($this->a)) {
-                if ($this->b === ' '
-                    || ($this->b === "\n" 
-                        && (false === strpos('}])+-"\'', $this->a)))) {
-                    $command = self::ACTION_DELETE_A_B;
-                }
-            }
-            $this->action($command);
-        }
-        $this->output = trim($this->output);
-
-        if ($mbIntEnc !== null) {
-            mb_internal_encoding($mbIntEnc);
-        }
-        return $this->output;
-    }
-
-    /**
-     * ACTION_KEEP_A = Output A. Copy B to A. Get the next B.
-     * ACTION_DELETE_A = Copy B to A. Get the next B.
-     * ACTION_DELETE_A_B = Get the next B.
-     *
-     * @param int $command
-     * @throws JSMin_UnterminatedRegExpException|JSMin_UnterminatedStringException
-     */
-    protected function action($command)
-    {
-        if ($command === self::ACTION_DELETE_A_B 
-            && $this->b === ' '
-            && ($this->a === '+' || $this->a === '-')) {
-            // Note: we're at an addition/substraction operator; the inputIndex
-            // will certainly be a valid index
-            if ($this->input[$this->inputIndex] === $this->a) {
-                // This is "+ +" or "- -". Don't delete the space.
-                $command = self::ACTION_KEEP_A;
-            }
-        }
-        switch ($command) {
-            case self::ACTION_KEEP_A:
-                $this->output .= $this->a;
-                $this->lastByteOut = $this->a;
-                
-                // fallthrough
-            case self::ACTION_DELETE_A:
-                $this->a = $this->b;
-                if ($this->a === "'" || $this->a === '"') { // string literal
-                    $str = $this->a; // in case needed for exception
-                    while (true) {
-                        $this->output .= $this->a;
-                        $this->lastByteOut = $this->a;
-                        
-                        $this->a       = $this->get();
-                        if ($this->a === $this->b) { // end quote
-                            break;
-                        }
-                        if (ord($this->a) <= self::ORD_LF) {
-                            throw new JSMin_UnterminatedStringException(
-                                "JSMin: Unterminated String at byte "
-                                . $this->inputIndex . ": {$str}");
-                        }
-                        $str .= $this->a;
-                        if ($this->a === '\\') {
-                            $this->output .= $this->a;
-                            $this->lastByteOut = $this->a;
-                            
-                            $this->a       = $this->get();
-                            $str .= $this->a;
-                        }
-                    }
-                }
-                // fallthrough
-            case self::ACTION_DELETE_A_B:
-                $this->b = $this->next();
-                if ($this->b === '/' && $this->isRegexpLiteral()) { // RegExp literal
-                    $this->output .= $this->a . $this->b;
-                    $pattern = '/'; // in case needed for exception
-                    while (true) {
-                        $this->a = $this->get();
-                        $pattern .= $this->a;
-                        if ($this->a === '/') { // end pattern
-                            break; // while (true)
-                        } elseif ($this->a === '\\') {
-                            $this->output .= $this->a;
-                            $this->a       = $this->get();
-                            $pattern      .= $this->a;
-                        } elseif (ord($this->a) <= self::ORD_LF) {
-                            throw new JSMin_UnterminatedRegExpException(
-                                "JSMin: Unterminated RegExp at byte "
-                                . $this->inputIndex .": {$pattern}");
-                        }
-                        $this->output .= $this->a;
-                        $this->lastByteOut = $this->a;
-                    }
-                    $this->b = $this->next();
-                }
-            // end case ACTION_DELETE_A_B
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isRegexpLiteral()
-    {
-        if (false !== strpos("\n{;(,=:[!&|?", $this->a)) { // we aren't dividing
-            return true;
-        }
-        if (' ' === $this->a) {
-            $length = strlen($this->output);
-            if ($length < 2) { // weird edge case
-                return true;
-            }
-            // you can't divide a keyword
-            if (preg_match('/(?:case|else|in|return|typeof)$/', $this->output, $m)) {
-                if ($this->output === $m[0]) { // odd but could happen
-                    return true;
-                }
-                // make sure it's a keyword, not end of an identifier
-                $charBeforeKeyword = substr($this->output, $length - strlen($m[0]) - 1, 1);
-                if (! $this->isAlphaNum($charBeforeKeyword)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get next char. Convert ctrl char to space.
-     *
-     * @return string
-     */
-    protected function get()
-    {
-        $c = $this->lookAhead;
-        $this->lookAhead = null;
-        if ($c === null) {
-            if ($this->inputIndex < $this->inputLength) {
-                $c = $this->input[$this->inputIndex];
-                $this->inputIndex += 1;
-            } else {
-                return null;
-            }
-        }
-        if ($c === "\r" || $c === "\n") {
-            return "\n";
-        }
-        if (ord($c) < self::ORD_SPACE) { // control char
-            return ' ';
-        }
-        return $c;
-    }
-
-    /**
-     * Get next char. If is ctrl character, translate to a space or newline.
-     *
-     * @return string
-     */
-    protected function peek()
-    {
-        $this->lookAhead = $this->get();
-        return $this->lookAhead;
-    }
-
-    /**
-     * Is $c a letter, digit, underscore, dollar sign, escape, or non-ASCII?
-     *
-     * @param string $c
-     *
-     * @return bool
-     */
-    protected function isAlphaNum($c)
-    {
-        return (preg_match('/^[0-9a-zA-Z_\\$\\\\]$/', $c) || ord($c) > 126);
-    }
-
-    /**
-     * @return string
-     */
-    protected function singleLineComment()
-    {
-        $comment = '';
-        while (true) {
-            $get = $this->get();
-            $comment .= $get;
-            if (ord($get) <= self::ORD_LF) { // EOL reached
-                // if IE conditional comment
-                if (preg_match('/^\\/@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
-                    return "/{$comment}";
-                }
-                return $get;
-            }
-        }
-    }
-
-    /**
-     * @return string
-     * @throws JSMin_UnterminatedCommentException
-     */
-    protected function multipleLineComment()
-    {
-        $this->get();
-        $comment = '';
-        while (true) {
-            $get = $this->get();
-            if ($get === '*') {
-                if ($this->peek() === '/') { // end of comment reached
-                    $this->get();
-                    // if comment preserved by YUI Compressor
-                    if (0 === strpos($comment, '!')) {
-                        return "\n/*!" . substr($comment, 1) . "*/\n";
-                    }
-                    // if IE conditional comment
-                    if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
-                        return "/*{$comment}*/";
-                    }
-                    return ' ';
-                }
-            } elseif ($get === null) {
-                throw new JSMin_UnterminatedCommentException(
-                    "JSMin: Unterminated comment at byte "
-                    . $this->inputIndex . ": /*{$comment}");
-            }
-            $comment .= $get;
-        }
-    }
-
-    /**
-     * Get the next character, skipping over comments.
-     * Some comments may be preserved.
-     *
-     * @return string
-     */
-    protected function next()
-    {
-        $get = $this->get();
-        if ($get !== '/') {
-            return $get;
-        }
-        switch ($this->peek()) {
-            case '/': return $this->singleLineComment();
-            case '*': return $this->multipleLineComment();
-            default: return $get;
-        }
-    }
-}
-
-class JSMin_UnterminatedStringException extends Exception {}
-class JSMin_UnterminatedCommentException extends Exception {}
-class JSMin_UnterminatedRegExpException extends Exception {}
diff --git a/inc/contrib/minify/JSMinPlus.php b/inc/contrib/minify/JSMinPlus.php
deleted file mode 100755
index 5a3c5bdf..00000000
--- a/inc/contrib/minify/JSMinPlus.php
+++ /dev/null
@@ -1,2086 +0,0 @@
-<?php
-
-/**
- * JSMinPlus version 1.4
- *
- * Minifies a javascript file using a javascript parser
- *
- * This implements a PHP port of Brendan Eich's Narcissus open source javascript engine (in javascript)
- * References: http://en.wikipedia.org/wiki/Narcissus_(JavaScript_engine)
- * Narcissus sourcecode: http://mxr.mozilla.org/mozilla/source/js/narcissus/
- * JSMinPlus weblog: http://crisp.tweakblogs.net/blog/cat/716
- *
- * Tino Zijdel <crisp@tweakers.net>
- *
- * Usage: $minified = JSMinPlus::minify($script [, $filename])
- *
- * Versionlog (see also changelog.txt):
- * 23-07-2011 - remove dynamic creation of OP_* and KEYWORD_* defines and declare them on top
- *              reduce memory footprint by minifying by block-scope
- *              some small byte-saving and performance improvements
- * 12-05-2009 - fixed hook:colon precedence, fixed empty body in loop and if-constructs
- * 18-04-2009 - fixed crashbug in PHP 5.2.9 and several other bugfixes
- * 12-04-2009 - some small bugfixes and performance improvements
- * 09-04-2009 - initial open sourced version 1.0
- *
- * Latest version of this script: http://files.tweakers.net/jsminplus/jsminplus.zip
- *
- */
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (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.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Tino Zijdel <crisp@tweakers.net>
- * PHP port, modifications and minifier routine are (C) 2009-2011
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('TOKEN_END', 1);
-define('TOKEN_NUMBER', 2);
-define('TOKEN_IDENTIFIER', 3);
-define('TOKEN_STRING', 4);
-define('TOKEN_REGEXP', 5);
-define('TOKEN_NEWLINE', 6);
-define('TOKEN_CONDCOMMENT_START', 7);
-define('TOKEN_CONDCOMMENT_END', 8);
-
-define('JS_SCRIPT', 100);
-define('JS_BLOCK', 101);
-define('JS_LABEL', 102);
-define('JS_FOR_IN', 103);
-define('JS_CALL', 104);
-define('JS_NEW_WITH_ARGS', 105);
-define('JS_INDEX', 106);
-define('JS_ARRAY_INIT', 107);
-define('JS_OBJECT_INIT', 108);
-define('JS_PROPERTY_INIT', 109);
-define('JS_GETTER', 110);
-define('JS_SETTER', 111);
-define('JS_GROUP', 112);
-define('JS_LIST', 113);
-
-define('JS_MINIFIED', 999);
-
-define('DECLARED_FORM', 0);
-define('EXPRESSED_FORM', 1);
-define('STATEMENT_FORM', 2);
-
-/* Operators */
-define('OP_SEMICOLON', ';');
-define('OP_COMMA', ',');
-define('OP_HOOK', '?');
-define('OP_COLON', ':');
-define('OP_OR', '||');
-define('OP_AND', '&&');
-define('OP_BITWISE_OR', '|');
-define('OP_BITWISE_XOR', '^');
-define('OP_BITWISE_AND', '&');
-define('OP_STRICT_EQ', '===');
-define('OP_EQ', '==');
-define('OP_ASSIGN', '=');
-define('OP_STRICT_NE', '!==');
-define('OP_NE', '!=');
-define('OP_LSH', '<<');
-define('OP_LE', '<=');
-define('OP_LT', '<');
-define('OP_URSH', '>>>');
-define('OP_RSH', '>>');
-define('OP_GE', '>=');
-define('OP_GT', '>');
-define('OP_INCREMENT', '++');
-define('OP_DECREMENT', '--');
-define('OP_PLUS', '+');
-define('OP_MINUS', '-');
-define('OP_MUL', '*');
-define('OP_DIV', '/');
-define('OP_MOD', '%');
-define('OP_NOT', '!');
-define('OP_BITWISE_NOT', '~');
-define('OP_DOT', '.');
-define('OP_LEFT_BRACKET', '[');
-define('OP_RIGHT_BRACKET', ']');
-define('OP_LEFT_CURLY', '{');
-define('OP_RIGHT_CURLY', '}');
-define('OP_LEFT_PAREN', '(');
-define('OP_RIGHT_PAREN', ')');
-define('OP_CONDCOMMENT_END', '@*/');
-
-define('OP_UNARY_PLUS', 'U+');
-define('OP_UNARY_MINUS', 'U-');
-
-/* Keywords */
-define('KEYWORD_BREAK', 'break');
-define('KEYWORD_CASE', 'case');
-define('KEYWORD_CATCH', 'catch');
-define('KEYWORD_CONST', 'const');
-define('KEYWORD_CONTINUE', 'continue');
-define('KEYWORD_DEBUGGER', 'debugger');
-define('KEYWORD_DEFAULT', 'default');
-define('KEYWORD_DELETE', 'delete');
-define('KEYWORD_DO', 'do');
-define('KEYWORD_ELSE', 'else');
-define('KEYWORD_ENUM', 'enum');
-define('KEYWORD_FALSE', 'false');
-define('KEYWORD_FINALLY', 'finally');
-define('KEYWORD_FOR', 'for');
-define('KEYWORD_FUNCTION', 'function');
-define('KEYWORD_IF', 'if');
-define('KEYWORD_IN', 'in');
-define('KEYWORD_INSTANCEOF', 'instanceof');
-define('KEYWORD_NEW', 'new');
-define('KEYWORD_NULL', 'null');
-define('KEYWORD_RETURN', 'return');
-define('KEYWORD_SWITCH', 'switch');
-define('KEYWORD_THIS', 'this');
-define('KEYWORD_THROW', 'throw');
-define('KEYWORD_TRUE', 'true');
-define('KEYWORD_TRY', 'try');
-define('KEYWORD_TYPEOF', 'typeof');
-define('KEYWORD_VAR', 'var');
-define('KEYWORD_VOID', 'void');
-define('KEYWORD_WHILE', 'while');
-define('KEYWORD_WITH', 'with');
-
-
-class JSMinPlus
-{
-	private $parser;
-	private $reserved = array(
-		'break', 'case', 'catch', 'continue', 'default', 'delete', 'do',
-		'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof',
-		'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var',
-		'void', 'while', 'with',
-		// Words reserved for future use
-		'abstract', 'boolean', 'byte', 'char', 'class', 'const', 'debugger',
-		'double', 'enum', 'export', 'extends', 'final', 'float', 'goto',
-		'implements', 'import', 'int', 'interface', 'long', 'native',
-		'package', 'private', 'protected', 'public', 'short', 'static',
-		'super', 'synchronized', 'throws', 'transient', 'volatile',
-		// These are not reserved, but should be taken into account
-		// in isValidIdentifier (See jslint source code)
-		'arguments', 'eval', 'true', 'false', 'Infinity', 'NaN', 'null', 'undefined'
-	);
-
-	private function __construct()
-	{
-		$this->parser = new JSParser($this);
-	}
-
-	public static function minify($js, $filename='')
-	{
-		static $instance;
-
-		// this is a singleton
-		if(!$instance)
-			$instance = new JSMinPlus();
-
-		return $instance->min($js, $filename);
-	}
-
-	private function min($js, $filename)
-	{
-		try
-		{
-			$n = $this->parser->parse($js, $filename, 1);
-			return $this->parseTree($n);
-		}
-		catch(Exception $e)
-		{
-			echo $e->getMessage() . "\n";
-		}
-
-		return false;
-	}
-
-	public function parseTree($n, $noBlockGrouping = false)
-	{
-		$s = '';
-
-		switch ($n->type)
-		{
-			case JS_MINIFIED:
-				$s = $n->value;
-			break;
-
-			case JS_SCRIPT:
-				// we do nothing yet with funDecls or varDecls
-				$noBlockGrouping = true;
-			// FALL THROUGH
-
-			case JS_BLOCK:
-				$childs = $n->treeNodes;
-				$lastType = 0;
-				for ($c = 0, $i = 0, $j = count($childs); $i < $j; $i++)
-				{
-					$type = $childs[$i]->type;
-					$t = $this->parseTree($childs[$i]);
-					if (strlen($t))
-					{
-						if ($c)
-						{
-							$s = rtrim($s, ';');
-
-							if ($type == KEYWORD_FUNCTION && $childs[$i]->functionForm == DECLARED_FORM)
-							{
-								// put declared functions on a new line
-								$s .= "\n";
-							}
-							elseif ($type == KEYWORD_VAR && $type == $lastType)
-							{
-								// mutiple var-statements can go into one
-								$t = ',' . substr($t, 4);
-							}
-							else
-							{
-								// add terminator
-								$s .= ';';
-							}
-						}
-
-						$s .= $t;
-
-						$c++;
-						$lastType = $type;
-					}
-				}
-
-				if ($c > 1 && !$noBlockGrouping)
-				{
-					$s = '{' . $s . '}';
-				}
-			break;
-
-			case KEYWORD_FUNCTION:
-				$s .= 'function' . ($n->name ? ' ' . $n->name : '') . '(';
-				$params = $n->params;
-				for ($i = 0, $j = count($params); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $params[$i];
-				$s .= '){' . $this->parseTree($n->body, true) . '}';
-			break;
-
-			case KEYWORD_IF:
-				$s = 'if(' . $this->parseTree($n->condition) . ')';
-				$thenPart = $this->parseTree($n->thenPart);
-				$elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null;
-
-				// empty if-statement
-				if ($thenPart == '')
-					$thenPart = ';';
-
-				if ($elsePart)
-				{
-					// be carefull and always make a block out of the thenPart; could be more optimized but is a lot of trouble
-					if ($thenPart != ';' && $thenPart[0] != '{')
-						$thenPart = '{' . $thenPart . '}';
-
-					$s .= $thenPart . 'else';
-
-					// we could check for more, but that hardly ever applies so go for performance
-					if ($elsePart[0] != '{')
-						$s .= ' ';
-
-					$s .= $elsePart;
-				}
-				else
-				{
-					$s .= $thenPart;
-				}
-			break;
-
-			case KEYWORD_SWITCH:
-				$s = 'switch(' . $this->parseTree($n->discriminant) . '){';
-				$cases = $n->cases;
-				for ($i = 0, $j = count($cases); $i < $j; $i++)
-				{
-					$case = $cases[$i];
-					if ($case->type == KEYWORD_CASE)
-						$s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
-					else
-						$s .= 'default:';
-
-					$statement = $this->parseTree($case->statements, true);
-					if ($statement)
-					{
-						$s .= $statement;
-						// no terminator for last statement
-						if ($i + 1 < $j)
-							$s .= ';';
-					}
-				}
-				$s .= '}';
-			break;
-
-			case KEYWORD_FOR:
-				$s = 'for(' . ($n->setup ? $this->parseTree($n->setup) : '')
-					. ';' . ($n->condition ? $this->parseTree($n->condition) : '')
-					. ';' . ($n->update ? $this->parseTree($n->update) : '') . ')';
-
-				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
-
-				$s .= $body;
-			break;
-
-			case KEYWORD_WHILE:
-				$s = 'while(' . $this->parseTree($n->condition) . ')';
-
-				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
-
-				$s .= $body;
-			break;
-
-			case JS_FOR_IN:
-				$s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')';
-
-				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
-
-				$s .= $body;
-			break;
-
-			case KEYWORD_DO:
-				$s = 'do{' . $this->parseTree($n->body, true) . '}while(' . $this->parseTree($n->condition) . ')';
-			break;
-
-			case KEYWORD_BREAK:
-			case KEYWORD_CONTINUE:
-				$s = $n->value . ($n->label ? ' ' . $n->label : '');
-			break;
-
-			case KEYWORD_TRY:
-				$s = 'try{' . $this->parseTree($n->tryBlock, true) . '}';
-				$catchClauses = $n->catchClauses;
-				for ($i = 0, $j = count($catchClauses); $i < $j; $i++)
-				{
-					$t = $catchClauses[$i];
-					$s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}';
-				}
-				if ($n->finallyBlock)
-					$s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
-			break;
-
-			case KEYWORD_THROW:
-			case KEYWORD_RETURN:
-				$s = $n->type;
-				if ($n->value)
-				{
-					$t = $this->parseTree($n->value);
-					if (strlen($t))
-					{
-						if ($this->isWordChar($t[0]) || $t[0] == '\\')
-							$s .= ' ';
-
-						$s .= $t;
-					}
-				}
-			break;
-
-			case KEYWORD_WITH:
-				$s = 'with(' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body);
-			break;
-
-			case KEYWORD_VAR:
-			case KEYWORD_CONST:
-				$s = $n->value . ' ';
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-				{
-					$t = $childs[$i];
-					$s .= ($i ? ',' : '') . $t->name;
-					$u = $t->initializer;
-					if ($u)
-						$s .= '=' . $this->parseTree($u);
-				}
-			break;
-
-			case KEYWORD_IN:
-			case KEYWORD_INSTANCEOF:
-				$left = $this->parseTree($n->treeNodes[0]);
-				$right = $this->parseTree($n->treeNodes[1]);
-
-				$s = $left;
-
-				if ($this->isWordChar(substr($left, -1)))
-					$s .= ' ';
-
-				$s .= $n->type;
-
-				if ($this->isWordChar($right[0]) || $right[0] == '\\')
-					$s .= ' ';
-
-				$s .= $right;
-			break;
-
-			case KEYWORD_DELETE:
-			case KEYWORD_TYPEOF:
-				$right = $this->parseTree($n->treeNodes[0]);
-
-				$s = $n->type;
-
-				if ($this->isWordChar($right[0]) || $right[0] == '\\')
-					$s .= ' ';
-
-				$s .= $right;
-			break;
-
-			case KEYWORD_VOID:
-				$s = 'void(' . $this->parseTree($n->treeNodes[0]) . ')';
-			break;
-
-			case KEYWORD_DEBUGGER:
-				throw new Exception('NOT IMPLEMENTED: DEBUGGER');
-			break;
-
-			case TOKEN_CONDCOMMENT_START:
-			case TOKEN_CONDCOMMENT_END:
-				$s = $n->value . ($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= $this->parseTree($childs[$i]);
-			break;
-
-			case OP_SEMICOLON:
-				if ($expression = $n->expression)
-					$s = $this->parseTree($expression);
-			break;
-
-			case JS_LABEL:
-				$s = $n->label . ':' . $this->parseTree($n->statement);
-			break;
-
-			case OP_COMMA:
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
-			break;
-
-			case OP_ASSIGN:
-				$s = $this->parseTree($n->treeNodes[0]) . $n->value . $this->parseTree($n->treeNodes[1]);
-			break;
-
-			case OP_HOOK:
-				$s = $this->parseTree($n->treeNodes[0]) . '?' . $this->parseTree($n->treeNodes[1]) . ':' . $this->parseTree($n->treeNodes[2]);
-			break;
-
-			case OP_OR: case OP_AND:
-			case OP_BITWISE_OR: case OP_BITWISE_XOR: case OP_BITWISE_AND:
-			case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE:
-			case OP_LT: case OP_LE: case OP_GE: case OP_GT:
-			case OP_LSH: case OP_RSH: case OP_URSH:
-			case OP_MUL: case OP_DIV: case OP_MOD:
-				$s = $this->parseTree($n->treeNodes[0]) . $n->type . $this->parseTree($n->treeNodes[1]);
-			break;
-
-			case OP_PLUS:
-			case OP_MINUS:
-				$left = $this->parseTree($n->treeNodes[0]);
-				$right = $this->parseTree($n->treeNodes[1]);
-
-				switch ($n->treeNodes[1]->type)
-				{
-					case OP_PLUS:
-					case OP_MINUS:
-					case OP_INCREMENT:
-					case OP_DECREMENT:
-					case OP_UNARY_PLUS:
-					case OP_UNARY_MINUS:
-						$s = $left . $n->type . ' ' . $right;
-					break;
-
-					case TOKEN_STRING:
-						//combine concatted strings with same quotestyle
-						if ($n->type == OP_PLUS && substr($left, -1) == $right[0])
-						{
-							$s = substr($left, 0, -1) . substr($right, 1);
-							break;
-						}
-					// FALL THROUGH
-
-					default:
-						$s = $left . $n->type . $right;
-				}
-			break;
-
-			case OP_NOT:
-			case OP_BITWISE_NOT:
-			case OP_UNARY_PLUS:
-			case OP_UNARY_MINUS:
-				$s = $n->value . $this->parseTree($n->treeNodes[0]);
-			break;
-
-			case OP_INCREMENT:
-			case OP_DECREMENT:
-				if ($n->postfix)
-					$s = $this->parseTree($n->treeNodes[0]) . $n->value;
-				else
-					$s = $n->value . $this->parseTree($n->treeNodes[0]);
-			break;
-
-			case OP_DOT:
-				$s = $this->parseTree($n->treeNodes[0]) . '.' . $this->parseTree($n->treeNodes[1]);
-			break;
-
-			case JS_INDEX:
-				$s = $this->parseTree($n->treeNodes[0]);
-				// See if we can replace named index with a dot saving 3 bytes
-				if (	$n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
-					$n->treeNodes[1]->type == TOKEN_STRING &&
-					$this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1))
-				)
-					$s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
-				else
-					$s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
-			break;
-
-			case JS_LIST:
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
-			break;
-
-			case JS_CALL:
-				$s = $this->parseTree($n->treeNodes[0]) . '(' . $this->parseTree($n->treeNodes[1]) . ')';
-			break;
-
-			case KEYWORD_NEW:
-			case JS_NEW_WITH_ARGS:
-				$s = 'new ' . $this->parseTree($n->treeNodes[0]) . '(' . ($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '') . ')';
-			break;
-
-			case JS_ARRAY_INIT:
-				$s = '[';
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-				{
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
-				}
-				$s .= ']';
-			break;
-
-			case JS_OBJECT_INIT:
-				$s = '{';
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-				{
-					$t = $childs[$i];
-					if ($i)
-						$s .= ',';
-					if ($t->type == JS_PROPERTY_INIT)
-					{
-						// Ditch the quotes when the index is a valid identifier
-						if (	$t->treeNodes[0]->type == TOKEN_STRING &&
-							$this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1))
-						)
-							$s .= substr($t->treeNodes[0]->value, 1, -1);
-						else
-							$s .= $t->treeNodes[0]->value;
-
-						$s .= ':' . $this->parseTree($t->treeNodes[1]);
-					}
-					else
-					{
-						$s .= $t->type == JS_GETTER ? 'get' : 'set';
-						$s .= ' ' . $t->name . '(';
-						$params = $t->params;
-						for ($i = 0, $j = count($params); $i < $j; $i++)
-							$s .= ($i ? ',' : '') . $params[$i];
-						$s .= '){' . $this->parseTree($t->body, true) . '}';
-					}
-				}
-				$s .= '}';
-			break;
-
-			case TOKEN_NUMBER:
-				$s = $n->value;
-				if (preg_match('/^([1-9]+)(0{3,})$/', $s, $m))
-					$s = $m[1] . 'e' . strlen($m[2]);
-			break;
-
-			case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
-			case TOKEN_IDENTIFIER: case TOKEN_STRING: case TOKEN_REGEXP:
-				$s = $n->value;
-			break;
-
-			case JS_GROUP:
-				if (in_array(
-					$n->treeNodes[0]->type,
-					array(
-						JS_ARRAY_INIT, JS_OBJECT_INIT, JS_GROUP,
-						TOKEN_NUMBER, TOKEN_STRING, TOKEN_REGEXP, TOKEN_IDENTIFIER,
-						KEYWORD_NULL, KEYWORD_THIS, KEYWORD_TRUE, KEYWORD_FALSE
-					)
-				))
-				{
-					$s = $this->parseTree($n->treeNodes[0]);
-				}
-				else
-				{
-					$s = '(' . $this->parseTree($n->treeNodes[0]) . ')';
-				}
-			break;
-
-			default:
-				throw new Exception('UNKNOWN TOKEN TYPE: ' . $n->type);
-		}
-
-		return $s;
-	}
-
-	private function isValidIdentifier($string)
-	{
-		return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $string) && !in_array($string, $this->reserved);
-	}
-
-	private function isWordChar($char)
-	{
-		return $char == '_' || $char == '$' || ctype_alnum($char);
-	}
-}
-
-class JSParser
-{
-	private $t;
-	private $minifier;
-
-	private $opPrecedence = array(
-		';' => 0,
-		',' => 1,
-		'=' => 2, '?' => 2, ':' => 2,
-		// The above all have to have the same precedence, see bug 330975
-		'||' => 4,
-		'&&' => 5,
-		'|' => 6,
-		'^' => 7,
-		'&' => 8,
-		'==' => 9, '!=' => 9, '===' => 9, '!==' => 9,
-		'<' => 10, '<=' => 10, '>=' => 10, '>' => 10, 'in' => 10, 'instanceof' => 10,
-		'<<' => 11, '>>' => 11, '>>>' => 11,
-		'+' => 12, '-' => 12,
-		'*' => 13, '/' => 13, '%' => 13,
-		'delete' => 14, 'void' => 14, 'typeof' => 14,
-		'!' => 14, '~' => 14, 'U+' => 14, 'U-' => 14,
-		'++' => 15, '--' => 15,
-		'new' => 16,
-		'.' => 17,
-		JS_NEW_WITH_ARGS => 0, JS_INDEX => 0, JS_CALL => 0,
-		JS_ARRAY_INIT => 0, JS_OBJECT_INIT => 0, JS_GROUP => 0
-	);
-
-	private $opArity = array(
-		',' => -2,
-		'=' => 2,
-		'?' => 3,
-		'||' => 2,
-		'&&' => 2,
-		'|' => 2,
-		'^' => 2,
-		'&' => 2,
-		'==' => 2, '!=' => 2, '===' => 2, '!==' => 2,
-		'<' => 2, '<=' => 2, '>=' => 2, '>' => 2, 'in' => 2, 'instanceof' => 2,
-		'<<' => 2, '>>' => 2, '>>>' => 2,
-		'+' => 2, '-' => 2,
-		'*' => 2, '/' => 2, '%' => 2,
-		'delete' => 1, 'void' => 1, 'typeof' => 1,
-		'!' => 1, '~' => 1, 'U+' => 1, 'U-' => 1,
-		'++' => 1, '--' => 1,
-		'new' => 1,
-		'.' => 2,
-		JS_NEW_WITH_ARGS => 2, JS_INDEX => 2, JS_CALL => 2,
-		JS_ARRAY_INIT => 1, JS_OBJECT_INIT => 1, JS_GROUP => 1,
-		TOKEN_CONDCOMMENT_START => 1, TOKEN_CONDCOMMENT_END => 1
-	);
-
-	public function __construct($minifier=null)
-	{
-		$this->minifier = $minifier;
-		$this->t = new JSTokenizer();
-	}
-
-	public function parse($s, $f, $l)
-	{
-		// initialize tokenizer
-		$this->t->init($s, $f, $l);
-
-		$x = new JSCompilerContext(false);
-		$n = $this->Script($x);
-		if (!$this->t->isDone())
-			throw $this->t->newSyntaxError('Syntax error');
-
-		return $n;
-	}
-
-	private function Script($x)
-	{
-		$n = $this->Statements($x);
-		$n->type = JS_SCRIPT;
-		$n->funDecls = $x->funDecls;
-		$n->varDecls = $x->varDecls;
-
-		// minify by scope
-		if ($this->minifier)
-		{
-			$n->value = $this->minifier->parseTree($n);
-
-			// clear tree from node to save memory
-			$n->treeNodes = null;
-			$n->funDecls = null;
-			$n->varDecls = null;
-
-			$n->type = JS_MINIFIED;
-		}
-
-		return $n;
-	}
-
-	private function Statements($x)
-	{
-		$n = new JSNode($this->t, JS_BLOCK);
-		array_push($x->stmtStack, $n);
-
-		while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY)
-			$n->addNode($this->Statement($x));
-
-		array_pop($x->stmtStack);
-
-		return $n;
-	}
-
-	private function Block($x)
-	{
-		$this->t->mustMatch(OP_LEFT_CURLY);
-		$n = $this->Statements($x);
-		$this->t->mustMatch(OP_RIGHT_CURLY);
-
-		return $n;
-	}
-
-	private function Statement($x)
-	{
-		$tt = $this->t->get();
-		$n2 = null;
-
-		// Cases for statements ending in a right curly return early, avoiding the
-		// common semicolon insertion magic after this switch.
-		switch ($tt)
-		{
-			case KEYWORD_FUNCTION:
-				return $this->FunctionDefinition(
-					$x,
-					true,
-					count($x->stmtStack) > 1 ? STATEMENT_FORM : DECLARED_FORM
-				);
-			break;
-
-			case OP_LEFT_CURLY:
-				$n = $this->Statements($x);
-				$this->t->mustMatch(OP_RIGHT_CURLY);
-			return $n;
-
-			case KEYWORD_IF:
-				$n = new JSNode($this->t);
-				$n->condition = $this->ParenExpression($x);
-				array_push($x->stmtStack, $n);
-				$n->thenPart = $this->Statement($x);
-				$n->elsePart = $this->t->match(KEYWORD_ELSE) ? $this->Statement($x) : null;
-				array_pop($x->stmtStack);
-			return $n;
-
-			case KEYWORD_SWITCH:
-				$n = new JSNode($this->t);
-				$this->t->mustMatch(OP_LEFT_PAREN);
-				$n->discriminant = $this->Expression($x);
-				$this->t->mustMatch(OP_RIGHT_PAREN);
-				$n->cases = array();
-				$n->defaultIndex = -1;
-
-				array_push($x->stmtStack, $n);
-
-				$this->t->mustMatch(OP_LEFT_CURLY);
-
-				while (($tt = $this->t->get()) != OP_RIGHT_CURLY)
-				{
-					switch ($tt)
-					{
-						case KEYWORD_DEFAULT:
-							if ($n->defaultIndex >= 0)
-								throw $this->t->newSyntaxError('More than one switch default');
-							// FALL THROUGH
-						case KEYWORD_CASE:
-							$n2 = new JSNode($this->t);
-							if ($tt == KEYWORD_DEFAULT)
-								$n->defaultIndex = count($n->cases);
-							else
-								$n2->caseLabel = $this->Expression($x, OP_COLON);
-								break;
-						default:
-							throw $this->t->newSyntaxError('Invalid switch case');
-					}
-
-					$this->t->mustMatch(OP_COLON);
-					$n2->statements = new JSNode($this->t, JS_BLOCK);
-					while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY)
-						$n2->statements->addNode($this->Statement($x));
-
-					array_push($n->cases, $n2);
-				}
-
-				array_pop($x->stmtStack);
-			return $n;
-
-			case KEYWORD_FOR:
-				$n = new JSNode($this->t);
-				$n->isLoop = true;
-				$this->t->mustMatch(OP_LEFT_PAREN);
-
-				if (($tt = $this->t->peek()) != OP_SEMICOLON)
-				{
-					$x->inForLoopInit = true;
-					if ($tt == KEYWORD_VAR || $tt == KEYWORD_CONST)
-					{
-						$this->t->get();
-						$n2 = $this->Variables($x);
-					}
-					else
-					{
-						$n2 = $this->Expression($x);
-					}
-					$x->inForLoopInit = false;
-				}
-
-				if ($n2 && $this->t->match(KEYWORD_IN))
-				{
-					$n->type = JS_FOR_IN;
-					if ($n2->type == KEYWORD_VAR)
-					{
-						if (count($n2->treeNodes) != 1)
-						{
-							throw $this->t->SyntaxError(
-								'Invalid for..in left-hand side',
-								$this->t->filename,
-								$n2->lineno
-							);
-						}
-
-						// NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name.
-						$n->iterator = $n2->treeNodes[0];
-						$n->varDecl = $n2;
-					}
-					else
-					{
-						$n->iterator = $n2;
-						$n->varDecl = null;
-					}
-
-					$n->object = $this->Expression($x);
-				}
-				else
-				{
-					$n->setup = $n2 ? $n2 : null;
-					$this->t->mustMatch(OP_SEMICOLON);
-					$n->condition = $this->t->peek() == OP_SEMICOLON ? null : $this->Expression($x);
-					$this->t->mustMatch(OP_SEMICOLON);
-					$n->update = $this->t->peek() == OP_RIGHT_PAREN ? null : $this->Expression($x);
-				}
-
-				$this->t->mustMatch(OP_RIGHT_PAREN);
-				$n->body = $this->nest($x, $n);
-			return $n;
-
-			case KEYWORD_WHILE:
-			        $n = new JSNode($this->t);
-			        $n->isLoop = true;
-			        $n->condition = $this->ParenExpression($x);
-			        $n->body = $this->nest($x, $n);
-			return $n;
-
-			case KEYWORD_DO:
-				$n = new JSNode($this->t);
-				$n->isLoop = true;
-				$n->body = $this->nest($x, $n, KEYWORD_WHILE);
-				$n->condition = $this->ParenExpression($x);
-				if (!$x->ecmaStrictMode)
-				{
-					// <script language="JavaScript"> (without version hints) may need
-					// automatic semicolon insertion without a newline after do-while.
-					// See http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
-					$this->t->match(OP_SEMICOLON);
-					return $n;
-				}
-			break;
-
-			case KEYWORD_BREAK:
-			case KEYWORD_CONTINUE:
-				$n = new JSNode($this->t);
-
-				if ($this->t->peekOnSameLine() == TOKEN_IDENTIFIER)
-				{
-					$this->t->get();
-					$n->label = $this->t->currentToken()->value;
-				}
-
-				$ss = $x->stmtStack;
-				$i = count($ss);
-				$label = $n->label;
-				if ($label)
-				{
-					do
-					{
-						if (--$i < 0)
-							throw $this->t->newSyntaxError('Label not found');
-					}
-					while ($ss[$i]->label != $label);
-				}
-				else
-				{
-					do
-					{
-						if (--$i < 0)
-							throw $this->t->newSyntaxError('Invalid ' . $tt);
-					}
-					while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH));
-				}
-
-				$n->target = $ss[$i];
-			break;
-
-			case KEYWORD_TRY:
-				$n = new JSNode($this->t);
-				$n->tryBlock = $this->Block($x);
-				$n->catchClauses = array();
-
-				while ($this->t->match(KEYWORD_CATCH))
-				{
-					$n2 = new JSNode($this->t);
-					$this->t->mustMatch(OP_LEFT_PAREN);
-					$n2->varName = $this->t->mustMatch(TOKEN_IDENTIFIER)->value;
-
-					if ($this->t->match(KEYWORD_IF))
-					{
-						if ($x->ecmaStrictMode)
-							throw $this->t->newSyntaxError('Illegal catch guard');
-
-						if (count($n->catchClauses) && !end($n->catchClauses)->guard)
-							throw $this->t->newSyntaxError('Guarded catch after unguarded');
-
-						$n2->guard = $this->Expression($x);
-					}
-					else
-					{
-						$n2->guard = null;
-					}
-
-					$this->t->mustMatch(OP_RIGHT_PAREN);
-					$n2->block = $this->Block($x);
-					array_push($n->catchClauses, $n2);
-				}
-
-				if ($this->t->match(KEYWORD_FINALLY))
-					$n->finallyBlock = $this->Block($x);
-
-				if (!count($n->catchClauses) && !$n->finallyBlock)
-					throw $this->t->newSyntaxError('Invalid try statement');
-			return $n;
-
-			case KEYWORD_CATCH:
-			case KEYWORD_FINALLY:
-				throw $this->t->newSyntaxError($tt + ' without preceding try');
-
-			case KEYWORD_THROW:
-				$n = new JSNode($this->t);
-				$n->value = $this->Expression($x);
-			break;
-
-			case KEYWORD_RETURN:
-				if (!$x->inFunction)
-					throw $this->t->newSyntaxError('Invalid return');
-
-				$n = new JSNode($this->t);
-				$tt = $this->t->peekOnSameLine();
-				if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
-					$n->value = $this->Expression($x);
-				else
-					$n->value = null;
-			break;
-
-			case KEYWORD_WITH:
-				$n = new JSNode($this->t);
-				$n->object = $this->ParenExpression($x);
-				$n->body = $this->nest($x, $n);
-			return $n;
-
-			case KEYWORD_VAR:
-			case KEYWORD_CONST:
-			        $n = $this->Variables($x);
-			break;
-
-			case TOKEN_CONDCOMMENT_START:
-			case TOKEN_CONDCOMMENT_END:
-				$n = new JSNode($this->t);
-			return $n;
-
-			case KEYWORD_DEBUGGER:
-				$n = new JSNode($this->t);
-			break;
-
-			case TOKEN_NEWLINE:
-			case OP_SEMICOLON:
-				$n = new JSNode($this->t, OP_SEMICOLON);
-				$n->expression = null;
-			return $n;
-
-			default:
-				if ($tt == TOKEN_IDENTIFIER)
-				{
-					$this->t->scanOperand = false;
-					$tt = $this->t->peek();
-					$this->t->scanOperand = true;
-					if ($tt == OP_COLON)
-					{
-						$label = $this->t->currentToken()->value;
-						$ss = $x->stmtStack;
-						for ($i = count($ss) - 1; $i >= 0; --$i)
-						{
-							if ($ss[$i]->label == $label)
-								throw $this->t->newSyntaxError('Duplicate label');
-						}
-
-						$this->t->get();
-						$n = new JSNode($this->t, JS_LABEL);
-						$n->label = $label;
-						$n->statement = $this->nest($x, $n);
-
-						return $n;
-					}
-				}
-
-				$n = new JSNode($this->t, OP_SEMICOLON);
-				$this->t->unget();
-				$n->expression = $this->Expression($x);
-				$n->end = $n->expression->end;
-			break;
-		}
-
-		if ($this->t->lineno == $this->t->currentToken()->lineno)
-		{
-			$tt = $this->t->peekOnSameLine();
-			if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
-				throw $this->t->newSyntaxError('Missing ; before statement');
-		}
-
-		$this->t->match(OP_SEMICOLON);
-
-		return $n;
-	}
-
-	private function FunctionDefinition($x, $requireName, $functionForm)
-	{
-		$f = new JSNode($this->t);
-
-		if ($f->type != KEYWORD_FUNCTION)
-			$f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER;
-
-		if ($this->t->match(TOKEN_IDENTIFIER))
-			$f->name = $this->t->currentToken()->value;
-		elseif ($requireName)
-			throw $this->t->newSyntaxError('Missing function identifier');
-
-		$this->t->mustMatch(OP_LEFT_PAREN);
-			$f->params = array();
-
-		while (($tt = $this->t->get()) != OP_RIGHT_PAREN)
-		{
-			if ($tt != TOKEN_IDENTIFIER)
-				throw $this->t->newSyntaxError('Missing formal parameter');
-
-			array_push($f->params, $this->t->currentToken()->value);
-
-			if ($this->t->peek() != OP_RIGHT_PAREN)
-				$this->t->mustMatch(OP_COMMA);
-		}
-
-		$this->t->mustMatch(OP_LEFT_CURLY);
-
-		$x2 = new JSCompilerContext(true);
-		$f->body = $this->Script($x2);
-
-		$this->t->mustMatch(OP_RIGHT_CURLY);
-		$f->end = $this->t->currentToken()->end;
-
-		$f->functionForm = $functionForm;
-		if ($functionForm == DECLARED_FORM)
-			array_push($x->funDecls, $f);
-
-		return $f;
-	}
-
-	private function Variables($x)
-	{
-		$n = new JSNode($this->t);
-
-		do
-		{
-			$this->t->mustMatch(TOKEN_IDENTIFIER);
-
-			$n2 = new JSNode($this->t);
-			$n2->name = $n2->value;
-
-			if ($this->t->match(OP_ASSIGN))
-			{
-				if ($this->t->currentToken()->assignOp)
-					throw $this->t->newSyntaxError('Invalid variable initialization');
-
-				$n2->initializer = $this->Expression($x, OP_COMMA);
-			}
-
-			$n2->readOnly = $n->type == KEYWORD_CONST;
-
-			$n->addNode($n2);
-			array_push($x->varDecls, $n2);
-		}
-		while ($this->t->match(OP_COMMA));
-
-		return $n;
-	}
-
-	private function Expression($x, $stop=false)
-	{
-		$operators = array();
-		$operands = array();
-		$n = false;
-
-		$bl = $x->bracketLevel;
-		$cl = $x->curlyLevel;
-		$pl = $x->parenLevel;
-		$hl = $x->hookLevel;
-
-		while (($tt = $this->t->get()) != TOKEN_END)
-		{
-			if ($tt == $stop &&
-				$x->bracketLevel == $bl &&
-				$x->curlyLevel == $cl &&
-				$x->parenLevel == $pl &&
-				$x->hookLevel == $hl
-			)
-			{
-				// Stop only if tt matches the optional stop parameter, and that
-				// token is not quoted by some kind of bracket.
-				break;
-			}
-
-			switch ($tt)
-			{
-				case OP_SEMICOLON:
-					// NB: cannot be empty, Statement handled that.
-					break 2;
-
-				case OP_HOOK:
-					if ($this->t->scanOperand)
-						break 2;
-
-					while (	!empty($operators) &&
-						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
-
-					array_push($operators, new JSNode($this->t));
-
-					++$x->hookLevel;
-					$this->t->scanOperand = true;
-					$n = $this->Expression($x);
-
-					if (!$this->t->match(OP_COLON))
-						break 2;
-
-					--$x->hookLevel;
-					array_push($operands, $n);
-				break;
-
-				case OP_COLON:
-					if ($x->hookLevel)
-						break 2;
-
-					throw $this->t->newSyntaxError('Invalid label');
-				break;
-
-				case OP_ASSIGN:
-					if ($this->t->scanOperand)
-						break 2;
-
-					// Use >, not >=, for right-associative ASSIGN
-					while (	!empty($operators) &&
-						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
-
-					array_push($operators, new JSNode($this->t));
-					end($operands)->assignOp = $this->t->currentToken()->assignOp;
-					$this->t->scanOperand = true;
-				break;
-
-				case KEYWORD_IN:
-					// An in operator should not be parsed if we're parsing the head of
-					// a for (...) loop, unless it is in the then part of a conditional
-					// expression, or parenthesized somehow.
-					if ($x->inForLoopInit && !$x->hookLevel &&
-						!$x->bracketLevel && !$x->curlyLevel &&
-						!$x->parenLevel
-					)
-						break 2;
-				// FALL THROUGH
-				case OP_COMMA:
-					// A comma operator should not be parsed if we're parsing the then part
-					// of a conditional expression unless it's parenthesized somehow.
-					if ($tt == OP_COMMA && $x->hookLevel &&
-						!$x->bracketLevel && !$x->curlyLevel &&
-						!$x->parenLevel
-					)
-						break 2;
-				// Treat comma as left-associative so reduce can fold left-heavy
-				// COMMA trees into a single array.
-				// FALL THROUGH
-				case OP_OR:
-				case OP_AND:
-				case OP_BITWISE_OR:
-				case OP_BITWISE_XOR:
-				case OP_BITWISE_AND:
-				case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE:
-				case OP_LT: case OP_LE: case OP_GE: case OP_GT:
-				case KEYWORD_INSTANCEOF:
-				case OP_LSH: case OP_RSH: case OP_URSH:
-				case OP_PLUS: case OP_MINUS:
-				case OP_MUL: case OP_DIV: case OP_MOD:
-				case OP_DOT:
-					if ($this->t->scanOperand)
-						break 2;
-
-					while (	!empty($operators) &&
-						$this->opPrecedence[end($operators)->type] >= $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
-
-					if ($tt == OP_DOT)
-					{
-						$this->t->mustMatch(TOKEN_IDENTIFIER);
-						array_push($operands, new JSNode($this->t, OP_DOT, array_pop($operands), new JSNode($this->t)));
-					}
-					else
-					{
-						array_push($operators, new JSNode($this->t));
-						$this->t->scanOperand = true;
-					}
-				break;
-
-				case KEYWORD_DELETE: case KEYWORD_VOID: case KEYWORD_TYPEOF:
-				case OP_NOT: case OP_BITWISE_NOT: case OP_UNARY_PLUS: case OP_UNARY_MINUS:
-				case KEYWORD_NEW:
-					if (!$this->t->scanOperand)
-						break 2;
-
-					array_push($operators, new JSNode($this->t));
-				break;
-
-				case OP_INCREMENT: case OP_DECREMENT:
-					if ($this->t->scanOperand)
-					{
-						array_push($operators, new JSNode($this->t));  // prefix increment or decrement
-					}
-					else
-					{
-						// Don't cross a line boundary for postfix {in,de}crement.
-						$t = $this->t->tokens[($this->t->tokenIndex + $this->t->lookahead - 1) & 3];
-						if ($t && $t->lineno != $this->t->lineno)
-							break 2;
-
-						if (!empty($operators))
-						{
-							// Use >, not >=, so postfix has higher precedence than prefix.
-							while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt])
-								$this->reduce($operators, $operands);
-						}
-
-						$n = new JSNode($this->t, $tt, array_pop($operands));
-						$n->postfix = true;
-						array_push($operands, $n);
-					}
-				break;
-
-				case KEYWORD_FUNCTION:
-					if (!$this->t->scanOperand)
-						break 2;
-
-					array_push($operands, $this->FunctionDefinition($x, false, EXPRESSED_FORM));
-					$this->t->scanOperand = false;
-				break;
-
-				case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
-				case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP:
-					if (!$this->t->scanOperand)
-						break 2;
-
-					array_push($operands, new JSNode($this->t));
-					$this->t->scanOperand = false;
-				break;
-
-				case TOKEN_CONDCOMMENT_START:
-				case TOKEN_CONDCOMMENT_END:
-					if ($this->t->scanOperand)
-						array_push($operators, new JSNode($this->t));
-					else
-						array_push($operands, new JSNode($this->t));
-				break;
-
-				case OP_LEFT_BRACKET:
-					if ($this->t->scanOperand)
-					{
-						// Array initialiser.  Parse using recursive descent, as the
-						// sub-grammar here is not an operator grammar.
-						$n = new JSNode($this->t, JS_ARRAY_INIT);
-						while (($tt = $this->t->peek()) != OP_RIGHT_BRACKET)
-						{
-							if ($tt == OP_COMMA)
-							{
-								$this->t->get();
-								$n->addNode(null);
-								continue;
-							}
-
-							$n->addNode($this->Expression($x, OP_COMMA));
-							if (!$this->t->match(OP_COMMA))
-								break;
-						}
-
-						$this->t->mustMatch(OP_RIGHT_BRACKET);
-						array_push($operands, $n);
-						$this->t->scanOperand = false;
-					}
-					else
-					{
-						// Property indexing operator.
-						array_push($operators, new JSNode($this->t, JS_INDEX));
-						$this->t->scanOperand = true;
-						++$x->bracketLevel;
-					}
-				break;
-
-				case OP_RIGHT_BRACKET:
-					if ($this->t->scanOperand || $x->bracketLevel == $bl)
-						break 2;
-
-					while ($this->reduce($operators, $operands)->type != JS_INDEX)
-						continue;
-
-					--$x->bracketLevel;
-				break;
-
-				case OP_LEFT_CURLY:
-					if (!$this->t->scanOperand)
-						break 2;
-
-					// Object initialiser.  As for array initialisers (see above),
-					// parse using recursive descent.
-					++$x->curlyLevel;
-					$n = new JSNode($this->t, JS_OBJECT_INIT);
-					while (!$this->t->match(OP_RIGHT_CURLY))
-					{
-						do
-						{
-							$tt = $this->t->get();
-							$tv = $this->t->currentToken()->value;
-							if (($tv == 'get' || $tv == 'set') && $this->t->peek() == TOKEN_IDENTIFIER)
-							{
-								if ($x->ecmaStrictMode)
-									throw $this->t->newSyntaxError('Illegal property accessor');
-
-								$n->addNode($this->FunctionDefinition($x, true, EXPRESSED_FORM));
-							}
-							else
-							{
-								switch ($tt)
-								{
-									case TOKEN_IDENTIFIER:
-									case TOKEN_NUMBER:
-									case TOKEN_STRING:
-										$id = new JSNode($this->t);
-									break;
-
-									case OP_RIGHT_CURLY:
-										if ($x->ecmaStrictMode)
-											throw $this->t->newSyntaxError('Illegal trailing ,');
-									break 3;
-
-									default:
-										throw $this->t->newSyntaxError('Invalid property name');
-								}
-
-								$this->t->mustMatch(OP_COLON);
-								$n->addNode(new JSNode($this->t, JS_PROPERTY_INIT, $id, $this->Expression($x, OP_COMMA)));
-							}
-						}
-						while ($this->t->match(OP_COMMA));
-
-						$this->t->mustMatch(OP_RIGHT_CURLY);
-						break;
-					}
-
-					array_push($operands, $n);
-					$this->t->scanOperand = false;
-					--$x->curlyLevel;
-				break;
-
-				case OP_RIGHT_CURLY:
-					if (!$this->t->scanOperand && $x->curlyLevel != $cl)
-						throw new Exception('PANIC: right curly botch');
-				break 2;
-
-				case OP_LEFT_PAREN:
-					if ($this->t->scanOperand)
-					{
-						array_push($operators, new JSNode($this->t, JS_GROUP));
-					}
-					else
-					{
-						while (	!empty($operators) &&
-							$this->opPrecedence[end($operators)->type] > $this->opPrecedence[KEYWORD_NEW]
-						)
-							$this->reduce($operators, $operands);
-
-						// Handle () now, to regularize the n-ary case for n > 0.
-						// We must set scanOperand in case there are arguments and
-						// the first one is a regexp or unary+/-.
-						$n = end($operators);
-						$this->t->scanOperand = true;
-						if ($this->t->match(OP_RIGHT_PAREN))
-						{
-							if ($n && $n->type == KEYWORD_NEW)
-							{
-								array_pop($operators);
-								$n->addNode(array_pop($operands));
-							}
-							else
-							{
-								$n = new JSNode($this->t, JS_CALL, array_pop($operands), new JSNode($this->t, JS_LIST));
-							}
-
-							array_push($operands, $n);
-							$this->t->scanOperand = false;
-							break;
-						}
-
-						if ($n && $n->type == KEYWORD_NEW)
-							$n->type = JS_NEW_WITH_ARGS;
-						else
-							array_push($operators, new JSNode($this->t, JS_CALL));
-					}
-
-					++$x->parenLevel;
-				break;
-
-				case OP_RIGHT_PAREN:
-					if ($this->t->scanOperand || $x->parenLevel == $pl)
-						break 2;
-
-					while (($tt = $this->reduce($operators, $operands)->type) != JS_GROUP &&
-						$tt != JS_CALL && $tt != JS_NEW_WITH_ARGS
-					)
-					{
-						continue;
-					}
-
-					if ($tt != JS_GROUP)
-					{
-						$n = end($operands);
-						if ($n->treeNodes[1]->type != OP_COMMA)
-							$n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]);
-						else
-							$n->treeNodes[1]->type = JS_LIST;
-					}
-
-					--$x->parenLevel;
-				break;
-
-				// Automatic semicolon insertion means we may scan across a newline
-				// and into the beginning of another statement.  If so, break out of
-				// the while loop and let the t.scanOperand logic handle errors.
-				default:
-					break 2;
-			}
-		}
-
-		if ($x->hookLevel != $hl)
-			throw $this->t->newSyntaxError('Missing : in conditional expression');
-
-		if ($x->parenLevel != $pl)
-			throw $this->t->newSyntaxError('Missing ) in parenthetical');
-
-		if ($x->bracketLevel != $bl)
-			throw $this->t->newSyntaxError('Missing ] in index expression');
-
-		if ($this->t->scanOperand)
-			throw $this->t->newSyntaxError('Missing operand');
-
-		// Resume default mode, scanning for operands, not operators.
-		$this->t->scanOperand = true;
-		$this->t->unget();
-
-		while (count($operators))
-			$this->reduce($operators, $operands);
-
-		return array_pop($operands);
-	}
-
-	private function ParenExpression($x)
-	{
-		$this->t->mustMatch(OP_LEFT_PAREN);
-		$n = $this->Expression($x);
-		$this->t->mustMatch(OP_RIGHT_PAREN);
-
-		return $n;
-	}
-
-	// Statement stack and nested statement handler.
-	private function nest($x, $node, $end = false)
-	{
-		array_push($x->stmtStack, $node);
-		$n = $this->statement($x);
-		array_pop($x->stmtStack);
-
-		if ($end)
-			$this->t->mustMatch($end);
-
-		return $n;
-	}
-
-	private function reduce(&$operators, &$operands)
-	{
-		$n = array_pop($operators);
-		$op = $n->type;
-		$arity = $this->opArity[$op];
-		$c = count($operands);
-		if ($arity == -2)
-		{
-			// Flatten left-associative trees
-			if ($c >= 2)
-			{
-				$left = $operands[$c - 2];
-				if ($left->type == $op)
-				{
-					$right = array_pop($operands);
-					$left->addNode($right);
-					return $left;
-				}
-			}
-			$arity = 2;
-		}
-
-		// Always use push to add operands to n, to update start and end
-		$a = array_splice($operands, $c - $arity);
-		for ($i = 0; $i < $arity; $i++)
-			$n->addNode($a[$i]);
-
-		// Include closing bracket or postfix operator in [start,end]
-		$te = $this->t->currentToken()->end;
-		if ($n->end < $te)
-			$n->end = $te;
-
-		array_push($operands, $n);
-
-		return $n;
-	}
-}
-
-class JSCompilerContext
-{
-	public $inFunction = false;
-	public $inForLoopInit = false;
-	public $ecmaStrictMode = false;
-	public $bracketLevel = 0;
-	public $curlyLevel = 0;
-	public $parenLevel = 0;
-	public $hookLevel = 0;
-
-	public $stmtStack = array();
-	public $funDecls = array();
-	public $varDecls = array();
-
-	public function __construct($inFunction)
-	{
-		$this->inFunction = $inFunction;
-	}
-}
-
-class JSNode
-{
-	private $type;
-	private $value;
-	private $lineno;
-	private $start;
-	private $end;
-
-	public $treeNodes = array();
-	public $funDecls = array();
-	public $varDecls = array();
-
-	public function __construct($t, $type=0)
-	{
-		if ($token = $t->currentToken())
-		{
-			$this->type = $type ? $type : $token->type;
-			$this->value = $token->value;
-			$this->lineno = $token->lineno;
-			$this->start = $token->start;
-			$this->end = $token->end;
-		}
-		else
-		{
-			$this->type = $type;
-			$this->lineno = $t->lineno;
-		}
-
-		if (($numargs = func_num_args()) > 2)
-		{
-			$args = func_get_args();
-			for ($i = 2; $i < $numargs; $i++)
-				$this->addNode($args[$i]);
-		}
-	}
-
-	// we don't want to bloat our object with all kind of specific properties, so we use overloading
-	public function __set($name, $value)
-	{
-		$this->$name = $value;
-	}
-
-	public function __get($name)
-	{
-		if (isset($this->$name))
-			return $this->$name;
-
-		return null;
-	}
-
-	public function addNode($node)
-	{
-		if ($node !== null)
-		{
-			if ($node->start < $this->start)
-				$this->start = $node->start;
-			if ($this->end < $node->end)
-				$this->end = $node->end;
-		}
-
-		$this->treeNodes[] = $node;
-	}
-}
-
-class JSTokenizer
-{
-	private $cursor = 0;
-	private $source;
-
-	public $tokens = array();
-	public $tokenIndex = 0;
-	public $lookahead = 0;
-	public $scanNewlines = false;
-	public $scanOperand = true;
-
-	public $filename;
-	public $lineno;
-
-	private $keywords = array(
-		'break',
-		'case', 'catch', 'const', 'continue',
-		'debugger', 'default', 'delete', 'do',
-		'else', 'enum',
-		'false', 'finally', 'for', 'function',
-		'if', 'in', 'instanceof',
-		'new', 'null',
-		'return',
-		'switch',
-		'this', 'throw', 'true', 'try', 'typeof',
-		'var', 'void',
-		'while', 'with'
-	);
-
-	private $opTypeNames = array(
-		';', ',', '?', ':', '||', '&&', '|', '^',
-		'&', '===', '==', '=', '!==', '!=', '<<', '<=',
-		'<', '>>>', '>>', '>=', '>', '++', '--', '+',
-		'-', '*', '/', '%', '!', '~', '.', '[',
-		']', '{', '}', '(', ')', '@*/'
-	);
-
-	private $assignOps = array('|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%');
-	private $opRegExp;
-
-	public function __construct()
-	{
-		$this->opRegExp = '#^(' . implode('|', array_map('preg_quote', $this->opTypeNames)) . ')#';
-	}
-
-	public function init($source, $filename = '', $lineno = 1)
-	{
-		$this->source = $source;
-		$this->filename = $filename ? $filename : '[inline]';
-		$this->lineno = $lineno;
-
-		$this->cursor = 0;
-		$this->tokens = array();
-		$this->tokenIndex = 0;
-		$this->lookahead = 0;
-		$this->scanNewlines = false;
-		$this->scanOperand = true;
-	}
-
-	public function getInput($chunksize)
-	{
-		if ($chunksize)
-			return substr($this->source, $this->cursor, $chunksize);
-
-		return substr($this->source, $this->cursor);
-	}
-
-	public function isDone()
-	{
-		return $this->peek() == TOKEN_END;
-	}
-
-	public function match($tt)
-	{
-		return $this->get() == $tt || $this->unget();
-	}
-
-	public function mustMatch($tt)
-	{
-	        if (!$this->match($tt))
-			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
-
-		return $this->currentToken();
-	}
-
-	public function peek()
-	{
-		if ($this->lookahead)
-		{
-			$next = $this->tokens[($this->tokenIndex + $this->lookahead) & 3];
-			if ($this->scanNewlines && $next->lineno != $this->lineno)
-				$tt = TOKEN_NEWLINE;
-			else
-				$tt = $next->type;
-		}
-		else
-		{
-			$tt = $this->get();
-			$this->unget();
-		}
-
-		return $tt;
-	}
-
-	public function peekOnSameLine()
-	{
-		$this->scanNewlines = true;
-		$tt = $this->peek();
-		$this->scanNewlines = false;
-
-		return $tt;
-	}
-
-	public function currentToken()
-	{
-		if (!empty($this->tokens))
-			return $this->tokens[$this->tokenIndex];
-	}
-
-	public function get($chunksize = 1000)
-	{
-		while($this->lookahead)
-		{
-			$this->lookahead--;
-			$this->tokenIndex = ($this->tokenIndex + 1) & 3;
-			$token = $this->tokens[$this->tokenIndex];
-			if ($token->type != TOKEN_NEWLINE || $this->scanNewlines)
-				return $token->type;
-		}
-
-		$conditional_comment = false;
-
-		// strip whitespace and comments
-		while(true)
-		{
-			$input = $this->getInput($chunksize);
-
-			// whitespace handling; gobble up \r as well (effectively we don't have support for MAC newlines!)
-			$re = $this->scanNewlines ? '/^[ \r\t]+/' : '/^\s+/';
-			if (preg_match($re, $input, $match))
-			{
-				$spaces = $match[0];
-				$spacelen = strlen($spaces);
-				$this->cursor += $spacelen;
-				if (!$this->scanNewlines)
-					$this->lineno += substr_count($spaces, "\n");
-
-				if ($spacelen == $chunksize)
-					continue; // complete chunk contained whitespace
-
-				$input = $this->getInput($chunksize);
-				if ($input == '' || $input[0] != '/')
-					break;
-			}
-
-			// Comments
-			if (!preg_match('/^\/(?:\*(@(?:cc_on|if|elif|else|end))?.*?\*\/|\/[^\n]*)/s', $input, $match))
-			{
-				if (!$chunksize)
-					break;
-
-				// retry with a full chunk fetch; this also prevents breakage of long regular expressions (which will never match a comment)
-				$chunksize = null;
-				continue;
-			}
-
-			// check if this is a conditional (JScript) comment
-			if (!empty($match[1]))
-			{
-				$match[0] = '/*' . $match[1];
-				$conditional_comment = true;
-				break;
-			}
-			else
-			{
-				$this->cursor += strlen($match[0]);
-				$this->lineno += substr_count($match[0], "\n");
-			}
-		}
-
-		if ($input == '')
-		{
-			$tt = TOKEN_END;
-			$match = array('');
-		}
-		elseif ($conditional_comment)
-		{
-			$tt = TOKEN_CONDCOMMENT_START;
-		}
-		else
-		{
-			switch ($input[0])
-			{
-				case '0':
-					// hexadecimal
-					if (($input[1] == 'x' || $input[1] == 'X') && preg_match('/^0x[0-9a-f]+/i', $input, $match))
-					{
-						$tt = TOKEN_NUMBER;
-						break;
-					}
-				// FALL THROUGH
-
-				case '1': case '2': case '3': case '4': case '5':
-				case '6': case '7': case '8': case '9':
-					// should always match
-					preg_match('/^\d+(?:\.\d*)?(?:[eE][-+]?\d+)?/', $input, $match);
-					$tt = TOKEN_NUMBER;
-				break;
-
-				case "'":
-					if (preg_match('/^\'(?:[^\\\\\'\r\n]++|\\\\(?:.|\r?\n))*\'/', $input, $match))
-					{
-						$tt = TOKEN_STRING;
-					}
-					else
-					{
-						if ($chunksize)
-							return $this->get(null); // retry with a full chunk fetch
-
-						throw $this->newSyntaxError('Unterminated string literal');
-					}
-				break;
-
-				case '"':
-					if (preg_match('/^"(?:[^\\\\"\r\n]++|\\\\(?:.|\r?\n))*"/', $input, $match))
-					{
-						$tt = TOKEN_STRING;
-					}
-					else
-					{
-						if ($chunksize)
-							return $this->get(null); // retry with a full chunk fetch
-
-						throw $this->newSyntaxError('Unterminated string literal');
-					}
-				break;
-
-				case '/':
-					if ($this->scanOperand && preg_match('/^\/((?:\\\\.|\[(?:\\\\.|[^\]])*\]|[^\/])+)\/([gimy]*)/', $input, $match))
-					{
-						$tt = TOKEN_REGEXP;
-						break;
-					}
-				// FALL THROUGH
-
-				case '|':
-				case '^':
-				case '&':
-				case '<':
-				case '>':
-				case '+':
-				case '-':
-				case '*':
-				case '%':
-				case '=':
-				case '!':
-					// should always match
-					preg_match($this->opRegExp, $input, $match);
-					$op = $match[0];
-					if (in_array($op, $this->assignOps) && $input[strlen($op)] == '=')
-					{
-						$tt = OP_ASSIGN;
-						$match[0] .= '=';
-					}
-					else
-					{
-						$tt = $op;
-						if ($this->scanOperand)
-						{
-							if ($op == OP_PLUS)
-								$tt = OP_UNARY_PLUS;
-							elseif ($op == OP_MINUS)
-								$tt = OP_UNARY_MINUS;
-						}
-						$op = null;
-					}
-				break;
-
-				case '.':
-					if (preg_match('/^\.\d+(?:[eE][-+]?\d+)?/', $input, $match))
-					{
-						$tt = TOKEN_NUMBER;
-						break;
-					}
-				// FALL THROUGH
-
-				case ';':
-				case ',':
-				case '?':
-				case ':':
-				case '~':
-				case '[':
-				case ']':
-				case '{':
-				case '}':
-				case '(':
-				case ')':
-					// these are all single
-					$match = array($input[0]);
-					$tt = $input[0];
-				break;
-
-				case '@':
-					// check end of conditional comment
-					if (substr($input, 0, 3) == '@*/')
-					{
-						$match = array('@*/');
-						$tt = TOKEN_CONDCOMMENT_END;
-					}
-					else
-						throw $this->newSyntaxError('Illegal token');
-				break;
-
-				case "\n":
-					if ($this->scanNewlines)
-					{
-						$match = array("\n");
-						$tt = TOKEN_NEWLINE;
-					}
-					else
-						throw $this->newSyntaxError('Illegal token');
-				break;
-
-				default:
-					// FIXME: add support for unicode and unicode escape sequence \uHHHH
-					if (preg_match('/^[$\w]+/', $input, $match))
-					{
-						$tt = in_array($match[0], $this->keywords) ? $match[0] : TOKEN_IDENTIFIER;
-					}
-					else
-						throw $this->newSyntaxError('Illegal token');
-			}
-		}
-
-		$this->tokenIndex = ($this->tokenIndex + 1) & 3;
-
-		if (!isset($this->tokens[$this->tokenIndex]))
-			$this->tokens[$this->tokenIndex] = new JSToken();
-
-		$token = $this->tokens[$this->tokenIndex];
-		$token->type = $tt;
-
-		if ($tt == OP_ASSIGN)
-			$token->assignOp = $op;
-
-		$token->start = $this->cursor;
-
-		$token->value = $match[0];
-		$this->cursor += strlen($match[0]);
-
-		$token->end = $this->cursor;
-		$token->lineno = $this->lineno;
-
-		return $tt;
-	}
-
-	public function unget()
-	{
-		if (++$this->lookahead == 4)
-			throw $this->newSyntaxError('PANIC: too much lookahead!');
-
-		$this->tokenIndex = ($this->tokenIndex - 1) & 3;
-	}
-
-	public function newSyntaxError($m)
-	{
-		return new Exception('Parse error: ' . $m . ' in file \'' . $this->filename . '\' on line ' . $this->lineno);
-	}
-}
-
-class JSToken
-{
-	public $type;
-	public $value;
-	public $start;
-	public $end;
-	public $lineno;
-	public $assignOp;
-}
diff --git a/inc/contrib/minify/Minify.php b/inc/contrib/minify/Minify.php
deleted file mode 100755
index 9634f221..00000000
--- a/inc/contrib/minify/Minify.php
+++ /dev/null
@@ -1,617 +0,0 @@
-<?php
-/**
- * Class Minify  
- * @package Minify
- */
-
-/**
- * Minify_Source
- */
-require_once 'Minify/Source.php';
- 
-/**
- * Minify - Combines, minifies, and caches JavaScript and CSS files on demand.
- *
- * See README for usage instructions (for now).
- *
- * This library was inspired by {@link mailto:flashkot@mail.ru jscsscomp by Maxim Martynyuk}
- * and by the article {@link http://www.hunlock.com/blogs/Supercharged_Javascript "Supercharged JavaScript" by Patrick Hunlock}.
- *
- * Requires PHP 5.1.0.
- * Tested on PHP 5.1.6.
- *
- * @package Minify
- * @author Ryan Grove <ryan@wonko.com>
- * @author Stephen Clay <steve@mrclay.org>
- * @copyright 2008 Ryan Grove, Stephen Clay. All rights reserved.
- * @license http://opensource.org/licenses/bsd-license.php  New BSD License
- * @link http://code.google.com/p/minify/
- */
-class Minify {
-    
-    const VERSION = '2.1.5';
-    const TYPE_CSS = 'text/css';
-    const TYPE_HTML = 'text/html';
-    // there is some debate over the ideal JS Content-Type, but this is the
-    // Apache default and what Yahoo! uses..
-    const TYPE_JS = 'application/x-javascript';
-    const URL_DEBUG = 'http://code.google.com/p/minify/wiki/Debugging';
-    
-    /**
-     * How many hours behind are the file modification times of uploaded files?
-     * 
-     * If you upload files from Windows to a non-Windows server, Windows may report
-     * incorrect mtimes for the files. Immediately after modifying and uploading a 
-     * file, use the touch command to update the mtime on the server. If the mtime 
-     * jumps ahead by a number of hours, set this variable to that number. If the mtime 
-     * moves back, this should not be needed.
-     *
-     * @var int $uploaderHoursBehind
-     */
-    public static $uploaderHoursBehind = 0;
-    
-    /**
-     * If this string is not empty AND the serve() option 'bubbleCssImports' is
-     * NOT set, then serve() will check CSS files for @import declarations that
-     * appear too late in the combined stylesheet. If found, serve() will prepend
-     * the output with this warning.
-     *
-     * @var string $importWarning
-     */
-    public static $importWarning = "/* See http://code.google.com/p/minify/wiki/CommonProblems#@imports_can_appear_in_invalid_locations_in_combined_CSS_files */\n";
-
-    /**
-     * Has the DOCUMENT_ROOT been set in user code?
-     * 
-     * @var bool
-     */
-    public static $isDocRootSet = false;
-
-    /**
-     * Specify a cache object (with identical interface as Minify_Cache_File) or
-     * a path to use with Minify_Cache_File.
-     * 
-     * If not called, Minify will not use a cache and, for each 200 response, will 
-     * need to recombine files, minify and encode the output.
-     *
-     * @param mixed $cache object with identical interface as Minify_Cache_File or
-     * a directory path, or null to disable caching. (default = '')
-     * 
-     * @param bool $fileLocking (default = true) This only applies if the first
-     * parameter is a string.
-     *
-     * @return null
-     */
-    public static function setCache($cache = '', $fileLocking = true)
-    {
-        if (is_string($cache)) {
-            require_once 'Minify/Cache/File.php';
-            self::$_cache = new Minify_Cache_File($cache, $fileLocking);
-        } else {
-            self::$_cache = $cache;
-        }
-    }
-    
-    /**
-     * Serve a request for a minified file. 
-     * 
-     * Here are the available options and defaults in the base controller:
-     * 
-     * 'isPublic' : send "public" instead of "private" in Cache-Control 
-     * headers, allowing shared caches to cache the output. (default true)
-     * 
-     * 'quiet' : set to true to have serve() return an array rather than sending
-     * any headers/output (default false)
-     * 
-     * 'encodeOutput' : set to false to disable content encoding, and not send
-     * the Vary header (default true)
-     * 
-     * 'encodeMethod' : generally you should let this be determined by 
-     * HTTP_Encoder (leave null), but you can force a particular encoding
-     * to be returned, by setting this to 'gzip' or '' (no encoding)
-     * 
-     * 'encodeLevel' : level of encoding compression (0 to 9, default 9)
-     * 
-     * 'contentTypeCharset' : appended to the Content-Type header sent. Set to a falsey
-     * value to remove. (default 'utf-8')  
-     * 
-     * 'maxAge' : set this to the number of seconds the client should use its cache
-     * before revalidating with the server. This sets Cache-Control: max-age and the
-     * Expires header. Unlike the old 'setExpires' setting, this setting will NOT
-     * prevent conditional GETs. Note this has nothing to do with server-side caching.
-     * 
-     * 'rewriteCssUris' : If true, serve() will automatically set the 'currentDir'
-     * minifier option to enable URI rewriting in CSS files (default true)
-     * 
-     * 'bubbleCssImports' : If true, all @import declarations in combined CSS
-     * files will be move to the top. Note this may alter effective CSS values
-     * due to a change in order. (default false)
-     * 
-     * 'debug' : set to true to minify all sources with the 'Lines' controller, which
-     * eases the debugging of combined files. This also prevents 304 responses.
-     * @see Minify_Lines::minify()
-     * 
-     * 'minifiers' : to override Minify's default choice of minifier function for 
-     * a particular content-type, specify your callback under the key of the 
-     * content-type:
-     * <code>
-     * // call customCssMinifier($css) for all CSS minification
-     * $options['minifiers'][Minify::TYPE_CSS] = 'customCssMinifier';
-     * 
-     * // don't minify Javascript at all
-     * $options['minifiers'][Minify::TYPE_JS] = '';
-     * </code>
-     * 
-     * 'minifierOptions' : to send options to the minifier function, specify your options
-     * under the key of the content-type. E.g. To send the CSS minifier an option: 
-     * <code>
-     * // give CSS minifier array('optionName' => 'optionValue') as 2nd argument 
-     * $options['minifierOptions'][Minify::TYPE_CSS]['optionName'] = 'optionValue';
-     * </code>
-     * 
-     * 'contentType' : (optional) this is only needed if your file extension is not 
-     * js/css/html. The given content-type will be sent regardless of source file
-     * extension, so this should not be used in a Groups config with other
-     * Javascript/CSS files.
-     * 
-     * Any controller options are documented in that controller's setupSources() method.
-     * 
-     * @param mixed $controller instance of subclass of Minify_Controller_Base or string
-     * name of controller. E.g. 'Files'
-     * 
-     * @param array $options controller/serve options
-     * 
-     * @return mixed null, or, if the 'quiet' option is set to true, an array
-     * with keys "success" (bool), "statusCode" (int), "content" (string), and
-     * "headers" (array).
-     */
-    public static function serve($controller, $options = array())
-    {
-        if (! self::$isDocRootSet && 0 === stripos(PHP_OS, 'win')) {
-            self::setDocRoot();
-        }
-
-        if (is_string($controller)) {
-            // make $controller into object
-            $class = 'Minify_Controller_' . $controller;
-            if (! class_exists($class, false)) {
-                require_once "Minify/Controller/" 
-                    . str_replace('_', '/', $controller) . ".php";    
-            }
-            $controller = new $class();
-            /* @var Minify_Controller_Base $controller */
-        }
-        
-        // set up controller sources and mix remaining options with
-        // controller defaults
-        $options = $controller->setupSources($options);
-        $options = $controller->analyzeSources($options);
-        self::$_options = $controller->mixInDefaultOptions($options);
-        
-        // check request validity
-        if (! $controller->sources) {
-            // invalid request!
-            if (! self::$_options['quiet']) {
-                self::_errorExit(self::$_options['badRequestHeader'], self::URL_DEBUG);
-            } else {
-                list(,$statusCode) = explode(' ', self::$_options['badRequestHeader']);
-                return array(
-                    'success' => false
-                    ,'statusCode' => (int)$statusCode
-                    ,'content' => ''
-                    ,'headers' => array()
-                );
-            }
-        }
-        
-        self::$_controller = $controller;
-        
-        if (self::$_options['debug']) {
-            self::_setupDebug($controller->sources);
-            self::$_options['maxAge'] = 0;
-        }
-        
-        // determine encoding
-        if (self::$_options['encodeOutput']) {
-            $sendVary = true;
-            if (self::$_options['encodeMethod'] !== null) {
-                // controller specifically requested this
-                $contentEncoding = self::$_options['encodeMethod'];
-            } else {
-                // sniff request header
-                require_once 'HTTP/Encoder.php';
-                // depending on what the client accepts, $contentEncoding may be 
-                // 'x-gzip' while our internal encodeMethod is 'gzip'. Calling
-                // getAcceptedEncoding(false, false) leaves out compress and deflate as options.
-                list(self::$_options['encodeMethod'], $contentEncoding) = HTTP_Encoder::getAcceptedEncoding(false, false);
-                $sendVary = ! HTTP_Encoder::isBuggyIe();
-            }
-        } else {
-            self::$_options['encodeMethod'] = ''; // identity (no encoding)
-        }
-        
-        // check client cache
-        require_once 'HTTP/ConditionalGet.php';
-        $cgOptions = array(
-            'lastModifiedTime' => self::$_options['lastModifiedTime']
-            ,'isPublic' => self::$_options['isPublic']
-            ,'encoding' => self::$_options['encodeMethod']
-        );
-        if (self::$_options['maxAge'] > 0) {
-            $cgOptions['maxAge'] = self::$_options['maxAge'];
-        } elseif (self::$_options['debug']) {
-            $cgOptions['invalidate'] = true;
-        }
-        $cg = new HTTP_ConditionalGet($cgOptions);
-        if ($cg->cacheIsValid) {
-            // client's cache is valid
-            if (! self::$_options['quiet']) {
-                $cg->sendHeaders();
-                return;
-            } else {
-                return array(
-                    'success' => true
-                    ,'statusCode' => 304
-                    ,'content' => ''
-                    ,'headers' => $cg->getHeaders()
-                );
-            }
-        } else {
-            // client will need output
-            $headers = $cg->getHeaders();
-            unset($cg);
-        }
-        
-        if (self::$_options['contentType'] === self::TYPE_CSS
-            && self::$_options['rewriteCssUris']) {
-            foreach($controller->sources as $key => $source) {
-                if ($source->filepath 
-                    && !isset($source->minifyOptions['currentDir'])
-                    && !isset($source->minifyOptions['prependRelativePath'])
-                ) {
-                    $source->minifyOptions['currentDir'] = dirname($source->filepath);
-                }
-            }
-        }
-        
-        // check server cache
-        if (null !== self::$_cache && ! self::$_options['debug']) {
-            // using cache
-            // the goal is to use only the cache methods to sniff the length and 
-            // output the content, as they do not require ever loading the file into
-            // memory.
-            $cacheId = self::_getCacheId();
-            $fullCacheId = (self::$_options['encodeMethod'])
-                ? $cacheId . '.gz'
-                : $cacheId;
-            // check cache for valid entry
-            $cacheIsReady = self::$_cache->isValid($fullCacheId, self::$_options['lastModifiedTime']); 
-            if ($cacheIsReady) {
-                $cacheContentLength = self::$_cache->getSize($fullCacheId);    
-            } else {
-                // generate & cache content
-                try {
-                    $content = self::_combineMinify();
-                } catch (Exception $e) {
-                    self::$_controller->log($e->getMessage());
-                    if (! self::$_options['quiet']) {
-                        self::_errorExit(self::$_options['errorHeader'], self::URL_DEBUG);
-                    }
-                    throw $e;
-                }
-                self::$_cache->store($cacheId, $content);
-                if (function_exists('gzencode')) {
-                    self::$_cache->store($cacheId . '.gz', gzencode($content, self::$_options['encodeLevel']));
-                }
-            }
-        } else {
-            // no cache
-            $cacheIsReady = false;
-            try {
-                $content = self::_combineMinify();
-            } catch (Exception $e) {
-                self::$_controller->log($e->getMessage());
-                if (! self::$_options['quiet']) {
-                    self::_errorExit(self::$_options['errorHeader'], self::URL_DEBUG);
-                }
-                throw $e;
-            }
-        }
-        if (! $cacheIsReady && self::$_options['encodeMethod']) {
-            // still need to encode
-            $content = gzencode($content, self::$_options['encodeLevel']);
-        }
-        
-        // add headers
-        $headers['Content-Length'] = $cacheIsReady
-            ? $cacheContentLength
-            : ((function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
-                ? mb_strlen($content, '8bit')
-                : strlen($content)
-            );
-        $headers['Content-Type'] = self::$_options['contentTypeCharset']
-            ? self::$_options['contentType'] . '; charset=' . self::$_options['contentTypeCharset']
-            : self::$_options['contentType'];
-        if (self::$_options['encodeMethod'] !== '') {
-            $headers['Content-Encoding'] = $contentEncoding;
-        }
-        if (self::$_options['encodeOutput'] && $sendVary) {
-            $headers['Vary'] = 'Accept-Encoding';
-        }
-
-        if (! self::$_options['quiet']) {
-            // output headers & content
-            foreach ($headers as $name => $val) {
-                header($name . ': ' . $val);
-            }
-            if ($cacheIsReady) {
-                self::$_cache->display($fullCacheId);
-            } else {
-                echo $content;
-            }
-        } else {
-            return array(
-                'success' => true
-                ,'statusCode' => 200
-                ,'content' => $cacheIsReady
-                    ? self::$_cache->fetch($fullCacheId)
-                    : $content
-                ,'headers' => $headers
-            );
-        }
-    }
-    
-    /**
-     * Return combined minified content for a set of sources
-     *
-     * No internal caching will be used and the content will not be HTTP encoded.
-     * 
-     * @param array $sources array of filepaths and/or Minify_Source objects
-     * 
-     * @param array $options (optional) array of options for serve. By default
-     * these are already set: quiet = true, encodeMethod = '', lastModifiedTime = 0.
-     * 
-     * @return string
-     */
-    public static function combine($sources, $options = array())
-    {
-        $cache = self::$_cache;
-        self::$_cache = null;
-        $options = array_merge(array(
-            'files' => (array)$sources
-            ,'quiet' => true
-            ,'encodeMethod' => ''
-            ,'lastModifiedTime' => 0
-        ), $options);
-        $out = self::serve('Files', $options);
-        self::$_cache = $cache;
-        return $out['content'];
-    }
-    
-    /**
-     * Set $_SERVER['DOCUMENT_ROOT']. On IIS, the value is created from SCRIPT_FILENAME and SCRIPT_NAME.
-     * 
-     * @param string $docRoot value to use for DOCUMENT_ROOT
-     */
-    public static function setDocRoot($docRoot = '')
-    {
-        self::$isDocRootSet = true;
-        if ($docRoot) {
-            $_SERVER['DOCUMENT_ROOT'] = $docRoot;
-        } elseif (isset($_SERVER['SERVER_SOFTWARE'])
-                  && 0 === strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/')) {
-            $_SERVER['DOCUMENT_ROOT'] = substr(
-                $_SERVER['SCRIPT_FILENAME']
-                ,0
-                ,strlen($_SERVER['SCRIPT_FILENAME']) - strlen($_SERVER['SCRIPT_NAME']));
-            $_SERVER['DOCUMENT_ROOT'] = rtrim($_SERVER['DOCUMENT_ROOT'], '\\');
-        }
-    }
-    
-    /**
-     * Any Minify_Cache_* object or null (i.e. no server cache is used)
-     *
-     * @var Minify_Cache_File
-     */
-    private static $_cache = null;
-    
-    /**
-     * Active controller for current request
-     *
-     * @var Minify_Controller_Base
-     */
-    protected static $_controller = null;
-    
-    /**
-     * Options for current request
-     *
-     * @var array
-     */
-    protected static $_options = null;
-
-    /**
-     * @param string $header
-     *
-     * @param string $url
-     */
-    protected static function _errorExit($header, $url)
-    {
-        $url = htmlspecialchars($url, ENT_QUOTES);
-        list(,$h1) = explode(' ', $header, 2);
-        $h1 = htmlspecialchars($h1);
-        // FastCGI environments require 3rd arg to header() to be set
-        list(, $code) = explode(' ', $header, 3);
-        header($header, true, $code);
-        header('Content-Type: text/html; charset=utf-8');
-        echo "<h1>$h1</h1>";
-        echo "<p>Please see <a href='$url'>$url</a>.</p>";
-        exit();
-    }
-
-    /**
-     * Set up sources to use Minify_Lines
-     *
-     * @param array $sources Minify_Source instances
-     */
-    protected static function _setupDebug($sources)
-    {
-        foreach ($sources as $source) {
-            $source->minifier = array('Minify_Lines', 'minify');
-            $id = $source->getId();
-            $source->minifyOptions = array(
-                'id' => (is_file($id) ? basename($id) : $id)
-            );
-        }
-    }
-    
-    /**
-     * Combines sources and minifies the result.
-     *
-     * @return string
-     */
-    protected static function _combineMinify()
-    {
-        $type = self::$_options['contentType']; // ease readability
-        
-        // when combining scripts, make sure all statements separated and
-        // trailing single line comment is terminated
-        $implodeSeparator = ($type === self::TYPE_JS)
-            ? "\n;"
-            : '';
-        // allow the user to pass a particular array of options to each
-        // minifier (designated by type). source objects may still override
-        // these
-        $defaultOptions = isset(self::$_options['minifierOptions'][$type])
-            ? self::$_options['minifierOptions'][$type]
-            : array();
-        // if minifier not set, default is no minification. source objects
-        // may still override this
-        $defaultMinifier = isset(self::$_options['minifiers'][$type])
-            ? self::$_options['minifiers'][$type]
-            : false;
-
-        // process groups of sources with identical minifiers/options
-        $content = array();
-        $i = 0;
-        $l = count(self::$_controller->sources);
-        $groupToProcessTogether = array();
-        $lastMinifier = null;
-        $lastOptions = null;
-        do {
-            // get next source
-            $source = null;
-            if ($i < $l) {
-                $source = self::$_controller->sources[$i];
-                /* @var Minify_Source $source */
-                $sourceContent = $source->getContent();
-
-                // allow the source to override our minifier and options
-                $minifier = (null !== $source->minifier)
-                    ? $source->minifier
-                    : $defaultMinifier;
-                $options = (null !== $source->minifyOptions)
-                    ? array_merge($defaultOptions, $source->minifyOptions)
-                    : $defaultOptions;
-            }
-            // do we need to process our group right now?
-            if ($i > 0                               // yes, we have at least the first group populated
-                && (
-                    ! $source                        // yes, we ran out of sources
-                    || $type === self::TYPE_CSS      // yes, to process CSS individually (avoiding PCRE bugs/limits)
-                    || $minifier !== $lastMinifier   // yes, minifier changed
-                    || $options !== $lastOptions)    // yes, options changed
-                )
-            {
-                // minify previous sources with last settings
-                $imploded = implode($implodeSeparator, $groupToProcessTogether);
-                $groupToProcessTogether = array();
-                if ($lastMinifier) {
-                    self::$_controller->loadMinifier($lastMinifier);
-                    try {
-                        $content[] = call_user_func($lastMinifier, $imploded, $lastOptions);
-                    } catch (Exception $e) {
-                        throw new Exception("Exception in minifier: " . $e->getMessage());
-                    }
-                } else {
-                    $content[] = $imploded;
-                }
-            }
-            // add content to the group
-            if ($source) {
-                $groupToProcessTogether[] = $sourceContent;
-                $lastMinifier = $minifier;
-                $lastOptions = $options;
-            }
-            $i++;
-        } while ($source);
-
-        $content = implode($implodeSeparator, $content);
-        
-        if ($type === self::TYPE_CSS && false !== strpos($content, '@import')) {
-            $content = self::_handleCssImports($content);
-        }
-        
-        // do any post-processing (esp. for editing build URIs)
-        if (self::$_options['postprocessorRequire']) {
-            require_once self::$_options['postprocessorRequire'];
-        }
-        if (self::$_options['postprocessor']) {
-            $content = call_user_func(self::$_options['postprocessor'], $content, $type);
-        }
-        return $content;
-    }
-    
-    /**
-     * Make a unique cache id for for this request.
-     * 
-     * Any settings that could affect output are taken into consideration  
-     *
-     * @param string $prefix
-     *
-     * @return string
-     */
-    protected static function _getCacheId($prefix = 'minify')
-    {
-        $name = preg_replace('/[^a-zA-Z0-9\\.=_,]/', '', self::$_controller->selectionId);
-        $name = preg_replace('/\\.+/', '.', $name);
-        $name = substr($name, 0, 200 - 34 - strlen($prefix));
-        $md5 = md5(serialize(array(
-            Minify_Source::getDigest(self::$_controller->sources)
-            ,self::$_options['minifiers'] 
-            ,self::$_options['minifierOptions']
-            ,self::$_options['postprocessor']
-            ,self::$_options['bubbleCssImports']
-            ,self::VERSION
-        )));
-        return "{$prefix}_{$name}_{$md5}";
-    }
-    
-    /**
-     * Bubble CSS @imports to the top or prepend a warning if an import is detected not at the top.
-     *
-     * @param string $css
-     *
-     * @return string
-     */
-    protected static function _handleCssImports($css)
-    {
-        if (self::$_options['bubbleCssImports']) {
-            // bubble CSS imports
-            preg_match_all('/@import.*?;/', $css, $imports);
-            $css = implode('', $imports[0]) . preg_replace('/@import.*?;/', '', $css);
-        } else if ('' !== self::$importWarning) {
-            // remove comments so we don't mistake { in a comment as a block
-            $noCommentCss = preg_replace('@/\\*[\\s\\S]*?\\*/@', '', $css);
-            $lastImportPos = strrpos($noCommentCss, '@import');
-            $firstBlockPos = strpos($noCommentCss, '{');
-            if (false !== $lastImportPos
-                && false !== $firstBlockPos
-                && $firstBlockPos < $lastImportPos
-            ) {
-                // { appears before @import : prepend warning
-                $css = self::$importWarning . $css;
-            }
-        }
-        return $css;
-    }
-}
diff --git a/inc/contrib/minify/Minify/Build.php b/inc/contrib/minify/Minify/Build.php
deleted file mode 100755
index e625165e..00000000
--- a/inc/contrib/minify/Minify/Build.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Class Minify_Build  
- * @package Minify
- */
-
-require_once 'Minify/Source.php';
-
-/**
- * Maintain a single last modification time for a group of Minify sources to
- * allow use of far off Expires headers in Minify.
- * 
- * <code>
- * // in config file
- * $groupSources = array(
- *   'js' => array('file1.js', 'file2.js')
- *   ,'css' => array('file1.css', 'file2.css', 'file3.css')
- * )
- * 
- * // during HTML generation
- * $jsBuild = new Minify_Build($groupSources['js']);
- * $cssBuild = new Minify_Build($groupSources['css']);
- * 
- * $script = "<script type='text/javascript' src='"
- *     . $jsBuild->uri('/min.php/js') . "'></script>";
- * $link = "<link rel='stylesheet' type='text/css' href='"
- *     . $cssBuild->uri('/min.php/css') . "'>";
- * 
- * // in min.php
- * Minify::serve('Groups', array(
- *   'groups' => $groupSources
- *   ,'setExpires' => (time() + 86400 * 365)
- * ));
- * </code>
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Build {
-    
-    /**
-     * Last modification time of all files in the build
-     * 
-     * @var int 
-     */
-    public $lastModified = 0;
-    
-    /**
-     * String to use as ampersand in uri(). Set this to '&' if
-     * you are not HTML-escaping URIs.
-     *
-     * @var string
-     */
-    public static $ampersand = '&amp;';
-    
-    /**
-     * Get a time-stamped URI
-     * 
-     * <code>
-     * echo $b->uri('/site.js');
-     * // outputs "/site.js?1678242"
-     * 
-     * echo $b->uri('/scriptaculous.js?load=effects');
-     * // outputs "/scriptaculous.js?load=effects&amp1678242"
-     * </code>
-     *
-     * @param string $uri
-     * @param boolean $forceAmpersand (default = false) Force the use of ampersand to 
-     * append the timestamp to the URI.
-     * @return string
-     */
-    public function uri($uri, $forceAmpersand = false) {
-        $sep = ($forceAmpersand || strpos($uri, '?') !== false)
-            ? self::$ampersand
-            : '?';
-        return "{$uri}{$sep}{$this->lastModified}";
-    }
-
-	/**
-     * Create a build object
-     * 
-     * @param array $sources array of Minify_Source objects and/or file paths
-     * 
-     * @return null
-     */
-    public function __construct($sources) 
-    {
-        $max = 0;
-        foreach ((array)$sources as $source) {
-            if ($source instanceof Minify_Source) {
-                $max = max($max, $source->lastModified);
-            } elseif (is_string($source)) {
-                if (0 === strpos($source, '//')) {
-                    $source = $_SERVER['DOCUMENT_ROOT'] . substr($source, 1);
-                }
-                if (is_file($source)) {
-                    $max = max($max, filemtime($source));
-                }
-            }
-        }
-        $this->lastModified = $max;
-    }
-}
diff --git a/inc/contrib/minify/Minify/CSS.php b/inc/contrib/minify/Minify/CSS.php
deleted file mode 100755
index 49882e9d..00000000
--- a/inc/contrib/minify/Minify/CSS.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php

-/**

- * Class Minify_CSS  

- * @package Minify

- */

-

-/**

- * Minify CSS

- *

- * This class uses Minify_CSS_Compressor and Minify_CSS_UriRewriter to 

- * minify CSS and rewrite relative URIs.

- * 

- * @package Minify

- * @author Stephen Clay <steve@mrclay.org>

- * @author http://code.google.com/u/1stvamp/ (Issue 64 patch)

- */

-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(

-            'removeCharsets' => true,

-            'preserveComments' => true,

-            'currentDir' => null,

-            'docRoot' => $_SERVER['DOCUMENT_ROOT'],

-            'prependRelativePath' => null,

-            'symlinks' => array(),

-        ), $options);

-        

-        if ($options['removeCharsets']) {

-            $css = preg_replace('/@charset[^;]+;\\s*/', '', $css);

-        }

-        require_once 'Minify/CSS/Compressor.php';

-        if (! $options['preserveComments']) {

-            $css = Minify_CSS_Compressor::process($css, $options);

-        } else {

-            require_once 'Minify/CommentPreserver.php';

-            $css = Minify_CommentPreserver::process(

-                $css

-                ,array('Minify_CSS_Compressor', 'process')

-                ,array($options)

-            );

-        }

-        if (! $options['currentDir'] && ! $options['prependRelativePath']) {

-            return $css;

-        }

-        require_once 'Minify/CSS/UriRewriter.php';

-        if ($options['currentDir']) {

-            return Minify_CSS_UriRewriter::rewrite(

-                $css

-                ,$options['currentDir']

-                ,$options['docRoot']

-                ,$options['symlinks']

-            );  

-        } else {

-            return Minify_CSS_UriRewriter::prepend(

-                $css

-                ,$options['prependRelativePath']

-            );

-        }

-    }

-}

diff --git a/inc/contrib/minify/Minify/CSS/Compressor.php b/inc/contrib/minify/Minify/CSS/Compressor.php
deleted file mode 100755
index c6cdd8b7..00000000
--- a/inc/contrib/minify/Minify/CSS/Compressor.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php

-/**

- * Class Minify_CSS_Compressor 

- * @package Minify

- */

-

-/**

- * Compress CSS

- *

- * This is a heavy regex-based removal of whitespace, unnecessary

- * comments and tokens, and some CSS value minimization, where practical.

- * Many steps have been taken to avoid breaking comment-based hacks, 

- * including the ie5/mac filter (and its inversion), but expect tricky

- * hacks involving comment tokens in 'content' value strings to break

- * minimization badly. A test suite is available.

- * 

- * @package Minify

- * @author Stephen Clay <steve@mrclay.org>

- * @author http://code.google.com/u/1stvamp/ (Issue 64 patch)

- */

-class Minify_CSS_Compressor {

-

-    /**

-     * Minify a CSS string

-     * 

-     * @param string $css

-     * 

-     * @param array $options (currently ignored)

-     * 

-     * @return string

-     */

-    public static function process($css, $options = array())

-    {

-        $obj = new Minify_CSS_Compressor($options);

-        return $obj->_process($css);

-    }

-    

-    /**

-     * @var array

-     */

-    protected $_options = null;

-    

-    /**

-     * Are we "in" a hack? I.e. are some browsers targetted until the next comment?

-     *

-     * @var bool

-     */

-    protected $_inHack = false;

-    

-    

-    /**

-     * Constructor

-     * 

-     * @param array $options (currently ignored)

-     */

-    private function __construct($options) {

-        $this->_options = $options;

-    }

-    

-    /**

-     * Minify a CSS string

-     * 

-     * @param string $css

-     * 

-     * @return string

-     */

-    protected function _process($css)

-    {

-        $css = str_replace("\r\n", "\n", $css);

-        

-        // preserve empty comment after '>'

-        // http://www.webdevout.net/css-hacks#in_css-selectors

-        $css = preg_replace('@>/\\*\\s*\\*/@', '>/*keep*/', $css);

-        

-        // preserve empty comment between property and value

-        // http://css-discuss.incutio.com/?page=BoxModelHack

-        $css = preg_replace('@/\\*\\s*\\*/\\s*:@', '/*keep*/:', $css);

-        $css = preg_replace('@:\\s*/\\*\\s*\\*/@', ':/*keep*/', $css);

-        

-        // apply callback to all valid comments (and strip out surrounding ws

-        $css = preg_replace_callback('@\\s*/\\*([\\s\\S]*?)\\*/\\s*@'

-            ,array($this, '_commentCB'), $css);

-

-        // remove ws around { } and last semicolon in declaration block

-        $css = preg_replace('/\\s*{\\s*/', '{', $css);

-        $css = preg_replace('/;?\\s*}\\s*/', '}', $css);

-        

-        // remove ws surrounding semicolons

-        $css = preg_replace('/\\s*;\\s*/', ';', $css);

-        

-        // remove ws around urls

-        $css = preg_replace('/

-                url\\(      # url(

-                \\s*

-                ([^\\)]+?)  # 1 = the URL (really just a bunch of non right parenthesis)

-                \\s*

-                \\)         # )

-            /x', 'url($1)', $css);

-        

-        // remove ws between rules and colons

-        $css = preg_replace('/

-                \\s*

-                ([{;])              # 1 = beginning of block or rule separator 

-                \\s*

-                ([\\*_]?[\\w\\-]+)  # 2 = property (and maybe IE filter)

-                \\s*

-                :

-                \\s*

-                (\\b|[#\'"-])        # 3 = first character of a value

-            /x', '$1$2:$3', $css);

-        

-        // remove ws in selectors

-        $css = preg_replace_callback('/

-                (?:              # non-capture

-                    \\s*

-                    [^~>+,\\s]+  # selector part

-                    \\s*

-                    [,>+~]       # combinators

-                )+

-                \\s*

-                [^~>+,\\s]+      # selector part

-                {                # open declaration block

-            /x'

-            ,array($this, '_selectorsCB'), $css);

-        

-        // minimize hex colors

-        $css = preg_replace('/([^=])#([a-f\\d])\\2([a-f\\d])\\3([a-f\\d])\\4([\\s;\\}])/i'

-            , '$1#$2$3$4$5', $css);

-        

-        // remove spaces between font families

-        $css = preg_replace_callback('/font-family:([^;}]+)([;}])/'

-            ,array($this, '_fontFamilyCB'), $css);

-        

-        $css = preg_replace('/@import\\s+url/', '@import url', $css);

-        

-        // replace any ws involving newlines with a single newline

-        $css = preg_replace('/[ \\t]*\\n+\\s*/', "\n", $css);

-        

-        // separate common descendent selectors w/ newlines (to limit line lengths)

-        $css = preg_replace('/([\\w#\\.\\*]+)\\s+([\\w#\\.\\*]+){/', "$1\n$2{", $css);

-        

-        // Use newline after 1st numeric value (to limit line lengths).

-        $css = preg_replace('/

-            ((?:padding|margin|border|outline):\\d+(?:px|em)?) # 1 = prop : 1st numeric value

-            \\s+

-            /x'

-            ,"$1\n", $css);

-        

-        // prevent triggering IE6 bug: http://www.crankygeek.com/ie6pebug/

-        $css = preg_replace('/:first-l(etter|ine)\\{/', ':first-l$1 {', $css);

-            

-        return trim($css);

-    }

-    

-    /**

-     * Replace what looks like a set of selectors  

-     *

-     * @param array $m regex matches

-     * 

-     * @return string

-     */

-    protected function _selectorsCB($m)

-    {

-        // remove ws around the combinators

-        return preg_replace('/\\s*([,>+~])\\s*/', '$1', $m[0]);

-    }

-    

-    /**

-     * Process a comment and return a replacement

-     * 

-     * @param array $m regex matches

-     * 

-     * @return string

-     */

-    protected function _commentCB($m)

-    {

-        $hasSurroundingWs = (trim($m[0]) !== $m[1]);

-        $m = $m[1]; 

-        // $m is the comment content w/o the surrounding tokens, 

-        // but the return value will replace the entire comment.

-        if ($m === 'keep') {

-            return '/**/';

-        }

-        if ($m === '" "') {

-            // component of http://tantek.com/CSS/Examples/midpass.html

-            return '/*" "*/';

-        }

-        if (preg_match('@";\\}\\s*\\}/\\*\\s+@', $m)) {

-            // component of http://tantek.com/CSS/Examples/midpass.html

-            return '/*";}}/* */';

-        }

-        if ($this->_inHack) {

-            // inversion: feeding only to one browser

-            if (preg_match('@

-                    ^/               # comment started like /*/

-                    \\s*

-                    (\\S[\\s\\S]+?)  # has at least some non-ws content

-                    \\s*

-                    /\\*             # ends like /*/ or /**/

-                @x', $m, $n)) {

-                // end hack mode after this comment, but preserve the hack and comment content

-                $this->_inHack = false;

-                return "/*/{$n[1]}/**/";

-            }

-        }

-        if (substr($m, -1) === '\\') { // comment ends like \*/

-            // begin hack mode and preserve hack

-            $this->_inHack = true;

-            return '/*\\*/';

-        }

-        if ($m !== '' && $m[0] === '/') { // comment looks like /*/ foo */

-            // begin hack mode and preserve hack

-            $this->_inHack = true;

-            return '/*/*/';

-        }

-        if ($this->_inHack) {

-            // a regular comment ends hack mode but should be preserved

-            $this->_inHack = false;

-            return '/**/';

-        }

-        // Issue 107: if there's any surrounding whitespace, it may be important, so 

-        // replace the comment with a single space

-        return $hasSurroundingWs // remove all other comments

-            ? ' '

-            : '';

-    }

-    

-    /**

-     * Process a font-family listing and return a replacement

-     * 

-     * @param array $m regex matches

-     * 

-     * @return string   

-     */

-    protected function _fontFamilyCB($m)

-    {

-        // Issue 210: must not eliminate WS between words in unquoted families

-        $pieces = preg_split('/(\'[^\']+\'|"[^"]+")/', $m[1], null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

-        $out = 'font-family:';

-        while (null !== ($piece = array_shift($pieces))) {

-            if ($piece[0] !== '"' && $piece[0] !== "'") {

-                $piece = preg_replace('/\\s+/', ' ', $piece);

-                $piece = preg_replace('/\\s?,\\s?/', ',', $piece);

-            }

-            $out .= $piece;

-        }

-        return $out . $m[2];

-    }

-}

diff --git a/inc/contrib/minify/Minify/CSS/UriRewriter.php b/inc/contrib/minify/Minify/CSS/UriRewriter.php
deleted file mode 100755
index 8845f156..00000000
--- a/inc/contrib/minify/Minify/CSS/UriRewriter.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-/**
- * Class Minify_CSS_UriRewriter  
- * @package Minify
- */
-
-/**
- * Rewrite file-relative URIs as root-relative in CSS files
- *
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_CSS_UriRewriter {
-    
-    /**
-     * rewrite() and rewriteRelative() append debugging information here
-     *
-     * @var string
-     */
-    public static $debugText = '';
-    
-    /**
-     * In CSS content, rewrite file relative URIs as root relative
-     * 
-     * @param string $css
-     * 
-     * @param string $currentDir The directory of the current CSS file.
-     * 
-     * @param string $docRoot The document root of the web site in which 
-     * the CSS file resides (default = $_SERVER['DOCUMENT_ROOT']).
-     * 
-     * @param array $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>
-     * 
-     * @return string
-     */
-    public static function rewrite($css, $currentDir, $docRoot = null, $symlinks = array()) 
-    {
-        self::$_docRoot = self::_realpath(
-            $docRoot ? $docRoot : $_SERVER['DOCUMENT_ROOT']
-        );
-        self::$_currentDir = self::_realpath($currentDir);
-        self::$_symlinks = array();
-        
-        // normalize symlinks
-        foreach ($symlinks as $link => $target) {
-            $link = ($link === '//')
-                ? self::$_docRoot
-                : str_replace('//', self::$_docRoot . '/', $link);
-            $link = strtr($link, '/', DIRECTORY_SEPARATOR);
-            self::$_symlinks[$link] = self::_realpath($target);
-        }
-        
-        self::$debugText .= "docRoot    : " . self::$_docRoot . "\n"
-                          . "currentDir : " . self::$_currentDir . "\n";
-        if (self::$_symlinks) {
-            self::$debugText .= "symlinks : " . var_export(self::$_symlinks, 1) . "\n";
-        }
-        self::$debugText .= "\n";
-        
-        $css = self::_trimUrls($css);
-        
-        // rewrite
-        $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/'
-            ,array(self::$className, '_processUriCB'), $css);
-        $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
-            ,array(self::$className, '_processUriCB'), $css);
-
-        return $css;
-    }
-    
-    /**
-     * In CSS content, prepend a path to relative URIs
-     * 
-     * @param string $css
-     * 
-     * @param string $path The path to prepend.
-     * 
-     * @return string
-     */
-    public static function prepend($css, $path)
-    {
-        self::$_prependPath = $path;
-        
-        $css = self::_trimUrls($css);
-        
-        // append
-        $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/'
-            ,array(self::$className, '_processUriCB'), $css);
-        $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
-            ,array(self::$className, '_processUriCB'), $css);
-
-        self::$_prependPath = null;
-        return $css;
-    }
-    
-    /**
-     * Get a root relative URI from a file relative URI
-     *
-     * <code>
-     * Minify_CSS_UriRewriter::rewriteRelative(
-     *       '../img/hello.gif'
-     *     , '/home/user/www/css'  // path of CSS file
-     *     , '/home/user/www'      // doc root
-     * );
-     * // returns '/img/hello.gif'
-     * 
-     * // example where static files are stored in a symlinked directory
-     * Minify_CSS_UriRewriter::rewriteRelative(
-     *       'hello.gif'
-     *     , '/var/staticFiles/theme'
-     *     , '/home/user/www'
-     *     , array('/home/user/www/static' => '/var/staticFiles')
-     * );
-     * // returns '/static/theme/hello.gif'
-     * </code>
-     * 
-     * @param string $uri file relative URI
-     * 
-     * @param string $realCurrentDir realpath of the current file's directory.
-     * 
-     * @param string $realDocRoot realpath of the site document root.
-     * 
-     * @param array $symlinks (default = array()) If the file is stored in 
-     * a symlink-ed directory, provide an array of link paths to
-     * real target paths, where the link paths "appear" to be within the document 
-     * root. E.g.:
-     * <code>
-     * array('/home/foo/www/not/real/path' => '/real/target/path') // unix
-     * array('C:\\htdocs\\not\\real' => 'D:\\real\\target\\path')  // Windows
-     * </code>
-     * 
-     * @return string
-     */
-    public static function rewriteRelative($uri, $realCurrentDir, $realDocRoot, $symlinks = array())
-    {
-        // prepend path with current dir separator (OS-independent)
-        $path = strtr($realCurrentDir, '/', DIRECTORY_SEPARATOR)  
-            . DIRECTORY_SEPARATOR . strtr($uri, '/', DIRECTORY_SEPARATOR);
-        
-        self::$debugText .= "file-relative URI  : {$uri}\n"
-                          . "path prepended     : {$path}\n";
-        
-        // "unresolve" a symlink back to doc root
-        foreach ($symlinks as $link => $target) {
-            if (0 === strpos($path, $target)) {
-                // replace $target with $link
-                $path = $link . substr($path, strlen($target));
-                
-                self::$debugText .= "symlink unresolved : {$path}\n";
-                
-                break;
-            }
-        }
-        // strip doc root
-        $path = substr($path, strlen($realDocRoot));
-        
-        self::$debugText .= "docroot stripped   : {$path}\n";
-        
-        // fix to root-relative URI
-        $uri = strtr($path, '/\\', '//');
-        $uri = self::removeDots($uri);
-      
-        self::$debugText .= "traversals removed : {$uri}\n\n";
-        
-        return $uri;
-    }
-
-    /**
-     * Remove instances of "./" and "../" where possible from a root-relative URI
-     *
-     * @param string $uri
-     *
-     * @return string
-     */
-    public static function removeDots($uri)
-    {
-        $uri = str_replace('/./', '/', $uri);
-        // inspired by patch from Oleg Cherniy
-        do {
-            $uri = preg_replace('@/[^/]+/\\.\\./@', '/', $uri, 1, $changed);
-        } while ($changed);
-        return $uri;
-    }
-    
-    /**
-     * Defines which class to call as part of callbacks, change this
-     * if you extend Minify_CSS_UriRewriter
-     *
-     * @var string
-     */
-    protected static $className = 'Minify_CSS_UriRewriter';
-
-    /**
-     * Get realpath with any trailing slash removed. If realpath() fails,
-     * just remove the trailing slash.
-     * 
-     * @param string $path
-     * 
-     * @return mixed path with no trailing slash
-     */
-    protected static function _realpath($path)
-    {
-        $realPath = realpath($path);
-        if ($realPath !== false) {
-            $path = $realPath;
-        }
-        return rtrim($path, '/\\');
-    }
-
-    /**
-     * Directory of this stylesheet
-     *
-     * @var string
-     */
-    private static $_currentDir = '';
-
-    /**
-     * DOC_ROOT
-     *
-     * @var string
-     */
-    private static $_docRoot = '';
-
-    /**
-     * directory replacements to map symlink targets back to their
-     * source (within the document root) E.g. '/var/www/symlink' => '/var/realpath'
-     *
-     * @var array
-     */
-    private static $_symlinks = array();
-
-    /**
-     * Path to prepend
-     *
-     * @var string
-     */
-    private static $_prependPath = null;
-
-    /**
-     * @param string $css
-     *
-     * @return string
-     */
-    private static function _trimUrls($css)
-    {
-        return preg_replace('/
-            url\\(      # url(
-            \\s*
-            ([^\\)]+?)  # 1 = URI (assuming does not contain ")")
-            \\s*
-            \\)         # )
-        /x', 'url($1)', $css);
-    }
-
-    /**
-     * @param array $m
-     *
-     * @return string
-     */
-    private static function _processUriCB($m)
-    {
-        // $m matched either '/@import\\s+([\'"])(.*?)[\'"]/' or '/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
-        $isImport = ($m[0][0] === '@');
-        // determine URI and the quote character (if any)
-        if ($isImport) {
-            $quoteChar = $m[1];
-            $uri = $m[2];
-        } else {
-            // $m[1] is either quoted or not
-            $quoteChar = ($m[1][0] === "'" || $m[1][0] === '"')
-                ? $m[1][0]
-                : '';
-            $uri = ($quoteChar === '')
-                ? $m[1]
-                : substr($m[1], 1, strlen($m[1]) - 2);
-        }
-        // analyze URI
-        if ('/' !== $uri[0]                  // root-relative
-            && false === strpos($uri, '//')  // protocol (non-data)
-            && 0 !== strpos($uri, 'data:')   // data protocol
-        ) {
-            // URI is file-relative: rewrite depending on options
-            if (self::$_prependPath === null) {
-                $uri = self::rewriteRelative($uri, self::$_currentDir, self::$_docRoot, self::$_symlinks);
-            } else {
-                $uri = self::$_prependPath . $uri;
-                if ($uri[0] === '/') {
-                    $root = '';
-                    $rootRelative = $uri;
-                    $uri = $root . self::removeDots($rootRelative);
-                } elseif (preg_match('@^((https?\:)?//([^/]+))/@', $uri, $m) && (false !== strpos($m[3], '.'))) {
-                    $root = $m[1];
-                    $rootRelative = substr($uri, strlen($root));
-                    $uri = $root . self::removeDots($rootRelative);
-                }
-            }
-        }
-        return $isImport
-            ? "@import {$quoteChar}{$uri}{$quoteChar}"
-            : "url({$quoteChar}{$uri}{$quoteChar})";
-    }
-}
diff --git a/inc/contrib/minify/Minify/Cache/APC.php b/inc/contrib/minify/Minify/Cache/APC.php
deleted file mode 100755
index 24ab0462..00000000
--- a/inc/contrib/minify/Minify/Cache/APC.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Class Minify_Cache_APC
- * @package Minify
- */
-
-/**
- * APC-based cache class for Minify
- * 
- * <code>
- * Minify::setCache(new Minify_Cache_APC());
- * </code>
- * 
- * @package Minify
- * @author Chris Edwards
- **/
-class Minify_Cache_APC {
-
-    /**
-     * Create a Minify_Cache_APC 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 apc_store($id, "{$_SERVER['REQUEST_TIME']}|{$data}", $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);
-    }
-
-    /**
-     * 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
-            : '';
-    }
-
-    /**
-     * 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 apc, store in instance
-     *
-     * @param string $id
-     *
-     * @return bool success
-     */
-    private function _fetch($id)
-    {
-        if ($this->_id === $id) {
-            return true;
-        }
-        $ret = apc_fetch($id);
-        if (false === $ret) {
-            $this->_id = null;
-            return false;
-        }
-        list($this->_lm, $this->_data) = explode('|', $ret, 2);
-        $this->_id = $id;
-        return true;
-    }
-}
diff --git a/inc/contrib/minify/Minify/Cache/File.php b/inc/contrib/minify/Minify/Cache/File.php
deleted file mode 100755
index 3fa6b18f..00000000
--- a/inc/contrib/minify/Minify/Cache/File.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Class Minify_Cache_File  
- * @package Minify
- */
-
-class Minify_Cache_File {
-    
-    public function __construct($path = '', $fileLocking = false)
-    {
-        if (! $path) {
-            $path = self::tmp();
-        }
-        $this->_locking = $fileLocking;
-        $this->_path = $path;
-    }
-
-    /**
-     * Write data to cache.
-     *
-     * @param string $id cache id (e.g. a filename)
-     * 
-     * @param string $data
-     * 
-     * @return bool success
-     */
-    public function store($id, $data)
-    {
-        $flag = $this->_locking
-            ? LOCK_EX
-            : null;
-        $file = $this->_path . '/' . $id;
-        if (! @file_put_contents($file, $data, $flag)) {
-            $this->_log("Minify_Cache_File: Write failed to '$file'");
-        }
-        // write control
-        if ($data !== $this->fetch($id)) {
-            @unlink($file);
-            $this->_log("Minify_Cache_File: Post-write read failed for '$file'");
-            return false;
-        }
-        return true;
-    }
-    
-    /**
-     * Get the size of a cache entry
-     *
-     * @param string $id cache id (e.g. a filename)
-     * 
-     * @return int size in bytes
-     */
-    public function getSize($id)
-    {
-        return filesize($this->_path . '/' . $id);
-    }
-    
-    /**
-     * Does a valid cache entry exist?
-     *
-     * @param string $id cache id (e.g. a filename)
-     * 
-     * @param int $srcMtime mtime of the original source file(s)
-     * 
-     * @return bool exists
-     */
-    public function isValid($id, $srcMtime)
-    {
-        $file = $this->_path . '/' . $id;
-        return (is_file($file) && (filemtime($file) >= $srcMtime));
-    }
-    
-    /**
-     * Send the cached content to output
-     *
-     * @param string $id cache id (e.g. a filename)
-     */
-    public function display($id)
-    {
-        if ($this->_locking) {
-            $fp = fopen($this->_path . '/' . $id, 'rb');
-            flock($fp, LOCK_SH);
-            fpassthru($fp);
-            flock($fp, LOCK_UN);
-            fclose($fp);
-        } else {
-            readfile($this->_path . '/' . $id);            
-        }
-    }
-    
-	/**
-     * Fetch the cached content
-     *
-     * @param string $id cache id (e.g. a filename)
-     * 
-     * @return string
-     */
-    public function fetch($id)
-    {
-        if ($this->_locking) {
-            $fp = fopen($this->_path . '/' . $id, 'rb');
-            flock($fp, LOCK_SH);
-            $ret = stream_get_contents($fp);
-            flock($fp, LOCK_UN);
-            fclose($fp);
-            return $ret;
-        } else {
-            return file_get_contents($this->_path . '/' . $id);
-        }
-    }
-    
-    /**
-     * Fetch the cache path used
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->_path;
-    }
-
-    /**
-     * Get a usable temp directory
-     *
-     * Adapted from Solar/Dir.php
-     * @author Paul M. Jones <pmjones@solarphp.com>
-     * @license http://opensource.org/licenses/bsd-license.php BSD
-     * @link http://solarphp.com/trac/core/browser/trunk/Solar/Dir.php
-     *
-     * @return string
-     */
-    public static function tmp()
-    {
-        static $tmp = null;
-        if (! $tmp) {
-            $tmp = function_exists('sys_get_temp_dir')
-                ? sys_get_temp_dir()
-                : self::_tmp();
-            $tmp = rtrim($tmp, DIRECTORY_SEPARATOR);
-        }
-        return $tmp;
-    }
-
-    /**
-     * Returns the OS-specific directory for temporary files
-     *
-     * @author Paul M. Jones <pmjones@solarphp.com>
-     * @license http://opensource.org/licenses/bsd-license.php BSD
-     * @link http://solarphp.com/trac/core/browser/trunk/Solar/Dir.php
-     *
-     * @return string
-     */
-    protected static function _tmp()
-    {
-        // non-Windows system?
-        if (strtolower(substr(PHP_OS, 0, 3)) != 'win') {
-            $tmp = empty($_ENV['TMPDIR']) ? getenv('TMPDIR') : $_ENV['TMPDIR'];
-            if ($tmp) {
-                return $tmp;
-            } else {
-                return '/tmp';
-            }
-        }
-        // Windows 'TEMP'
-        $tmp = empty($_ENV['TEMP']) ? getenv('TEMP') : $_ENV['TEMP'];
-        if ($tmp) {
-            return $tmp;
-        }
-        // Windows 'TMP'
-        $tmp = empty($_ENV['TMP']) ? getenv('TMP') : $_ENV['TMP'];
-        if ($tmp) {
-            return $tmp;
-        }
-        // Windows 'windir'
-        $tmp = empty($_ENV['windir']) ? getenv('windir') : $_ENV['windir'];
-        if ($tmp) {
-            return $tmp;
-        }
-        // final fallback for Windows
-        return getenv('SystemRoot') . '\\temp';
-    }
-
-    /**
-     * Send message to the Minify logger
-     * @param string $msg
-     * @return null
-     */
-    protected function _log($msg)
-    {
-        require_once 'Minify/Logger.php';
-        Minify_Logger::log($msg);
-    }
-    
-    private $_path = null;
-    private $_locking = null;
-}
diff --git a/inc/contrib/minify/Minify/Cache/Memcache.php b/inc/contrib/minify/Minify/Cache/Memcache.php
deleted file mode 100755
index 72bf454b..00000000
--- a/inc/contrib/minify/Minify/Cache/Memcache.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Class Minify_Cache_Memcache
- * @package Minify
- */
-
-/**
- * Memcache-based cache class for Minify
- * 
- * <code>
- * // fall back to disk caching if memcache can't connect
- * $memcache = new Memcache;
- * if ($memcache->connect('localhost', 11211)) {
- *     Minify::setCache(new Minify_Cache_Memcache($memcache));
- * } else {
- *     Minify::setCache();
- * }
- * </code>
- **/
-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;
-    }
-    
-    /**
-     * 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);
-    }
-    
-    /**
-     * 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
-            : '';
-    }
-    
-	/**
-     * 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;
-    
-    // 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;
-    }
-}
diff --git a/inc/contrib/minify/Minify/Cache/ZendPlatform.php b/inc/contrib/minify/Minify/Cache/ZendPlatform.php
deleted file mode 100755
index 3130d69a..00000000
--- a/inc/contrib/minify/Minify/Cache/ZendPlatform.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Class Minify_Cache_ZendPlatform
- * @package Minify
- */
-
-
-/**
- * ZendPlatform-based cache class for Minify
- *
- * Based on Minify_Cache_APC, uses output_cache_get/put (currently deprecated)
- * 
- * <code>
- * Minify::setCache(new Minify_Cache_ZendPlatform());
- * </code>
- *
- * @package Minify
- * @author Patrick van Dissel
- */
-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;
-    }
-}
diff --git a/inc/contrib/minify/Minify/CommentPreserver.php b/inc/contrib/minify/Minify/CommentPreserver.php
deleted file mode 100755
index 7a359bf9..00000000
--- a/inc/contrib/minify/Minify/CommentPreserver.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Class Minify_CommentPreserver 
- * @package Minify
- */
-
-/**
- * Process a string in pieces preserving C-style comments that begin with "/*!"
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_CommentPreserver {
-    
-    /**
-     * 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";
-    
-    /**
-     * 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;
-    }
-}
diff --git a/inc/contrib/minify/Minify/Controller/Base.php b/inc/contrib/minify/Minify/Controller/Base.php
deleted file mode 100755
index 240b5449..00000000
--- a/inc/contrib/minify/Minify/Controller/Base.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Base  
- * @package Minify
- */
-
-/**
- * Base class for Minify controller
- * 
- * The controller class validates a request and uses it to create sources
- * for minification and set options like contentType. It's also responsible
- * for loading minifier code upon request.
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-abstract class Minify_Controller_Base {
-    
-    /**
-     * Setup controller sources and set an needed options for Minify::source
-     * 
-     * You must override this method in your subclass controller to set 
-     * $this->sources. If the request is NOT valid, make sure $this->sources 
-     * is left an empty array. Then strip any controller-specific options from 
-     * $options and return it. To serve files, $this->sources must be an array of
-     * Minify_Source objects.
-     * 
-     * @param array $options controller and Minify options
-     * 
-     * @return array $options Minify::serve options
-     */
-    abstract public function setupSources($options);
-    
-    /**
-     * Get default Minify options for this controller.
-     * 
-     * Override in subclass to change defaults
-     *
-     * @return array options for Minify
-     */
-    public function getDefaultMinifyOptions() {
-        return array(
-            'isPublic' => true
-            ,'encodeOutput' => function_exists('gzdeflate')
-            ,'encodeMethod' => null // determine later
-            ,'encodeLevel' => 9
-            ,'minifierOptions' => array() // no minifier options
-            ,'contentTypeCharset' => 'utf-8'
-            ,'maxAge' => 1800 // 30 minutes
-            ,'rewriteCssUris' => true
-            ,'bubbleCssImports' => false
-            ,'quiet' => false // serve() will send headers and output
-            ,'debug' => false
-            
-            // if you override these, the response codes MUST be directly after
-            // the first space.
-            ,'badRequestHeader' => 'HTTP/1.0 400 Bad Request'
-            ,'errorHeader'      => 'HTTP/1.0 500 Internal Server Error'
-            
-            // callback function to see/modify content of all sources
-            ,'postprocessor' => null
-            // file to require to load preprocessor
-            ,'postprocessorRequire' => null
-        );
-    }  
-
-    /**
-     * Get default minifiers for this controller.
-     * 
-     * Override in subclass to change defaults
-     *
-     * @return array minifier callbacks for common types
-     */
-    public function getDefaultMinifers() {
-        $ret[Minify::TYPE_JS] = array('JSMin', 'minify');
-        $ret[Minify::TYPE_CSS] = array('Minify_CSS', 'minify');
-        $ret[Minify::TYPE_HTML] = array('Minify_HTML', 'minify');
-        return $ret;
-    }
-    
-    /**
-     * Load any code necessary to execute the given minifier callback.
-     * 
-     * The controller is responsible for loading minification code on demand
-     * via this method. This built-in function will only load classes for
-     * static method callbacks where the class isn't already defined. It uses
-     * the PEAR convention, so, given array('Jimmy_Minifier', 'minCss'), this 
-     * function will include 'Jimmy/Minifier.php'.
-     * 
-     * If you need code loaded on demand and this doesn't suit you, you'll need
-     * to override this function in your subclass. 
-     * @see Minify_Controller_Page::loadMinifier()
-     * 
-     * @param callback $minifierCallback callback of minifier function
-     * 
-     * @return null
-     */
-    public function loadMinifier($minifierCallback)
-    {
-        if (is_array($minifierCallback)
-            && is_string($minifierCallback[0])
-            && !class_exists($minifierCallback[0], false)) {
-            
-            require str_replace('_', '/', $minifierCallback[0]) . '.php';
-        }
-    }
-    
-    /**
-     * Is a user-given file within an allowable directory, existing,
-     * and having an extension js/css/html/txt ?
-     * 
-     * This is a convenience function for controllers that have to accept
-     * user-given paths
-     *
-     * @param string $file full file path (already processed by realpath())
-     * 
-     * @param array $safeDirs directories where files are safe to serve. Files can also
-     * be in subdirectories of these directories.
-     * 
-     * @return bool file is safe
-     *
-     * @deprecated use checkAllowDirs, checkNotHidden instead
-     */
-    public static function _fileIsSafe($file, $safeDirs)
-    {
-        $pathOk = false;
-        foreach ((array)$safeDirs as $safeDir) {
-            if (strpos($file, $safeDir) === 0) {
-                $pathOk = true;
-                break;
-            }
-        }
-        $base = basename($file);
-        if (! $pathOk || ! is_file($file) || $base[0] === '.') {
-            return false;
-        }
-        list($revExt) = explode('.', strrev($base));
-        return in_array(strrev($revExt), array('js', 'css', 'html', 'txt'));
-    }
-
-    /**
-     * @param string $file
-     * @param array $allowDirs
-     * @param string $uri
-     * @return bool
-     * @throws Exception
-     */
-    public static function checkAllowDirs($file, $allowDirs, $uri)
-    {
-        foreach ((array)$allowDirs as $allowDir) {
-            if (strpos($file, $allowDir) === 0) {
-                return true;
-            }
-        }
-        throw new Exception("File '$file' is outside \$allowDirs. If the path is"
-            . " resolved via an alias/symlink, look into the \$min_symlinks option."
-            . " E.g. \$min_symlinks['/" . dirname($uri) . "'] = '" . dirname($file) . "';");
-    }
-
-    /**
-     * @param string $file
-     * @throws Exception
-     */
-    public static function checkNotHidden($file)
-    {
-        $b = basename($file);
-        if (0 === strpos($b, '.')) {
-            throw new Exception("Filename '$b' starts with period (may be hidden)");
-        }
-    }
-
-    /**
-     * instances of Minify_Source, which provide content and any individual minification needs.
-     *
-     * @var array
-     * 
-     * @see Minify_Source
-     */
-    public $sources = array();
-    
-    /**
-     * Short name to place inside cache id
-     *
-     * The setupSources() method may choose to set this, making it easier to
-     * recognize a particular set of sources/settings in the cache folder. It
-     * will be filtered and truncated to make the final cache id <= 250 bytes.
-     * 
-     * @var string
-     */
-    public $selectionId = '';
-
-    /**
-     * Mix in default controller options with user-given options
-     * 
-     * @param array $options user options
-     * 
-     * @return array mixed options
-     */
-    public final function mixInDefaultOptions($options)
-    {
-        $ret = array_merge(
-            $this->getDefaultMinifyOptions(), $options
-        );
-        if (! isset($options['minifiers'])) {
-            $options['minifiers'] = array();
-        }
-        $ret['minifiers'] = array_merge(
-            $this->getDefaultMinifers(), $options['minifiers']
-        );
-        return $ret;
-    }
-    
-    /**
-     * Analyze sources (if there are any) and set $options 'contentType' 
-     * and 'lastModifiedTime' if they already aren't.
-     * 
-     * @param array $options options for Minify
-     * 
-     * @return array options for Minify
-     */
-    public final function analyzeSources($options = array()) 
-    {
-        if ($this->sources) {
-            if (! isset($options['contentType'])) {
-                $options['contentType'] = Minify_Source::getContentType($this->sources);
-            }
-            // last modified is needed for caching, even if setExpires is set
-            if (! isset($options['lastModifiedTime'])) {
-                $max = 0;
-                foreach ($this->sources as $source) {
-                    $max = max($source->lastModified, $max);
-                }
-                $options['lastModifiedTime'] = $max;
-            }    
-        }
-        return $options;
-    }
-
-    /**
-     * Send message to the Minify logger
-     *
-     * @param string $msg
-     *
-     * @return null
-     */
-    public function log($msg) {
-        require_once 'Minify/Logger.php';
-        Minify_Logger::log($msg);
-    }
-}
diff --git a/inc/contrib/minify/Minify/Controller/Files.php b/inc/contrib/minify/Minify/Controller/Files.php
deleted file mode 100755
index 83f028ad..00000000
--- a/inc/contrib/minify/Minify/Controller/Files.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Files  
- * @package Minify
- */
-
-require_once 'Minify/Controller/Base.php';
-
-/**
- * Controller class for minifying a set of files
- * 
- * E.g. the following would serve the minified Javascript for a site
- * <code>
- * Minify::serve('Files', array(
- *     'files' => array(
- *         '//js/jquery.js'
- *         ,'//js/plugins.js'
- *         ,'/home/username/file.js'
- *     )
- * ));
- * </code>
- * 
- * As a shortcut, the controller will replace "//" at the beginning
- * of a filename with $_SERVER['DOCUMENT_ROOT'] . '/'.
- *
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Controller_Files extends Minify_Controller_Base {
-    
-    /**
-     * Set up file sources
-     * 
-     * @param array $options controller and Minify options
-     * @return array Minify options
-     * 
-     * Controller options:
-     * 
-     * 'files': (required) array of complete file paths, or a single path
-     */
-    public function setupSources($options) {
-        // strip controller options
-        
-        $files = $options['files'];
-        // if $files is a single object, casting will break it
-        if (is_object($files)) {
-            $files = array($files);
-        } elseif (! is_array($files)) {
-            $files = (array)$files;
-        }
-        unset($options['files']);
-        
-        $sources = array();
-        foreach ($files as $file) {
-            if ($file instanceof Minify_Source) {
-                $sources[] = $file;
-                continue;
-            }
-            if (0 === strpos($file, '//')) {
-                $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1);
-            }
-            $realPath = realpath($file);
-            if (is_file($realPath)) {
-                $sources[] = new Minify_Source(array(
-                    'filepath' => $realPath
-                ));    
-            } else {
-                $this->log("The path \"{$file}\" could not be found (or was not a file)");
-                return $options;
-            }
-        }
-        if ($sources) {
-            $this->sources = $sources;
-        }
-        return $options;
-    }
-}
-
diff --git a/inc/contrib/minify/Minify/Controller/Groups.php b/inc/contrib/minify/Minify/Controller/Groups.php
deleted file mode 100755
index 2d4e43b2..00000000
--- a/inc/contrib/minify/Minify/Controller/Groups.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Groups  
- * @package Minify
- */
-
-require_once 'Minify/Controller/Base.php';
-
-/**
- * Controller class for serving predetermined groups of minimized sets, selected
- * by PATH_INFO
- * 
- * <code>
- * Minify::serve('Groups', array( 
- *     'groups' => array(
- *         'css' => array('//css/type.css', '//css/layout.css')
- *        ,'js' => array('//js/jquery.js', '//js/site.js')
- *     )
- * ));
- * </code>
- * 
- * If the above code were placed in /serve.php, it would enable the URLs
- * /serve.php/js and /serve.php/css
- * 
- * As a shortcut, the controller will replace "//" at the beginning
- * of a filename with $_SERVER['DOCUMENT_ROOT'] . '/'.
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Controller_Groups extends Minify_Controller_Base {
-    
-    /**
-     * Set up groups of files as sources
-     * 
-     * @param array $options controller and Minify options
-     *
-     * 'groups': (required) array mapping PATH_INFO strings to arrays
-     * of complete file paths. @see Minify_Controller_Groups
-     *
-     * @return array Minify options
-     */
-    public function setupSources($options) {
-        // strip controller options
-        $groups = $options['groups'];
-        unset($options['groups']);
-        
-        // mod_fcgid places PATH_INFO in ORIG_PATH_INFO
-        $pi = isset($_SERVER['ORIG_PATH_INFO'])
-            ? substr($_SERVER['ORIG_PATH_INFO'], 1) 
-            : (isset($_SERVER['PATH_INFO'])
-                ? substr($_SERVER['PATH_INFO'], 1) 
-                : false
-            );
-        if (false === $pi || ! isset($groups[$pi])) {
-            // no PATH_INFO or not a valid group
-            $this->log("Missing PATH_INFO or no group set for \"$pi\"");
-            return $options;
-        }
-        $sources = array();
-        
-        $files = $groups[$pi];
-        // if $files is a single object, casting will break it
-        if (is_object($files)) {
-            $files = array($files);
-        } elseif (! is_array($files)) {
-            $files = (array)$files;
-        }
-        foreach ($files as $file) {
-            if ($file instanceof Minify_Source) {
-                $sources[] = $file;
-                continue;
-            }
-            if (0 === strpos($file, '//')) {
-                $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1);
-            }
-            $realPath = realpath($file);
-            if (is_file($realPath)) {
-                $sources[] = new Minify_Source(array(
-                    'filepath' => $realPath
-                ));    
-            } else {
-                $this->log("The path \"{$file}\" could not be found (or was not a file)");
-                return $options;
-            }
-        }
-        if ($sources) {
-            $this->sources = $sources;
-        }
-        return $options;
-    }
-}
-
diff --git a/inc/contrib/minify/Minify/Controller/MinApp.php b/inc/contrib/minify/Minify/Controller/MinApp.php
deleted file mode 100755
index d47c60d9..00000000
--- a/inc/contrib/minify/Minify/Controller/MinApp.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_MinApp  
- * @package Minify
- */
-
-require_once 'Minify/Controller/Base.php';
-
-/**
- * Controller class for requests to /min/index.php
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Controller_MinApp 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) {
-        // filter controller options
-        $cOptions = array_merge(
-            array(
-                'allowDirs' => '//'
-                ,'groupsOnly' => false
-                ,'groups' => array()
-                ,'noMinPattern' => '@[-\\.]min\\.(?:js|css)$@i' // matched against basename
-            )
-            ,(isset($options['minApp']) ? $options['minApp'] : array())
-        );
-        unset($options['minApp']);
-        $sources = array();
-        $this->selectionId = '';
-        $firstMissingResource = null;
-        
-        if (isset($_GET['g'])) {
-            // add group(s)
-            $this->selectionId .= 'g=' . $_GET['g'];
-            $keys = explode(',', $_GET['g']);
-            if ($keys != array_unique($keys)) {
-                $this->log("Duplicate group key found.");
-                return $options;
-            }
-            $keys = explode(',', $_GET['g']);
-            foreach ($keys as $key) {
-                if (! isset($cOptions['groups'][$key])) {
-                    $this->log("A group configuration for \"{$key}\" was not found");
-                    return $options;
-                }
-                $files = $cOptions['groups'][$key];
-                // if $files is a single object, casting will break it
-                if (is_object($files)) {
-                    $files = array($files);
-                } elseif (! is_array($files)) {
-                    $files = (array)$files;
-                }
-                foreach ($files as $file) {
-                    if ($file instanceof Minify_Source) {
-                        $sources[] = $file;
-                        continue;
-                    }
-                    if (0 === strpos($file, '//')) {
-                        $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1);
-                    }
-                    $realpath = realpath($file);
-                    if ($realpath && is_file($realpath)) {
-                        $sources[] = $this->_getFileSource($realpath, $cOptions);
-                    } else {
-                        $this->log("The path \"{$file}\" (realpath \"{$realpath}\") could not be found (or was not a file)");
-                        if (null === $firstMissingResource) {
-                            $firstMissingResource = basename($file);
-                            continue;
-                        } else {
-                            $secondMissingResource = basename($file);
-                            $this->log("More than one file was missing: '$firstMissingResource', '$secondMissingResource'");
-                            return $options;
-                        }
-                    }
-                }
-                if ($sources) {
-                    try {
-                        $this->checkType($sources[0]);
-                    } catch (Exception $e) {
-                        $this->log($e->getMessage());
-                        return $options;
-                    }
-                }
-            }
-        }
-        if (! $cOptions['groupsOnly'] && isset($_GET['f'])) {
-            // try user files
-            // The following restrictions are to limit the URLs that minify will
-            // respond to.
-            if (// verify at least one file, files are single comma separated, 
-                // and are all same extension
-                ! preg_match('/^[^,]+\\.(css|js)(?:,[^,]+\\.\\1)*$/', $_GET['f'], $m)
-                // no "//"
-                || strpos($_GET['f'], '//') !== false
-                // no "\"
-                || strpos($_GET['f'], '\\') !== false
-            ) {
-                $this->log("GET param 'f' was invalid");
-                return $options;
-            }
-            $ext = ".{$m[1]}";
-            try {
-                $this->checkType($m[1]);
-            } catch (Exception $e) {
-                $this->log($e->getMessage());
-                return $options;
-            }
-            $files = explode(',', $_GET['f']);
-            if ($files != array_unique($files)) {
-                $this->log("Duplicate files were specified");
-                return $options;
-            }
-            if (isset($_GET['b'])) {
-                // check for validity
-                if (preg_match('@^[^/]+(?:/[^/]+)*$@', $_GET['b'])
-                    && false === strpos($_GET['b'], '..')
-                    && $_GET['b'] !== '.') {
-                    // valid base
-                    $base = "/{$_GET['b']}/";       
-                } else {
-                    $this->log("GET param 'b' was invalid");
-                    return $options;
-                }
-            } else {
-                $base = '/';
-            }
-            $allowDirs = array();
-            foreach ((array)$cOptions['allowDirs'] as $allowDir) {
-                $allowDirs[] = realpath(str_replace('//', $_SERVER['DOCUMENT_ROOT'] . '/', $allowDir));
-            }
-            $basenames = array(); // just for cache id
-            foreach ($files as $file) {
-                $uri = $base . $file;
-                $path = $_SERVER['DOCUMENT_ROOT'] . $uri;
-                $realpath = realpath($path);
-                if (false === $realpath || ! is_file($realpath)) {
-                    $this->log("The path \"{$path}\" (realpath \"{$realpath}\") could not be found (or was not a file)");
-                    if (null === $firstMissingResource) {
-                        $firstMissingResource = $uri;
-                        continue;
-                    } else {
-                        $secondMissingResource = $uri;
-                        $this->log("More than one file was missing: '$firstMissingResource', '$secondMissingResource`'");
-                        return $options;
-                    }
-                }
-                try {
-                    parent::checkNotHidden($realpath);
-                    parent::checkAllowDirs($realpath, $allowDirs, $uri);
-                } catch (Exception $e) {
-                    $this->log($e->getMessage());
-                    return $options;
-                }
-                $sources[] = $this->_getFileSource($realpath, $cOptions);
-                $basenames[] = basename($realpath, $ext);
-            }
-            if ($this->selectionId) {
-                $this->selectionId .= '_f=';
-            }
-            $this->selectionId .= implode(',', $basenames) . $ext;
-        }
-        if ($sources) {
-            if (null !== $firstMissingResource) {
-                array_unshift($sources, new Minify_Source(array(
-                    'id' => 'missingFile'
-                    // should not cause cache invalidation
-                    ,'lastModified' => 0
-                    // due to caching, filename is unreliable.
-                    ,'content' => "/* Minify: at least one missing file. See " . Minify::URL_DEBUG . " */\n"
-                    ,'minifier' => ''
-                )));
-            }
-            $this->sources = $sources;
-        } else {
-            $this->log("No sources to serve");
-        }
-        return $options;
-    }
-
-    /**
-     * @param string $file
-     *
-     * @param array $cOptions
-     *
-     * @return Minify_Source
-     */
-    protected function _getFileSource($file, $cOptions)
-    {
-        $spec['filepath'] = $file;
-        if ($cOptions['noMinPattern']
-            && preg_match($cOptions['noMinPattern'], basename($file))) {
-            $spec['minifier'] = '';
-        }
-        return new Minify_Source($spec);
-    }
-
-    protected $_type = null;
-
-    /**
-     * Make sure that only source files of a single type are registered
-     *
-     * @param string $sourceOrExt
-     *
-     * @throws Exception
-     */
-    public function checkType($sourceOrExt)
-    {
-        if ($sourceOrExt === 'js') {
-            $type = Minify::TYPE_JS;
-        } elseif ($sourceOrExt === 'css') {
-            $type = Minify::TYPE_CSS;
-        } elseif ($sourceOrExt->contentType !== null) {
-            $type = $sourceOrExt->contentType;
-        } else {
-            return;
-        }
-        if ($this->_type === null) {
-            $this->_type = $type;
-        } elseif ($this->_type !== $type) {
-            throw new Exception('Content-Type mismatch');
-        }
-    }
-}
diff --git a/inc/contrib/minify/Minify/Controller/Page.php b/inc/contrib/minify/Minify/Controller/Page.php
deleted file mode 100755
index de471e12..00000000
--- a/inc/contrib/minify/Minify/Controller/Page.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Page  
- * @package Minify
- */
-
-require_once 'Minify/Controller/Base.php';
-
-/**
- * Controller class for serving a single HTML page
- * 
- * @link http://code.google.com/p/minify/source/browse/trunk/web/examples/1/index.php#59
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Controller_Page extends Minify_Controller_Base {
-    
-    /**
-     * Set up source of HTML content
-     * 
-     * @param array $options controller and Minify options
-     * @return array Minify options
-     * 
-     * Controller options:
-     * 
-     * 'content': (required) HTML markup
-     * 
-     * 'id': (required) id of page (string for use in server-side caching)
-     * 
-     * 'lastModifiedTime': timestamp of when this content changed. This
-     * is recommended to allow both server and client-side caching.
-     * 
-     * 'minifyAll': should all CSS and Javascript blocks be individually 
-     * minified? (default false) 
-     *
-     * @todo Add 'file' option to read HTML file.
-     */
-    public function setupSources($options) {
-        if (isset($options['file'])) {
-            $sourceSpec = array(
-                'filepath' => $options['file']
-            );
-            $f = $options['file'];
-        } else {
-            // strip controller options
-            $sourceSpec = array(
-                'content' => $options['content']
-                ,'id' => $options['id']
-            );
-            $f = $options['id'];
-            unset($options['content'], $options['id']);
-        }
-        // something like "builder,index.php" or "directory,file.html"
-        $this->selectionId = strtr(substr($f, 1 + strlen(dirname(dirname($f)))), '/\\', ',,');
-
-        if (isset($options['minifyAll'])) {
-            // this will be the 2nd argument passed to Minify_HTML::minify()
-            $sourceSpec['minifyOptions'] = array(
-                'cssMinifier' => array('Minify_CSS', 'minify')
-                ,'jsMinifier' => array('JSMin', 'minify')
-            );
-            $this->_loadCssJsMinifiers = true;
-            unset($options['minifyAll']);
-        }
-        $this->sources[] = new Minify_Source($sourceSpec);
-        
-        $options['contentType'] = Minify::TYPE_HTML;
-        return $options;
-    }
-    
-    protected $_loadCssJsMinifiers = false;
-    
-    /**
-     * @see Minify_Controller_Base::loadMinifier()
-     */
-    public function loadMinifier($minifierCallback)
-    {
-        if ($this->_loadCssJsMinifiers) {
-            // Minify will not call for these so we must manually load
-            // them when Minify/HTML.php is called for.
-            require_once 'Minify/CSS.php';
-            require_once 'JSMin.php';
-        }
-        parent::loadMinifier($minifierCallback); // load Minify/HTML.php
-    }
-}
-
diff --git a/inc/contrib/minify/Minify/Controller/Version1.php b/inc/contrib/minify/Minify/Controller/Version1.php
deleted file mode 100755
index 5279d36d..00000000
--- a/inc/contrib/minify/Minify/Controller/Version1.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Version1  
- * @package Minify
- */
-
-require_once 'Minify/Controller/Base.php';
-
-/**
- * Controller class for emulating version 1 of minify.php (mostly a proof-of-concept)
- * 
- * <code>
- * Minify::serve('Version1');
- * </code>
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-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) {
-        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;
-        }
-        $extension = $m[1];
-        
-        $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'];
-        
-        $sources = array();
-        $goodFiles = array();
-        $hasBadSource = false;
-        
-        $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;
-    }
-    
-    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);
-            }
-        }
-    }
-}
-
diff --git a/inc/contrib/minify/Minify/DebugDetector.php b/inc/contrib/minify/Minify/DebugDetector.php
deleted file mode 100755
index 1def9748..00000000
--- a/inc/contrib/minify/Minify/DebugDetector.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php

-

-/**

- * Detect whether request should be debugged

- *

- * @package Minify

- * @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;

-    }

-}

diff --git a/inc/contrib/minify/Minify/HTML.php b/inc/contrib/minify/Minify/HTML.php
deleted file mode 100755
index e9453ffb..00000000
--- a/inc/contrib/minify/Minify/HTML.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php

-/**

- * Class Minify_HTML  

- * @package Minify

- */

-

-/**

- * Compress HTML

- *

- * This is a heavy regex-based removal of whitespace, unnecessary comments and 

- * tokens. IE conditional comments are preserved. There are also options to have

- * STYLE and SCRIPT blocks compressed by callback functions. 

- * 

- * A test suite is available.

- * 

- * @package Minify

- * @author Stephen Clay <steve@mrclay.org>

- */

-class Minify_HTML {

-

-    /**

-     * "Minify" an HTML page

-     *

-     * @param string $html

-     *

-     * @param array $options

-     *

-     * 'cssMinifier' : (optional) callback function to process content of STYLE

-     * elements.

-     * 

-     * 'jsMinifier' : (optional) callback function to process content of SCRIPT

-     * elements. Note: the type attribute is ignored.

-     * 

-     * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If

-     * unset, minify will sniff for an XHTML doctype.

-     * 

-     * @return string

-     */

-    public static function minify($html, $options = array()) {

-        $min = new Minify_HTML($html, $options);

-        return $min->process();

-    }

-    

-    

-    /**

-     * Create a minifier object

-     *

-     * @param string $html

-     *

-     * @param array $options

-     *

-     * 'cssMinifier' : (optional) callback function to process content of STYLE

-     * elements.

-     * 

-     * 'jsMinifier' : (optional) callback function to process content of SCRIPT

-     * elements. Note: the type attribute is ignored.

-     * 

-     * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If

-     * unset, minify will sniff for an XHTML doctype.

-     * 

-     * @return null

-     */

-    public function __construct($html, $options = array())

-    {

-        $this->_html = str_replace("\r\n", "\n", trim($html));

-        if (isset($options['xhtml'])) {

-            $this->_isXhtml = (bool)$options['xhtml'];

-        }

-        if (isset($options['cssMinifier'])) {

-            $this->_cssMinifier = $options['cssMinifier'];

-        }

-        if (isset($options['jsMinifier'])) {

-            $this->_jsMinifier = $options['jsMinifier'];

-        }

-    }

-    

-    

-    /**

-     * Minify the markeup given in the constructor

-     * 

-     * @return string

-     */

-    public function process()

-    {

-        if ($this->_isXhtml === null) {

-            $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML'));

-        }

-        

-        $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);

-        $this->_placeholders = array();

-        

-        // replace SCRIPTs (and minify) with placeholders

-        $this->_html = preg_replace_callback(

-            '/(\\s*)<script(\\b[^>]*?>)([\\s\\S]*?)<\\/script>(\\s*)/i'

-            ,array($this, '_removeScriptCB')

-            ,$this->_html);

-        

-        // replace STYLEs (and minify) with placeholders

-        $this->_html = preg_replace_callback(

-            '/\\s*<style(\\b[^>]*>)([\\s\\S]*?)<\\/style>\\s*/i'

-            ,array($this, '_removeStyleCB')

-            ,$this->_html);

-        

-        // remove HTML comments (not containing IE conditional comments).

-        $this->_html = preg_replace_callback(

-            '/<!--([\\s\\S]*?)-->/'

-            ,array($this, '_commentCB')

-            ,$this->_html);

-        

-        // replace PREs with placeholders

-        $this->_html = preg_replace_callback('/\\s*<pre(\\b[^>]*?>[\\s\\S]*?<\\/pre>)\\s*/i'

-            ,array($this, '_removePreCB')

-            ,$this->_html);

-        

-        // replace TEXTAREAs with placeholders

-        $this->_html = preg_replace_callback(

-            '/\\s*<textarea(\\b[^>]*?>[\\s\\S]*?<\\/textarea>)\\s*/i'

-            ,array($this, '_removeTextareaCB')

-            ,$this->_html);

-        

-        // trim each line.

-        // @todo take into account attribute values that span multiple lines.

-        $this->_html = preg_replace('/^\\s+|\\s+$/m', '', $this->_html);

-        

-        // remove ws around block/undisplayed elements

-        $this->_html = preg_replace('/\\s+(<\\/?(?:area|base(?:font)?|blockquote|body'

-            .'|caption|center|cite|col(?:group)?|dd|dir|div|dl|dt|fieldset|form'

-            .'|frame(?:set)?|h[1-6]|head|hr|html|legend|li|link|map|menu|meta'

-            .'|ol|opt(?:group|ion)|p|param|t(?:able|body|head|d|h||r|foot|itle)'

-            .'|ul)\\b[^>]*>)/i', '$1', $this->_html);

-        

-        // remove ws outside of all elements

-        $this->_html = preg_replace(

-            '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?</'

-            ,'>$1$2$3<'

-            ,$this->_html);

-        

-        // use newlines before 1st attribute in open tags (to limit line lengths)

-        $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html);

-        

-        // fill placeholders

-        $this->_html = str_replace(

-            array_keys($this->_placeholders)

-            ,array_values($this->_placeholders)

-            ,$this->_html

-        );

-        // issue 229: multi-pass to catch scripts that didn't get replaced in textareas

-        $this->_html = str_replace(

-            array_keys($this->_placeholders)

-            ,array_values($this->_placeholders)

-            ,$this->_html

-        );

-        return $this->_html;

-    }

-    

-    protected function _commentCB($m)

-    {

-        return (0 === strpos($m[1], '[') || false !== strpos($m[1], '<!['))

-            ? $m[0]

-            : '';

-    }

-    

-    protected function _reservePlace($content)

-    {

-        $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';

-        $this->_placeholders[$placeholder] = $content;

-        return $placeholder;

-    }

-

-    protected $_isXhtml = null;

-    protected $_replacementHash = null;

-    protected $_placeholders = array();

-    protected $_cssMinifier = null;

-    protected $_jsMinifier = null;

-

-    protected function _removePreCB($m)

-    {

-        return $this->_reservePlace("<pre{$m[1]}");

-    }

-    

-    protected function _removeTextareaCB($m)

-    {

-        return $this->_reservePlace("<textarea{$m[1]}");

-    }

-

-    protected function _removeStyleCB($m)

-    {

-        $openStyle = "<style{$m[1]}";

-        $css = $m[2];

-        // remove HTML comments

-        $css = preg_replace('/(?:^\\s*<!--|-->\\s*$)/', '', $css);

-        

-        // remove CDATA section markers

-        $css = $this->_removeCdata($css);

-        

-        // minify

-        $minifier = $this->_cssMinifier

-            ? $this->_cssMinifier

-            : 'trim';

-        $css = call_user_func($minifier, $css);

-        

-        return $this->_reservePlace($this->_needsCdata($css)

-            ? "{$openStyle}/*<![CDATA[*/{$css}/*]]>*/</style>"

-            : "{$openStyle}{$css}</style>"

-        );

-    }

-

-    protected function _removeScriptCB($m)

-    {

-        $openScript = "<script{$m[2]}";

-        $js = $m[3];

-        

-        // whitespace surrounding? preserve at least one space

-        $ws1 = ($m[1] === '') ? '' : ' ';

-        $ws2 = ($m[4] === '') ? '' : ' ';

- 

-        // remove HTML comments (and ending "//" if present)

-        $js = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $js);

-            

-        // remove CDATA section markers

-        $js = $this->_removeCdata($js);

-        

-        // minify

-        $minifier = $this->_jsMinifier

-            ? $this->_jsMinifier

-            : 'trim'; 

-        $js = call_user_func($minifier, $js);

-        

-        return $this->_reservePlace($this->_needsCdata($js)

-            ? "{$ws1}{$openScript}/*<![CDATA[*/{$js}/*]]>*/</script>{$ws2}"

-            : "{$ws1}{$openScript}{$js}</script>{$ws2}"

-        );

-    }

-

-    protected function _removeCdata($str)

-    {

-        return (false !== strpos($str, '<![CDATA['))

-            ? str_replace(array('<![CDATA[', ']]>'), '', $str)

-            : $str;

-    }

-    

-    protected function _needsCdata($str)

-    {

-        return ($this->_isXhtml && preg_match('/(?:[<&]|\\-\\-|\\]\\]>)/', $str));

-    }

-}

diff --git a/inc/contrib/minify/Minify/HTML/Helper.php b/inc/contrib/minify/Minify/HTML/Helper.php
deleted file mode 100755
index 807fdc9c..00000000
--- a/inc/contrib/minify/Minify/HTML/Helper.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/**
- * Class Minify_HTML_Helper
- * @package Minify
- */
-
-/**
- * Helpers for writing Minfy URIs into HTML
- *
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_HTML_Helper {
-    public $rewriteWorks = true;
-    public $minAppUri = '/min';
-    public $groupsConfigFile = '';
-
-    /*
-     * Get an HTML-escaped Minify URI for a group or set of files
-     * 
-     * @param mixed $keyOrFiles a group key or array of filepaths/URIs
-     * @param array $opts options:
-     *   'farExpires' : (default true) append a modified timestamp for cache revving
-     *   'debug' : (default false) append debug flag
-     *   'charset' : (default 'UTF-8') for htmlspecialchars
-     *   'minAppUri' : (default '/min') URI of min directory
-     *   'rewriteWorks' : (default true) does mod_rewrite work in min app?
-     *   'groupsConfigFile' : specify if different
-     * @return string
-     */
-    public static function getUri($keyOrFiles, $opts = array())
-    {
-        $opts = array_merge(array( // default options
-            'farExpires' => true
-            ,'debug' => false
-            ,'charset' => 'UTF-8'
-            ,'minAppUri' => '/min'
-            ,'rewriteWorks' => true
-            ,'groupsConfigFile' => ''
-        ), $opts);
-        $h = new self;
-        $h->minAppUri = $opts['minAppUri'];
-        $h->rewriteWorks = $opts['rewriteWorks'];
-        $h->groupsConfigFile = $opts['groupsConfigFile'];
-        if (is_array($keyOrFiles)) {
-            $h->setFiles($keyOrFiles, $opts['farExpires']);
-        } else {
-            $h->setGroup($keyOrFiles, $opts['farExpires']);
-        }
-        $uri = $h->getRawUri($opts['farExpires'], $opts['debug']);
-        return htmlspecialchars($uri, ENT_QUOTES, $opts['charset']);
-    }
-
-    /*
-     * Get non-HTML-escaped URI to minify the specified files
-     */
-    public function getRawUri($farExpires = true, $debug = false)
-    {
-        $path = rtrim($this->minAppUri, '/') . '/';
-        if (! $this->rewriteWorks) {
-            $path .= '?';
-        }
-        if (null === $this->_groupKey) {
-            // @todo: implement shortest uri
-            $path = self::_getShortestUri($this->_filePaths, $path);
-        } else {
-            $path .= "g=" . $this->_groupKey;
-        }
-        if ($debug) {
-            $path .= "&debug";
-        } elseif ($farExpires && $this->_lastModified) {
-            $path .= "&" . $this->_lastModified;
-        }
-        return $path;
-    }
-
-    public function setFiles($files, $checkLastModified = true)
-    {
-        $this->_groupKey = null;
-        if ($checkLastModified) {
-            $this->_lastModified = self::getLastModified($files);
-        }
-        // normalize paths like in /min/f=<paths>
-        foreach ($files as $k => $file) {
-            if (0 === strpos($file, '//')) {
-                $file = substr($file, 2);
-            } elseif (0 === strpos($file, '/')
-                      || 1 === strpos($file, ':\\')) {
-                $file = substr($file, strlen($_SERVER['DOCUMENT_ROOT']) + 1);
-            }
-            $file = strtr($file, '\\', '/');
-            $files[$k] = $file;
-        }
-        $this->_filePaths = $files;
-    }
-
-    public function setGroup($key, $checkLastModified = true)
-    {
-        $this->_groupKey = $key;
-        if ($checkLastModified) {
-            if (! $this->groupsConfigFile) {
-                $this->groupsConfigFile = dirname(dirname(dirname(dirname(__FILE__)))) . '/groupsConfig.php';
-            }
-            if (is_file($this->groupsConfigFile)) {
-                $gc = (require $this->groupsConfigFile);
-                if (isset($gc[$key])) {
-                    $this->_lastModified = self::getLastModified($gc[$key]);
-                }
-            }
-        }
-    }
-    
-    public static function getLastModified($sources, $lastModified = 0)
-    {
-        $max = $lastModified;
-        foreach ((array)$sources as $source) {
-            if (is_object($source) && isset($source->lastModified)) {
-                $max = max($max, $source->lastModified);
-            } elseif (is_string($source)) {
-                if (0 === strpos($source, '//')) {
-                    $source = $_SERVER['DOCUMENT_ROOT'] . substr($source, 1);
-                }
-                if (is_file($source)) {
-                    $max = max($max, filemtime($source));
-                }
-            }
-        }
-        return $max;
-    }
-
-    protected $_groupKey = null; // if present, URI will be like g=...
-    protected $_filePaths = array();
-    protected $_lastModified = null;
-
-    
-    /**
-     * In a given array of strings, find the character they all have at
-     * a particular index
-     *
-     * @param array $arr array of strings
-     * @param int $pos index to check
-     * @return mixed a common char or '' if any do not match
-     */
-    protected static function _getCommonCharAtPos($arr, $pos) {
-        $l = count($arr);
-        $c = $arr[0][$pos];
-        if ($c === '' || $l === 1)
-            return $c;
-        for ($i = 1; $i < $l; ++$i)
-            if ($arr[$i][$pos] !== $c)
-                return '';
-        return $c;
-    }
-
-    /**
-     * Get the shortest URI to minify the set of source files
-     *
-     * @param array $paths root-relative URIs of files
-     * @param string $minRoot root-relative URI of the "min" application
-     */
-    protected static function _getShortestUri($paths, $minRoot = '/min/') {
-        $pos = 0;
-        $base = '';
-        $c;
-        while (true) {
-            $c = self::_getCommonCharAtPos($paths, $pos);
-            if ($c === '') {
-                break;
-            } else {
-                $base .= $c;
-            }
-            ++$pos;
-        }
-        $base = preg_replace('@[^/]+$@', '', $base);
-        $uri = $minRoot . 'f=' . implode(',', $paths);
-        
-        if (substr($base, -1) === '/') {
-            // we have a base dir!
-            $basedPaths = $paths;
-            $l = count($paths);
-            for ($i = 0; $i < $l; ++$i) {
-                $basedPaths[$i] = substr($paths[$i], strlen($base));
-            }
-            $base = substr($base, 0, strlen($base) - 1);
-            $bUri = $minRoot . 'b=' . $base . '&f=' . implode(',', $basedPaths);
-
-            $uri = strlen($uri) < strlen($bUri)
-                ? $uri
-                : $bUri;
-        }
-        return $uri;
-    }
-}
diff --git a/inc/contrib/minify/Minify/ImportProcessor.php b/inc/contrib/minify/Minify/ImportProcessor.php
deleted file mode 100755
index bdfae547..00000000
--- a/inc/contrib/minify/Minify/ImportProcessor.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php

-/**

- * Class Minify_ImportProcessor

- * @package Minify

- */

-

-/**

- * Linearize a CSS/JS file by including content specified by CSS import

- * declarations. In CSS files, relative URIs are fixed.

- *

- * @imports will be processed regardless of where they appear in the source

- * files; i.e. @imports commented out or in string content will still be

- * processed!

- *

- * This has a unit test but should be considered "experimental".

- *

- * @package Minify

- * @author Stephen Clay <steve@mrclay.org>

- * @author Simon Schick <simonsimcity@gmail.com>

- */

-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(

-            '/

-                @import\\s+

-                (?:url\\(\\s*)?      # maybe url(

-                [\'"]?               # maybe quote

-                (.*?)                # 1 = URI

-                [\'"]?               # maybe end quote

-                (?:\\s*\\))?         # maybe )

-                ([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;

-    }

-}

diff --git a/inc/contrib/minify/Minify/JS/ClosureCompiler.php b/inc/contrib/minify/Minify/JS/ClosureCompiler.php
deleted file mode 100755
index f4ed5bdb..00000000
--- a/inc/contrib/minify/Minify/JS/ClosureCompiler.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Class Minify_JS_ClosureCompiler
- * @package Minify
- */
-
-/**
- * Minify Javascript using Google's Closure Compiler API
- *
- * @link http://code.google.com/closure/compiler/
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- *
- * @todo can use a stream wrapper to unit test this?
- */
-class Minify_JS_ClosureCompiler {
-    const URL = 'http://closure-compiler.appspot.com/compile';
-
-    /**
-     * Minify Javascript code via HTTP request to the Closure Compiler API
-     *
-     * @param string $js input code
-     * @param array $options unused at this point
-     * @return string
-     */
-    public static function minify($js, array $options = array())
-    {
-        $obj = new self($options);
-        return $obj->min($js);
-    }
-
-    /**
-     *
-     * @param array $options
-     *
-     * fallbackFunc : default array($this, 'fallback');
-     */
-    public function __construct(array $options = array())
-    {
-        $this->_fallbackFunc = isset($options['fallbackMinifier'])
-            ? $options['fallbackMinifier']
-            : array($this, '_fallback');
-    }
-
-    public function min($js)
-    {
-        $postBody = $this->_buildPostBody($js);
-        $bytes = (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
-            ? mb_strlen($postBody, '8bit')
-            : strlen($postBody);
-        if ($bytes > 200000) {
-            throw new Minify_JS_ClosureCompiler_Exception(
-                'POST content larger than 200000 bytes'
-            );
-        }
-        $response = $this->_getResponse($postBody);
-        if (preg_match('/^Error\(\d\d?\):/', $response)) {
-            if (is_callable($this->_fallbackFunc)) {
-                $response = "/* Received errors from Closure Compiler API:\n$response"
-                          . "\n(Using fallback minifier)\n*/\n";
-                $response .= call_user_func($this->_fallbackFunc, $js);
-            } else {
-                throw new Minify_JS_ClosureCompiler_Exception($response);
-            }
-        }
-        if ($response === '') {
-            $errors = $this->_getResponse($this->_buildPostBody($js, true));
-            throw new Minify_JS_ClosureCompiler_Exception($errors);
-        }
-        return $response;
-    }
-    
-    protected $_fallbackFunc = null;
-
-    protected function _getResponse($postBody)
-    {
-        $allowUrlFopen = preg_match('/1|yes|on|true/i', ini_get('allow_url_fopen'));
-        if ($allowUrlFopen) {
-            $contents = file_get_contents(self::URL, false, stream_context_create(array(
-                'http' => array(
-                    'method' => 'POST',
-                    'header' => 'Content-type: application/x-www-form-urlencoded',
-                    'content' => $postBody,
-                    'max_redirects' => 0,
-                    'timeout' => 15,
-                )
-            )));
-        } elseif (defined('CURLOPT_POST')) {
-            $ch = curl_init(self::URL);
-            curl_setopt($ch, CURLOPT_POST, true);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-type: application/x-www-form-urlencoded'));
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $postBody);
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
-            $contents = curl_exec($ch);
-            curl_close($ch);
-        } else {
-            throw new Minify_JS_ClosureCompiler_Exception(
-               "Could not make HTTP request: allow_url_open is false and cURL not available"
-            );
-        }
-        if (false === $contents) {
-            throw new Minify_JS_ClosureCompiler_Exception(
-               "No HTTP response from server"
-            );
-        }
-        return trim($contents);
-    }
-
-    protected function _buildPostBody($js, $returnErrors = false)
-    {
-        return http_build_query(array(
-            'js_code' => $js,
-            'output_info' => ($returnErrors ? 'errors' : 'compiled_code'),
-            'output_format' => 'text',
-            'compilation_level' => 'SIMPLE_OPTIMIZATIONS'
-        ), null, '&');
-    }
-
-    /**
-     * Default fallback function if CC API fails
-     * @param string $js
-     * @return string
-     */
-    protected function _fallback($js)
-    {
-        require_once 'JSMin.php';
-        return JSMin::minify($js);
-    }
-}
-
-class Minify_JS_ClosureCompiler_Exception extends Exception {}
diff --git a/inc/contrib/minify/Minify/Lines.php b/inc/contrib/minify/Minify/Lines.php
deleted file mode 100755
index ca8afa1b..00000000
--- a/inc/contrib/minify/Minify/Lines.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Class Minify_Lines  
- * @package Minify
- */
-
-/**
- * Add line numbers in C-style comments for easier debugging of combined content
- *
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- * @author Adam Pedersen (Issue 55 fix)
- */
-class Minify_Lines {
-
-    /**
-     * Add line numbers in C-style comments
-     *
-     * This uses a very basic parser easily fooled by comment tokens inside
-     * strings or regexes, but, otherwise, generally clean code will not be 
-     * mangled. URI rewriting can also be performed.
-     *
-     * @param string $content
-     * 
-     * @param array $options available options:
-     * 
-     * 'id': (optional) string to identify file. E.g. file name/path
-     *
-     * '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, and prepend a comment with debugging information about
-     * this process.
-     * 
-     * @return string 
-     */
-    public static function minify($content, $options = array()) 
-    {
-        $id = (isset($options['id']) && $options['id'])
-            ? $options['id']
-            : '';
-        $content = str_replace("\r\n", "\n", $content);
-
-        // Hackily rewrite strings with XPath expressions that are
-        // likely to throw off our dumb parser (for Prototype 1.6.1).
-        $content = str_replace('"/*"', '"/"+"*"', $content);
-        $content = preg_replace('@([\'"])(\\.?//?)\\*@', '$1$2$1+$1*', $content);
-
-        $lines = explode("\n", $content);
-        $numLines = count($lines);
-        // determine left padding
-        $padTo = strlen((string) $numLines); // e.g. 103 lines = 3 digits
-        $inComment = false;
-        $i = 0;
-        $newLines = array();
-        while (null !== ($line = array_shift($lines))) {
-            if (('' !== $id) && (0 == $i % 50)) {
-                array_push($newLines, '', "/* {$id} */", '');
-            }
-            ++$i;
-            $newLines[] = self::_addNote($line, $i, $inComment, $padTo);
-            $inComment = self::_eolInComment($line, $inComment);
-        }
-        $content = implode("\n", $newLines) . "\n";
-        
-        // check for desired URI rewriting
-        if (isset($options['currentDir'])) {
-            require_once 'Minify/CSS/UriRewriter.php';
-            Minify_CSS_UriRewriter::$debugText = '';
-            $content = Minify_CSS_UriRewriter::rewrite(
-                 $content
-                ,$options['currentDir']
-                ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT']
-                ,isset($options['symlinks']) ? $options['symlinks'] : array()
-            );
-            $content = "/* Minify_CSS_UriRewriter::\$debugText\n\n" 
-                     . Minify_CSS_UriRewriter::$debugText . "*/\n"
-                     . $content;
-        }
-        
-        return $content;
-    }
-    
-    /**
-     * Is the parser within a C-style comment at the end of this line?
-     *
-     * @param string $line current line of code
-     * 
-     * @param bool $inComment was the parser in a comment at the
-     * beginning of the line?
-     *
-     * @return bool
-     */
-    private static function _eolInComment($line, $inComment)
-    {
-        while (strlen($line)) {
-            $search = $inComment
-                ? '*/'
-                : '/*';
-            $pos = strpos($line, $search);
-            if (false === $pos) {
-                return $inComment;
-            } else {
-                if ($pos == 0
-                    || ($inComment
-                        ? substr($line, $pos, 3)
-                        : substr($line, $pos-1, 3)) != '*/*')
-                {
-                        $inComment = ! $inComment;
-                }
-                $line = substr($line, $pos + 2);
-            }
-        }
-        return $inComment;
-    }
-    
-    /**
-     * Prepend a comment (or note) to the given line
-     *
-     * @param string $line current line of code
-     *
-     * @param string $note content of note/comment
-     * 
-     * @param bool $inComment was the parser in a comment at the
-     * beginning of the line?
-     *
-     * @param int $padTo minimum width of comment
-     * 
-     * @return string
-     */
-    private static function _addNote($line, $note, $inComment, $padTo)
-    {
-        return $inComment
-            ? '/* ' . str_pad($note, $padTo, ' ', STR_PAD_RIGHT) . ' *| ' . $line
-            : '/* ' . str_pad($note, $padTo, ' ', STR_PAD_RIGHT) . ' */ ' . $line;
-    }
-}
diff --git a/inc/contrib/minify/Minify/Logger.php b/inc/contrib/minify/Minify/Logger.php
deleted file mode 100755
index 8eb72f45..00000000
--- a/inc/contrib/minify/Minify/Logger.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Class Minify_Logger  
- * @package Minify
- */
-
-/** 
- * Message logging class
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- *
- * @todo lose this singleton! pass log object in Minify::serve and distribute to others
- */
-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;
-    }
-    
-    /**
-     * 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;
-}
diff --git a/inc/contrib/minify/Minify/Packer.php b/inc/contrib/minify/Minify/Packer.php
deleted file mode 100755
index 949c3eef..00000000
--- a/inc/contrib/minify/Minify/Packer.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Class Minify_Packer
- *
- * To use this class you must first download the PHP port of Packer
- * and place the file "class.JavaScriptPacker.php" in /lib (or your
- * include_path). 
- * @link http://joliclic.free.fr/php/javascript-packer/en/
- *
- * Be aware that, as long as HTTP encoding is used, scripts minified with JSMin
- * will provide better client-side performance, as they need not be unpacked in
- * client-side code.
- * 
- * @package Minify  
- */
-
-if (false === (@include 'class.JavaScriptPacker.php')) {
-    trigger_error(
-        'The script "class.JavaScriptPacker.php" is required. Please see: http:'
-        .'//code.google.com/p/minify/source/browse/trunk/min/lib/Minify/Packer.php'
-        ,E_USER_ERROR
-    );
-}
-
-/**
- * Minify Javascript using Dean Edward's Packer
- * 
- * @package Minify
- */
-class Minify_Packer {
-    public static function minify($code, $options = array())
-    {
-        // @todo: set encoding options based on $options :)
-        $packer = new JavascriptPacker($code, 'Normal', true, false);
-        return trim($packer->pack());
-    }
-}
diff --git a/inc/contrib/minify/Minify/Source.php b/inc/contrib/minify/Minify/Source.php
deleted file mode 100755
index 5a85d10d..00000000
--- a/inc/contrib/minify/Minify/Source.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/**
- * Class Minify_Source  
- * @package Minify
- */
-
-/** 
- * A content source to be minified by Minify. 
- * 
- * This allows per-source minification options and the mixing of files with
- * content from other sources.
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Source {
-
-    /**
-     * @var int time of last modification
-     */
-    public $lastModified = null;
-    
-    /**
-     * @var callback minifier function specifically for this source.
-     */
-    public $minifier = null;
-    
-    /**
-     * @var array minification options specific to this source.
-     */
-    public $minifyOptions = 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;
-    
-    /**
-     * 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 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;
-    }
-    
-    /**
-     * 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';
-    }
-    
-    protected $_content = null;
-    protected $_getContentFunc = null;
-    protected $_id = null;
-}
-
diff --git a/inc/contrib/minify/Minify/YUI/CssCompressor.java b/inc/contrib/minify/Minify/YUI/CssCompressor.java
deleted file mode 100755
index 3fb497a9..00000000
--- a/inc/contrib/minify/Minify/YUI/CssCompressor.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * YUI Compressor
- * http://developer.yahoo.com/yui/compressor/
- * Author: Julien Lecomte -  http://www.julienlecomte.net/
- * Author: Isaac Schlueter - http://foohack.com/
- * Author: Stoyan Stefanov - http://phpied.com/
- * Copyright (c) 2011 Yahoo! Inc.  All rights reserved.
- * The copyrights embodied in the content of this file are licensed
- * by Yahoo! Inc. under the BSD (revised) open source license.
- */
-package com.yahoo.platform.yui.compressor;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.ArrayList;
-
-public class CssCompressor {
-
-    private StringBuffer srcsb = new StringBuffer();
-
-    public CssCompressor(Reader in) throws IOException {
-        // Read the stream...
-        int c;
-        while ((c = in.read()) != -1) {
-            srcsb.append((char) c);
-        }
-    }
-
-    // Leave data urls alone to increase parse performance.
-    protected String extractDataUrls(String css, ArrayList preservedTokens) {
-
-    	int maxIndex = css.length() - 1;
-        int appendIndex = 0;
-
-    	StringBuffer sb = new StringBuffer();
-
-        Pattern p = Pattern.compile("url\\(\\s*([\"']?)data\\:");
-        Matcher m = p.matcher(css);
-        
-        /* 
-         * Since we need to account for non-base64 data urls, we need to handle 
-         * ' and ) being part of the data string. Hence switching to indexOf,
-         * to determine whether or not we have matching string terminators and
-         * handling sb appends directly, instead of using matcher.append* methods.
-         */
-
-        while (m.find()) {
-
-        	int startIndex = m.start() + 4;  	// "url(".length()
-    		String terminator = m.group(1);     // ', " or empty (not quoted)
-    		
-    		if (terminator.length() == 0) {
-    		 	terminator = ")";
-    		}
-
-    		boolean foundTerminator = false;
-
-    		int endIndex = m.end() - 1;
-    		while(foundTerminator == false && endIndex+1 <= maxIndex) {
-    			endIndex = css.indexOf(terminator, endIndex+1);
-
-    			if ((endIndex > 0) && (css.charAt(endIndex-1) != '\\')) {
-    				foundTerminator = true;
-    				if (!")".equals(terminator)) {
-    					endIndex = css.indexOf(")", endIndex); 
-    				}
-    			}
-    		}
-
-    		// Enough searching, start moving stuff over to the buffer
-			sb.append(css.substring(appendIndex, m.start()));
-
-    		if (foundTerminator) {
-    			String token = css.substring(startIndex, endIndex);
-    			token = token.replaceAll("\\s+", "");
-	    		preservedTokens.add(token);
-
-	    		String preserver = "url(___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___)";
-	    		sb.append(preserver);
-
-	    		appendIndex = endIndex + 1;
-    		} else {
-    			// No end terminator found, re-add the whole match. Should we throw/warn here?
-    			sb.append(css.substring(m.start(), m.end()));
-    			appendIndex = m.end();
-    		}
-        }
-
-        sb.append(css.substring(appendIndex));
-
-        return sb.toString();
-    }
-
-    public void compress(Writer out, int linebreakpos)
-            throws IOException {
-
-        Pattern p;
-        Matcher m;
-        String css = srcsb.toString();
-
-        int startIndex = 0;
-        int endIndex = 0;
-        int i = 0;
-        int max = 0;
-        ArrayList preservedTokens = new ArrayList(0);
-        ArrayList comments = new ArrayList(0);
-        String token;
-        int totallen = css.length();
-        String placeholder;
-
-        css = this.extractDataUrls(css, preservedTokens);
-
-        StringBuffer sb = new StringBuffer(css);
-
-        // collect all comment blocks...
-        while ((startIndex = sb.indexOf("/*", startIndex)) >= 0) {
-            endIndex = sb.indexOf("*/", startIndex + 2);
-            if (endIndex < 0) {
-                endIndex = totallen;
-            }
-
-            token = sb.substring(startIndex + 2, endIndex);
-            comments.add(token);
-            sb.replace(startIndex + 2, endIndex, "___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + (comments.size() - 1) + "___");
-            startIndex += 2;
-        }
-        css = sb.toString();
-
-        // preserve strings so their content doesn't get accidentally minified
-        sb = new StringBuffer();
-        p = Pattern.compile("(\"([^\\\\\"]|\\\\.|\\\\)*\")|(\'([^\\\\\']|\\\\.|\\\\)*\')");
-        m = p.matcher(css);
-        while (m.find()) {
-            token = m.group();
-            char quote = token.charAt(0);
-            token = token.substring(1, token.length() - 1);
-
-            // maybe the string contains a comment-like substring?
-            // one, maybe more? put'em back then
-            if (token.indexOf("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_") >= 0) {
-                for (i = 0, max = comments.size(); i < max; i += 1) {
-                    token = token.replace("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___", comments.get(i).toString());
-                }
-            }
-
-            // minify alpha opacity in filter strings
-            token = token.replaceAll("(?i)progid:DXImageTransform.Microsoft.Alpha\\(Opacity=", "alpha(opacity=");
-
-            preservedTokens.add(token);
-            String preserver = quote + "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___" + quote;
-            m.appendReplacement(sb, preserver);
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-
-
-        // strings are safe, now wrestle the comments
-        for (i = 0, max = comments.size(); i < max; i += 1) {
-
-            token = comments.get(i).toString();
-            placeholder = "___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___";
-
-            // ! in the first position of the comment means preserve
-            // so push to the preserved tokens while stripping the !
-            if (token.startsWith("!")) {
-                preservedTokens.add(token);
-                css = css.replace(placeholder,  "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___");
-                continue;
-            }
-
-            // \ in the last position looks like hack for Mac/IE5
-            // shorten that to /*\*/ and the next one to /**/
-            if (token.endsWith("\\")) {
-                preservedTokens.add("\\");
-                css = css.replace(placeholder,  "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___");
-                i = i + 1; // attn: advancing the loop
-                preservedTokens.add("");
-                css = css.replace("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___",  "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___");
-                continue;
-            }
-
-            // keep empty comments after child selectors (IE7 hack)
-            // e.g. html >/**/ body
-            if (token.length() == 0) {
-                startIndex = css.indexOf(placeholder);
-                if (startIndex > 2) {
-                    if (css.charAt(startIndex - 3) == '>') {
-                        preservedTokens.add("");
-                        css = css.replace(placeholder,  "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___");
-                    }
-                }
-            }
-
-            // in all other cases kill the comment
-            css = css.replace("/*" + placeholder + "*/", "");
-        }
-
-
-        // Normalize all whitespace strings to single spaces. Easier to work with that way.
-        css = css.replaceAll("\\s+", " ");
-
-        // Remove the spaces before the things that should not have spaces before them.
-        // But, be careful not to turn "p :link {...}" into "p:link{...}"
-        // Swap out any pseudo-class colons with the token, and then swap back.
-        sb = new StringBuffer();
-        p = Pattern.compile("(^|\\})(([^\\{:])+:)+([^\\{]*\\{)");
-        m = p.matcher(css);
-        while (m.find()) {
-            String s = m.group();
-            s = s.replaceAll(":", "___YUICSSMIN_PSEUDOCLASSCOLON___");
-            s = s.replaceAll( "\\\\", "\\\\\\\\" ).replaceAll( "\\$", "\\\\\\$" );
-            m.appendReplacement(sb, s);
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-        // Remove spaces before the things that should not have spaces before them.
-        css = css.replaceAll("\\s+([!{};:>+\\(\\)\\],])", "$1");
-        // bring back the colon
-        css = css.replaceAll("___YUICSSMIN_PSEUDOCLASSCOLON___", ":");
-
-        // retain space for special IE6 cases
-        css = css.replaceAll(":first\\-(line|letter)(\\{|,)", ":first-$1 $2");
-
-        // no space after the end of a preserved comment
-        css = css.replaceAll("\\*/ ", "*/");
-
-        // If there is a @charset, then only allow one, and push to the top of the file.
-        css = css.replaceAll("^(.*)(@charset \"[^\"]*\";)", "$2$1");
-        css = css.replaceAll("^(\\s*@charset [^;]+;\\s*)+", "$1");
-
-        // Put the space back in some cases, to support stuff like
-        // @media screen and (-webkit-min-device-pixel-ratio:0){
-        css = css.replaceAll("\\band\\(", "and (");
-
-        // Remove the spaces after the things that should not have spaces after them.
-        css = css.replaceAll("([!{}:;>+\\(\\[,])\\s+", "$1");
-
-        // remove unnecessary semicolons
-        css = css.replaceAll(";+}", "}");
-
-        // Replace 0(px,em,%) with 0.
-        css = css.replaceAll("([\\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)", "$1$2");
-
-        // Replace 0 0 0 0; with 0.
-        css = css.replaceAll(":0 0 0 0(;|})", ":0$1");
-        css = css.replaceAll(":0 0 0(;|})", ":0$1");
-        css = css.replaceAll(":0 0(;|})", ":0$1");
-
-
-        // Replace background-position:0; with background-position:0 0;
-        // same for transform-origin
-        sb = new StringBuffer();
-        p = Pattern.compile("(?i)(background-position|transform-origin|webkit-transform-origin|moz-transform-origin|o-transform-origin|ms-transform-origin):0(;|})");
-        m = p.matcher(css);
-        while (m.find()) {
-            m.appendReplacement(sb, m.group(1).toLowerCase() + ":0 0" + m.group(2));
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-
-        // Replace 0.6 to .6, but only when preceded by : or a white-space
-        css = css.replaceAll("(:|\\s)0+\\.(\\d+)", "$1.$2");
-
-        // Shorten colors from rgb(51,102,153) to #336699
-        // This makes it more likely that it'll get further compressed in the next step.
-        p = Pattern.compile("rgb\\s*\\(\\s*([0-9,\\s]+)\\s*\\)");
-        m = p.matcher(css);
-        sb = new StringBuffer();
-        while (m.find()) {
-            String[] rgbcolors = m.group(1).split(",");
-            StringBuffer hexcolor = new StringBuffer("#");
-            for (i = 0; i < rgbcolors.length; i++) {
-                int val = Integer.parseInt(rgbcolors[i]);
-                if (val < 16) {
-                    hexcolor.append("0");
-                }
-                hexcolor.append(Integer.toHexString(val));
-            }
-            m.appendReplacement(sb, hexcolor.toString());
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-
-        // Shorten colors from #AABBCC to #ABC. Note that we want to make sure
-        // the color is not preceded by either ", " or =. Indeed, the property
-        //     filter: chroma(color="#FFFFFF");
-        // would become
-        //     filter: chroma(color="#FFF");
-        // which makes the filter break in IE.
-        // We also want to make sure we're only compressing #AABBCC patterns inside { }, not id selectors ( #FAABAC {} )
-        // We also want to avoid compressing invalid values (e.g. #AABBCCD to #ABCD)
-        p = Pattern.compile("(\\=\\s*?[\"']?)?" + "#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])" + "(:?\\}|[^0-9a-fA-F{][^{]*?\\})");
-
-        m = p.matcher(css);
-        sb = new StringBuffer();
-        int index = 0;
-
-        while (m.find(index)) {
-
-        	sb.append(css.substring(index, m.start()));
-
-        	boolean isFilter = (m.group(1) != null && !"".equals(m.group(1))); 
-
-        	if (isFilter) {
-        		// Restore, as is. Compression will break filters
-        		sb.append(m.group(1) + "#" + m.group(2) + m.group(3) + m.group(4) + m.group(5) + m.group(6) + m.group(7));
-        	} else {
-        		if( m.group(2).equalsIgnoreCase(m.group(3)) &&
-                    m.group(4).equalsIgnoreCase(m.group(5)) &&
-                    m.group(6).equalsIgnoreCase(m.group(7))) {
-
-	        		// #AABBCC pattern
-	                sb.append("#" + (m.group(3) + m.group(5) + m.group(7)).toLowerCase());
-
-        		} else {
-
-        			// Non-compressible color, restore, but lower case.
-        			sb.append("#" + (m.group(2) + m.group(3) + m.group(4) + m.group(5) + m.group(6) + m.group(7)).toLowerCase());
-        		}
-            }
-
-        	index = m.end(7);
-        }
-
-        sb.append(css.substring(index));
-        css = sb.toString();
-
-        // border: none -> border:0
-        sb = new StringBuffer();
-        p = Pattern.compile("(?i)(border|border-top|border-right|border-bottom|border-right|outline|background):none(;|})");
-        m = p.matcher(css);
-        while (m.find()) {
-            m.appendReplacement(sb, m.group(1).toLowerCase() + ":0" + m.group(2));
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-
-        // shorter opacity IE filter
-        css = css.replaceAll("(?i)progid:DXImageTransform.Microsoft.Alpha\\(Opacity=", "alpha(opacity=");
-
-        // Remove empty rules.
-        css = css.replaceAll("[^\\}\\{/;]+\\{\\}", "");
-
-        // TODO: Should this be after we re-insert tokens. These could alter the break points. However then
-        // we'd need to make sure we don't break in the middle of a string etc.
-        if (linebreakpos >= 0) {
-            // Some source control tools don't like it when files containing lines longer
-            // than, say 8000 characters, are checked in. The linebreak option is used in
-            // that case to split long lines after a specific column.
-            i = 0;
-            int linestartpos = 0;
-            sb = new StringBuffer(css);
-            while (i < sb.length()) {
-                char c = sb.charAt(i++);
-                if (c == '}' && i - linestartpos > linebreakpos) {
-                    sb.insert(i, '\n');
-                    linestartpos = i;
-                }
-            }
-
-            css = sb.toString();
-        }
-
-        // Replace multiple semi-colons in a row by a single one
-        // See SF bug #1980989
-        css = css.replaceAll(";;+", ";");
-
-        // restore preserved comments and strings
-        for(i = 0, max = preservedTokens.size(); i < max; i++) {
-            css = css.replace("___YUICSSMIN_PRESERVED_TOKEN_" + i + "___", preservedTokens.get(i).toString());
-        }
-
-        // Trim the final string (for any leading or trailing white spaces)
-        css = css.trim();
-
-        // Write the output...
-        out.write(css);
-    }
-}
diff --git a/inc/contrib/minify/Minify/YUI/CssCompressor.php b/inc/contrib/minify/Minify/YUI/CssCompressor.php
deleted file mode 100755
index ae3443d4..00000000
--- a/inc/contrib/minify/Minify/YUI/CssCompressor.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Class Minify_YUI_CssCompressor 
- * @package Minify
- *
- * YUI Compressor
- * Author: Julien Lecomte -  http://www.julienlecomte.net/
- * Author: Isaac Schlueter - http://foohack.com/
- * Author: Stoyan Stefanov - http://phpied.com/
- * Author: Steve Clay      - http://www.mrclay.org/ (PHP port)
- * Copyright (c) 2009 Yahoo! Inc.  All rights reserved.
- * The copyrights embodied in the content of this file are licensed
- * by Yahoo! Inc. under the BSD (revised) open source license.
- */
-
-/**
- * Compress CSS (incomplete DO NOT USE)
- * 
- * @see https://github.com/yui/yuicompressor/blob/master/src/com/yahoo/platform/yui/compressor/CssCompressor.java
- *
- * @package Minify
- */
-class Minify_YUI_CssCompressor {
-
-    /**
-     * Minify a CSS string
-     *
-     * @param string $css
-     *
-     * @return string
-     */
-    public function compress($css, $linebreakpos = 0)
-    {
-        $css = str_replace("\r\n", "\n", $css);
-
-        /**
-         * @todo comment removal
-         * @todo re-port from newer Java version
-         */
-
-        // Normalize all whitespace strings to single spaces. Easier to work with that way.
-        $css = preg_replace('@\s+@', ' ', $css);
-
-        // Make a pseudo class for the Box Model Hack
-        $css = preg_replace("@\"\\\\\"}\\\\\"\"@", "___PSEUDOCLASSBMH___", $css);
-
-        // Remove the spaces before the things that should not have spaces before them.
-        // But, be careful not to turn "p :link {...}" into "p:link{...}"
-        // Swap out any pseudo-class colons with the token, and then swap back.
-        $css = preg_replace_callback("@(^|\\})(([^\\{:])+:)+([^\\{]*\\{)@", array($this, '_removeSpacesCB'), $css);
-
-        $css = preg_replace("@\\s+([!{};:>+\\(\\)\\],])@", "$1", $css);
-        $css = str_replace("___PSEUDOCLASSCOLON___", ":", $css);
-
-        // Remove the spaces after the things that should not have spaces after them.
-        $css = preg_replace("@([!{}:;>+\\(\\[,])\\s+@", "$1", $css);
-
-        // Add the semicolon where it's missing.
-        $css = preg_replace("@([^;\\}])}@", "$1;}", $css);
-
-        // Replace 0(px,em,%) with 0.
-        $css = preg_replace("@([\\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)@", "$1$2", $css);
-
-        // Replace 0 0 0 0; with 0.
-        $css = str_replace(":0 0 0 0;", ":0;", $css);
-        $css = str_replace(":0 0 0;", ":0;", $css);
-        $css = str_replace(":0 0;", ":0;", $css);
-
-        // Replace background-position:0; with background-position:0 0;
-        $css = str_replace("background-position:0;", "background-position:0 0;", $css);
-
-        // Replace 0.6 to .6, but only when preceded by : or a white-space
-        $css = preg_replace("@(:|\\s)0+\\.(\\d+)@", "$1.$2", $css);
-
-        // Shorten colors from rgb(51,102,153) to #336699
-        // This makes it more likely that it'll get further compressed in the next step.
-        $css = preg_replace_callback("@rgb\\s*\\(\\s*([0-9,\\s]+)\\s*\\)@", array($this, '_shortenRgbCB'), $css);
-
-        // Shorten colors from #AABBCC to #ABC. Note that we want to make sure
-        // the color is not preceded by either ", " or =. Indeed, the property
-        //     filter: chroma(color="#FFFFFF");
-        // would become
-        //     filter: chroma(color="#FFF");
-        // which makes the filter break in IE.
-        $css = preg_replace_callback("@([^\"'=\\s])(\\s*)#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])@", array($this, '_shortenHexCB'), $css);
-
-        // Remove empty rules.
-        $css = preg_replace("@[^\\}]+\\{;\\}@", "", $css);
-
-        $linebreakpos = isset($this->_options['linebreakpos'])
-            ? $this->_options['linebreakpos']
-            : 0;
-
-        if ($linebreakpos > 0) {
-            // Some source control tools don't like it when files containing lines longer
-            // than, say 8000 characters, are checked in. The linebreak option is used in
-            // that case to split long lines after a specific column.
-            $i = 0;
-            $linestartpos = 0;
-            $sb = $css;
-
-            // make sure strlen returns byte count
-            $mbIntEnc = null;
-            if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
-                $mbIntEnc = mb_internal_encoding();
-                mb_internal_encoding('8bit');
-            }
-            $sbLength = strlen($css);
-            while ($i < $sbLength) {
-                $c = $sb[$i++];
-                if ($c === '}' && $i - $linestartpos > $linebreakpos) {
-                    $sb = substr_replace($sb, "\n", $i, 0);
-                    $sbLength++;
-                    $linestartpos = $i;
-                }
-            }
-            $css = $sb;
-
-            // undo potential mb_encoding change
-            if ($mbIntEnc !== null) {
-                mb_internal_encoding($mbIntEnc);
-            }
-        }
-
-        // Replace the pseudo class for the Box Model Hack
-        $css = str_replace("___PSEUDOCLASSBMH___", "\"\\\\\"}\\\\\"\"", $css);
-
-        // Replace multiple semi-colons in a row by a single one
-        // See SF bug #1980989
-        $css = preg_replace("@;;+@", ";", $css);
-
-        // prevent triggering IE6 bug: http://www.crankygeek.com/ie6pebug/
-        $css = preg_replace('/:first-l(etter|ine)\\{/', ':first-l$1 {', $css);
-
-        // Trim the final string (for any leading or trailing white spaces)
-        $css = trim($css);
-
-        return $css;
-    }
-
-    protected function _removeSpacesCB($m)
-    {
-        return str_replace(':', '___PSEUDOCLASSCOLON___', $m[0]);
-    }
-
-    protected function _shortenRgbCB($m)
-    {
-        $rgbcolors = explode(',', $m[1]);
-        $hexcolor = '#';
-        for ($i = 0; $i < count($rgbcolors); $i++) {
-            $val = round($rgbcolors[$i]);
-            if ($val < 16) {
-                $hexcolor .= '0';
-            }
-            $hexcolor .= dechex($val);
-        }
-        return $hexcolor;
-    }
-
-    protected function _shortenHexCB($m)
-    {
-        // Test for AABBCC pattern
-        if ((strtolower($m[3])===strtolower($m[4])) &&
-                (strtolower($m[5])===strtolower($m[6])) &&
-                (strtolower($m[7])===strtolower($m[8]))) {
-            return $m[1] . $m[2] . "#" . $m[3] . $m[5] . $m[7];
-        } else {
-            return $m[0];
-        }
-    }
-}
\ No newline at end of file
diff --git a/inc/contrib/minify/Minify/YUICompressor.php b/inc/contrib/minify/Minify/YUICompressor.php
deleted file mode 100755
index c5bd8a1e..00000000
--- a/inc/contrib/minify/Minify/YUICompressor.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Class Minify_YUICompressor 
- * @package Minify
- */
-
-/**
- * Compress Javascript/CSS using the YUI Compressor
- * 
- * You must set $jarFile and $tempDir before calling the minify functions.
- * Also, depending on your shell's environment, you may need to specify
- * the full path to java in $javaExecutable or use putenv() to setup the
- * Java environment.
- * 
- * <code>
- * Minify_YUICompressor::$jarFile = '/path/to/yuicompressor-2.3.5.jar';
- * Minify_YUICompressor::$tempDir = '/tmp';
- * $code = Minify_YUICompressor::minifyJs(
- *   $code
- *   ,array('nomunge' => true, 'line-break' => 1000)
- * );
- * </code>
- * 
- * @todo unit tests, $options docs
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_YUICompressor {
-
-    /**
-     * Filepath of the YUI Compressor jar file. This must be set before
-     * calling minifyJs() or minifyCss().
-     *
-     * @var string
-     */
-    public static $jarFile = null;
-    
-    /**
-     * Writable temp directory. This must be set before calling minifyJs()
-     * or minifyCss().
-     *
-     * @var string
-     */
-    public static $tempDir = null;
-    
-    /**
-     * Filepath of "java" executable (may be needed if not in shell's PATH)
-     *
-     * @var string
-     */
-    public static $javaExecutable = 'java';
-    
-    /**
-     * Minify a Javascript string
-     * 
-     * @param string $js
-     * 
-     * @param array $options (verbose is ignored)
-     * 
-     * @see http://www.julienlecomte.net/yuicompressor/README
-     * 
-     * @return string 
-     */
-    public static function minifyJs($js, $options = array())
-    {
-        return self::_minify('js', $js, $options);
-    }
-    
-    /**
-     * Minify a CSS string
-     * 
-     * @param string $css
-     * 
-     * @param array $options (verbose is ignored)
-     * 
-     * @see http://www.julienlecomte.net/yuicompressor/README
-     * 
-     * @return string 
-     */
-    public static function minifyCss($css, $options = array())
-    {
-        return self::_minify('css', $css, $options);
-    }
-    
-    private static function _minify($type, $content, $options)
-    {
-        self::_prepare();
-        if (! ($tmpFile = tempnam(self::$tempDir, 'yuic_'))) {
-            throw new Exception('Minify_YUICompressor : could not create temp file.');
-        }
-        file_put_contents($tmpFile, $content);
-        exec(self::_getCmd($options, $type, $tmpFile), $output, $result_code);
-        unlink($tmpFile);
-        if ($result_code != 0) {
-            throw new Exception('Minify_YUICompressor : YUI compressor execution failed.');
-        }
-        return implode("\n", $output);
-    }
-    
-    private static function _getCmd($userOptions, $type, $tmpFile)
-    {
-        $o = array_merge(
-            array(
-                'charset' => ''
-                ,'line-break' => 5000
-                ,'type' => $type
-                ,'nomunge' => false
-                ,'preserve-semi' => false
-                ,'disable-optimizations' => false
-            )
-            ,$userOptions
-        );
-        $cmd = self::$javaExecutable . ' -jar ' . escapeshellarg(self::$jarFile)
-             . " --type {$type}"
-             . (preg_match('/^[\\da-zA-Z0-9\\-]+$/', $o['charset'])
-                ? " --charset {$o['charset']}" 
-                : '')
-             . (is_numeric($o['line-break']) && $o['line-break'] >= 0
-                ? ' --line-break ' . (int)$o['line-break']
-                : '');
-        if ($type === 'js') {
-            foreach (array('nomunge', 'preserve-semi', 'disable-optimizations') as $opt) {
-                $cmd .= $o[$opt] 
-                    ? " --{$opt}"
-                    : '';
-            }
-        }
-        return $cmd . ' ' . escapeshellarg($tmpFile);
-    }
-    
-    private static function _prepare()
-    {
-        if (! is_file(self::$jarFile)) {
-            throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not a valid file.');
-        }
-        if (! is_executable(self::$jarFile)) {
-            throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not executable.');
-        }
-        if (! is_dir(self::$tempDir)) {
-            throw new Exception('Minify_YUICompressor : $tempDir('.self::$tempDir.') is not a valid direcotry.');
-        }
-        if (! is_writable(self::$tempDir)) {
-            throw new Exception('Minify_YUICompressor : $tempDir('.self::$tempDir.') is not writable.');
-        }
-    }
-}
-
diff --git a/inc/contrib/minify/MrClay/Cli.php b/inc/contrib/minify/MrClay/Cli.php
deleted file mode 100755
index ac201582..00000000
--- a/inc/contrib/minify/MrClay/Cli.php
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php 
-
-namespace MrClay;
-
-/**
- * Forms a front controller for a console app, handling and validating arguments (options)
- *
- * Instantiate, add arguments, then call validate(). Afterwards, the user's valid arguments
- * and their values will be available in $cli->values.
- *
- * You may also specify that some arguments be used to provide input/output. By communicating
- * solely through the file pointers provided by openInput()/openOutput(), you can make your
- * app more flexible to end users.
- *
- * @author Steve Clay <steve@mrclay.org>
- * @license http://www.opensource.org/licenses/mit-license.php  MIT License
- */
-class Cli {
-    
-    /**
-     * @var array validation errors
-     */
-    public $errors = array();
-    
-    /**
-     * @var array option values available after validation.
-     * 
-     * E.g. array(
-     *      'a' => false              // option was missing
-     *     ,'b' => true               // option was present
-     *     ,'c' => "Hello"            // option had value
-     *     ,'f' => "/home/user/file"  // file path from root
-     *     ,'f.raw' => "~/file"       // file path as given to option
-     * )
-     */
-    public $values = array();
-
-    /**
-     * @var array
-     */
-    public $moreArgs = array();
-
-    /**
-     * @var array
-     */
-    public $debug = array();
-
-    /**
-     * @var bool The user wants help info
-     */
-    public $isHelpRequest = false;
-
-    /**
-     * @var array of Cli\Arg
-     */
-    protected $_args = array();
-
-    /**
-     * @var resource
-     */
-    protected $_stdin = null;
-
-    /**
-     * @var resource
-     */
-    protected $_stdout = null;
-    
-    /**
-     * @param bool $exitIfNoStdin (default true) Exit() if STDIN is not defined
-     */
-    public function __construct($exitIfNoStdin = true)
-    {
-        if ($exitIfNoStdin && ! defined('STDIN')) {
-            exit('This script is for command-line use only.');
-        }
-        if (isset($GLOBALS['argv'][1])
-             && ($GLOBALS['argv'][1] === '-?' || $GLOBALS['argv'][1] === '--help')) {
-            $this->isHelpRequest = true;
-        }
-    }
-
-    /**
-     * @param Cli\Arg|string $letter
-     * @return Cli\Arg
-     */
-    public function addOptionalArg($letter)
-    {
-        return $this->addArgument($letter, false);
-    }
-
-    /**
-     * @param Cli\Arg|string $letter
-     * @return Cli\Arg
-     */
-    public function addRequiredArg($letter)
-    {
-        return $this->addArgument($letter, true);
-    }
-
-    /**
-     * @param string $letter
-     * @param bool $required
-     * @param Cli\Arg|null $arg
-     * @return Cli\Arg
-     * @throws \InvalidArgumentException
-     */
-    public function addArgument($letter, $required, Cli\Arg $arg = null)
-    {
-        if (! preg_match('/^[a-zA-Z]$/', $letter)) {
-            throw new \InvalidArgumentException('$letter must be in [a-zA-z]');
-        }
-        if (! $arg) {
-            $arg = new Cli\Arg($required);
-        }
-        $this->_args[$letter] = $arg;
-        return $arg;
-    }
-
-    /**
-     * @param string $letter
-     * @return Cli\Arg|null
-     */
-    public function getArgument($letter)
-    {
-        return isset($this->_args[$letter]) ? $this->_args[$letter] : null;
-    }
-
-    /*
-     * Read and validate options
-     * 
-     * @return bool true if all options are valid
-     */
-    public function validate()
-    {
-        $options = '';
-        $this->errors = array();
-        $this->values = array();
-        $this->_stdin = null;
-        
-        if ($this->isHelpRequest) {
-            return false;
-        }
-        
-        $lettersUsed = '';
-        foreach ($this->_args as $letter => $arg) {
-            /* @var Cli\Arg $arg  */
-            $options .= $letter;
-            $lettersUsed .= $letter;
-            
-            if ($arg->mayHaveValue || $arg->mustHaveValue) {
-                $options .= ($arg->mustHaveValue ? ':' : '::');
-            }
-        }
-
-        $this->debug['argv'] = $GLOBALS['argv'];
-        $argvCopy = array_slice($GLOBALS['argv'], 1);
-        $o = getopt($options);
-        $this->debug['getopt_options'] = $options;
-        $this->debug['getopt_return'] = $o;
-
-        foreach ($this->_args as $letter => $arg) {
-            /* @var Cli\Arg $arg  */
-            $this->values[$letter] = false;
-            if (isset($o[$letter])) {
-                if (is_bool($o[$letter])) {
-
-                    // remove from argv copy
-                    $k = array_search("-$letter", $argvCopy);
-                    if ($k !== false) {
-                        array_splice($argvCopy, $k, 1);
-                    }
-
-                    if ($arg->mustHaveValue) {
-                        $this->addError($letter, "Missing value");
-                    } else {
-                        $this->values[$letter] = true;
-                    }
-                } else {
-                    // string
-                    $this->values[$letter] = $o[$letter];
-                    $v =& $this->values[$letter];
-
-                    // remove from argv copy
-                    // first look for -ovalue or -o=value
-                    $pattern = "/^-{$letter}=?" . preg_quote($v, '/') . "$/";
-                    $foundInArgv = false;
-                    foreach ($argvCopy as $k => $argV) {
-                        if (preg_match($pattern, $argV)) {
-                            array_splice($argvCopy, $k, 1);
-                            $foundInArgv = true;
-                            break;
-                        }
-                    }
-                    if (! $foundInArgv) {
-                        // space separated
-                        $k = array_search("-$letter", $argvCopy);
-                        if ($k !== false) {
-                            array_splice($argvCopy, $k, 2);
-                        }
-                    }
-                    
-                    // check that value isn't really another option
-                    if (strlen($lettersUsed) > 1) {
-                        $pattern = "/^-[" . str_replace($letter, '', $lettersUsed) . "]/i";
-                        if (preg_match($pattern, $v)) {
-                            $this->addError($letter, "Value was read as another option: %s", $v);
-                            return false;
-                        }    
-                    }
-                    if ($arg->assertFile || $arg->assertDir) {
-                        if ($v[0] !== '/' && $v[0] !== '~') {
-                            $this->values["$letter.raw"] = $v;
-                            $v = getcwd() . "/$v";
-                        }
-                    }
-                    if ($arg->assertFile) {
-                        if ($arg->useAsInfile) {
-                            $this->_stdin = $v;
-                        } elseif ($arg->useAsOutfile) {
-                            $this->_stdout = $v;
-                        }
-                        if ($arg->assertReadable && ! is_readable($v)) {
-                            $this->addError($letter, "File not readable: %s", $v);
-                            continue;
-                        }
-                        if ($arg->assertWritable) {
-                            if (is_file($v)) {
-                                if (! is_writable($v)) {
-                                    $this->addError($letter, "File not writable: %s", $v);
-                                }
-                            } else {
-                                if (! is_writable(dirname($v))) {
-                                    $this->addError($letter, "Directory not writable: %s", dirname($v));
-                                }
-                            }
-                        }
-                    } elseif ($arg->assertDir && $arg->assertWritable && ! is_writable($v)) {
-                        $this->addError($letter, "Directory not readable: %s", $v);
-                    }
-                }
-            } else {
-                if ($arg->isRequired()) {
-                    $this->addError($letter, "Missing");
-                }
-            }
-        }
-        $this->moreArgs = $argvCopy;
-        reset($this->moreArgs);
-        return empty($this->errors);
-    }
-
-    /**
-     * Get the full paths of file(s) passed in as unspecified arguments
-     *
-     * @return array
-     */
-    public function getPathArgs()
-    {
-        $r = $this->moreArgs;
-        foreach ($r as $k => $v) {
-            if ($v[0] !== '/' && $v[0] !== '~') {
-                $v = getcwd() . "/$v";
-                $v = str_replace('/./', '/', $v);
-                do {
-                    $v = preg_replace('@/[^/]+/\\.\\./@', '/', $v, 1, $changed);
-                } while ($changed);
-                $r[$k] = $v;
-            }
-        }
-        return $r;
-    }
-    
-    /**
-     * Get a short list of errors with options
-     * 
-     * @return string
-     */
-    public function getErrorReport()
-    {
-        if (empty($this->errors)) {
-            return '';
-        }
-        $r = "Some arguments did not pass validation:\n";
-        foreach ($this->errors as $letter => $arr) {
-            $r .= "  $letter : " . implode(', ', $arr) . "\n";
-        }
-        $r .= "\n";
-        return $r;
-    }
-
-    /**
-     * @return string
-     */
-    public function getArgumentsListing()
-    {
-        $r = "\n";
-        foreach ($this->_args as $letter => $arg) {
-            /* @var Cli\Arg $arg  */
-            $desc = $arg->getDescription();
-            $flag = " -$letter ";
-            if ($arg->mayHaveValue) {
-                $flag .= "[VAL]";
-            } elseif ($arg->mustHaveValue) {
-                $flag .= "VAL";
-            }
-            if ($arg->assertFile) {
-                $flag = str_replace('VAL', 'FILE', $flag);
-            } elseif ($arg->assertDir) {
-                $flag = str_replace('VAL', 'DIR', $flag);
-            }
-            if ($arg->isRequired()) {
-                $desc = "(required) $desc";
-            }
-            $flag = str_pad($flag, 12, " ", STR_PAD_RIGHT);
-            $desc = wordwrap($desc, 70);
-            $r .= $flag . str_replace("\n", "\n            ", $desc) . "\n\n";
-        }
-        return $r;
-    }
-    
-    /**
-     * Get resource of open input stream. May be STDIN or a file pointer
-     * to the file specified by an option with 'STDIN'.
-     *
-     * @return resource
-     */
-    public function openInput()
-    {
-        if (null === $this->_stdin) {
-            return STDIN;
-        } else {
-            $this->_stdin = fopen($this->_stdin, 'rb');
-            return $this->_stdin;
-        }
-    }
-    
-    public function closeInput()
-    {
-        if (null !== $this->_stdin) {
-            fclose($this->_stdin);
-        }
-    }
-    
-    /**
-     * Get resource of open output stream. May be STDOUT or a file pointer
-     * to the file specified by an option with 'STDOUT'. The file will be
-     * truncated to 0 bytes on opening.
-     *
-     * @return resource
-     */
-    public function openOutput()
-    {
-        if (null === $this->_stdout) {
-            return STDOUT;
-        } else {
-            $this->_stdout = fopen($this->_stdout, 'wb');
-            return $this->_stdout;
-        }
-    }
-    
-    public function closeOutput()
-    {
-        if (null !== $this->_stdout) {
-            fclose($this->_stdout);
-        }
-    }
-
-    /**
-     * @param string $letter
-     * @param string $msg
-     * @param string $value
-     */
-    protected function addError($letter, $msg, $value = null)
-    {
-        if ($value !== null) {
-            $value = var_export($value, 1);
-        }
-        $this->errors[$letter][] = sprintf($msg, $value);
-    }
-}
-
diff --git a/inc/contrib/minify/MrClay/Cli/Arg.php b/inc/contrib/minify/MrClay/Cli/Arg.php
deleted file mode 100755
index 81146a7f..00000000
--- a/inc/contrib/minify/MrClay/Cli/Arg.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-namespace MrClay\Cli;
-
-/**
- * An argument for a CLI app. This specifies the argument, what values it expects and
- * how it's treated during validation.
- *
- * By default, the argument will be assumed to be an optional letter flag with no value following.
- *
- * If the argument may receive a value, call mayHaveValue(). If there's whitespace after the
- * flag, the value will be returned as true instead of the string.
- *
- * If the argument MUST be accompanied by a value, call mustHaveValue(). In this case, whitespace
- * is permitted between the flag and its value.
- *
- * Use assertFile() or assertDir() to indicate that the argument must return a string value
- * specifying a file or directory. During validation, the value will be resolved to a
- * full file/dir path (not necessarily existing!) and the original value will be accessible
- * via a "*.raw" key. E.g. $cli->values['f.raw']
- *
- * Use assertReadable()/assertWritable() to cause the validator to test the file/dir for
- * read/write permissions respectively.
- *
- * @method \MrClay\Cli\Arg mayHaveValue() Assert that the argument, if present, may receive a string value
- * @method \MrClay\Cli\Arg mustHaveValue() Assert that the argument, if present, must receive a string value
- * @method \MrClay\Cli\Arg assertFile() Assert that the argument's value must specify a file
- * @method \MrClay\Cli\Arg assertDir() Assert that the argument's value must specify a directory
- * @method \MrClay\Cli\Arg assertReadable() Assert that the specified file/dir must be readable
- * @method \MrClay\Cli\Arg assertWritable() Assert that the specified file/dir must be writable
- *
- * @property-read bool mayHaveValue
- * @property-read bool mustHaveValue
- * @property-read bool assertFile
- * @property-read bool assertDir
- * @property-read bool assertReadable
- * @property-read bool assertWritable
- * @property-read bool useAsInfile
- * @property-read bool useAsOutfile
- *
- * @author Steve Clay <steve@mrclay.org>
- * @license http://www.opensource.org/licenses/mit-license.php  MIT License
- */
-class Arg {
-    /**
-     * @return array
-     */
-    public function getDefaultSpec()
-    {
-        return array(
-            'mayHaveValue' => false,
-            'mustHaveValue' => false,
-            'assertFile' => false,
-            'assertDir' => false,
-            'assertReadable' => false,
-            'assertWritable' => false,
-            'useAsInfile' => false,
-            'useAsOutfile' => false,
-        );
-    }
-
-    /**
-     * @var array
-     */
-    protected $spec = array();
-
-    /**
-     * @var bool
-     */
-    protected $required = false;
-
-    /**
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * @param bool $isRequired
-     */
-    public function __construct($isRequired = false)
-    {
-        $this->spec = $this->getDefaultSpec();
-        $this->required = (bool) $isRequired;
-        if ($isRequired) {
-            $this->spec['mustHaveValue'] = true;
-        }
-    }
-
-    /**
-     * Assert that the argument's value points to a writable file. When
-     * Cli::openOutput() is called, a write pointer to this file will
-     * be provided.
-     * @return Arg
-     */
-    public function useAsOutfile()
-    {
-        $this->spec['useAsOutfile'] = true;
-        return $this->assertFile()->assertWritable();
-    }
-
-    /**
-     * Assert that the argument's value points to a readable file. When
-     * Cli::openInput() is called, a read pointer to this file will
-     * be provided.
-     * @return Arg
-     */
-    public function useAsInfile()
-    {
-        $this->spec['useAsInfile'] = true;
-        return $this->assertFile()->assertReadable();
-    }
-
-    /**
-     * @return array
-     */
-    public function getSpec()
-    {
-        return $this->spec;
-    }
-
-    /**
-     * @param string $desc
-     * @return Arg
-     */
-    public function setDescription($desc)
-    {
-        $this->description = $desc;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isRequired()
-    {
-        return $this->required;
-    }
-
-    /**
-     * Note: magic methods declared in class PHPDOC
-     *
-     * @param string $name
-     * @param array $args
-     * @return Arg
-     * @throws \BadMethodCallException
-     */
-    public function __call($name, array $args = array())
-    {
-        if (array_key_exists($name, $this->spec)) {
-            $this->spec[$name] = true;
-            if ($name === 'assertFile' || $name === 'assertDir') {
-                $this->spec['mustHaveValue'] = true;
-            }
-        } else {
-            throw new \BadMethodCallException('Method does not exist');
-        }
-        return $this;
-    }
-
-    /**
-     * Note: magic properties declared in class PHPDOC
-     *
-     * @param string $name
-     * @return bool|null
-     */
-    public function __get($name)
-    {
-        if (array_key_exists($name, $this->spec)) {
-            return $this->spec[$name];
-        }
-        return null;
-    }
-}
diff --git a/inc/contrib/recaptcha/LICENSE b/inc/contrib/recaptcha/LICENSE
deleted file mode 100644
index b612f71f..00000000
--- a/inc/contrib/recaptcha/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
-AUTHORS:
-  Mike Crawford
-  Ben Maurer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/inc/contrib/recaptcha/recaptchalib.php b/inc/contrib/recaptcha/recaptchalib.php
deleted file mode 100644
index 32c4f4d7..00000000
--- a/inc/contrib/recaptcha/recaptchalib.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/*
- * This is a PHP library that handles calling reCAPTCHA.
- *    - Documentation and latest version
- *          http://recaptcha.net/plugins/php/
- *    - Get a reCAPTCHA API Key
- *          https://www.google.com/recaptcha/admin/create
- *    - Discussion group
- *          http://groups.google.com/group/recaptcha
- *
- * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
- * AUTHORS:
- *   Mike Crawford
- *   Ben Maurer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * The reCAPTCHA server URL's
- */
-define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
-define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
-define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
-
-/**
- * Encodes the given data into a query string format
- * @param $data - array of string elements to be encoded
- * @return string - encoded request
- */
-function _recaptcha_qsencode ($data) {
-        $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
-
-        // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
-        return $req;
-}
-
-
-
-/**
- * Submits an HTTP POST to a reCAPTCHA server
- * @param string $host
- * @param string $path
- * @param array $data
- * @param int port
- * @return array response
- */
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
-
-        $req = _recaptcha_qsencode ($data);
-
-        $http_request  = "POST $path HTTP/1.0\r\n";
-        $http_request .= "Host: $host\r\n";
-        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
-        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $req;
-
-        $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-                die ('Could not open socket');
-        }
-
-        fwrite($fs, $http_request);
-
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
-        fclose($fs);
-        $response = explode("\r\n\r\n", $response, 2);
-
-        return $response;
-}
-
-
-
-/**
- * Gets the challenge HTML (javascript and non-javascript version).
- * This is called from the browser, and the resulting reCAPTCHA HTML widget
- * is embedded within the HTML form it was called from.
- * @param string $pubkey A public key for reCAPTCHA
- * @param string $error The error given by reCAPTCHA (optional, default is null)
- * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
- * @return string - The HTML to be embedded in the user's form.
- */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
-{
-	if ($pubkey == null || $pubkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
-	
-	if ($use_ssl) {
-                $server = RECAPTCHA_API_SECURE_SERVER;
-        } else {
-                $server = RECAPTCHA_API_SERVER;
-        }
-
-        $errorpart = "";
-        if ($error) {
-           $errorpart = "&amp;error=" . $error;
-        }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
-
-	<noscript>
-  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-	</noscript>';
-}
-
-
-
-
-/**
- * A ReCaptchaResponse is returned from recaptcha_check_answer()
- */
-class ReCaptchaResponse {
-        var $is_valid;
-        var $error;
-}
-
-
-/**
-  * Calls an HTTP POST function to verify if the user's guess was correct
-  * @param string $privkey
-  * @param string $remoteip
-  * @param string $challenge
-  * @param string $response
-  * @param array $extra_params an array of extra variables to post to the server
-  * @return ReCaptchaResponse
-  */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
-{
-	if ($privkey == null || $privkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
-
-	if ($remoteip == null || $remoteip == '') {
-		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
-	}
-
-	
-	
-        //discard spam submissions
-        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
-                $recaptcha_response = new ReCaptchaResponse();
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = 'incorrect-captcha-sol';
-                return $recaptcha_response;
-        }
-
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
-                                                 'privatekey' => $privkey,
-                                                 'remoteip' => $remoteip,
-                                                 'challenge' => $challenge,
-                                                 'response' => $response
-                                                 ) + $extra_params
-                                          );
-
-        $answers = explode ("\n", $response [1]);
-        $recaptcha_response = new ReCaptchaResponse();
-
-        if (trim ($answers [0]) == 'true') {
-                $recaptcha_response->is_valid = true;
-        }
-        else {
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = $answers [1];
-        }
-        return $recaptcha_response;
-
-}
-
-/**
- * gets a URL where the user can sign up for reCAPTCHA. If your application
- * has a configuration page where you enter a key, you should provide a link
- * using this function.
- * @param string $domain The domain where the page is hosted
- * @param string $appname The name of your application
- */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
-}
-
-function _recaptcha_aes_pad($val) {
-	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
-}
-
-/* Mailhide related code */
-
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
-		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
-	}
-	$mode=MCRYPT_MODE_CBC;   
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
-	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-}
-
-
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
-}
-
-/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-function recaptcha_mailhide_url($pubkey, $privkey, $email) {
-	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
-	}
-	
-
-	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
-	
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
-}
-
-/**
- * gets the parts of the email to expose to the user.
- * eg, given johndoe@example,com return ["john", "example.com"].
- * the email is then displayed as john...@example.com
- */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
-
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
-	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
-	}
-	return $arr;
-}
-
-/**
- * Gets html to display an email address given a public an private key.
- * to get a key, go to:
- *
- * http://www.google.com/recaptcha/mailhide/apikey
- */
-function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
-	
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
-
-}
-
-
-?>