EGroupware / egroupware

phpgwapi/inc/class.vfs_stream_wrapper.inc.php

Indentation +3 added lines, -3 removed lines

@@ -388,10 +388,10 @@ 
  	 * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite!
  	 *
  	 * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<'))
-  	 * {
+ 	 * {
  	 * 		$eof = !$eof;
  	 * }
-  	 *
+ 	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
 	function stream_eof ( )
@@ -1010,7 +1010,7 @@ 
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url'): ".function_backtrace(1));
 
 		while (($rel_path = egw_vfs::basename($url).($rel_path ? '/'.$rel_path : '')) &&
-		       ($url = egw_vfs::dirname($url)))
+			   ($url = egw_vfs::dirname($url)))
 		{
 			if (($stat = self::url_stat($url,0,false,false)))
 			{

phpgwapi/inc/class.html.inc.php

Indentation +49 added lines, -49 removed lines

@@ -112,16 +112,16 @@ 
 	}
 
 	/**
-	* Created an input-field with an attached color-picker
-	*
-	* Please note: it need to be called before the call to egw_header() !!!
-	*
-	* @param string $name the name of the input-field
-	* @param string $value ='' the actual value for the input-field, default ''
-	* @param string $title ='' tooltip/title for the picker-activation-icon
-	* @param string $options ='' options for input
-	* @return string the html
-	*/
+	 * Created an input-field with an attached color-picker
+	 *
+	 * Please note: it need to be called before the call to egw_header() !!!
+	 *
+	 * @param string $name the name of the input-field
+	 * @param string $value ='' the actual value for the input-field, default ''
+	 * @param string $title ='' tooltip/title for the picker-activation-icon
+	 * @param string $options ='' options for input
+	 * @return string the html
+	 */
 	static function inputColor($name,$value='',$title='',$options='')
 	{
 		$options .= ' id="'.htmlspecialchars($id=str_replace(array('[',']'),array('_',''),$name).'_colorpicker').'"';
@@ -137,16 +137,16 @@ 
 	}
 
 	/**
-	* Handles tooltips via the wz_tooltip class from Walter Zorn
-	*
-	* @param string $text text or html for the tooltip, all chars allowed, they will be quoted approperiate
-	* @param boolean $do_lang (default False) should the text be run though lang()
-	* @param array $options param/value pairs, eg. 'TITLE' => 'I am the title'. Some common parameters:
-	*  title (string) gives extra title-row, width (int,'auto') , padding (int), above (bool), bgcolor (color), bgimg (URL)
-	*  For a complete list and description see http://www.walterzorn.com/tooltip/tooltip_e.htm
-	* @param boolean $return_as_attributes true to return array(onmouseover, onmouseout) attributes
-	* @return string|array to be included in any tag, like '<p'.html::tooltip('Hello <b>Ralf</b>').'>Text with tooltip</p>'
-	*/
+	 * Handles tooltips via the wz_tooltip class from Walter Zorn
+	 *
+	 * @param string $text text or html for the tooltip, all chars allowed, they will be quoted approperiate
+	 * @param boolean $do_lang (default False) should the text be run though lang()
+	 * @param array $options param/value pairs, eg. 'TITLE' => 'I am the title'. Some common parameters:
+	 *  title (string) gives extra title-row, width (int,'auto') , padding (int), above (bool), bgcolor (color), bgimg (URL)
+	 *  For a complete list and description see http://www.walterzorn.com/tooltip/tooltip_e.htm
+	 * @param boolean $return_as_attributes true to return array(onmouseover, onmouseout) attributes
+	 * @return string|array to be included in any tag, like '<p'.html::tooltip('Hello <b>Ralf</b>').'>Text with tooltip</p>'
+	 */
 	static function tooltip($text,$do_lang=False,$options=False, $return_as_attributes=false)
 	{
 		// tell egw_framework to include wz_tooltip.js
@@ -594,20 +594,20 @@ 
 	}
 
 	/**
-	* this static function is a wrapper for fckEditor to create some reuseable layouts
-	*
-	* @param string $_name name and id of the input-field
-	* @param string $_content of the tinymce (will be run through htmlspecialchars !!!), default ''
-	* @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
-	* @param array  $_options (toolbar_expanded true/false)
-	* @param string $_height ='400px'
-	* @param string $_width ='100%'
-	* @param string $_start_path ='' if passed activates the browser for image at absolute path passed
-	* @param boolean $_purify =true run $_content through htmlpurifier before handing it to fckEditor
-	* @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
-	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
-	* @return string the necessary html for the textarea
-	*/
+	 * this static function is a wrapper for fckEditor to create some reuseable layouts
+	 *
+	 * @param string $_name name and id of the input-field
+	 * @param string $_content of the tinymce (will be run through htmlspecialchars !!!), default ''
+	 * @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
+	 * @param array  $_options (toolbar_expanded true/false)
+	 * @param string $_height ='400px'
+	 * @param string $_width ='100%'
+	 * @param string $_start_path ='' if passed activates the browser for image at absolute path passed
+	 * @param boolean $_purify =true run $_content through htmlpurifier before handing it to fckEditor
+	 * @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
+	 * @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
+	 * @return string the necessary html for the textarea
+	 */
 	static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'),
 		$_height='400px', $_width='100%',$_start_path='',$_purify=true, $_focusToBody=false, $_executeJSAfterInit='')
 	{
@@ -678,21 +678,21 @@ 
 	}
 
 	/**
-	* this static function is a wrapper for tinymce to create some reuseable layouts
-	*
-	* Please note: if you did not run init_tinymce already you this static function need to be called before the call to phpgw_header() !!!
-	*
-	* @param string $_name name and id of the input-field
-	* @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
-	* @param string $_content ='' of the tinymce (will be run through htmlspecialchars !!!), default ''
-	* @param string $_height ='400px'
-	* @param string $_width ='100%'
-	* @param boolean $_purify =true
-	* @param string $_border ='0px' NOT used for CKEditor
-	* @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
-	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
-	* @return string the necessary html for the textarea
-	*/
+	 * this static function is a wrapper for tinymce to create some reuseable layouts
+	 *
+	 * Please note: if you did not run init_tinymce already you this static function need to be called before the call to phpgw_header() !!!
+	 *
+	 * @param string $_name name and id of the input-field
+	 * @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
+	 * @param string $_content ='' of the tinymce (will be run through htmlspecialchars !!!), default ''
+	 * @param string $_height ='400px'
+	 * @param string $_width ='100%'
+	 * @param boolean $_purify =true
+	 * @param string $_border ='0px' NOT used for CKEditor
+	 * @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
+	 * @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
+	 * @return string the necessary html for the textarea
+	 */
 	static function fckEditorQuick($_name, $_mode, $_content='', $_height='400px', $_width='100%',$_purify=true, $_border='0px',$_focusToBody=false,$_executeJSAfterInit='')
 	{
 		if (!self::htmlarea_availible() || $_mode == 'ascii')

phpgwapi/inc/class.accounts_ldap.inc.php

Indentation +1 added lines, -1 removed lines

@@ -962,7 +962,7 @@
 			'account_fullname' => 'cn',
 		);
 		if (!isset($to_ldap[$which]) || $account_type === 'g') {
-		    return False;
+			return False;
 		}
 
 		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));

