HTTP digest authentication can be used with the URI router.
- * HTTP digest is much more recommended over the use of HTTP Basic auth which doesn't provide any encryption.
- * If you are running PHP on Apache in CGI/FastCGI mode, you would need to
- * add the following line to your .htaccess for digest auth to work correctly.
This class is tested under Apache 2.2 and Cherokee web server. It should work in both mod_php and cgi mode.
- *
- * @author Leng Sheng Hong
- * @version $Id: DooDigestAuth.php 1000 2009-07-7 18:27:22
- * @package doo.auth
- * @since 1.0
- */
-class DooDigestAuth{
-
- /**
- * Authenticate against a list of username and passwords.
- *
- *
HTTP Digest Authentication doesn't work with PHP in CGI mode,
- * you have to add this into your .htaccess RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
- *
- * @param string $realm Name of the authentication session
- * @param array $users An assoc array of username and password: array('uname1'=>'pwd1', 'uname2'=>'pwd2')
- * @param string $fail_msg Message to be displayed if the User cancel the login
- * @param string $fail_url URL to be redirect if the User cancel the login
- * @return string The username if login success.
- */
- public static function http_auth($realm, $users, $fail_msg=NULL, $fail_url=NULL){
- $realm = "Restricted area - $realm";
-
- //user => password
- //$users = array('admin' => '1234', 'guest' => 'guest');
- if(!empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && strpos($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 'Digest')===0){
- $_SERVER['PHP_AUTH_DIGEST'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
- }
-
- if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
- header('WWW-Authenticate: Digest realm="'.$realm.
- '",qop="auth",nonce="'.uniqid().'",opaque="'.md5($realm).'"');
- header('HTTP/1.1 401 Unauthorized');
- if($fail_msg!=NULL)
- die($fail_msg);
- if($fail_url!=NULL)
- die("");
- exit;
- }
-
- // analyze the PHP_AUTH_DIGEST variable
- if (!($data = self::http_digest_parse($_SERVER['PHP_AUTH_DIGEST'])) || !isset($users[$data['username']])){
- header('WWW-Authenticate: Digest realm="'.$realm.
- '",qop="auth",nonce="'.uniqid().'",opaque="'.md5($realm).'"');
- header('HTTP/1.1 401 Unauthorized');
- if($fail_msg!=NULL)
- die($fail_msg);
- if($fail_url!=NULL)
- die("");
- exit;
- }
-
- // generate the valid response
- $A1 = md5($data['username'] . ':' . $realm . ':' . $users[$data['username']]);
- $A2 = md5($_SERVER['REQUEST_METHOD'].':'.$data['uri']);
- $valid_response = md5($A1.':'.$data['nonce'].':'.$data['nc'].':'.$data['cnonce'].':'.$data['qop'].':'.$A2);
-
- if ($data['response'] != $valid_response){
- header('HTTP/1.1 401 Unauthorized');
- header('WWW-Authenticate: Digest realm="'.$realm.
- '",qop="auth",nonce="'.uniqid().'",opaque="'.md5($realm).'"');
- if($fail_msg!=NULL)
- die($fail_msg);
- if($fail_url!=NULL)
- die("");
- exit;
- }
-
- // ok, valid username & password
- return $data['username'];
- }
-
- /**
- * Method to parse the http auth header, works with IE.
- *
- * Internet Explorer returns a qop="xxxxxxxxxxx" in the header instead of qop=xxxxxxxxxxx as most browsers do.
- *
- * @param string $txt header string to parse
- * @return array An assoc array of the digest auth session
- */
- private static function http_digest_parse($txt)
- {
- $res = preg_match("/username=\"([^\"]+)\"/i", $txt, $match);
- $data['username'] = (isset($match[1]))?$match[1]:null;
- $res = preg_match('/nonce=\"([^\"]+)\"/i', $txt, $match);
- $data['nonce'] = $match[1];
- $res = preg_match('/nc=([0-9]+)/i', $txt, $match);
- $data['nc'] = $match[1];
- $res = preg_match('/cnonce=\"([^\"]+)\"/i', $txt, $match);
- $data['cnonce'] = $match[1];
- $res = preg_match('/qop=([^,]+)/i', $txt, $match);
- $data['qop'] = str_replace('"','',$match[1]);
- $res = preg_match('/uri=\"([^\"]+)\"/i', $txt, $match);
- $data['uri'] = $match[1];
- $res = preg_match('/response=\"([^\"]+)\"/i', $txt, $match);
- $data['response'] = $match[1];
- return $data;
- }
-
-
-}
diff --git a/phpgwapi/inc/min/lib/FirePHP.php b/phpgwapi/inc/min/lib/FirePHP.php
deleted file mode 100755
index 0e265a15f2..0000000000
--- a/phpgwapi/inc/min/lib/FirePHP.php
+++ /dev/null
@@ -1,1370 +0,0 @@
-
- * @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
- * @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_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_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 ; $i2) {
- // Message needs to be split into multiple parts
- $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
- (($i==0)?strlen($msg):'')
- . '|' . $part . '|'
- . (($isetHeader('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_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 ; $iencodeObject($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
- * @author Matt Knapp
- * @author Brett Stimmerman
- * @author Christoph Dorn
- * @copyright 2005 Michal Migurski
- * @version CVS: $Id$
- * @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/phpgwapi/inc/min/lib/HTTP/ConditionalGet.php b/phpgwapi/inc/min/lib/HTTP/ConditionalGet.php
deleted file mode 100755
index 4ae461d8c5..0000000000
--- a/phpgwapi/inc/min/lib/HTTP/ConditionalGet.php
+++ /dev/null
@@ -1,366 +0,0 @@
-
- * list($updateTime, $content) = getDbUpdateAndContent();
- * $cg = new HTTP_ConditionalGet(array(
- * 'lastModifiedTime' => $updateTime
- * ,'isPublic' => true
- * ));
- * $cg->sendHeaders();
- * if ($cg->cacheIsValid) {
- * exit();
- * }
- * echo $content;
- *
- *
- * E.g. Shortcut for the above
- *
- * HTTP_ConditionalGet::check($updateTime, true); // exits if client has cache
- * echo $content;
- *
- *
- * E.g. Content from DB with no update time:
- *
- * $content = getContentFromDB();
- * $cg = new HTTP_ConditionalGet(array(
- * 'contentHash' => md5($content)
- * ));
- * $cg->sendHeaders();
- * if ($cg->cacheIsValid) {
- * exit();
- * }
- * echo $content;
- *
- *
- * E.g. Static content with some static includes:
- *
- * // 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();
- * }
- *
- * @package Minify
- * @subpackage HTTP
- * @author Stephen Clay
- */
-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:
- *
- * array(
- * 'Cache-Control' => 'max-age=0, public'
- * ,'ETag' => '"foobar"'
- * )
- *
- *
- * @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
- *
- *
- * header('Expires: ' . HTTP_ConditionalGet::gmtdate($time));
- *
- *
- * @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/phpgwapi/inc/min/lib/HTTP/Encoder.php b/phpgwapi/inc/min/lib/HTTP/Encoder.php
deleted file mode 100755
index b8b550cf98..0000000000
--- a/phpgwapi/inc/min/lib/HTTP/Encoder.php
+++ /dev/null
@@ -1,335 +0,0 @@
-
- * // Send a CSS file, compressed if possible
- * $he = new HTTP_Encoder(array(
- * 'content' => file_get_contents($cssFile)
- * ,'type' => 'text/css'
- * ));
- * $he->encode();
- * $he->sendAll();
- *
- *
- *
- * // Shortcut to encoding output
- * header('Content-Type: text/css'); // needed if not HTML
- * HTTP_Encoder::output($css);
- *
- *
- *
- * // Just sniff for the accepted encoding
- * $encoding = HTTP_Encoder::getAcceptedEncoding();
- *
- *
- * 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
- */
-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.
- *
- * array(
- * 'Content-Length' => '615'
- * ,'Content-Encoding' => 'x-gzip'
- * ,'Vary' => 'Accept-Encoding'
- * )
- *
- *
- * @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/phpgwapi/inc/min/lib/JSMin.php b/phpgwapi/inc/min/lib/JSMin.php
deleted file mode 100755
index c84dd84584..0000000000
--- a/phpgwapi/inc/min/lib/JSMin.php
+++ /dev/null
@@ -1,437 +0,0 @@
-
- * $minifiedJs = JSMin::minify($js);
- *
- *
- * 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 (PHP port)
- * @author Steve Clay (modifications + cleanup)
- * @author Andrea Giammarchi (spaceBeforeRegExp)
- * @copyright 2002 Douglas Crockford (jsmin.c)
- * @copyright 2008 Ryan Grove (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 = '';
- protected $keptComment = '';
-
- /**
- * 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)
- {
- // make sure we don't compress "a + ++b" to "a+++b", etc.
- 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: // 1
- $this->output .= $this->a;
-
- if ($this->keptComment) {
- $this->output = rtrim($this->output, "\n");
- $this->output .= $this->keptComment;
- $this->keptComment = '';
- }
-
- $this->lastByteOut = $this->a;
-
- // fallthrough intentional
- case self::ACTION_DELETE_A: // 2
- $this->a = $this->b;
- if ($this->a === "'" || $this->a === '"') { // string literal
- $str = $this->a; // in case needed for exception
- for(;;) {
- $this->output .= $this->a;
- $this->lastByteOut = $this->a;
-
- $this->a = $this->get();
- if ($this->a === $this->b) { // end quote
- break;
- }
- if ($this->isEOF($this->a)) {
- 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 intentional
- case self::ACTION_DELETE_A_B: // 3
- $this->b = $this->next();
- if ($this->b === '/' && $this->isRegexpLiteral()) {
- $this->output .= $this->a . $this->b;
- $pattern = '/'; // keep entire pattern in case we need to report it in the exception
- for(;;) {
- $this->a = $this->get();
- $pattern .= $this->a;
- if ($this->a === '[') {
- for(;;) {
- $this->output .= $this->a;
- $this->a = $this->get();
- $pattern .= $this->a;
- if ($this->a === ']') {
- break;
- }
- if ($this->a === '\\') {
- $this->output .= $this->a;
- $this->a = $this->get();
- $pattern .= $this->a;
- }
- if ($this->isEOF($this->a)) {
- throw new JSMin_UnterminatedRegExpException(
- "JSMin: Unterminated set in RegExp at byte "
- . $this->inputIndex .": {$pattern}");
- }
- }
- }
-
- if ($this->a === '/') { // end pattern
- break; // while (true)
- } elseif ($this->a === '\\') {
- $this->output .= $this->a;
- $this->a = $this->get();
- $pattern .= $this->a;
- } elseif ($this->isEOF($this->a)) {
- 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("(,=:[!&|?+-~*{;", $this->a)) {
- // we obviously aren't dividing
- return true;
- }
- if ($this->a === ' ' || $this->a === "\n") {
- $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;
- }
-
- /**
- * Return the next character from stdin. Watch out for lookahead. If the character is a control character,
- * translate it to a space or linefeed.
- *
- * @return string
- */
- protected function get()
- {
- $c = $this->lookAhead;
- $this->lookAhead = null;
- if ($c === null) {
- // getc(stdin)
- if ($this->inputIndex < $this->inputLength) {
- $c = $this->input[$this->inputIndex];
- $this->inputIndex += 1;
- } else {
- $c = null;
- }
- }
- if (ord($c) >= self::ORD_SPACE || $c === "\n" || $c === null) {
- return $c;
- }
- if ($c === "\r") {
- return "\n";
- }
- return ' ';
- }
-
- /**
- * Does $a indicate end of input?
- *
- * @param string $a
- * @return bool
- */
- protected function isEOF($a)
- {
- return ord($a) <= self::ORD_LF;
- }
-
- /**
- * Get next char (without getting it). If is ctrl character, translate to a space or newline.
- *
- * @return string
- */
- protected function peek()
- {
- $this->lookAhead = $this->get();
- return $this->lookAhead;
- }
-
- /**
- * Return true if the character is a letter, digit, underscore, dollar sign, or non-ASCII character.
- *
- * @param string $c
- *
- * @return bool
- */
- protected function isAlphaNum($c)
- {
- return (preg_match('/^[a-z0-9A-Z_\\$\\\\]$/', $c) || ord($c) > 126);
- }
-
- /**
- * Consume a single line comment from input (possibly retaining it)
- */
- protected function consumeSingleLineComment()
- {
- $comment = '';
- while (true) {
- $get = $this->get();
- $comment .= $get;
- if (ord($get) <= self::ORD_LF) { // end of line reached
- // if IE conditional comment
- if (preg_match('/^\\/@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
- $this->keptComment .= "/{$comment}";
- }
- return;
- }
- }
- }
-
- /**
- * Consume a multiple line comment from input (possibly retaining it)
- *
- * @throws JSMin_UnterminatedCommentException
- */
- protected function consumeMultipleLineComment()
- {
- $this->get();
- $comment = '';
- for(;;) {
- $get = $this->get();
- if ($get === '*') {
- if ($this->peek() === '/') { // end of comment reached
- $this->get();
- if (0 === strpos($comment, '!')) {
- // preserved by YUI Compressor
- if (!$this->keptComment) {
- // don't prepend a newline if two comments right after one another
- $this->keptComment = "\n";
- }
- $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n";
- } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
- // IE conditional
- $this->keptComment .= "/*{$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 === '/') {
- switch ($this->peek()) {
- case '/':
- $this->consumeSingleLineComment();
- $get = "\n";
- break;
- case '*':
- $this->consumeMultipleLineComment();
- $get = ' ';
- break;
- }
- }
- return $get;
- }
-}
-
-class JSMin_UnterminatedStringException extends Exception {}
-class JSMin_UnterminatedCommentException extends Exception {}
-class JSMin_UnterminatedRegExpException extends Exception {}
diff --git a/phpgwapi/inc/min/lib/JSMinPlus.php b/phpgwapi/inc/min/lib/JSMinPlus.php
deleted file mode 100755
index 5a3c5bdff4..0000000000
--- a/phpgwapi/inc/min/lib/JSMinPlus.php
+++ /dev/null
@@ -1,2086 +0,0 @@
-
- *
- * 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 .
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Tino Zijdel
- * 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)
- {
- // ";
- * $link = "";
- *
- * // in min.php
- * Minify::serve('Groups', array(
- * 'groups' => $groupSources
- * ,'setExpires' => (time() + 86400 * 365)
- * ));
- *
- *
- * @package Minify
- * @author Stephen Clay
- */
-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 = '&';
-
- /**
- * Get a time-stamped URI
- *
- *
- * echo $b->uri('/site.js');
- * // outputs "/site.js?1678242"
- *
- * echo $b->uri('/scriptaculous.js?load=effects');
- * // outputs "/scriptaculous.js?load=effects&1678242"
- *
- *
- * @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/phpgwapi/inc/min/lib/Minify/CSS.php b/phpgwapi/inc/min/lib/Minify/CSS.php
deleted file mode 100755
index e30f99f2fa..0000000000
--- a/phpgwapi/inc/min/lib/Minify/CSS.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- * @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.:
- *
- * array('//symlink' => '/real/target/path') // unix
- * array('//static' => 'D:\\staticStorage') // Windows
- *
- *
- * 'docRoot': (default = $_SERVER['DOCUMENT_ROOT'])
- * see Minify_CSS_UriRewriter::rewrite
- *
- * @return string
- */
- public static function minify($css, $options = array())
- {
- $options = array_merge(array(
- 'compress' => true,
- 'removeCharsets' => true,
- 'preserveComments' => true,
- 'currentDir' => null,
- 'docRoot' => $_SERVER['DOCUMENT_ROOT'],
- 'prependRelativePath' => null,
- 'symlinks' => array(),
- ), $options);
-
- if ($options['removeCharsets']) {
- $css = preg_replace('/@charset[^;]+;\\s*/', '', $css);
- }
- if ($options['compress']) {
- if (! $options['preserveComments']) {
- $css = Minify_CSS_Compressor::process($css, $options);
- } else {
- $css = Minify_CommentPreserver::process(
- $css
- ,array('Minify_CSS_Compressor', 'process')
- ,array($options)
- );
- }
- }
- if (! $options['currentDir'] && ! $options['prependRelativePath']) {
- return $css;
- }
- if ($options['currentDir']) {
- return Minify_CSS_UriRewriter::rewrite(
- $css
- ,$options['currentDir']
- ,$options['docRoot']
- ,$options['symlinks']
- );
- } else {
- return Minify_CSS_UriRewriter::prepend(
- $css
- ,$options['prependRelativePath']
- );
- }
- }
-}
diff --git a/phpgwapi/inc/min/lib/Minify/CSS/Compressor.php b/phpgwapi/inc/min/lib/Minify/CSS/Compressor.php
deleted file mode 100755
index 533ea79b5f..0000000000
--- a/phpgwapi/inc/min/lib/Minify/CSS/Compressor.php
+++ /dev/null
@@ -1,249 +0,0 @@
-
- * @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/phpgwapi/inc/min/lib/Minify/CSS/UriRewriter.php b/phpgwapi/inc/min/lib/Minify/CSS/UriRewriter.php
deleted file mode 100755
index 79f7d98e69..0000000000
--- a/phpgwapi/inc/min/lib/Minify/CSS/UriRewriter.php
+++ /dev/null
@@ -1,310 +0,0 @@
-
- */
-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.:
- *
- * array('//symlink' => '/real/target/path') // unix
- * array('//static' => 'D:\\staticStorage') // Windows
- *
- *
- * @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
- *
- *
- * 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'
- *
- *
- * @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.:
- *
- * array('/home/foo/www/not/real/path' => '/real/target/path') // unix
- * array('C:\\htdocs\\not\\real' => 'D:\\real\\target\\path') // Windows
- *
- *
- * @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/phpgwapi/inc/min/lib/Minify/Cache/APC.php b/phpgwapi/inc/min/lib/Minify/Cache/APC.php
deleted file mode 100755
index ebca4a3797..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Cache/APC.php
+++ /dev/null
@@ -1,133 +0,0 @@
-
- * Minify::setCache(new Minify_Cache_APC());
- *
- *
- * @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/phpgwapi/inc/min/lib/Minify/Cache/File.php b/phpgwapi/inc/min/lib/Minify/Cache/File.php
deleted file mode 100755
index 33aad3b43f..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Cache/File.php
+++ /dev/null
@@ -1,194 +0,0 @@
-_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
- * @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
- * @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)
- {
- Minify_Logger::log($msg);
- }
-
- private $_path = null;
- private $_locking = null;
-}
diff --git a/phpgwapi/inc/min/lib/Minify/Cache/Memcache.php b/phpgwapi/inc/min/lib/Minify/Cache/Memcache.php
deleted file mode 100755
index 677675adc3..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Cache/Memcache.php
+++ /dev/null
@@ -1,140 +0,0 @@
-
- * // 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();
- * }
- *
- **/
-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/phpgwapi/inc/min/lib/Minify/Cache/XCache.php b/phpgwapi/inc/min/lib/Minify/Cache/XCache.php
deleted file mode 100755
index 3039deddcb..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Cache/XCache.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- * Minify::setCache(new Minify_Cache_XCache());
- *
- *
- * @package Minify
- * @author Elan Ruusamäe
- **/
-class Minify_Cache_XCache {
-
- /**
- * Create a Minify_Cache_XCache object, to be passed to
- * Minify::setCache().
- *
- * @param int $expire seconds until expiration (default = 0
- * meaning the item will not get an expiration date)
- */
- 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 xcache_set($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 xcache, store in instance
- *
- * @param string $id
- * @return bool success
- */
- private function _fetch($id)
- {
- if ($this->_id === $id) {
- return true;
- }
- $ret = xcache_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/phpgwapi/inc/min/lib/Minify/Cache/ZendPlatform.php b/phpgwapi/inc/min/lib/Minify/Cache/ZendPlatform.php
deleted file mode 100755
index 5025fd8167..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Cache/ZendPlatform.php
+++ /dev/null
@@ -1,142 +0,0 @@
-
- * Minify::setCache(new Minify_Cache_ZendPlatform());
- *
- *
- * @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/phpgwapi/inc/min/lib/Minify/ClosureCompiler.php b/phpgwapi/inc/min/lib/Minify/ClosureCompiler.php
deleted file mode 100755
index 7856097de5..0000000000
--- a/phpgwapi/inc/min/lib/Minify/ClosureCompiler.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
- * Minify_ClosureCompiler::$jarFile = '/path/to/closure-compiler-20120123.jar';
- * Minify_ClosureCompiler::$tempDir = '/tmp';
- * $code = Minify_ClosureCompiler::minify(
- * $code,
- * array('compilation_level' => 'SIMPLE_OPTIMIZATIONS')
- * );
- *
- * --compilation_level WHITESPACE_ONLY, SIMPLE_OPTIMIZATIONS, ADVANCED_OPTIMIZATIONS
- *
- *
- *
- * @todo unit tests, $options docs
- * @todo more options support (or should just passthru them all?)
- *
- * @package Minify
- * @author Stephen Clay
- * @author Elan Ruusamäe
- */
-class Minify_ClosureCompiler {
-
- /**
- * Filepath of the Closure Compiler jar file. This must be set before
- * calling minifyJs().
- *
- * @var string
- */
- public static $jarFile = null;
-
- /**
- * Writable temp directory. This must be set before calling minifyJs().
- *
- * @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 https://code.google.com/p/closure-compiler/source/browse/trunk/README
- *
- * @return string
- */
- public static function minify($js, $options = array())
- {
- self::_prepare();
- if (! ($tmpFile = tempnam(self::$tempDir, 'cc_'))) {
- throw new Exception('Minify_ClosureCompiler : could not create temp file.');
- }
- file_put_contents($tmpFile, $js);
- exec(self::_getCmd($options, $tmpFile), $output, $result_code);
- unlink($tmpFile);
- if ($result_code != 0) {
- throw new Exception('Minify_ClosureCompiler : Closure Compiler execution failed.');
- }
- return implode("\n", $output);
- }
-
- private static function _getCmd($userOptions, $tmpFile)
- {
- $o = array_merge(
- array(
- 'charset' => 'utf-8',
- 'compilation_level' => 'SIMPLE_OPTIMIZATIONS',
- ),
- $userOptions
- );
- $cmd = self::$javaExecutable . ' -jar ' . escapeshellarg(self::$jarFile)
- . (preg_match('/^[\\da-zA-Z0-9\\-]+$/', $o['charset'])
- ? " --charset {$o['charset']}"
- : '');
-
- foreach (array('compilation_level') as $opt) {
- if ($o[$opt]) {
- $cmd .= " --{$opt} ". escapeshellarg($o[$opt]);
- }
- }
- return $cmd . ' ' . escapeshellarg($tmpFile);
- }
-
- private static function _prepare()
- {
- if (! is_file(self::$jarFile)) {
- throw new Exception('Minify_ClosureCompiler : $jarFile('.self::$jarFile.') is not a valid file.');
- }
- if (! is_readable(self::$jarFile)) {
- throw new Exception('Minify_ClosureCompiler : $jarFile('.self::$jarFile.') is not readable.');
- }
- if (! is_dir(self::$tempDir)) {
- throw new Exception('Minify_ClosureCompiler : $tempDir('.self::$tempDir.') is not a valid direcotry.');
- }
- if (! is_writable(self::$tempDir)) {
- throw new Exception('Minify_ClosureCompiler : $tempDir('.self::$tempDir.') is not writable.');
- }
- }
-}
-
-/* vim:ts=4:sw=4:et */
diff --git a/phpgwapi/inc/min/lib/Minify/CommentPreserver.php b/phpgwapi/inc/min/lib/Minify/CommentPreserver.php
deleted file mode 100755
index 2cf4468b51..0000000000
--- a/phpgwapi/inc/min/lib/Minify/CommentPreserver.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
- */
-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/phpgwapi/inc/min/lib/Minify/Controller/Base.php b/phpgwapi/inc/min/lib/Minify/Controller/Base.php
deleted file mode 100755
index ca61f14f8b..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Controller/Base.php
+++ /dev/null
@@ -1,222 +0,0 @@
-
- */
-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;
- }
-
- /**
- * 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) {
- Minify_Logger::log($msg);
- }
-}
diff --git a/phpgwapi/inc/min/lib/Minify/Controller/Files.php b/phpgwapi/inc/min/lib/Minify/Controller/Files.php
deleted file mode 100755
index 8d818a6d17..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Controller/Files.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- * Minify::serve('Files', array(
- * 'files' => array(
- * '//js/jquery.js'
- * ,'//js/plugins.js'
- * ,'/home/username/file.js'
- * )
- * ));
- *
- *
- * As a shortcut, the controller will replace "//" at the beginning
- * of a filename with $_SERVER['DOCUMENT_ROOT'] . '/'.
- *
- * @package Minify
- * @author Stephen Clay
- */
-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/phpgwapi/inc/min/lib/Minify/Controller/Groups.php b/phpgwapi/inc/min/lib/Minify/Controller/Groups.php
deleted file mode 100755
index cb22a69191..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Controller/Groups.php
+++ /dev/null
@@ -1,91 +0,0 @@
-
- * Minify::serve('Groups', array(
- * 'groups' => array(
- * 'css' => array('//css/type.css', '//css/layout.css')
- * ,'js' => array('//js/jquery.js', '//js/site.js')
- * )
- * ));
- *
- *
- * 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
- */
-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/phpgwapi/inc/min/lib/Minify/Controller/MinApp.php b/phpgwapi/inc/min/lib/Minify/Controller/MinApp.php
deleted file mode 100755
index 4def285e04..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Controller/MinApp.php
+++ /dev/null
@@ -1,246 +0,0 @@
-
- */
-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) {
- // PHP insecure by default: realpath() and other FS functions can't handle null bytes.
- foreach (array('g', 'b', 'f') as $key) {
- if (isset($_GET[$key])) {
- $_GET[$key] = str_replace("\x00", '', (string)$_GET[$key]);
- }
- }
-
- // 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));
- }
- $base_path = $_SERVER['DOCUMENT_ROOT'].$base;
- // check base against symlinks to support aliases configured via symlinks
- if (!(@file_exists($base_path) && is_dir($base_path) && realpath($base_path) !== false) &&
- isset($options['minifierOptions']['text/css']['symlinks'][$t='//'.trim($base, '/')]) &&
- ($base_path = realpath($options['minifierOptions']['text/css']['symlinks'][$t]))) {
- $base_path .= '/';
- $allowDirs[] = $base_path;
- }
- $basenames = array(); // just for cache id
- foreach ($files as $file) {
- $uri = $base . $file;
- $path = $base_path . $file;
- $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))) {
- if (preg_match('~\.css$~i', $file)) {
- $spec['minifyOptions']['compress'] = false;
- } else {
- $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/phpgwapi/inc/min/lib/Minify/Controller/Page.php b/phpgwapi/inc/min/lib/Minify/Controller/Page.php
deleted file mode 100755
index 4f4b8d4640..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Controller/Page.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
- */
-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')
- );
- unset($options['minifyAll']);
- }
- $this->sources[] = new Minify_Source($sourceSpec);
-
- $options['contentType'] = Minify::TYPE_HTML;
- return $options;
- }
-}
-
diff --git a/phpgwapi/inc/min/lib/Minify/Controller/Version1.php b/phpgwapi/inc/min/lib/Minify/Controller/Version1.php
deleted file mode 100755
index 483731e22e..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Controller/Version1.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- * Minify::serve('Version1');
- *
- *
- * @package Minify
- * @author Stephen Clay
- */
-class Minify_Controller_Version1 extends Minify_Controller_Base {
-
- /**
- * Set up groups of files as sources
- *
- * @param array $options controller and Minify options
- * @return array Minify options
- *
- */
- public function setupSources($options) {
- // PHP insecure by default: realpath() and other FS functions can't handle null bytes.
- if (isset($_GET['files'])) {
- $_GET['files'] = str_replace("\x00", '', (string)$_GET['files']);
- }
-
- 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;
- }
-
- $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'];
-
- $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/phpgwapi/inc/min/lib/Minify/DebugDetector.php b/phpgwapi/inc/min/lib/Minify/DebugDetector.php
deleted file mode 100755
index 7db0b41f5c..0000000000
--- a/phpgwapi/inc/min/lib/Minify/DebugDetector.php
+++ /dev/null
@@ -1,26 +0,0 @@
-
- */
-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/phpgwapi/inc/min/lib/Minify/HTML.php b/phpgwapi/inc/min/lib/Minify/HTML.php
deleted file mode 100755
index 4529fd082e..0000000000
--- a/phpgwapi/inc/min/lib/Minify/HTML.php
+++ /dev/null
@@ -1,257 +0,0 @@
-
- */
-class Minify_HTML {
- /**
- * @var boolean
- */
- protected $_jsCleanComments = true;
-
- /**
- * "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 self($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.
- *
- * 'jsCleanComments' : (optional) whether to remove HTML comments beginning and end of script block
- *
- * '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'];
- }
- if (isset($options['jsCleanComments'])) {
- $this->_jsCleanComments = (bool)$options['jsCleanComments'];
- }
- }
-
-
- /**
- * Minify the markeup given in the constructor
- *
- * @return string
- */
- public function process()
- {
- if ($this->_isXhtml === null) {
- $this->_isXhtml = (false !== strpos($this->_html, '_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);
- $this->_placeholders = array();
-
- // replace SCRIPTs (and minify) with placeholders
- $this->_html = preg_replace_callback(
- '/(\\s*)]*?>)([\\s\\S]*?)<\\/script>(\\s*)/i'
- ,array($this, '_removeScriptCB')
- ,$this->_html);
-
- // replace STYLEs (and minify) with placeholders
- $this->_html = preg_replace_callback(
- '/\\s*]*>)([\\s\\S]*?)<\\/style>\\s*/i'
- ,array($this, '_removeStyleCB')
- ,$this->_html);
-
- // remove HTML comments (not containing IE conditional comments).
- $this->_html = preg_replace_callback(
- '//'
- ,array($this, '_commentCB')
- ,$this->_html);
-
- // replace PREs with placeholders
- $this->_html = preg_replace_callback('/\\s*]*?>[\\s\\S]*?<\\/pre>)\\s*/i'
- ,array($this, '_removePreCB')
- ,$this->_html);
-
- // replace TEXTAREAs with placeholders
- $this->_html = preg_replace_callback(
- '/\\s*]*?>[\\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], '_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("_reservePlace("\\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}/**/"
- : "{$openStyle}{$css}"
- );
- }
-
- protected function _removeScriptCB($m)
- {
- $openScript = "_jsCleanComments) {
- $js = preg_replace('/(?:^\\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}/**/{$ws2}"
- : "{$ws1}{$openScript}{$js}{$ws2}"
- );
- }
-
- protected function _removeCdata($str)
- {
- return (false !== strpos($str, ''), '', $str)
- : $str;
- }
-
- protected function _needsCdata($str)
- {
- return ($this->_isXhtml && preg_match('/(?:[<&]|\\-\\-|\\]\\]>)/', $str));
- }
-}
diff --git a/phpgwapi/inc/min/lib/Minify/HTML/Helper.php b/phpgwapi/inc/min/lib/Minify/HTML/Helper.php
deleted file mode 100755
index e8af8b7e5f..0000000000
--- a/phpgwapi/inc/min/lib/Minify/HTML/Helper.php
+++ /dev/null
@@ -1,225 +0,0 @@
-
- */
-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 string|array $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
- *
- * @param bool $farExpires
- * @param bool $debug
- * @return string
- */
- 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;
- }
-
- /**
- * Set the files that will comprise the URI we're building
- *
- * @param array $files
- * @param bool $checkLastModified
- */
- public function setFiles($files, $checkLastModified = true)
- {
- $this->_groupKey = null;
- if ($checkLastModified) {
- $this->_lastModified = self::getLastModified($files);
- }
- // normalize paths like in /min/f=
- 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;
- }
-
- /**
- * Set the group of files that will comprise the URI we're building
- *
- * @param string $key
- * @param bool $checkLastModified
- */
- 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);
- $keys = explode(',', $key);
- foreach ($keys as $key) {
- if (isset($gc[$key])) {
- $this->_lastModified = self::getLastModified($gc[$key], $this->_lastModified);
- }
- }
- }
- }
- }
-
- /**
- * Get the max(lastModified) of all files
- *
- * @param array|string $sources
- * @param int $lastModified
- * @return int
- */
- 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) {
- if (!isset($arr[0][$pos])) {
- return '';
- }
- $c = $arr[0][$pos];
- $l = count($arr);
- if ($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
- * @return string
- */
- protected static function _getShortestUri($paths, $minRoot = '/min/') {
- $pos = 0;
- $base = '';
- 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/phpgwapi/inc/min/lib/Minify/ImportProcessor.php b/phpgwapi/inc/min/lib/Minify/ImportProcessor.php
deleted file mode 100755
index 5957babc20..0000000000
--- a/phpgwapi/inc/min/lib/Minify/ImportProcessor.php
+++ /dev/null
@@ -1,216 +0,0 @@
-
- * @author Simon Schick
- */
-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/phpgwapi/inc/min/lib/Minify/JS/ClosureCompiler.php b/phpgwapi/inc/min/lib/Minify/JS/ClosureCompiler.php
deleted file mode 100755
index 51f7cd1a96..0000000000
--- a/phpgwapi/inc/min/lib/Minify/JS/ClosureCompiler.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- *
- * @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\r\nConnection: close\r\n",
- '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)
- {
- return JSMin::minify($js);
- }
-}
-
-class Minify_JS_ClosureCompiler_Exception extends Exception {}
diff --git a/phpgwapi/inc/min/lib/Minify/Lines.php b/phpgwapi/inc/min/lib/Minify/Lines.php
deleted file mode 100755
index ea97152dd4..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Lines.php
+++ /dev/null
@@ -1,143 +0,0 @@
-
- * @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)) {
- if ($inComment) {
- array_push($newLines, '', "/* {$id} *|", '');
- } else {
- 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'])) {
- 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)
- {
- // crude way to avoid things like // */
- $line = preg_replace('~//.*?(\\*/|/\\*).*~', '', $line);
-
- 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/phpgwapi/inc/min/lib/Minify/Loader.php b/phpgwapi/inc/min/lib/Minify/Loader.php
deleted file mode 100755
index 0a225c056c..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Loader.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- */
-class Minify_Loader {
- public function loadClass($class)
- {
- $file = dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR;
- $file .= strtr($class, "\\_", DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR) . '.php';
- if (is_readable($file)) {
- require $file;
- }
- }
-
- static public function register()
- {
- $inst = new self();
- spl_autoload_register(array($inst, 'loadClass'));
- }
-}
diff --git a/phpgwapi/inc/min/lib/Minify/Logger.php b/phpgwapi/inc/min/lib/Minify/Logger.php
deleted file mode 100755
index 5a9e931639..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Logger.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *
- * @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/phpgwapi/inc/min/lib/Minify/Packer.php b/phpgwapi/inc/min/lib/Minify/Packer.php
deleted file mode 100755
index bd3956525e..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Packer.php
+++ /dev/null
@@ -1,37 +0,0 @@
-pack());
- }
-}
diff --git a/phpgwapi/inc/min/lib/Minify/Source.php b/phpgwapi/inc/min/lib/Minify/Source.php
deleted file mode 100755
index f001ebc9d5..0000000000
--- a/phpgwapi/inc/min/lib/Minify/Source.php
+++ /dev/null
@@ -1,187 +0,0 @@
-
- */
-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/phpgwapi/inc/min/lib/Minify/YUI/CssCompressor.java b/phpgwapi/inc/min/lib/Minify/YUI/CssCompressor.java
deleted file mode 100755
index 3fb497a969..0000000000
--- a/phpgwapi/inc/min/lib/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/phpgwapi/inc/min/lib/Minify/YUI/CssCompressor.php b/phpgwapi/inc/min/lib/Minify/YUI/CssCompressor.php
deleted file mode 100755
index 3dcfecc245..0000000000
--- a/phpgwapi/inc/min/lib/Minify/YUI/CssCompressor.php
+++ /dev/null
@@ -1,171 +0,0 @@
-+\\(\\)\\],])@", "$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/phpgwapi/inc/min/lib/Minify/YUICompressor.php b/phpgwapi/inc/min/lib/Minify/YUICompressor.php
deleted file mode 100755
index 5bb1df39c8..0000000000
--- a/phpgwapi/inc/min/lib/Minify/YUICompressor.php
+++ /dev/null
@@ -1,156 +0,0 @@
-
- * Minify_YUICompressor::$jarFile = '/path/to/yuicompressor-2.4.6.jar';
- * Minify_YUICompressor::$tempDir = '/tmp';
- * $code = Minify_YUICompressor::minifyJs(
- * $code
- * ,array('nomunge' => true, 'line-break' => 1000)
- * );
- *
- *
- * Note: In case you run out stack (default is 512k), you may increase stack size in $options:
- * array('stack-size' => '2048k')
- *
- * @todo unit tests, $options docs
- *
- * @package Minify
- * @author Stephen Clay
- */
-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
- ,'stack-size' => ''
- )
- ,$userOptions
- );
- $cmd = self::$javaExecutable
- . (!empty($o['stack-size'])
- ? ' -Xss' . $o['stack-size']
- : '')
- . ' -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_readable(self::$jarFile)) {
- throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not readable.');
- }
- 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/phpgwapi/inc/min/lib/MrClay/Cli.php b/phpgwapi/inc/min/lib/MrClay/Cli.php
deleted file mode 100755
index 6f76579097..0000000000
--- a/phpgwapi/inc/min/lib/MrClay/Cli.php
+++ /dev/null
@@ -1,384 +0,0 @@
-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
- * @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 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 Arg|string $letter
- * @return Arg
- */
- public function addOptionalArg($letter)
- {
- return $this->addArgument($letter, false);
- }
-
- /**
- * @param Arg|string $letter
- * @return Arg
- */
- public function addRequiredArg($letter)
- {
- return $this->addArgument($letter, true);
- }
-
- /**
- * @param string $letter
- * @param bool $required
- * @param Arg|null $arg
- * @return Arg
- * @throws InvalidArgumentException
- */
- public function addArgument($letter, $required, Arg $arg = null)
- {
- if (! preg_match('/^[a-zA-Z]$/', $letter)) {
- throw new InvalidArgumentException('$letter must be in [a-zA-Z]');
- }
- if (! $arg) {
- $arg = new Arg($required);
- }
- $this->_args[$letter] = $arg;
- return $arg;
- }
-
- /**
- * @param string $letter
- * @return 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 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 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 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/phpgwapi/inc/min/lib/MrClay/Cli/Arg.php b/phpgwapi/inc/min/lib/MrClay/Cli/Arg.php
deleted file mode 100755
index 5fa5932734..0000000000
--- a/phpgwapi/inc/min/lib/MrClay/Cli/Arg.php
+++ /dev/null
@@ -1,183 +0,0 @@
-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
- * @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/phpgwapi/inc/min/quick-test.css b/phpgwapi/inc/min/quick-test.css
deleted file mode 100755
index 9ae38bd1f3..0000000000
--- a/phpgwapi/inc/min/quick-test.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/*! This file exists only for testing a Minify installation. It's content is not used.
- *
- * http://example.org/min/f=min/quick-test.css
- */
-
-@import url( /more.css );
-
- body, td, th {
- font-family: Verdana , "Bitstream Vera Sans" , Arial Narrow, sans-serif ;
-
- font-size : 12px;
-}
-
-.nav {
- margin-left: 20%;
-}
-#main-nav {
- background-color: red;
- border: 1px solid #00ff77;
-}
-
-div#content
-h1 + p {
- padding-top: 0;
- margin-top: 0;
-}
-
-@media all and (min-width: 640px) {
- #media-queries-1 { background-color: #0f0; }
-}
diff --git a/phpgwapi/inc/min/quick-test.js b/phpgwapi/inc/min/quick-test.js
deleted file mode 100755
index eceb3584ff..0000000000
--- a/phpgwapi/inc/min/quick-test.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*! This file exists only for testing a Minify installation. It's content is not used.
- *
- * http://example.org/min/f=min/quick-test.js
- */
-
-/* Finds the lowest common multiple of two numbers */
-function LCMCalculator(x, y) { // constructor function
- var checkInt = function (x) { // inner function
- if (x % 1 !== 0) {
- throw new TypeError(x + " is not an integer"); // throw an exception
- }
- return x;
- };
- this.a = checkInt(x);
- // ^ semicolons are optional
- this.b = checkInt(y);
-}
-// The prototype of object instances created by a constructor is
-// that constructor's "prototype" property.
-LCMCalculator.prototype = { // object literal
- constructor: LCMCalculator, // when reassigning a prototype, set the constructor property appropriately
- gcd: function () { // method that calculates the greatest common divisor
- // Euclidean algorithm:
- var a = Math.abs(this.a), b = Math.abs(this.b), t;
- if (a < b) {
- // swap variables
- t = b;
- b = a;
- a = t;
- }
- while (b !== 0) {
- t = b;
- b = a % b;
- a = t;
- }
- // Only need to calculate GCD once, so "redefine" this method.
- // (Actually not redefinition - it's defined on the instance itself,
- // so that this.gcd refers to this "redefinition" instead of LCMCalculator.prototype.gcd.)
- // Also, 'gcd' === "gcd", this['gcd'] === this.gcd
- this['gcd'] = function () {
- return a;
- };
- return a;
- },
- // Object property names can be specified by strings delimited by double (") or single (') quotes.
- "lcm" : function () {
- // Variable names don't collide with object properties, e.g. |lcm| is not |this.lcm|.
- // not using |this.a * this.b| to avoid FP precision issues
- var lcm = this.a / this.gcd() * this.b;
- // Only need to calculate lcm once, so "redefine" this method.
- this.lcm = function () {
- return lcm;
- };
- return lcm;
- },
- toString: function () {
- return "LCMCalculator: a = " + this.a + ", b = " + this.b;
- }
-};
-
-//define generic output function; this implementation only works for web browsers
-function output(x) {
- document.write(x + " ");
-}
-
-// Note: Array's map() and forEach() are defined in JavaScript 1.6.
-// They are used here to demonstrate JavaScript's inherent functional nature.
-[[25, 55], [21, 56], [22, 58], [28, 56]].map(function (pair) { // array literal + mapping function
- return new LCMCalculator(pair[0], pair[1]);
-}).sort(function (a, b) { // sort with this comparative function
- return a.lcm() - b.lcm();
-}).forEach(function (obj) {
- output(obj + ", gcd = " + obj.gcd() + ", lcm = " + obj.lcm());
-});
\ No newline at end of file
diff --git a/phpgwapi/inc/min/utils.php b/phpgwapi/inc/min/utils.php
deleted file mode 100755
index 3e9cf16d2e..0000000000
--- a/phpgwapi/inc/min/utils.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- *
- *
- *
- *
- *
- * @param mixed $keyOrFiles a group key or array of file paths/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
- */
-function Minify_getUri($keyOrFiles, $opts = array())
-{
- return Minify_HTML_Helper::getUri($keyOrFiles, $opts);
-}
-
-
-/**
- * Get the last modification time of several source js/css files. If you're
- * caching the output of Minify_getUri(), you might want to know if one of the
- * dependent source files has changed so you can update the HTML.
- *
- * Since this makes a bunch of stat() calls, you might not want to check this
- * on every request.
- *
- * @param array $keysAndFiles group keys and/or file paths/URIs.
- * @return int latest modification time of all given keys/files
- */
-function Minify_mtime($keysAndFiles, $groupsConfigFile = null)
-{
- $gc = null;
- if (! $groupsConfigFile) {
- $groupsConfigFile = dirname(__FILE__) . '/groupsConfig.php';
- }
- $sources = array();
- foreach ($keysAndFiles as $keyOrFile) {
- if (is_object($keyOrFile)
- || 0 === strpos($keyOrFile, '/')
- || 1 === strpos($keyOrFile, ':\\')) {
- // a file/source obj
- $sources[] = $keyOrFile;
- } else {
- if (! $gc) {
- $gc = (require $groupsConfigFile);
- }
- foreach ($gc[$keyOrFile] as $source) {
- $sources[] = $source;
- }
- }
- }
- return Minify_HTML_Helper::getLastModified($sources);
-}