phpgwapi/inc/class.ldap.inc.php

Indentation +8 added lines, -8 removed lines

@@ -27,17 +27,17 @@
 class ldap
 {
 	/**
-	* Holds the LDAP link identifier
-	*
-	* @var resource $ds
-	*/
+	 * Holds the LDAP link identifier
+	 *
+	 * @var resource $ds
+	 */
 	var $ds;
 
 	/**
-	* Holds the detected information about the connected ldap server
-	*
-	* @var ldapserverinfo $ldapserverinfo
-	*/
+	 * Holds the detected information about the connected ldap server
+	 *
+	 * @var ldapserverinfo $ldapserverinfo
+	 */
 	var $ldapServerInfo;
 
 	/**

phpgwapi/inc/jscalendar-setup.php

Indentation +1 added lines, -1 removed lines

@@ -286,7 +286,7 @@
 	$short = translation::translate($m=substr($name,0,3), null, '*');	// test if our lang-file have a translation for the english short with 3 chars
 	if ($substr($short,-1) == '*')			// else create one by truncating the full translation to x chars
 	{
-        $short = $chars_shortcut > 0 ? $substr(lang($name),0,$chars_shortcut) : $substr(lang($name),$chars_shortcut);
+		$short = $chars_shortcut > 0 ? $substr(lang($name),0,$chars_shortcut) : $substr(lang($name),$chars_shortcut);
 	}
 	echo "\n \"".$short.'"'.($n < 11 ? ',' : '');
 }

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

Indentation +57 added lines, -57 removed lines

@@ -28,64 +28,64 @@
  */
 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']);
+	/**
+	 * 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();
+		// 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;
-    }
+		$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;
+	}
 }
 

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

Indentation +191 added lines, -191 removed lines

@@ -16,207 +16,207 @@
  */
 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);
+	/**
+	 * 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
+	/**
+	 * 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'
+			// 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
-        );
-    }
+			// 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;
-    }
+	/**
+	 * 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'));
-    }
+	/**
+	 * 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
+	 * @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)");
-        }
-    }
+	/**
+	 * @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();
+	/**
+	 * 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 = '';
+	/**
+	 * 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;
-    }
+	/**
+	 * 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;
-    }
+	/**
+	 * 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);
-    }
+	/**
+	 * Send message to the Minify logger
+	 *
+	 * @param string $msg
+	 *
+	 * @return null
+	 */
+	public function log($msg) {
+		Minify_Logger::log($msg);
+	}
 }

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

Indentation +227 added lines, -227 removed lines

@@ -12,235 +12,235 @@
  */
 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]);
-            }
-        }
+	/**
+	 * 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;
-    }
+		// 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);
-    }
+	/**
+	 * @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;
+	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');
-        }
-    }
+	/**
+	 * 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');
+		}
+	}
 }

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

Indentation +44 added lines, -44 removed lines

@@ -26,51 +26,51 @@
  */
 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
+	/**
+	 * 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']);
+		$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;
-    }
+		$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;
+	}
 }