mambax7 / references

class/wideimage/Operation/Crop.php

Braces +7 added lines, -6 removed lines

@@ -51,8 +51,9 @@ 
 				$left = 0;
 			}
 			
-			if ($width > $img->getWidth() - $left)
-				$width = $img->getWidth() - $left;
+			if ($width > $img->getWidth() - $left) {
+							$width = $img->getWidth() - $left;
+			}
 			
 			if ($top < 0)
 			{
@@ -60,8 +61,9 @@ 
 				$top = 0;
 			}
 			
-			if ($height > $img->getHeight() - $top)
-				$height = $img->getHeight() - $top;
+			if ($height > $img->getHeight() - $top) {
+							$height = $img->getHeight() - $top;
+			}
 			
 			$new = $img->doCreate($width, $height);
 			
@@ -71,8 +73,7 @@ 
 				imagecopyresized(
 					$new->getHandle(), $img->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height
 					);
-			}
-			else
+			} else
 			{
 				$new->alphaBlending(false);
 				$new->saveAlpha(true);

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     This file is part of WideImage.
 		
@@ -18,9 +18,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+	 * @package Internal/Operations
+	 **/
 	
 	/**
 	 * An Exception for when an invalid fit method is passed

class/wideimage/Operation/Rotate.php

Braces +16 added lines, -13 removed lines

@@ -41,32 +41,35 @@
 		function execute($image, $angle, $bgColor, $ignoreTransparent)
 		{
 			$angle = -floatval($angle);
-			if ($angle < 0)
-				$angle = 360 + $angle;
+			if ($angle < 0) {
+							$angle = 360 + $angle;
+			}
 			$angle = $angle % 360;
 			
-			if ($angle == 0)
-				return $image->copy();
+			if ($angle == 0) {
+							return $image->copy();
+			}
 			
 			if ($bgColor === null)
 			{
-				if ($image->isTransparent())
-					$bgColor = $image->getTransparentColor();
-				else
+				if ($image->isTransparent()) {
+									$bgColor = $image->getTransparentColor();
+				} else
 				{
 					$tc = array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127);
 					
 					if ($image->isTrueColor())
 					{
 						$bgColor = $image->getExactColorAlpha($tc);
-						if ($bgColor == -1)
-							$bgColor = $image->allocateColorAlpha($tc);
-					}
-					else
+						if ($bgColor == -1) {
+													$bgColor = $image->allocateColorAlpha($tc);
+						}
+					} else
 					{
 						$bgColor = $image->getExactColor($tc);
-						if ($bgColor == -1)
-							$bgColor = $image->allocateColor($tc);
+						if ($bgColor == -1) {
+													$bgColor = $image->allocateColor($tc);
+						}
 					}
 				}
 			}

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     This file is part of WideImage.
 		
@@ -18,9 +18,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+	 * @package Internal/Operations
+	 **/
 	
 	/**
 	 * An Exception for when an invalid fit method is passed

class/wideimage/Operation/Resize.php

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     This file is part of WideImage.
 		
@@ -18,9 +18,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+	 * @package Internal/Operations
+	 **/
 	
 	/**
 	 * An Exception for when an invalid fit method is passed

Braces +21 added lines, -18 removed lines

@@ -54,33 +54,35 @@ 
 		protected function prepareDimensions($img, $width, $height, $fit)
 		{
 			list($width, $height) = WideImage_Coordinate::fixForResize($img, $width, $height);
-			if ($width === 0 || $height === 0)
-				return array('width' => 0, 'height' => 0);
+			if ($width === 0 || $height === 0) {
+							return array('width' => 0, 'height' => 0);
+			}
 			
-			if ($fit == null)
-				$fit = 'inside';
+			if ($fit == null) {
+							$fit = 'inside';
+			}
 			
 			$dim = array();
 			if ($fit == 'fill')
 			{
 				$dim['width'] = $width;
 				$dim['height'] = $height;
-			}
-			elseif ($fit == 'inside' || $fit == 'outside')
+			} elseif ($fit == 'inside' || $fit == 'outside')
 			{
 				$rx = $img->getWidth() / $width;
 				$ry = $img->getHeight() / $height;
 				
-				if ($fit == 'inside')
-					$ratio = ($rx > $ry) ? $rx : $ry;
-				else
-					$ratio = ($rx < $ry) ? $rx : $ry;
+				if ($fit == 'inside') {
+									$ratio = ($rx > $ry) ? $rx : $ry;
+				} else {
+									$ratio = ($rx < $ry) ? $rx : $ry;
+				}
 				
 				$dim['width'] = round($img->getWidth() / $ratio);
 				$dim['height'] = round($img->getHeight() / $ratio);
+			} else {
+							throw new WideImage_Operation_InvalidFitMethodException("{$fit} is not a valid resize-fit method.");
 			}
-			else
-				throw new WideImage_Operation_InvalidFitMethodException("{$fit} is not a valid resize-fit method.");
 			
 			return $dim;
 		}
@@ -99,11 +101,13 @@ 
 		{
 			$dim = $this->prepareDimensions($img, $width, $height, $fit);
 			if (($scale === 'down' && ($dim['width'] >= $img->getWidth() && $dim['height'] >= $img->getHeight())) ||
-				($scale === 'up' && ($dim['width'] <= $img->getWidth() && $dim['height'] <= $img->getHeight())))
-				$dim = array('width' => $img->getWidth(), 'height' => $img->getHeight());
+				($scale === 'up' && ($dim['width'] <= $img->getWidth() && $dim['height'] <= $img->getHeight()))) {
+							$dim = array('width' => $img->getWidth(), 'height' => $img->getHeight());
+			}
 			
-			if ($dim['width'] <= 0 || $dim['height'] <= 0)
-				throw new WideImage_Operation_InvalidResizeDimensionException("Both dimensions must be larger than 0.");
+			if ($dim['width'] <= 0 || $dim['height'] <= 0) {
+							throw new WideImage_Operation_InvalidResizeDimensionException("Both dimensions must be larger than 0.");
+			}
 			
 			$new = WideImage_TrueColorImage::create($dim['width'], $dim['height']);
 			
@@ -119,8 +123,7 @@ 
 						$img->getWidth(), 
 						$img->getHeight()
 					);
-			}
-			else
+			} else
 			{
 				$new->alphaBlending(false);
 				$new->saveAlpha(true);

class/lite.php

Indentation +791 added lines, -791 removed lines

@@ -29,798 +29,798 @@
 class references_Cache_Lite
 {
 
-    // --- Private properties ---
-
-    /**
-    * Directory where to put the cache files
-    * (make sure to add a trailing slash)
-    *
-    * @var string $_cacheDir
-    */
-    public $_cacheDir = '/tmp/';
-
-    /**
-    * Enable / disable caching
-    *
-    * (can be very usefull for the debug of cached scripts)
-    *
-    * @var boolean $_caching
-    */
-    public $_caching = true;
-
-    /**
-    * Cache lifetime (in seconds)
-    *
-    * If null, the cache is valid forever.
-    *
-    * @var int $_lifeTime
-    */
-    public $_lifeTime = 3600;
-
-    /**
-    * Enable / disable fileLocking
-    *
-    * (can avoid cache corruption under bad circumstances)
-    *
-    * @var boolean $_fileLocking
-    */
-    public $_fileLocking = true;
-
-    /**
-    * Timestamp of the last valid cache
-    *
-    * @var int $_refreshTime
-    */
-    public $_refreshTime;
-
-    /**
-    * File name (with path)
-    *
-    * @var string $_file
-    */
-    public $_file;
-
-    /**
-    * File name (without path)
-    *
-    * @var string $_fileName
-    */
-    public $_fileName;
-
-    /**
-    * Enable / disable write control (the cache is read just after writing to detect corrupt entries)
-    *
-    * Enable write control will lightly slow the cache writing but not the cache reading
-    * Write control can detect some corrupt cache files but maybe it's not a perfect control
-    *
-    * @var boolean $_writeControl
-    */
-    public $_writeControl = true;
-
-    /**
-    * Enable / disable read control
-    *
-    * If enabled, a control key is embeded in cache file and this key is compared with the one
-    * calculated after the reading.
-    *
-    * @var boolean $_writeControl
-    */
-    public $_readControl = true;
-
-    /**
-    * Type of read control (only if read control is enabled)
-    *
-    * Available values are :
-    * 'md5' for a md5 hash control (best but slowest)
-    * 'crc32' for a crc32 hash control (lightly less safe but faster, better choice)
-    * 'strlen' for a length only test (fastest)
-    *
-    * @var boolean $_readControlType
-    */
-    public $_readControlType = 'crc32';
-
-    /**
-    * Pear error mode (when raiseError is called)
-    *
-    * (see PEAR doc)
-    *
-    * @see setToDebug()
-    * @var int $_pearErrorMode
-    */
-    public $_pearErrorMode = REFERENCES_CACHE_LITE_ERROR_RETURN;
-
-    /**
-    * Current cache id
-    *
-    * @var string $_id
-    */
-    public $_id;
-
-    /**
-    * Current cache group
-    *
-    * @var string $_group
-    */
-    public $_group;
-
-    /**
-    * Enable / Disable "Memory Caching"
-    *
-    * NB : There is no lifetime for memory caching !
-    *
-    * @var boolean $_memoryCaching
-    */
-    public $_memoryCaching = false;
-
-    /**
-    * Enable / Disable "Only Memory Caching"
-    * (be carefull, memory caching is "beta quality")
-    *
-    * @var boolean $_onlyMemoryCaching
-    */
-    public $_onlyMemoryCaching = false;
-
-    /**
-    * Memory caching array
-    *
-    * @var array $_memoryCachingArray
-    */
-    public $_memoryCachingArray = array();
-
-    /**
-    * Memory caching counter
-    *
-    * @var int $memoryCachingCounter
-    */
-    public $_memoryCachingCounter = 0;
-
-    /**
-    * Memory caching limit
-    *
-    * @var int $memoryCachingLimit
-    */
-    public $_memoryCachingLimit = 1000;
-
-    /**
-    * File Name protection
-    *
-    * if set to true, you can use any cache id or group name
-    * if set to false, it can be faster but cache ids and group names
-    * will be used directly in cache file names so be carefull with
-    * special characters...
-    *
-    * @var boolean $fileNameProtection
-    */
-    public $_fileNameProtection = true;
-
-    /**
-    * Enable / disable automatic serialization
-    *
-    * it can be used to save directly datas which aren't strings
-    * (but it's slower)
-    *
-    * @var boolean $_serialize
-    */
-    public $_automaticSerialization = false;
-
-    /**
-    * Disable / Tune the automatic cleaning process
-    *
-    * The automatic cleaning process destroy too old (for the given life time)
-    * cache files when a new cache file is written.
-    * 0               => no automatic cache cleaning
-    * 1               => systematic cache cleaning
-    * x (integer) > 1 => automatic cleaning randomly 1 times on x cache write
-    *
-    * @var int $_automaticCleaning
-    */
-    public $_automaticCleaningFactor = 0;
-
-    /**
-    * Nested directory level
-    *
-    * Set the hashed directory structure level. 0 means "no hashed directory
-    * structure", 1 means "one level of directory", 2 means "two levels"...
-    * This option can speed up Cache_Lite only when you have many thousands of
-    * cache file. Only specific benchs can help you to choose the perfect value
-    * for you. Maybe, 1 or 2 is a good start.
-    *
-    * @var int $_hashedDirectoryLevel
-    */
-    public $_hashedDirectoryLevel = 0;
-
-    /**
-    * Umask for hashed directory structure
-    *
-    * @var int $_hashedDirectoryUmask
-    */
-    public $_hashedDirectoryUmask = 0700;
-
-    /**
-     * API break for error handling in REFERENCES_CACHE_LITE_ERROR_RETURN mode
-     *
-     * In REFERENCES_CACHE_LITE_ERROR_RETURN mode, error handling was not good because
-     * for example save() method always returned a boolean (a PEAR_Error object
-     * would be better in REFERENCES_CACHE_LITE_ERROR_RETURN mode). To correct this without
-     * breaking the API, this option (false by default) can change this handling.
-     *
-     * @var boolean
-     */
-    public $_errorHandlingAPIBreak = false;
-
-    // --- Public methods ---
-
-    /**
-    * Constructor
-    *
-    * $options is an assoc. Available options are :
-    * $options = array(
-    *     'cacheDir' => directory where to put the cache files (string),
-    *     'caching' => enable / disable caching (boolean),
-    *     'lifeTime' => cache lifetime in seconds (int),
-    *     'fileLocking' => enable / disable fileLocking (boolean),
-    *     'writeControl' => enable / disable write control (boolean),
-    *     'readControl' => enable / disable read control (boolean),
-    *     'readControlType' => type of read control 'crc32', 'md5', 'strlen' (string),
-    *     'pearErrorMode' => pear error mode (when raiseError is called) (cf PEAR doc) (int),
-    *     'memoryCaching' => enable / disable memory caching (boolean),
-    *     'onlyMemoryCaching' => enable / disable only memory caching (boolean),
-    *     'memoryCachingLimit' => max nbr of records to store into memory caching (int),
-    *     'fileNameProtection' => enable / disable automatic file name protection (boolean),
-    *     'automaticSerialization' => enable / disable automatic serialization (boolean),
-    *     'automaticCleaningFactor' => distable / tune automatic cleaning process (int),
-    *     'hashedDirectoryLevel' => level of the hashed directory system (int),
-    *     'hashedDirectoryUmask' => umask for hashed directory structure (int),
-    *     'errorHandlingAPIBreak' => API break for better error handling ? (boolean)
-    * );
-    *
-    * @param array $options options
-    * @access public
-    */
-    function __construct($options = array(NULL))
-    {
-        foreach($options as $key => $value) {
-            $this->setOption($key, $value);
-        }
-    }
-
-    /**
-    * Generic way to set a Cache_Lite option
-    *
-    * see Cache_Lite constructor for available options
-    *
-    * @var string $name name of the option
-    * @var mixed $value value of the option
-    * @access public
-    */
-    function setOption($name, $value)
-    {
-        $availableOptions = array('errorHandlingAPIBreak', 'hashedDirectoryUmask', 'hashedDirectoryLevel', 'automaticCleaningFactor', 'automaticSerialization', 'fileNameProtection', 'memoryCaching', 'onlyMemoryCaching', 'memoryCachingLimit', 'cacheDir', 'caching', 'lifeTime', 'fileLocking', 'writeControl', 'readControl', 'readControlType', 'pearErrorMode');
-        if (in_array($name, $availableOptions)) {
-            $property = '_'.$name;
-            $this->$property = $value;
-        }
-    }
-
-    /**
-    * Test if a cache is available and (if yes) return it
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-    * @return string data of the cache (else : false)
-    * @access public
-    */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
-            $this->_setRefreshTime();
-            $this->_setFileName($id, $group);
-            clearstatcache();
-            if ($this->_memoryCaching) {
-                if (isset($this->_memoryCachingArray[$this->_file])) {
-                    if ($this->_automaticSerialization) {
-                        return unserialize($this->_memoryCachingArray[$this->_file]);
-                    }
-                    return $this->_memoryCachingArray[$this->_file];
-                }
-                if ($this->_onlyMemoryCaching) {
-                    return false;
-                }
-            }
-            if (($doNotTestCacheValidity) || (is_null($this->_refreshTime))) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
-                }
-            } else {
-                if ((file_exists($this->_file)) && (@filemtime($this->_file) > $this->_refreshTime)) {
-                    $data = $this->_read();
-                }
-            }
-            if (($data) and ($this->_memoryCaching)) {
-                $this->_memoryCacheAdd($data);
-            }
-            if (($this->_automaticSerialization) and (is_string($data))) {
-                $data = unserialize($data);
-            }
-            return $data;
-        }
-        return false;
-    }
-
-    /**
-    * Save some data in a cache file
-    *
-    * @param string $data data to put in cache (can be another type than strings if automaticSerialization is on)
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem (else : false or a PEAR_Error object)
-    * @access public
-    */
-    function save($data, $id = NULL, $group = 'default')
-    {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
-            }
-            if (isset($id)) {
-                $this->_setFileName($id, $group);
-            }
-            if ($this->_memoryCaching) {
-                $this->_memoryCacheAdd($data);
-                if ($this->_onlyMemoryCaching) {
-                    return true;
-                }
-            }
-            if ($this->_automaticCleaningFactor>0 && ($this->_automaticCleaningFactor==1 || mt_rand(1, $this->_automaticCleaningFactor)==1)) {
-                    $this->clean(false, 'old');
-                }
-            if ($this->_writeControl) {
-                $res = $this->_writeAndControl($data);
-                if (is_bool($res)) {
-                    if ($res) {
-                        return true;
-                    }
-                    // if $res if false, we need to invalidate the cache
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                }
-            } else {
-                $res = $this->_write($data);
-            }
-            if (is_object($res)) {
-	        	// $res is a PEAR_Error object
-                if (!($this->_errorHandlingAPIBreak)) {
-	                return false; // we return false (old API)
-	            }
-	        }
-            return $res;
-        }
-        return false;
-    }
-
-    /**
-    * Remove a cache file
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $checkbeforeunlink check if file exists before removing it
-    * @return boolean true if no problem
-    * @access public
-    */
-    function remove($id, $group = 'default', $checkbeforeunlink = false)
-    {
-        $this->_setFileName($id, $group);
-        if ($this->_memoryCaching) {
-            if (isset($this->_memoryCachingArray[$this->_file])) {
-                unset($this->_memoryCachingArray[$this->_file]);
-                $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1;
-            }
-            if ($this->_onlyMemoryCaching) {
-                return true;
-            }
-        }
-        if ( $checkbeforeunlink ) {
-            if (!file_exists($this->_file)) return true;
-        }
-        return $this->_unlink($this->_file);
-    }
-
-    /**
-    * Clean the cache
-    *
-    * if no group is specified all cache files will be destroyed
-    * else only cache files of the specified group will be destroyed
-    *
-    * @param string $group name of the cache group
-    * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup',
-    *                                        'callback_myFunction'
-    * @return boolean true if no problem
-    * @access public
-    */
-    function clean($group = false, $mode = 'ingroup')
-    {
-        return $this->_cleanDir($this->_cacheDir, $group, $mode);
-    }
-
-    /**
-    * Set to debug mode
-    *
-    * When an error is found, the script will stop and the message will be displayed
-    * (in debug mode only).
-    *
-    * @access public
-    */
-    function setToDebug()
-    {
-        $this->setOption('pearErrorMode', REFERENCES_CACHE_LITE_ERROR_DIE);
-    }
-
-    /**
-    * Set a new life time
-    *
-    * @param int $newLifeTime new life time (in seconds)
-    * @access public
-    */
-    function setLifeTime($newLifeTime)
-    {
-        $this->_lifeTime = $newLifeTime;
-        $this->_setRefreshTime();
-    }
-
-    /**
-    * Save the state of the caching memory array into a cache file cache
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @access public
-    */
-    function saveMemoryCachingState($id, $group = 'default')
-    {
-        if ($this->_caching) {
-            $array = array(
-                'counter' => $this->_memoryCachingCounter,
-                'array' => $this->_memoryCachingArray
-            );
-            $data = serialize($array);
-            $this->save($data, $id, $group);
-        }
-    }
-
-    /**
-    * Load the state of the caching memory array from a given cache file cache
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-    * @access public
-    */
-    function getMemoryCachingState($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity)) {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
-            }
-        }
-    }
-
-    /**
-    * Return the cache last modification time
-    *
-    * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
-    *
-    * @return int last modification time
-    */
-    function lastModified()
-    {
-        return @filemtime($this->_file);
-    }
-
-    /**
-    * Trigger a PEAR error
-    *
-    * To improve performances, the PEAR.php file is included dynamically.
-    * The file is so included only when an error is triggered. So, in most
-    * cases, the file isn't included and perfs are much better.
-    *
-    * @param string $msg error message
-    * @param int $code error code
-    * @access public
-    */
-    function raiseError($msg, $code)
-    {
-        include_once('PEAR.php');
-        return references_PEAR::raiseError($msg, $code, $this->_pearErrorMode);
-    }
-
-    /**
-     * Extend the life of a valid cache file
-     *
-     * see http://pear.php.net/bugs/bug.php?id=6681
-     *
-     * @access public
-     */
-    function extendLife()
-    {
-        @touch($this->_file);
-    }
-
-    // --- Private methods ---
-
-    /**
-    * Compute & set the refresh time
-    *
-    * @access private
-    */
-    function _setRefreshTime()
-    {
-        if (is_null($this->_lifeTime)) {
-            $this->_refreshTime = null;
-        } else {
-            $this->_refreshTime = time() - $this->_lifeTime;
-        }
-    }
-
-    /**
-    * Remove a file
-    *
-    * @param string $file complete file path and name
-    * @return boolean true if no problem
-    * @access private
-    */
-    function _unlink($file)
-    {
-        if (!@unlink($file)) {
-            return $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
-        }
-        return true;
-    }
-
-    /**
-    * Recursive function for cleaning cache file in the given directory
-    *
-    * @param string $dir directory complete path (with a trailing slash)
-    * @param string $group name of the cache group
-    * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup',
+	// --- Private properties ---
+
+	/**
+	 * Directory where to put the cache files
+	 * (make sure to add a trailing slash)
+	 *
+	 * @var string $_cacheDir
+	 */
+	public $_cacheDir = '/tmp/';
+
+	/**
+	 * Enable / disable caching
+	 *
+	 * (can be very usefull for the debug of cached scripts)
+	 *
+	 * @var boolean $_caching
+	 */
+	public $_caching = true;
+
+	/**
+	 * Cache lifetime (in seconds)
+	 *
+	 * If null, the cache is valid forever.
+	 *
+	 * @var int $_lifeTime
+	 */
+	public $_lifeTime = 3600;
+
+	/**
+	 * Enable / disable fileLocking
+	 *
+	 * (can avoid cache corruption under bad circumstances)
+	 *
+	 * @var boolean $_fileLocking
+	 */
+	public $_fileLocking = true;
+
+	/**
+	 * Timestamp of the last valid cache
+	 *
+	 * @var int $_refreshTime
+	 */
+	public $_refreshTime;
+
+	/**
+	 * File name (with path)
+	 *
+	 * @var string $_file
+	 */
+	public $_file;
+
+	/**
+	 * File name (without path)
+	 *
+	 * @var string $_fileName
+	 */
+	public $_fileName;
+
+	/**
+	 * Enable / disable write control (the cache is read just after writing to detect corrupt entries)
+	 *
+	 * Enable write control will lightly slow the cache writing but not the cache reading
+	 * Write control can detect some corrupt cache files but maybe it's not a perfect control
+	 *
+	 * @var boolean $_writeControl
+	 */
+	public $_writeControl = true;
+
+	/**
+	 * Enable / disable read control
+	 *
+	 * If enabled, a control key is embeded in cache file and this key is compared with the one
+	 * calculated after the reading.
+	 *
+	 * @var boolean $_writeControl
+	 */
+	public $_readControl = true;
+
+	/**
+	 * Type of read control (only if read control is enabled)
+	 *
+	 * Available values are :
+	 * 'md5' for a md5 hash control (best but slowest)
+	 * 'crc32' for a crc32 hash control (lightly less safe but faster, better choice)
+	 * 'strlen' for a length only test (fastest)
+	 *
+	 * @var boolean $_readControlType
+	 */
+	public $_readControlType = 'crc32';
+
+	/**
+	 * Pear error mode (when raiseError is called)
+	 *
+	 * (see PEAR doc)
+	 *
+	 * @see setToDebug()
+	 * @var int $_pearErrorMode
+	 */
+	public $_pearErrorMode = REFERENCES_CACHE_LITE_ERROR_RETURN;
+
+	/**
+	 * Current cache id
+	 *
+	 * @var string $_id
+	 */
+	public $_id;
+
+	/**
+	 * Current cache group
+	 *
+	 * @var string $_group
+	 */
+	public $_group;
+
+	/**
+	 * Enable / Disable "Memory Caching"
+	 *
+	 * NB : There is no lifetime for memory caching !
+	 *
+	 * @var boolean $_memoryCaching
+	 */
+	public $_memoryCaching = false;
+
+	/**
+	 * Enable / Disable "Only Memory Caching"
+	 * (be carefull, memory caching is "beta quality")
+	 *
+	 * @var boolean $_onlyMemoryCaching
+	 */
+	public $_onlyMemoryCaching = false;
+
+	/**
+	 * Memory caching array
+	 *
+	 * @var array $_memoryCachingArray
+	 */
+	public $_memoryCachingArray = array();
+
+	/**
+	 * Memory caching counter
+	 *
+	 * @var int $memoryCachingCounter
+	 */
+	public $_memoryCachingCounter = 0;
+
+	/**
+	 * Memory caching limit
+	 *
+	 * @var int $memoryCachingLimit
+	 */
+	public $_memoryCachingLimit = 1000;
+
+	/**
+	 * File Name protection
+	 *
+	 * if set to true, you can use any cache id or group name
+	 * if set to false, it can be faster but cache ids and group names
+	 * will be used directly in cache file names so be carefull with
+	 * special characters...
+	 *
+	 * @var boolean $fileNameProtection
+	 */
+	public $_fileNameProtection = true;
+
+	/**
+	 * Enable / disable automatic serialization
+	 *
+	 * it can be used to save directly datas which aren't strings
+	 * (but it's slower)
+	 *
+	 * @var boolean $_serialize
+	 */
+	public $_automaticSerialization = false;
+
+	/**
+	 * Disable / Tune the automatic cleaning process
+	 *
+	 * The automatic cleaning process destroy too old (for the given life time)
+	 * cache files when a new cache file is written.
+	 * 0               => no automatic cache cleaning
+	 * 1               => systematic cache cleaning
+	 * x (integer) > 1 => automatic cleaning randomly 1 times on x cache write
+	 *
+	 * @var int $_automaticCleaning
+	 */
+	public $_automaticCleaningFactor = 0;
+
+	/**
+	 * Nested directory level
+	 *
+	 * Set the hashed directory structure level. 0 means "no hashed directory
+	 * structure", 1 means "one level of directory", 2 means "two levels"...
+	 * This option can speed up Cache_Lite only when you have many thousands of
+	 * cache file. Only specific benchs can help you to choose the perfect value
+	 * for you. Maybe, 1 or 2 is a good start.
+	 *
+	 * @var int $_hashedDirectoryLevel
+	 */
+	public $_hashedDirectoryLevel = 0;
+
+	/**
+	 * Umask for hashed directory structure
+	 *
+	 * @var int $_hashedDirectoryUmask
+	 */
+	public $_hashedDirectoryUmask = 0700;
+
+	/**
+	 * API break for error handling in REFERENCES_CACHE_LITE_ERROR_RETURN mode
+	 *
+	 * In REFERENCES_CACHE_LITE_ERROR_RETURN mode, error handling was not good because
+	 * for example save() method always returned a boolean (a PEAR_Error object
+	 * would be better in REFERENCES_CACHE_LITE_ERROR_RETURN mode). To correct this without
+	 * breaking the API, this option (false by default) can change this handling.
+	 *
+	 * @var boolean
+	 */
+	public $_errorHandlingAPIBreak = false;
+
+	// --- Public methods ---
+
+	/**
+	 * Constructor
+	 *
+	 * $options is an assoc. Available options are :
+	 * $options = array(
+	 *     'cacheDir' => directory where to put the cache files (string),
+	 *     'caching' => enable / disable caching (boolean),
+	 *     'lifeTime' => cache lifetime in seconds (int),
+	 *     'fileLocking' => enable / disable fileLocking (boolean),
+	 *     'writeControl' => enable / disable write control (boolean),
+	 *     'readControl' => enable / disable read control (boolean),
+	 *     'readControlType' => type of read control 'crc32', 'md5', 'strlen' (string),
+	 *     'pearErrorMode' => pear error mode (when raiseError is called) (cf PEAR doc) (int),
+	 *     'memoryCaching' => enable / disable memory caching (boolean),
+	 *     'onlyMemoryCaching' => enable / disable only memory caching (boolean),
+	 *     'memoryCachingLimit' => max nbr of records to store into memory caching (int),
+	 *     'fileNameProtection' => enable / disable automatic file name protection (boolean),
+	 *     'automaticSerialization' => enable / disable automatic serialization (boolean),
+	 *     'automaticCleaningFactor' => distable / tune automatic cleaning process (int),
+	 *     'hashedDirectoryLevel' => level of the hashed directory system (int),
+	 *     'hashedDirectoryUmask' => umask for hashed directory structure (int),
+	 *     'errorHandlingAPIBreak' => API break for better error handling ? (boolean)
+	 * );
+	 *
+	 * @param array $options options
+	 * @access public
+	 */
+	function __construct($options = array(NULL))
+	{
+		foreach($options as $key => $value) {
+			$this->setOption($key, $value);
+		}
+	}
+
+	/**
+	 * Generic way to set a Cache_Lite option
+	 *
+	 * see Cache_Lite constructor for available options
+	 *
+	 * @var string $name name of the option
+	 * @var mixed $value value of the option
+	 * @access public
+	 */
+	function setOption($name, $value)
+	{
+		$availableOptions = array('errorHandlingAPIBreak', 'hashedDirectoryUmask', 'hashedDirectoryLevel', 'automaticCleaningFactor', 'automaticSerialization', 'fileNameProtection', 'memoryCaching', 'onlyMemoryCaching', 'memoryCachingLimit', 'cacheDir', 'caching', 'lifeTime', 'fileLocking', 'writeControl', 'readControl', 'readControlType', 'pearErrorMode');
+		if (in_array($name, $availableOptions)) {
+			$property = '_'.$name;
+			$this->$property = $value;
+		}
+	}
+
+	/**
+	 * Test if a cache is available and (if yes) return it
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
+	 * @return string data of the cache (else : false)
+	 * @access public
+	 */
+	function get($id, $group = 'default', $doNotTestCacheValidity = false)
+	{
+		$this->_id = $id;
+		$this->_group = $group;
+		$data = false;
+		if ($this->_caching) {
+			$this->_setRefreshTime();
+			$this->_setFileName($id, $group);
+			clearstatcache();
+			if ($this->_memoryCaching) {
+				if (isset($this->_memoryCachingArray[$this->_file])) {
+					if ($this->_automaticSerialization) {
+						return unserialize($this->_memoryCachingArray[$this->_file]);
+					}
+					return $this->_memoryCachingArray[$this->_file];
+				}
+				if ($this->_onlyMemoryCaching) {
+					return false;
+				}
+			}
+			if (($doNotTestCacheValidity) || (is_null($this->_refreshTime))) {
+				if (file_exists($this->_file)) {
+					$data = $this->_read();
+				}
+			} else {
+				if ((file_exists($this->_file)) && (@filemtime($this->_file) > $this->_refreshTime)) {
+					$data = $this->_read();
+				}
+			}
+			if (($data) and ($this->_memoryCaching)) {
+				$this->_memoryCacheAdd($data);
+			}
+			if (($this->_automaticSerialization) and (is_string($data))) {
+				$data = unserialize($data);
+			}
+			return $data;
+		}
+		return false;
+	}
+
+	/**
+	 * Save some data in a cache file
+	 *
+	 * @param string $data data to put in cache (can be another type than strings if automaticSerialization is on)
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem (else : false or a PEAR_Error object)
+	 * @access public
+	 */
+	function save($data, $id = NULL, $group = 'default')
+	{
+		if ($this->_caching) {
+			if ($this->_automaticSerialization) {
+				$data = serialize($data);
+			}
+			if (isset($id)) {
+				$this->_setFileName($id, $group);
+			}
+			if ($this->_memoryCaching) {
+				$this->_memoryCacheAdd($data);
+				if ($this->_onlyMemoryCaching) {
+					return true;
+				}
+			}
+			if ($this->_automaticCleaningFactor>0 && ($this->_automaticCleaningFactor==1 || mt_rand(1, $this->_automaticCleaningFactor)==1)) {
+					$this->clean(false, 'old');
+				}
+			if ($this->_writeControl) {
+				$res = $this->_writeAndControl($data);
+				if (is_bool($res)) {
+					if ($res) {
+						return true;
+					}
+					// if $res if false, we need to invalidate the cache
+					@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					return false;
+				}
+			} else {
+				$res = $this->_write($data);
+			}
+			if (is_object($res)) {
+				// $res is a PEAR_Error object
+				if (!($this->_errorHandlingAPIBreak)) {
+					return false; // we return false (old API)
+				}
+			}
+			return $res;
+		}
+		return false;
+	}
+
+	/**
+	 * Remove a cache file
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @param boolean $checkbeforeunlink check if file exists before removing it
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function remove($id, $group = 'default', $checkbeforeunlink = false)
+	{
+		$this->_setFileName($id, $group);
+		if ($this->_memoryCaching) {
+			if (isset($this->_memoryCachingArray[$this->_file])) {
+				unset($this->_memoryCachingArray[$this->_file]);
+				$this->_memoryCachingCounter = $this->_memoryCachingCounter - 1;
+			}
+			if ($this->_onlyMemoryCaching) {
+				return true;
+			}
+		}
+		if ( $checkbeforeunlink ) {
+			if (!file_exists($this->_file)) return true;
+		}
+		return $this->_unlink($this->_file);
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * if no group is specified all cache files will be destroyed
+	 * else only cache files of the specified group will be destroyed
+	 *
+	 * @param string $group name of the cache group
+	 * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup',
+	 *                                        'callback_myFunction'
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function clean($group = false, $mode = 'ingroup')
+	{
+		return $this->_cleanDir($this->_cacheDir, $group, $mode);
+	}
+
+	/**
+	 * Set to debug mode
+	 *
+	 * When an error is found, the script will stop and the message will be displayed
+	 * (in debug mode only).
+	 *
+	 * @access public
+	 */
+	function setToDebug()
+	{
+		$this->setOption('pearErrorMode', REFERENCES_CACHE_LITE_ERROR_DIE);
+	}
+
+	/**
+	 * Set a new life time
+	 *
+	 * @param int $newLifeTime new life time (in seconds)
+	 * @access public
+	 */
+	function setLifeTime($newLifeTime)
+	{
+		$this->_lifeTime = $newLifeTime;
+		$this->_setRefreshTime();
+	}
+
+	/**
+	 * Save the state of the caching memory array into a cache file cache
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @access public
+	 */
+	function saveMemoryCachingState($id, $group = 'default')
+	{
+		if ($this->_caching) {
+			$array = array(
+				'counter' => $this->_memoryCachingCounter,
+				'array' => $this->_memoryCachingArray
+			);
+			$data = serialize($array);
+			$this->save($data, $id, $group);
+		}
+	}
+
+	/**
+	 * Load the state of the caching memory array from a given cache file cache
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
+	 * @access public
+	 */
+	function getMemoryCachingState($id, $group = 'default', $doNotTestCacheValidity = false)
+	{
+		if ($this->_caching) {
+			if ($data = $this->get($id, $group, $doNotTestCacheValidity)) {
+				$array = unserialize($data);
+				$this->_memoryCachingCounter = $array['counter'];
+				$this->_memoryCachingArray = $array['array'];
+			}
+		}
+	}
+
+	/**
+	 * Return the cache last modification time
+	 *
+	 * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
+	 *
+	 * @return int last modification time
+	 */
+	function lastModified()
+	{
+		return @filemtime($this->_file);
+	}
+
+	/**
+	 * Trigger a PEAR error
+	 *
+	 * To improve performances, the PEAR.php file is included dynamically.
+	 * The file is so included only when an error is triggered. So, in most
+	 * cases, the file isn't included and perfs are much better.
+	 *
+	 * @param string $msg error message
+	 * @param int $code error code
+	 * @access public
+	 */
+	function raiseError($msg, $code)
+	{
+		include_once('PEAR.php');
+		return references_PEAR::raiseError($msg, $code, $this->_pearErrorMode);
+	}
+
+	/**
+	 * Extend the life of a valid cache file
+	 *
+	 * see http://pear.php.net/bugs/bug.php?id=6681
+	 *
+	 * @access public
+	 */
+	function extendLife()
+	{
+		@touch($this->_file);
+	}
+
+	// --- Private methods ---
+
+	/**
+	 * Compute & set the refresh time
+	 *
+	 * @access private
+	 */
+	function _setRefreshTime()
+	{
+		if (is_null($this->_lifeTime)) {
+			$this->_refreshTime = null;
+		} else {
+			$this->_refreshTime = time() - $this->_lifeTime;
+		}
+	}
+
+	/**
+	 * Remove a file
+	 *
+	 * @param string $file complete file path and name
+	 * @return boolean true if no problem
+	 * @access private
+	 */
+	function _unlink($file)
+	{
+		if (!@unlink($file)) {
+			return $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
+		}
+		return true;
+	}
+
+	/**
+	 * Recursive function for cleaning cache file in the given directory
+	 *
+	 * @param string $dir directory complete path (with a trailing slash)
+	 * @param string $group name of the cache group
+	 * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup',
                                              'callback_myFunction'
-    * @return boolean true if no problem
-    * @access private
-    */
-    function _cleanDir($dir, $group = false, $mode = 'ingroup')
-    {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
-        } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
-        }
-        if ($this->_memoryCaching) {
-	    foreach($this->_memoryCachingArray as $key => $v) {
-                if (strpos($key, $motif) !== false) {
-                    unset($this->_memoryCachingArray[$key]);
-                    $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1;
-                }
-            }
-            if ($this->_onlyMemoryCaching) {
-                return true;
-            }
-        }
-        if (!($dh = opendir($dir))) {
-            return $this->raiseError('Cache_Lite : Unable to open cache directory !', -4);
-        }
-        $result = true;
-        while ($file = readdir($dh)) {
-            if (($file != '.') && ($file != '..')) {
-                if (substr($file, 0, 6)=='cache_') {
-                    $file2 = $dir . $file;
-                    if (is_file($file2)) {
-                        switch (substr($mode, 0, 9)) {
-                            case 'old':
-                                // files older than lifeTime get deleted from cache
-                                if (!is_null($this->_lifeTime)) {
-                                    if ((time() - @filemtime($file2)) > $this->_lifeTime) {
-                                        $result = ($result and ($this->_unlink($file2)));
-                                    }
-                                }
-                                break;
-                            case 'notingrou':
-                                if (strpos($file2, $motif) === false) {
-                                    $result = ($result and ($this->_unlink($file2)));
-                                }
-                                break;
-                            case 'callback_':
-                                $func = substr($mode, 9, strlen($mode) - 9);
-                                if ($func($file2, $group)) {
-                                    $result = ($result and ($this->_unlink($file2)));
-                                }
-                                break;
-                            case 'ingroup':
-                            default:
-                                if (strpos($file2, $motif) !== false) {
-                                    $result = ($result and ($this->_unlink($file2)));
-                                }
-                                break;
-                        }
-                    }
-                    if ((is_dir($file2)) and ($this->_hashedDirectoryLevel>0)) {
-                        $result = ($result and ($this->_cleanDir($file2 . '/', $group, $mode)));
-                    }
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-    * Add some date in the memory caching array
-    *
-    * @param string $data data to cache
-    * @access private
-    */
-    function _memoryCacheAdd($data)
-    {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, ) = each($this->_memoryCachingArray);
-            unset($this->_memoryCachingArray[$key]);
-        } else {
-            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
-        }
-    }
-
-    /**
-    * Make a file name (with path)
-    *
-    * @param string $id cache id
-    * @param string $group name of the group
-    * @access private
-    */
-    function _setFileName($id, $group)
-    {
-
-        if ($this->_fileNameProtection) {
-            $suffix = 'cache_'.md5($group).'_'.md5($id);
-        } else {
-            $suffix = 'cache_'.$group.'_'.$id;
-        }
-        $root = $this->_cacheDir;
-        if ($this->_hashedDirectoryLevel>0) {
-            $hash = md5($suffix);
-            for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) {
-                $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
-            }
-        }
-        $this->_fileName = $suffix;
-        $this->_file = $root.$suffix;
-    }
-
-    /**
-    * Read the cache file and return the content
-    *
-    * @return string content of the cache file (else : false or a PEAR_Error object)
-    * @access private
-    */
-    function _read()
-    {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
-            clearstatcache();
-            $length = @filesize($this->_file);
-            $mqr = get_magic_quotes_runtime();
-            @set_magic_quotes_runtime(0);
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
-            }
-            if ($length) {
-                $data = @fread($fp, $length);
-            } else {
-                $data = '';
-            }
-            @set_magic_quotes_runtime($mqr);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            if ($this->_readControl) {
-                $hashData = $this->_hash($data, $this->_readControlType);
-                if ($hashData != $hashControl) {
-                    if (!(is_null($this->_lifeTime))) {
-                        @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    } else {
-                        @unlink($this->_file);
-                    }
-                    return false;
-                }
-            }
-            return $data;
-        }
-        return $this->raiseError('Cache_Lite : Unable to read cache !', -2);
-    }
-
-    /**
-    * Write the given data in the cache file
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if ok (a PEAR_Error object else)
-    * @access private
-    */
-    function _write($data)
-    {
-        if ($this->_hashedDirectoryLevel > 0) {
-            $hash = md5($this->_fileName);
-            $root = $this->_cacheDir;
-            for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) {
-                $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
-                if (!(@is_dir($root))) {
-                    @mkdir($root, $this->_hashedDirectoryUmask);
-                }
-            }
-        }
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
-                @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
-            }
-            $mqr = get_magic_quotes_runtime();
-            @set_magic_quotes_runtime(0);
-            @fwrite($fp, $data);
-            @set_magic_quotes_runtime($mqr);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            return true;
-        }
-        return $this->raiseError('Cache_Lite : Unable to write cache file : '.$this->_file, -1);
-    }
-
-    /**
-    * Write the given data in the cache file and control it just after to avoir corrupted cache entries
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if the test is ok (else : false or a PEAR_Error object)
-    * @access private
-    */
-    function _writeAndControl($data)
-    {
-        $result = $this->_write($data);
-        if (is_object($result)) {
-            return $result; # We return the PEAR_Error object
-        }
-        $dataRead = $this->_read();
-        if (is_object($dataRead)) {
-            return $dataRead; # We return the PEAR_Error object
-        }
-        if ((is_bool($dataRead)) && (!$dataRead)) {
-            return false;
-        }
-        return ($dataRead==$data);
-    }
-
-    /**
-    * Make a control key with the string containing datas
-    *
-    * @param string $data data
-    * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
-    * @return string control key
-    * @access private
-    */
-    function _hash($data, $controlType)
-    {
-        switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            return $this->raiseError('Unknown controlType ! (available values are only \'md5\', \'crc32\', \'strlen\')', -5);
-        }
-    }
+	 * @return boolean true if no problem
+	 * @access private
+	 */
+	function _cleanDir($dir, $group = false, $mode = 'ingroup')
+	{
+		if ($this->_fileNameProtection) {
+			$motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+		} else {
+			$motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+		}
+		if ($this->_memoryCaching) {
+		foreach($this->_memoryCachingArray as $key => $v) {
+				if (strpos($key, $motif) !== false) {
+					unset($this->_memoryCachingArray[$key]);
+					$this->_memoryCachingCounter = $this->_memoryCachingCounter - 1;
+				}
+			}
+			if ($this->_onlyMemoryCaching) {
+				return true;
+			}
+		}
+		if (!($dh = opendir($dir))) {
+			return $this->raiseError('Cache_Lite : Unable to open cache directory !', -4);
+		}
+		$result = true;
+		while ($file = readdir($dh)) {
+			if (($file != '.') && ($file != '..')) {
+				if (substr($file, 0, 6)=='cache_') {
+					$file2 = $dir . $file;
+					if (is_file($file2)) {
+						switch (substr($mode, 0, 9)) {
+							case 'old':
+								// files older than lifeTime get deleted from cache
+								if (!is_null($this->_lifeTime)) {
+									if ((time() - @filemtime($file2)) > $this->_lifeTime) {
+										$result = ($result and ($this->_unlink($file2)));
+									}
+								}
+								break;
+							case 'notingrou':
+								if (strpos($file2, $motif) === false) {
+									$result = ($result and ($this->_unlink($file2)));
+								}
+								break;
+							case 'callback_':
+								$func = substr($mode, 9, strlen($mode) - 9);
+								if ($func($file2, $group)) {
+									$result = ($result and ($this->_unlink($file2)));
+								}
+								break;
+							case 'ingroup':
+							default:
+								if (strpos($file2, $motif) !== false) {
+									$result = ($result and ($this->_unlink($file2)));
+								}
+								break;
+						}
+					}
+					if ((is_dir($file2)) and ($this->_hashedDirectoryLevel>0)) {
+						$result = ($result and ($this->_cleanDir($file2 . '/', $group, $mode)));
+					}
+				}
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Add some date in the memory caching array
+	 *
+	 * @param string $data data to cache
+	 * @access private
+	 */
+	function _memoryCacheAdd($data)
+	{
+		$this->_memoryCachingArray[$this->_file] = $data;
+		if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+			list($key, ) = each($this->_memoryCachingArray);
+			unset($this->_memoryCachingArray[$key]);
+		} else {
+			$this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
+		}
+	}
+
+	/**
+	 * Make a file name (with path)
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the group
+	 * @access private
+	 */
+	function _setFileName($id, $group)
+	{
+
+		if ($this->_fileNameProtection) {
+			$suffix = 'cache_'.md5($group).'_'.md5($id);
+		} else {
+			$suffix = 'cache_'.$group.'_'.$id;
+		}
+		$root = $this->_cacheDir;
+		if ($this->_hashedDirectoryLevel>0) {
+			$hash = md5($suffix);
+			for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) {
+				$root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
+			}
+		}
+		$this->_fileName = $suffix;
+		$this->_file = $root.$suffix;
+	}
+
+	/**
+	 * Read the cache file and return the content
+	 *
+	 * @return string content of the cache file (else : false or a PEAR_Error object)
+	 * @access private
+	 */
+	function _read()
+	{
+		$fp = @fopen($this->_file, "rb");
+		if ($this->_fileLocking) @flock($fp, LOCK_SH);
+		if ($fp) {
+			clearstatcache();
+			$length = @filesize($this->_file);
+			$mqr = get_magic_quotes_runtime();
+			@set_magic_quotes_runtime(0);
+			if ($this->_readControl) {
+				$hashControl = @fread($fp, 32);
+				$length = $length - 32;
+			}
+			if ($length) {
+				$data = @fread($fp, $length);
+			} else {
+				$data = '';
+			}
+			@set_magic_quotes_runtime($mqr);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			if ($this->_readControl) {
+				$hashData = $this->_hash($data, $this->_readControlType);
+				if ($hashData != $hashControl) {
+					if (!(is_null($this->_lifeTime))) {
+						@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					} else {
+						@unlink($this->_file);
+					}
+					return false;
+				}
+			}
+			return $data;
+		}
+		return $this->raiseError('Cache_Lite : Unable to read cache !', -2);
+	}
+
+	/**
+	 * Write the given data in the cache file
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if ok (a PEAR_Error object else)
+	 * @access private
+	 */
+	function _write($data)
+	{
+		if ($this->_hashedDirectoryLevel > 0) {
+			$hash = md5($this->_fileName);
+			$root = $this->_cacheDir;
+			for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) {
+				$root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
+				if (!(@is_dir($root))) {
+					@mkdir($root, $this->_hashedDirectoryUmask);
+				}
+			}
+		}
+		$fp = @fopen($this->_file, "wb");
+		if ($fp) {
+			if ($this->_fileLocking) @flock($fp, LOCK_EX);
+			if ($this->_readControl) {
+				@fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
+			}
+			$mqr = get_magic_quotes_runtime();
+			@set_magic_quotes_runtime(0);
+			@fwrite($fp, $data);
+			@set_magic_quotes_runtime($mqr);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			return true;
+		}
+		return $this->raiseError('Cache_Lite : Unable to write cache file : '.$this->_file, -1);
+	}
+
+	/**
+	 * Write the given data in the cache file and control it just after to avoir corrupted cache entries
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if the test is ok (else : false or a PEAR_Error object)
+	 * @access private
+	 */
+	function _writeAndControl($data)
+	{
+		$result = $this->_write($data);
+		if (is_object($result)) {
+			return $result; # We return the PEAR_Error object
+		}
+		$dataRead = $this->_read();
+		if (is_object($dataRead)) {
+			return $dataRead; # We return the PEAR_Error object
+		}
+		if ((is_bool($dataRead)) && (!$dataRead)) {
+			return false;
+		}
+		return ($dataRead==$data);
+	}
+
+	/**
+	 * Make a control key with the string containing datas
+	 *
+	 * @param string $data data
+	 * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
+	 * @return string control key
+	 * @access private
+	 */
+	function _hash($data, $controlType)
+	{
+		switch ($controlType) {
+		case 'md5':
+			return md5($data);
+		case 'crc32':
+			return sprintf('% 32d', crc32($data));
+		case 'strlen':
+			return sprintf('% 32d', strlen($data));
+		default:
+			return $this->raiseError('Unknown controlType ! (available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+		}
+	}
 
 }
 

Switch Indentation +8 added lines, -8 removed lines

@@ -811,14 +811,14 @@
     function _hash($data, $controlType)
     {
         switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            return $this->raiseError('Unknown controlType ! (available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+        	case 'md5':
+            	return md5($data);
+        	case 'crc32':
+            	return sprintf('% 32d', crc32($data));
+        	case 'strlen':
+            	return sprintf('% 32d', strlen($data));
+        	default:
+            	return $this->raiseError('Unknown controlType ! (available values are only \'md5\', \'crc32\', \'strlen\')', -5);
         }
     }
 

Spacing +17 added lines, -17 removed lines

@@ -279,7 +279,7 @@ 
     */
     function __construct($options = array(NULL))
     {
-        foreach($options as $key => $value) {
+        foreach ($options as $key => $value) {
             $this->setOption($key, $value);
         }
     }
@@ -375,7 +375,7 @@ 
                     return true;
                 }
             }
-            if ($this->_automaticCleaningFactor>0 && ($this->_automaticCleaningFactor==1 || mt_rand(1, $this->_automaticCleaningFactor)==1)) {
+            if ($this->_automaticCleaningFactor > 0 && ($this->_automaticCleaningFactor == 1 || mt_rand(1, $this->_automaticCleaningFactor) == 1)) {
                     $this->clean(false, 'old');
                 }
             if ($this->_writeControl) {
@@ -385,7 +385,7 @@ 
                         return true;
                     }
                     // if $res if false, we need to invalidate the cache
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 }
             } else {
@@ -423,7 +423,7 @@ 
                 return true;
             }
         }
-        if ( $checkbeforeunlink ) {
+        if ($checkbeforeunlink) {
             if (!file_exists($this->_file)) return true;
         }
         return $this->_unlink($this->_file);
@@ -599,7 +599,7 @@ 
             $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
         }
         if ($this->_memoryCaching) {
-	    foreach($this->_memoryCachingArray as $key => $v) {
+	    foreach ($this->_memoryCachingArray as $key => $v) {
                 if (strpos($key, $motif) !== false) {
                     unset($this->_memoryCachingArray[$key]);
                     $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1;
@@ -615,8 +615,8 @@ 
         $result = true;
         while ($file = readdir($dh)) {
             if (($file != '.') && ($file != '..')) {
-                if (substr($file, 0, 6)=='cache_') {
-                    $file2 = $dir . $file;
+                if (substr($file, 0, 6) == 'cache_') {
+                    $file2 = $dir.$file;
                     if (is_file($file2)) {
                         switch (substr($mode, 0, 9)) {
                             case 'old':
@@ -646,8 +646,8 @@ 
                                 break;
                         }
                     }
-                    if ((is_dir($file2)) and ($this->_hashedDirectoryLevel>0)) {
-                        $result = ($result and ($this->_cleanDir($file2 . '/', $group, $mode)));
+                    if ((is_dir($file2)) and ($this->_hashedDirectoryLevel > 0)) {
+                        $result = ($result and ($this->_cleanDir($file2.'/', $group, $mode)));
                     }
                 }
             }
@@ -665,7 +665,7 @@ 
     {
         $this->_memoryCachingArray[$this->_file] = $data;
         if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, ) = each($this->_memoryCachingArray);
+            list($key,) = each($this->_memoryCachingArray);
             unset($this->_memoryCachingArray[$key]);
         } else {
             $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
@@ -688,10 +688,10 @@ 
             $suffix = 'cache_'.$group.'_'.$id;
         }
         $root = $this->_cacheDir;
-        if ($this->_hashedDirectoryLevel>0) {
+        if ($this->_hashedDirectoryLevel > 0) {
             $hash = md5($suffix);
-            for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) {
-                $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
+            for ($i = 0; $i < $this->_hashedDirectoryLevel; $i++) {
+                $root = $root.'cache_'.substr($hash, 0, $i + 1).'/';
             }
         }
         $this->_fileName = $suffix;
@@ -729,7 +729,7 @@ 
                 $hashData = $this->_hash($data, $this->_readControlType);
                 if ($hashData != $hashControl) {
                     if (!(is_null($this->_lifeTime))) {
-                        @touch($this->_file, time() - 2*abs($this->_lifeTime));
+                        @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     } else {
                         @unlink($this->_file);
                     }
@@ -753,8 +753,8 @@ 
         if ($this->_hashedDirectoryLevel > 0) {
             $hash = md5($this->_fileName);
             $root = $this->_cacheDir;
-            for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) {
-                $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
+            for ($i = 0; $i < $this->_hashedDirectoryLevel; $i++) {
+                $root = $root.'cache_'.substr($hash, 0, $i + 1).'/';
                 if (!(@is_dir($root))) {
                     @mkdir($root, $this->_hashedDirectoryUmask);
                 }
@@ -797,7 +797,7 @@ 
         if ((is_bool($dataRead)) && (!$dataRead)) {
             return false;
         }
-        return ($dataRead==$data);
+        return ($dataRead == $data);
     }
 
     /**

Braces +15 added lines, -5 removed lines

@@ -424,7 +424,9 @@ 
             }
         }
         if ( $checkbeforeunlink ) {
-            if (!file_exists($this->_file)) return true;
+            if (!file_exists($this->_file)) {
+            	return true;
+            }
         }
         return $this->_unlink($this->_file);
     }
@@ -707,7 +709,9 @@ 
     function _read()
     {
         $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
+        if ($this->_fileLocking) {
+        	@flock($fp, LOCK_SH);
+        }
         if ($fp) {
             clearstatcache();
             $length = @filesize($this->_file);
@@ -723,7 +727,9 @@ 
                 $data = '';
             }
             @set_magic_quotes_runtime($mqr);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            if ($this->_fileLocking) {
+            	@flock($fp, LOCK_UN);
+            }
             @fclose($fp);
             if ($this->_readControl) {
                 $hashData = $this->_hash($data, $this->_readControlType);
@@ -762,7 +768,9 @@ 
         }
         $fp = @fopen($this->_file, "wb");
         if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
+            if ($this->_fileLocking) {
+            	@flock($fp, LOCK_EX);
+            }
             if ($this->_readControl) {
                 @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
             }
@@ -770,7 +778,9 @@ 
             @set_magic_quotes_runtime(0);
             @fwrite($fp, $data);
             @set_magic_quotes_runtime($mqr);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            if ($this->_fileLocking) {
+            	@flock($fp, LOCK_UN);
+            }
             @fclose($fp);
             return true;
         }

plugins/actions/twitter/twitter.php

Spacing +265 added lines, -265 removed lines

@@ -134,7 +134,7 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->curl != null) curl_close($this->curl);
+		if ($this->curl != null) curl_close($this->curl);
 	}
 
 
@@ -147,7 +147,7 @@ 
 	private function buildQuery(array $parameters)
 	{
 		// no parameters?
-		if(empty($parameters)) return '';
+		if (empty($parameters)) return '';
 
 		// encode the keys
 		$keys = self::urlencode_rfc3986(array_keys($parameters));
@@ -162,14 +162,14 @@ 
 		uksort($parameters, 'strcmp');
 
 		// loop parameters
-		foreach($parameters as $key => $value)
+		foreach ($parameters as $key => $value)
 		{
 			// sort by value
-			if(is_array($value)) $parameters[$key] = natsort($value);
+			if (is_array($value)) $parameters[$key] = natsort($value);
 		}
 
 		// process parameters
-		foreach($parameters as $key => $value) $chunks[] = $key .'='. str_replace('%25', '%', $value);
+		foreach ($parameters as $key => $value) $chunks[] = $key.'='.str_replace('%25', '%', $value);
 
 		// return
 		return implode('&', $chunks);
@@ -205,21 +205,21 @@ 
 		uksort($parameters, 'strcmp');
 
 		// loop parameters
-		foreach($parameters as $key => $value)
+		foreach ($parameters as $key => $value)
 		{
 			// sort by value
-			if(is_array($value)) $parameters[$key] = natsort($value);
+			if (is_array($value)) $parameters[$key] = natsort($value);
 		}
 
 		// process queries
-		foreach($parameters as $key => $value)
+		foreach ($parameters as $key => $value)
 		{
-			$chunks[] = self::urlencode_rfc3986($key) .'%3D'. self::urlencode_rfc3986($value);
+			$chunks[] = self::urlencode_rfc3986($key).'%3D'.self::urlencode_rfc3986($value);
 		}
 
 		// buils base
-		$base = $method .'&';
-		$base .= urlencode($url) .'&';
+		$base = $method.'&';
+		$base .= urlencode($url).'&';
 		$base .= implode('%26', $chunks);
 
 		// return
@@ -246,10 +246,10 @@ 
 		$chunks = array();
 
 		// process queries
-		foreach($parameters as $key => $value) $chunks[] = str_replace('%25', '%', self::urlencode_rfc3986($key) .'="'. self::urlencode_rfc3986($value) .'"');
+		foreach ($parameters as $key => $value) $chunks[] = str_replace('%25', '%', self::urlencode_rfc3986($key).'="'.self::urlencode_rfc3986($value).'"');
 
 		// build return
-		$return = 'Authorization: OAuth realm="' . $parts['scheme'] . '://' . $parts['host'] . $parts['path'] . '", ';
+		$return = 'Authorization: OAuth realm="'.$parts['scheme'].'://'.$parts['host'].$parts['path'].'", ';
 		$return .= implode(',', $chunks);
 
 		// prepend name and OAuth part
@@ -272,22 +272,22 @@ 
 
 		// append default parameters
 		$parameters['oauth_consumer_key'] = $this->getConsumerKey();
-		$parameters['oauth_nonce'] = md5(microtime() . rand());
+		$parameters['oauth_nonce'] = md5(microtime().rand());
 		$parameters['oauth_timestamp'] = time();
 		$parameters['oauth_signature_method'] = 'HMAC-SHA1';
 		$parameters['oauth_version'] = '1.0';
 
 		// calculate the base string
-		$base = $this->calculateBaseString(self::SECURE_API_URL .'/oauth/'. $method, 'POST', $parameters);
+		$base = $this->calculateBaseString(self::SECURE_API_URL.'/oauth/'.$method, 'POST', $parameters);
 
 		// add sign into the parameters
-		$parameters['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() .'&' . $this->getOAuthTokenSecret(), $base);
+		$parameters['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret().'&'.$this->getOAuthTokenSecret(), $base);
 
 		// calculate header
-		$header = $this->calculateHeader($parameters, self::SECURE_API_URL .'/oauth/'. $method);
+		$header = $this->calculateHeader($parameters, self::SECURE_API_URL.'/oauth/'.$method);
 
 		// set options
-		$options[CURLOPT_URL] = self::SECURE_API_URL .'/oauth/'. $method;
+		$options[CURLOPT_URL] = self::SECURE_API_URL.'/oauth/'.$method;
 		$options[CURLOPT_PORT] = self::SECURE_API_PORT;
 		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
 		$options[CURLOPT_FOLLOWLOCATION] = true;
@@ -300,7 +300,7 @@ 
 		$options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
 
 		// init
-		if($this->curl == null) $this->curl = curl_init();
+		if ($this->curl == null) $this->curl = curl_init();
 
 		// set options
 		curl_setopt_array($this->curl, $options);
@@ -314,7 +314,7 @@ 
 		$errorMessage = curl_error($this->curl);
 
 		// error?
-		if($errorNumber != '') throw new TwitterException($errorMessage, $errorNumber);
+		if ($errorNumber != '') throw new TwitterException($errorMessage, $errorNumber);
 
 		// init var
 		$return = array();
@@ -349,11 +349,11 @@ 
 		$expectJSON = (bool) $expectJSON;
 
 		// validate method
-		if(!in_array($method, $allowedMethods)) throw new TwitterException('Unknown method ('. $method .'). Allowed methods are: '. implode(', ', $allowedMethods));
+		if (!in_array($method, $allowedMethods)) throw new TwitterException('Unknown method ('.$method.'). Allowed methods are: '.implode(', ', $allowedMethods));
 
 		// append default parameters
 		$oauth['oauth_consumer_key'] = $this->getConsumerKey();
-		$oauth['oauth_nonce'] = md5(microtime() . rand());
+		$oauth['oauth_nonce'] = md5(microtime().rand());
 		$oauth['oauth_timestamp'] = time();
 		$oauth['oauth_token'] = $this->getOAuthToken();
 		$oauth['oauth_signature_method'] = 'HMAC-SHA1';
@@ -361,22 +361,22 @@ 
 
 		// set data
 		$data = $oauth;
-		if(!empty($parameters)) $data = array_merge($data, $parameters);
+		if (!empty($parameters)) $data = array_merge($data, $parameters);
 
 		// calculate the base string
-		$base = $this->calculateBaseString(self::API_URL .'/'. $url, $method, $data);
+		$base = $this->calculateBaseString(self::API_URL.'/'.$url, $method, $data);
 
 		// add sign into the parameters
-		$oauth['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() .'&' . $this->getOAuthTokenSecret(), $base);
+		$oauth['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret().'&'.$this->getOAuthTokenSecret(), $base);
 
-		$headers[] = $this->calculateHeader($oauth, self::API_URL .'/'. $url);
+		$headers[] = $this->calculateHeader($oauth, self::API_URL.'/'.$url);
 		$headers[] = 'Expect:';
 
 		// based on the method, we should handle the parameters in a different way
-		if($method == 'POST')
+		if ($method == 'POST')
 		{
 			// file provided?
-			if($filePath != null)
+			if ($filePath != null)
 			{
 				// build a boundary
 				$boundary = md5(time());
@@ -386,19 +386,19 @@ 
 
 				// set mimeType
 				$mimeType = 'application/octet-stream';
-				if($fileInfo['extension'] == 'jpg' || $fileInfo['extension'] == 'jpeg') $mimeType = 'image/jpeg';
-				elseif($fileInfo['extension'] == 'gif') $mimeType = 'image/gif';
-				elseif($fileInfo['extension'] == 'png') $mimeType = 'image/png';
+				if ($fileInfo['extension'] == 'jpg' || $fileInfo['extension'] == 'jpeg') $mimeType = 'image/jpeg';
+				elseif ($fileInfo['extension'] == 'gif') $mimeType = 'image/gif';
+				elseif ($fileInfo['extension'] == 'png') $mimeType = 'image/png';
 
 				// init var
-				$content = '--'. $boundary ."\r\n";
+				$content = '--'.$boundary."\r\n";
 
 				// set file
-				$content = 'Content-Disposition: form-data; name="image";filename="'. $fileInfo['basename'] .'"' ."\r\n" . 'Content-Type: '. $mimeType . "\r\n\r\n" . file_get_contents($filePath) ."\r\n--". $boundary ."\r\n";
+				$content = 'Content-Disposition: form-data; name="image";filename="'.$fileInfo['basename'].'"'."\r\n".'Content-Type: '.$mimeType."\r\n\r\n".file_get_contents($filePath)."\r\n--".$boundary."\r\n";
 
 				// build headers
-				$headers[] = 'Content-Type: multipart/form-data; boundary=' . $boundary;
-				$headers[] = 'Content-Length: '. strlen($content);
+				$headers[] = 'Content-Type: multipart/form-data; boundary='.$boundary;
+				$headers[] = 'Content-Length: '.strlen($content);
 
 				// set content
 				$options[CURLOPT_POSTFIELDS] = $content;
@@ -414,11 +414,11 @@ 
 		else
 		{
 			// add the parameters into the querystring
-			if(!empty($parameters)) $url .= '?'. $this->buildQuery($parameters);
+			if (!empty($parameters)) $url .= '?'.$this->buildQuery($parameters);
 		}
 
 		// set options
-		$options[CURLOPT_URL] = self::API_URL .'/'. $url;
+		$options[CURLOPT_URL] = self::API_URL.'/'.$url;
 		$options[CURLOPT_PORT] = self::API_PORT;
 		$options[CURLOPT_USERAGENT] = $this->getUserAgent();
 		$options[CURLOPT_FOLLOWLOCATION] = true;
@@ -430,7 +430,7 @@ 
 		$options[CURLOPT_HTTPHEADER] = $headers;
 
 		// init
-		if($this->curl == null) $this->curl = curl_init();
+		if ($this->curl == null) $this->curl = curl_init();
 
 		// set options
 		curl_setopt_array($this->curl, $options);
@@ -444,7 +444,7 @@ 
 		$errorMessage = curl_error($this->curl);
 
 		// we don't expext JSON, return the response
-		if(!$expectJSON) return $response;
+		if (!$expectJSON) return $response;
 
 		// replace ids with their string values, added because of some PHP-version can't handle these large values
 		$response = preg_replace('/id":(\d+)/', 'id":"\1"', $response);
@@ -453,10 +453,10 @@ 
 		$json = @json_decode($response, true);
 
 		// validate JSON
-		if($json === null)
+		if ($json === null)
 		{
 			// should we provide debug information
-			if(self::DEBUG)
+			if (self::DEBUG)
 			{
 				// make it output proper
 				echo '<pre>';
@@ -480,10 +480,10 @@ 
 
 
 		// any errors
-		if(isset($json['errors']))
+		if (isset($json['errors']))
 		{
 			// should we provide debug information
-			if(self::DEBUG)
+			if (self::DEBUG)
 			{
 				// make it output proper
 				echo '<pre>';
@@ -502,16 +502,16 @@ 
 			}
 
 			// throw exception
-			if(isset($json['errors'][0]['message'])) throw new TwitterException($json['errors'][0]['message']);
+			if (isset($json['errors'][0]['message'])) throw new TwitterException($json['errors'][0]['message']);
 			else throw new TwitterException('Invalid response.');
 		}
 
 
 		// any error
-		if(isset($json['error']))
+		if (isset($json['error']))
 		{
 			// should we provide debug information
-			if(self::DEBUG)
+			if (self::DEBUG)
 			{
 				// make it output proper
 				echo '<pre>';
@@ -598,7 +598,7 @@ 
 	 */
 	public function getUserAgent()
 	{
-		return (string) 'PHP Twitter/'. self::VERSION .' '. $this->userAgent;
+		return (string) 'PHP Twitter/'.self::VERSION.' '.$this->userAgent;
 	}
 
 
@@ -696,7 +696,7 @@ 
 	 */
 	private static function urlencode_rfc3986($value)
 	{
-		if(is_array($value)) return array_map(array('Twitter', 'urlencode_rfc3986'), $value);
+		if (is_array($value)) return array_map(array('Twitter', 'urlencode_rfc3986'), $value);
 		else
 		{
 			$search = array('+', ' ', '%7E', '%');
@@ -722,7 +722,7 @@ 
 
 		// build parameters
 		$parameters = array();
-		if($skipUser) $parameters['skip_user'] = 'true';
+		if ($skipUser) $parameters['skip_user'] = 'true';
 
 		// make the call
 		return (array) $this->doCall('statuses/public_timeline.json', $parameters);
@@ -746,11 +746,11 @@ 
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($skipUser) $parameters['skip_user'] = 'true';
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
+		if ($skipUser) $parameters['skip_user'] = 'true';
 
 		// make the call
 		return (array) $this->doCall('statuses/home_timeline.json', $parameters, true);
@@ -778,11 +778,11 @@ 
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($skipUser) $parameters['skip_user'] = 'true';
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
+		if ($skipUser) $parameters['skip_user'] = 'true';
 
 		// make the call
 		return (array) $this->doCall('statuses/friends_timeline.json', $parameters, true);
@@ -813,14 +813,14 @@ 
 
 		// build parameters
 		$parameters = array();
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($skipUser) $parameters['skip_user'] = 'true';
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
+		if ($skipUser) $parameters['skip_user'] = 'true';
 
 		// make the call
 		return (array) $this->doCall('statuses/user_timeline.json', $parameters, true);
@@ -839,14 +839,14 @@ 
 	public function statusesMentions($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if ($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
 		return (array) $this->doCall('statuses/mentions.json', $parameters);
@@ -865,14 +865,14 @@ 
 	public function statusesRetweetedByMe($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if ($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
 		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters);
@@ -891,14 +891,14 @@ 
 	public function statusesRetweetedToMe($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if ($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
 		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters);
@@ -918,14 +918,14 @@ 
 	public function statusesReweetsOfMe($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if ($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
 		return (array) $this->doCall('statuses/retweets_of_me.json', $parameters);
@@ -963,11 +963,11 @@ 
 	{
 		// build parameters
 		$parameters['status'] = (string) $status;
-		if($inReplyToStatusId != null) $parameters['in_reply_to_status_id'] = (string) $inReplyToStatusId;
-		if($lat != null) $parameters['lat'] = (float) $lat;
-		if($long != null) $parameters['long'] = (float) $long;
-		if($placeId != null) $parameters['place_id'] = (string) $placeId;
-		if($displayCoordinates) $parameters['display_coordinates'] = 'true';
+		if ($inReplyToStatusId != null) $parameters['in_reply_to_status_id'] = (string) $inReplyToStatusId;
+		if ($lat != null) $parameters['lat'] = (float) $lat;
+		if ($long != null) $parameters['long'] = (float) $long;
+		if ($placeId != null) $parameters['place_id'] = (string) $placeId;
+		if ($displayCoordinates) $parameters['display_coordinates'] = 'true';
 
 		// make the call
 		return (array) $this->doCall('statuses/update.json', $parameters, true, 'POST');
@@ -1000,7 +1000,7 @@ 
 	public function statusesRetweet($id)
 	{
 		// make the call
-		return (array) $this->doCall('statuses/retweet/'. $id .'.json', null, true, 'POST');
+		return (array) $this->doCall('statuses/retweet/'.$id.'.json', null, true, 'POST');
 	}
 
 
@@ -1015,14 +1015,14 @@ 
 	public function statusesRetweets($id, $count = null)
 	{
 		// validate
-		if($count != null && $count > 100) throw new TwitterException('Count may not be greater than 100.');
+		if ($count != null && $count > 100) throw new TwitterException('Count may not be greater than 100.');
 
 		// build parameters
 		$parameters = null;
-		if($count != null) $parameters['count'] = (int) $count;
+		if ($count != null) $parameters['count'] = (int) $count;
 
 		// make the call
-		return (array) $this->doCall('statuses/retweets/'. $id .'.json', $parameters);
+		return (array) $this->doCall('statuses/retweets/'.$id.'.json', $parameters);
 	}
 
 
@@ -1037,15 +1037,15 @@ 
 	public function statusesIdRetweetedBy($id, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if ($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
 		// build parameters
 		$parameters = null;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
-		return (array) $this->doCall('statuses/'. (string) $id .'/retweeted_by.json', $parameters, true);
+		return (array) $this->doCall('statuses/'.(string) $id.'/retweeted_by.json', $parameters, true);
 	}
 
 
@@ -1060,15 +1060,15 @@ 
 	public function statusesIdRetweetedByIds($id, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if ($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
 		// build parameters
 		$parameters = null;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
-		return (array) $this->doCall('statuses/'. (string) $id .'/retweeted_by/ids.json', $parameters, true);
+		return (array) $this->doCall('statuses/'.(string) $id.'/retweeted_by/ids.json', $parameters, true);
 	}
 
 
@@ -1085,12 +1085,12 @@ 
 	public function usersShow($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 
 		// make the call
 		return (array) $this->doCall('users/show.json', $parameters);
@@ -1112,11 +1112,11 @@ 
 		$screenNames = (array) $screenNames;
 
 		// validate
-		if(empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
+		if (empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
 
 		// build parameters
-		if(!empty($userIds)) $parameters['user_id'] = implode(',', $userIds);
-		if(!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
+		if (!empty($userIds)) $parameters['user_id'] = implode(',', $userIds);
+		if (!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
 
 		// make the call
 		return (array) $this->doCall('users/lookup.json', $parameters, true);
@@ -1137,8 +1137,8 @@ 
 	{
 		// build parameters
 		$parameters['q'] = (string) $q;
-		if($perPage != null) $parameters['per_page'] = (int) $perPage;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($perPage != null) $parameters['per_page'] = (int) $perPage;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
 		return (array) $this->doCall('users/search.json', $parameters, true);
@@ -1166,7 +1166,7 @@ 
 	 */
 	public function usersSuggestionsSlug($slug)
 	{
-		return (array) $this->doCall('users/suggestions/'. (string) $slug .'.json');
+		return (array) $this->doCall('users/suggestions/'.(string) $slug.'.json');
 	}
 
 
@@ -1188,10 +1188,10 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (int) $cursor;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($cursor != null) $parameters['cursor'] = (int) $cursor;
 
 		// make the call
 		return (array) $this->doCall('statuses/friends.json', $parameters);
@@ -1212,10 +1212,10 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (int) $cursor;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($cursor != null) $parameters['cursor'] = (int) $cursor;
 
 		// make the call
 		return (array) $this->doCall('statuses/followers.json', $parameters);
@@ -1246,7 +1246,7 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($exclude != null) $parameters['exclude'] = (string) $exclude;
+		if ($exclude != null) $parameters['exclude'] = (string) $exclude;
 
 		// make the call
 		return (array) $this->doCall('trends/current.json', $parameters);
@@ -1264,8 +1264,8 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($exclude != null) $parameters['exclude'] = (string) $exclude;
-		if($date != null) $parameters['date'] = (string) $date;
+		if ($exclude != null) $parameters['exclude'] = (string) $exclude;
+		if ($date != null) $parameters['date'] = (string) $date;
 
 		// make the call
 		return (array) $this->doCall('trends/daily.json', $parameters);
@@ -1283,8 +1283,8 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($exclude != null) $parameters['exclude'] = (string) $exclude;
-		if($date != null) $parameters['date'] = (string) $date;
+		if ($exclude != null) $parameters['exclude'] = (string) $exclude;
+		if ($date != null) $parameters['date'] = (string) $date;
 
 		// make the call
 		return (array) $this->doCall('trends/weekly.json', $parameters);
@@ -1307,15 +1307,15 @@ 
 		$allowedModes = array('public', 'private');
 
 		// validate
-		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: '. implode($allowedModes) .'.');
+		if ($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: '.implode($allowedModes).'.');
 
 		// build parameters
 		$parameters['name'] = (string) $name;
-		if($mode != null) $parameters['mode'] = (string) $mode;
-		if($description != null) $parameters['description'] = (string) $description;
+		if ($mode != null) $parameters['mode'] = (string) $mode;
+		if ($description != null) $parameters['description'] = (string) $description;
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/lists.json', $parameters, true, 'POST');
+		return (array) $this->doCall((string) $user.'/lists.json', $parameters, true, 'POST');
 	}
 
 
@@ -1329,10 +1329,10 @@ 
 	public function userLists($user, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if ($cursor != null) $parameters['cursor'] = (string) $cursor;
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/lists.json', $parameters, true);
+		return (array) $this->doCall((string) $user.'/lists.json', $parameters, true);
 	}
 
 
@@ -1346,7 +1346,7 @@ 
 	public function userListsId($user, $id)
 	{
 		// make the call
-		return (array) $this->doCall((string) $user .'/lists/'. (string) $id .'.json', null, true);
+		return (array) $this->doCall((string) $user.'/lists/'.(string) $id.'.json', null, true);
 	}
 
 
@@ -1366,15 +1366,15 @@ 
 		$allowedModes = array('public', 'private');
 
 		// validate
-		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: '. implode($allowedModes) .'.');
+		if ($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: '.implode($allowedModes).'.');
 
 		// build parameters
-		if($name != null) $parameters['name'] = (string) $name;
-		if($mode != null) $parameters['mode'] = (string) $mode;
-		if($description != null) $parameters['description'] = (string) $description;
+		if ($name != null) $parameters['name'] = (string) $name;
+		if ($mode != null) $parameters['mode'] = (string) $mode;
+		if ($description != null) $parameters['description'] = (string) $description;
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/lists/'. (string) $id .'.json', $parameters, true, 'POST');
+		return (array) $this->doCall((string) $user.'/lists/'.(string) $id.'.json', $parameters, true, 'POST');
 	}
 
 
@@ -1392,17 +1392,17 @@ 
 	public function userListsIdStatuses($user, $id, $sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if ($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['per_page'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['per_page'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/lists/'. (string) $id .'/statuses.json', $parameters);
+		return (array) $this->doCall((string) $user.'/lists/'.(string) $id.'/statuses.json', $parameters);
 	}
 
 
@@ -1416,10 +1416,10 @@ 
 	public function userListsMemberships($user, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if ($cursor != null) $parameters['cursor'] = (string) $cursor;
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/lists/memberships.json', $parameters, true);
+		return (array) $this->doCall((string) $user.'/lists/memberships.json', $parameters, true);
 	}
 
 
@@ -1433,10 +1433,10 @@ 
 	public function userListsSubscriptions($user, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if ($cursor != null) $parameters['cursor'] = (string) $cursor;
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/lists/subscriptions.json', $parameters, true);
+		return (array) $this->doCall((string) $user.'/lists/subscriptions.json', $parameters, true);
 	}
 
 
@@ -1452,10 +1452,10 @@ 
 	public function userListMembers($user, $id, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if ($cursor != null) $parameters['cursor'] = (string) $cursor;
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/'. (string) $id .'/members.json', $parameters, true);
+		return (array) $this->doCall((string) $user.'/'.(string) $id.'/members.json', $parameters, true);
 	}
 
 
@@ -1473,7 +1473,7 @@ 
 		$parameters['id'] = (string) $userId;
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/'. (string) $id .'/members.json', $parameters, true, 'POST');
+		return (array) $this->doCall((string) $user.'/'.(string) $id.'/members.json', $parameters, true, 'POST');
 	}
 
 
@@ -1492,7 +1492,7 @@ 
 		$parameters['_method'] = 'DELETE';
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/'. (string) $id .'/members.json', $parameters, true, 'POST');
+		return (array) $this->doCall((string) $user.'/'.(string) $id.'/members.json', $parameters, true, 'POST');
 	}
 
 
@@ -1509,13 +1509,13 @@ 
 		try
 		{
 			// make the call
-			return (array) $this->doCall((string) $user .'/'. (string) $id .'/members/'. (string) $userId .'.json', null, true);
+			return (array) $this->doCall((string) $user.'/'.(string) $id.'/members/'.(string) $userId.'.json', null, true);
 		}
 
 		// catch exceptions
-		catch(TwitterException $e)
+		catch (TwitterException $e)
 		{
-			if($e->getMessage() == 'The specified user is not a member of this list') return false;
+			if ($e->getMessage() == 'The specified user is not a member of this list') return false;
 			else throw $e;
 		}
 	}
@@ -1533,10 +1533,10 @@ 
 	public function userListSubscribers($user, $id, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if ($cursor != null) $parameters['cursor'] = (string) $cursor;
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/'. (string) $id .'/subscribers.json', $parameters, true);
+		return (array) $this->doCall((string) $user.'/'.(string) $id.'/subscribers.json', $parameters, true);
 	}
 
 
@@ -1550,7 +1550,7 @@ 
 	public function userListSubscribersCreate($user, $id)
 	{
 		// make the call
-		return (array) $this->doCall((string) $user .'/'. (string) $id .'/subscribers.json', null, true, 'POST');
+		return (array) $this->doCall((string) $user.'/'.(string) $id.'/subscribers.json', null, true, 'POST');
 	}
 
 
@@ -1567,7 +1567,7 @@ 
 		$parameters['_method'] = 'DELETE';
 
 		// make the call
-		return (array) $this->doCall((string) $user .'/'. (string) $id .'/subscribers.json', $parameters, true, 'POST');
+		return (array) $this->doCall((string) $user.'/'.(string) $id.'/subscribers.json', $parameters, true, 'POST');
 	}
 
 
@@ -1584,13 +1584,13 @@ 
 		try
 		{
 			// make the call
-			return (array) $this->doCall((string) $user .'/'. (string) $id .'/subscribers/'. (string) $userId .'.json', null, true);
+			return (array) $this->doCall((string) $user.'/'.(string) $id.'/subscribers/'.(string) $userId.'.json', null, true);
 		}
 
 		// catch exceptions
-		catch(TwitterException $e)
+		catch (TwitterException $e)
 		{
-			if($e->getMessage() == 'The specified user is not a subscriber of this list') return false;
+			if ($e->getMessage() == 'The specified user is not a subscriber of this list') return false;
 			else throw $e;
 		}
 
@@ -1610,14 +1610,14 @@ 
 	public function directMessages($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if ($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
 		return (array) $this->doCall('direct_messages.json', $parameters, true);
@@ -1636,14 +1636,14 @@ 
 	public function directMessagesSent($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if ($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($sinceId != null) $parameters['since_id'] = (string) $sinceId;
+		if ($maxId != null) $parameters['max_id'] = (string) $maxId;
+		if ($count != null) $parameters['count'] = (int) $count;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
 		return (array) $this->doCall('direct_messages/sent.json', $parameters, true);
@@ -1663,13 +1663,13 @@ 
 	public function directMessagesNew($text, $id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
 		$parameters['text'] = (string) $text;
-		if($id != null) $parameters['user'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['user'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 
 		// make the call
 		return (array) $this->doCall('direct_messages/new.json', $parameters, true, 'POST');
@@ -1707,12 +1707,12 @@ 
 	public function friendshipsCreate($id = null, $userId = null, $screenName = null, $follow = false)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 		$parameters['follow'] = ($follow) ? 'true' : 'false';
 
 		// make the call
@@ -1732,12 +1732,12 @@ 
 	public function friendshipsDestroy($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 
 		// make the call
 		return (array) $this->doCall('friendships/destroy.json', $parameters, true, 'POST');
@@ -1774,14 +1774,14 @@ 
 	public function friendshipsShow($sourceId = null, $sourceScreenName = null, $targetId = null, $targetScreenName = null)
 	{
 		// validate
-		if($sourceId == '' && $sourceScreenName == '') throw new TwitterException('Specify an sourceId or a sourceScreenName.');
-		if($targetId == '' && $targetScreenName == '') throw new TwitterException('Specify an targetId or a targetScreenName.');
+		if ($sourceId == '' && $sourceScreenName == '') throw new TwitterException('Specify an sourceId or a sourceScreenName.');
+		if ($targetId == '' && $targetScreenName == '') throw new TwitterException('Specify an targetId or a targetScreenName.');
 
 		// build parameters
-		if($sourceId != null) $parameters['source_id'] = (string) $sourceId;
-		if($sourceScreenName != null) $parameters['source_screen_name'] = (string) $sourceScreenName;
-		if($targetId != null) $parameters['target_id'] = (string) $targetId;
-		if($targetScreenName != null) $parameters['target_screen_name'] = (string) $targetScreenName;
+		if ($sourceId != null) $parameters['source_id'] = (string) $sourceId;
+		if ($sourceScreenName != null) $parameters['source_screen_name'] = (string) $sourceScreenName;
+		if ($targetId != null) $parameters['target_id'] = (string) $targetId;
+		if ($targetScreenName != null) $parameters['target_screen_name'] = (string) $targetScreenName;
 
 		// make the call
 		return (array) $this->doCall('friendships/show.json', $parameters);
@@ -1797,7 +1797,7 @@ 
 	public function friendshipsIncoming($cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if ($cursor != null) $parameters['cursor'] = (string) $cursor;
 
 		// make the call
 		return (array) $this->doCall('friendships/incoming.json', $parameters, true);
@@ -1813,7 +1813,7 @@ 
 	public function friendshipsOutgoing($cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if ($cursor != null) $parameters['cursor'] = (string) $cursor;
 
 		// make the call
 		return (array) $this->doCall('friendships/outgoing.json', $parameters, true);
@@ -1833,13 +1833,13 @@ 
 	public function friendsIds($id = null, $userId = null, $screenName = null, $cursor = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($cursor != null) $parameters['cursor'] = (string) $cursor;
 
 		// make the call
 		return (array) $this->doCall('friends/ids.json', $parameters);
@@ -1858,13 +1858,13 @@ 
 	public function followersIds($id = null, $userId = null, $screenName = null, $cursor = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($cursor != null) $parameters['cursor'] = (string) $cursor;
 
 		// make the call
 		return (array) $this->doCall('followers/ids.json', $parameters);
@@ -1909,9 +1909,9 @@ 
 		}
 
 		// catch exceptions
-		catch(TwitterException $e)
+		catch (TwitterException $e)
 		{
-			if($e->getMessage() == 'Logged out.') return true;
+			if ($e->getMessage() == 'Logged out.') return true;
 			else throw $e;
 		}
 	}
@@ -1947,14 +1947,14 @@ 
 	public function accountUpdateProfileColors($profileBackgroundColor = null, $profileTextColor = null, $profileLinkColor = null, $profileSidebarFillColor = null, $profileSidebarBorderColor = null)
 	{
 		// validate
-		if($profileBackgroundColor == '' && $profileTextColor == '' && $profileLinkColor == '' && $profileSidebarFillColor == '' && $profileSidebarBorderColor == '') throw new TwitterException('Specify a profileBackgroundColor, profileTextColor, profileLinkColor, profileSidebarFillColor or a profileSidebarBorderColor.');
+		if ($profileBackgroundColor == '' && $profileTextColor == '' && $profileLinkColor == '' && $profileSidebarFillColor == '' && $profileSidebarBorderColor == '') throw new TwitterException('Specify a profileBackgroundColor, profileTextColor, profileLinkColor, profileSidebarFillColor or a profileSidebarBorderColor.');
 
 		// build parameters
-		if($profileBackgroundColor != null) $parameters['profile_background_color'] = (string) $profileBackgroundColor;
-		if($profileTextColor != null) $parameters['profile_text_color'] = (string) $profileTextColor;
-		if($profileLinkColor != null) $parameters['profile_link_color'] = (string) $profileLinkColor;
-		if($profileSidebarFillColor != null) $parameters['profile_sidebar_fill_color'] = (string) $profileSidebarFillColor;
-		if($profileSidebarBorderColor != null) $parameters['profile_sidebar_border_color'] = (string) $profileSidebarBorderColor;
+		if ($profileBackgroundColor != null) $parameters['profile_background_color'] = (string) $profileBackgroundColor;
+		if ($profileTextColor != null) $parameters['profile_text_color'] = (string) $profileTextColor;
+		if ($profileLinkColor != null) $parameters['profile_link_color'] = (string) $profileLinkColor;
+		if ($profileSidebarFillColor != null) $parameters['profile_sidebar_fill_color'] = (string) $profileSidebarFillColor;
+		if ($profileSidebarBorderColor != null) $parameters['profile_sidebar_border_color'] = (string) $profileSidebarBorderColor;
 
 		// make the call
 		return (array) $this->doCall('account/update_profile_colors.json', $parameters, true, 'POST');
@@ -1972,7 +1972,7 @@ 
 		throw new TwitterException('Not implemented');
 
 		// validate
-		if(!file_exists($image)) throw new TwitterException('Image ('. $image .') doesn\'t exists.');
+		if (!file_exists($image)) throw new TwitterException('Image ('.$image.') doesn\'t exists.');
 
 		// make the call
 		return (array) $this->doCall('account/update_profile_image.json', null, true, 'POST', $image);
@@ -1991,10 +1991,10 @@ 
 		throw new TwitterException('Not implemented');
 
 		// validate
-		if(!file_exists($image)) throw new TwitterException('Image ('. $image .') doesn\'t exists.');
+		if (!file_exists($image)) throw new TwitterException('Image ('.$image.') doesn\'t exists.');
 
 		// build parameters
-		if($tile) $parameters['tile'] = 'true';
+		if ($tile) $parameters['tile'] = 'true';
 
 		// make the call
 		return (array) $this->doCall('account/update_profile_background_image.json', $parameters, true, 'POST', $image);
@@ -2014,10 +2014,10 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($name != null) $parameters['name'] = (string) $name;
-		if($url != null) $parameters['url'] = (string) $url;
-		if($location != null) $parameters['location'] = (string) $location;
-		if($description != null) $parameters['description'] = (string) $description;
+		if ($name != null) $parameters['name'] = (string) $name;
+		if ($url != null) $parameters['url'] = (string) $url;
+		if ($location != null) $parameters['location'] = (string) $location;
+		if ($description != null) $parameters['description'] = (string) $description;
 
 		// make the call
 		return (array) $this->doCall('account/update_profile.json', $parameters, true, 'POST');
@@ -2036,8 +2036,8 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($id != null) $parameters['id'] = (string) $id;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
 		return (array) $this->doCall('favorites.json', $parameters, true);
@@ -2053,7 +2053,7 @@ 
 	public function favoritesCreate($id)
 	{
 		// make the call
-		return (array) $this->doCall('favorites/create/'. $id .'.json', null, true, 'POST');
+		return (array) $this->doCall('favorites/create/'.$id.'.json', null, true, 'POST');
 	}
 
 
@@ -2066,7 +2066,7 @@ 
 	public function favoritesDestroy($id)
 	{
 		// make the call
-		return (array) $this->doCall('favorites/destroy/'. $id .'.json', null, true, 'POST');
+		return (array) $this->doCall('favorites/destroy/'.$id.'.json', null, true, 'POST');
 	}
 
 
@@ -2082,12 +2082,12 @@ 
 	public function notificationsFollow($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 
 		// make the call
 		return (array) $this->doCall('notifications/follow.json', $parameters, true, 'POST');
@@ -2105,12 +2105,12 @@ 
 	public function notificationsLeave($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 
 		// make the call
 		return (array) $this->doCall('notifications/leave.json', $parameters, true, 'POST');
@@ -2129,12 +2129,12 @@ 
 	public function blocksCreate($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 
 		// make the call
 		return (array) $this->doCall('blocks/create.json', $parameters, true, 'POST');
@@ -2152,12 +2152,12 @@ 
 	public function blocksDestroy($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 
 		// make the call
 		return (array) $this->doCall('blocks/destroy.json', $parameters, true, 'POST');
@@ -2175,12 +2175,12 @@ 
 	public function blocksExists($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 
 		try
 		{
@@ -2188,9 +2188,9 @@ 
 			return (array) $this->doCall('blocks/exists.json', $parameters, true);
 		}
 		// catch exceptions
-		catch(TwitterException $e)
+		catch (TwitterException $e)
 		{
-			if($e->getMessage() == 'You are not blocking this user.') return false;
+			if ($e->getMessage() == 'You are not blocking this user.') return false;
 			else throw $e;
 		}
 	}
@@ -2206,7 +2206,7 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($page != null) $parameters['page'] = (int) $page;
+		if ($page != null) $parameters['page'] = (int) $page;
 
 		// make the call
 		return (array) $this->doCall('blocks/blocking.json', $parameters, true);
@@ -2237,12 +2237,12 @@ 
 	public function reportSpam($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if ($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if ($id != null) $parameters['id'] = (string) $id;
+		if ($userId != null) $parameters['user_id'] = (string) $userId;
+		if ($screenName != null) $parameters['screen_name'] = (string) $screenName;
 
 		// make the call
 		return (array) $this->doCall('report_spam.json', $parameters, true, 'POST');
@@ -2303,7 +2303,7 @@ 
 	 */
 	public function savedSearchesDestroy($id)
 	{
-		return (array) $this->doCall('saved_searches/destroy/'. (string) $id .'.json', null, true, 'POST');
+		return (array) $this->doCall('saved_searches/destroy/'.(string) $id.'.json', null, true, 'POST');
 	}
 
 
@@ -2321,17 +2321,17 @@ 
 		$parameters = array();
 
 		// set callback
-		if($callbackURL != null) $parameters['oauth_callback'] = (string) $callbackURL;
+		if ($callbackURL != null) $parameters['oauth_callback'] = (string) $callbackURL;
 
 		// make the call
 		$response = $this->doOAuthCall('request_token', $parameters);
 
 		// validate
-		if(!isset($response['oauth_token'], $response['oauth_token_secret'])) throw new TwitterException(implode(', ', array_keys($response)));
+		if (!isset($response['oauth_token'], $response['oauth_token_secret'])) throw new TwitterException(implode(', ', array_keys($response)));
 
 		// set some properties
-		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
-		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
+		if (isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
+		if (isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
 
 		// return
 		return $response;
@@ -2357,8 +2357,8 @@ 
 		$response = $this->doOAuthCall('access_token', $parameters);
 
 		// set some properties
-		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
-		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
+		if (isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
+		if (isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
 
 		// return
 		return $response;
@@ -2372,7 +2372,7 @@ 
 	 */
 	public function oAuthAuthorize()
 	{
-		header('Location: '. self::SECURE_API_URL .'/oauth/authorize?oauth_token='. $this->oAuthToken);
+		header('Location: '.self::SECURE_API_URL.'/oauth/authorize?oauth_token='.$this->oAuthToken);
 	}
 
 
@@ -2403,8 +2403,8 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($lat != null) $parameters['lat_for_trends'] = (float) $lat;
-		if($long != null) $parameters['long_for_trends'] = (float) $long;
+		if ($lat != null) $parameters['lat_for_trends'] = (float) $lat;
+		if ($long != null) $parameters['long_for_trends'] = (float) $long;
 
 		// make the call
 		return (array) $this->doCall('trends/available.json', $parameters);
@@ -2423,7 +2423,7 @@ 
 	public function trendsLocation($woeid)
 	{
 		// make the call
-		return (array) $this->doCall('trends/location/'. (string) $woeid .'.json');
+		return (array) $this->doCall('trends/location/'.(string) $woeid.'.json');
 	}
 
 
@@ -2446,9 +2446,9 @@ 
 		// build parameters
 		$parameters['lat'] = (float) $lat;
 		$parameters['long'] = (float) $long;
-		if($accuracy != null) $parameters['accuracy'] = (string) $accuracy;
-		if($granularity != null) $parameters['granularity'] = (string) $granularity;
-		if($maxResults != null) $parameters['max_results'] = (int) $maxResults;
+		if ($accuracy != null) $parameters['accuracy'] = (string) $accuracy;
+		if ($granularity != null) $parameters['granularity'] = (string) $granularity;
+		if ($maxResults != null) $parameters['max_results'] = (int) $maxResults;
 
 		// make the call
 		return (array) $this->doCall('geo/reverse_geocode.json', $parameters);
@@ -2466,10 +2466,10 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($placeId != null) $parameters['place_id'] = (string) $placeId;
+		if ($placeId != null) $parameters['place_id'] = (string) $placeId;
 
 		// make the call
-		return (array) $this->doCall('geo/id/'. (string) $id .'.json', $parameters);
+		return (array) $this->doCall('geo/id/'.(string) $id.'.json', $parameters);
 	}
 
 

Braces +627 added lines, -215 removed lines

@@ -134,7 +134,9 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->curl != null) curl_close($this->curl);
+		if($this->curl != null) {
+			curl_close($this->curl);
+		}
 	}
 
 
@@ -147,7 +149,9 @@ 
 	private function buildQuery(array $parameters)
 	{
 		// no parameters?
-		if(empty($parameters)) return '';
+		if(empty($parameters)) {
+			return '';
+		}
 
 		// encode the keys
 		$keys = self::urlencode_rfc3986(array_keys($parameters));
@@ -165,11 +169,15 @@ 
 		foreach($parameters as $key => $value)
 		{
 			// sort by value
-			if(is_array($value)) $parameters[$key] = natsort($value);
+			if(is_array($value)) {
+				$parameters[$key] = natsort($value);
+			}
 		}
 
 		// process parameters
-		foreach($parameters as $key => $value) $chunks[] = $key .'='. str_replace('%25', '%', $value);
+		foreach($parameters as $key => $value) {
+			$chunks[] = $key .'='. str_replace('%25', '%', $value);
+		}
 
 		// return
 		return implode('&', $chunks);
@@ -208,7 +216,9 @@ 
 		foreach($parameters as $key => $value)
 		{
 			// sort by value
-			if(is_array($value)) $parameters[$key] = natsort($value);
+			if(is_array($value)) {
+				$parameters[$key] = natsort($value);
+			}
 		}
 
 		// process queries
@@ -246,7 +256,9 @@ 
 		$chunks = array();
 
 		// process queries
-		foreach($parameters as $key => $value) $chunks[] = str_replace('%25', '%', self::urlencode_rfc3986($key) .'="'. self::urlencode_rfc3986($value) .'"');
+		foreach($parameters as $key => $value) {
+			$chunks[] = str_replace('%25', '%', self::urlencode_rfc3986($key) .'="'. self::urlencode_rfc3986($value) .'"');
+		}
 
 		// build return
 		$return = 'Authorization: OAuth realm="' . $parts['scheme'] . '://' . $parts['host'] . $parts['path'] . '", ';
@@ -300,7 +312,9 @@ 
 		$options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
 
 		// init
-		if($this->curl == null) $this->curl = curl_init();
+		if($this->curl == null) {
+			$this->curl = curl_init();
+		}
 
 		// set options
 		curl_setopt_array($this->curl, $options);
@@ -314,7 +328,9 @@ 
 		$errorMessage = curl_error($this->curl);
 
 		// error?
-		if($errorNumber != '') throw new TwitterException($errorMessage, $errorNumber);
+		if($errorNumber != '') {
+			throw new TwitterException($errorMessage, $errorNumber);
+		}
 
 		// init var
 		$return = array();
@@ -349,7 +365,9 @@ 
 		$expectJSON = (bool) $expectJSON;
 
 		// validate method
-		if(!in_array($method, $allowedMethods)) throw new TwitterException('Unknown method ('. $method .'). Allowed methods are: '. implode(', ', $allowedMethods));
+		if(!in_array($method, $allowedMethods)) {
+			throw new TwitterException('Unknown method ('. $method .'). Allowed methods are: '. implode(', ', $allowedMethods));
+		}
 
 		// append default parameters
 		$oauth['oauth_consumer_key'] = $this->getConsumerKey();
@@ -361,7 +379,9 @@ 
 
 		// set data
 		$data = $oauth;
-		if(!empty($parameters)) $data = array_merge($data, $parameters);
+		if(!empty($parameters)) {
+			$data = array_merge($data, $parameters);
+		}
 
 		// calculate the base string
 		$base = $this->calculateBaseString(self::API_URL .'/'. $url, $method, $data);
@@ -386,9 +406,13 @@ 
 
 				// set mimeType
 				$mimeType = 'application/octet-stream';
-				if($fileInfo['extension'] == 'jpg' || $fileInfo['extension'] == 'jpeg') $mimeType = 'image/jpeg';
-				elseif($fileInfo['extension'] == 'gif') $mimeType = 'image/gif';
-				elseif($fileInfo['extension'] == 'png') $mimeType = 'image/png';
+				if($fileInfo['extension'] == 'jpg' || $fileInfo['extension'] == 'jpeg') {
+					$mimeType = 'image/jpeg';
+				} elseif($fileInfo['extension'] == 'gif') {
+					$mimeType = 'image/gif';
+				} elseif($fileInfo['extension'] == 'png') {
+					$mimeType = 'image/png';
+				}
 
 				// init var
 				$content = '--'. $boundary ."\r\n";
@@ -405,16 +429,18 @@ 
 			}
 
 			// no file
-			else $options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
+			else {
+				$options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
+			}
 
 			// enable post
 			$options[CURLOPT_POST] = 1;
-		}
-
-		else
+		} else
 		{
 			// add the parameters into the querystring
-			if(!empty($parameters)) $url .= '?'. $this->buildQuery($parameters);
+			if(!empty($parameters)) {
+				$url .= '?'. $this->buildQuery($parameters);
+			}
 		}
 
 		// set options
@@ -430,7 +456,9 @@ 
 		$options[CURLOPT_HTTPHEADER] = $headers;
 
 		// init
-		if($this->curl == null) $this->curl = curl_init();
+		if($this->curl == null) {
+			$this->curl = curl_init();
+		}
 
 		// set options
 		curl_setopt_array($this->curl, $options);
@@ -444,7 +472,9 @@ 
 		$errorMessage = curl_error($this->curl);
 
 		// we don't expext JSON, return the response
-		if(!$expectJSON) return $response;
+		if(!$expectJSON) {
+			return $response;
+		}
 
 		// replace ids with their string values, added because of some PHP-version can't handle these large values
 		$response = preg_replace('/id":(\d+)/', 'id":"\1"', $response);
@@ -502,8 +532,11 @@ 
 			}
 
 			// throw exception
-			if(isset($json['errors'][0]['message'])) throw new TwitterException($json['errors'][0]['message']);
-			else throw new TwitterException('Invalid response.');
+			if(isset($json['errors'][0]['message'])) {
+				throw new TwitterException($json['errors'][0]['message']);
+			} else {
+				throw new TwitterException('Invalid response.');
+			}
 		}
 
 
@@ -696,8 +729,9 @@ 
 	 */
 	private static function urlencode_rfc3986($value)
 	{
-		if(is_array($value)) return array_map(array('Twitter', 'urlencode_rfc3986'), $value);
-		else
+		if(is_array($value)) {
+			return array_map(array('Twitter', 'urlencode_rfc3986'), $value);
+		} else
 		{
 			$search = array('+', ' ', '%7E', '%');
 			$replace = array('%20', '%20', '~', '%25');
@@ -722,7 +756,9 @@ 
 
 		// build parameters
 		$parameters = array();
-		if($skipUser) $parameters['skip_user'] = 'true';
+		if($skipUser) {
+			$parameters['skip_user'] = 'true';
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/public_timeline.json', $parameters);
@@ -746,11 +782,21 @@ 
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($skipUser) $parameters['skip_user'] = 'true';
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
+		if($skipUser) {
+			$parameters['skip_user'] = 'true';
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/home_timeline.json', $parameters, true);
@@ -778,11 +824,21 @@ 
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($skipUser) $parameters['skip_user'] = 'true';
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
+		if($skipUser) {
+			$parameters['skip_user'] = 'true';
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/friends_timeline.json', $parameters, true);
@@ -813,14 +869,30 @@ 
 
 		// build parameters
 		$parameters = array();
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
-		if($skipUser) $parameters['skip_user'] = 'true';
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
+		if($skipUser) {
+			$parameters['skip_user'] = 'true';
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/user_timeline.json', $parameters, true);
@@ -839,14 +911,24 @@ 
 	public function statusesMentions($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if($count != null && $count > 200) {
+			throw new TwitterException('Count may not be greater than 200.');
+		}
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/mentions.json', $parameters);
@@ -865,14 +947,24 @@ 
 	public function statusesRetweetedByMe($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if($count != null && $count > 200) {
+			throw new TwitterException('Count may not be greater than 200.');
+		}
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters);
@@ -891,14 +983,24 @@ 
 	public function statusesRetweetedToMe($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if($count != null && $count > 200) {
+			throw new TwitterException('Count may not be greater than 200.');
+		}
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters);
@@ -918,14 +1020,24 @@ 
 	public function statusesReweetsOfMe($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if($count != null && $count > 200) {
+			throw new TwitterException('Count may not be greater than 200.');
+		}
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/retweets_of_me.json', $parameters);
@@ -963,11 +1075,21 @@ 
 	{
 		// build parameters
 		$parameters['status'] = (string) $status;
-		if($inReplyToStatusId != null) $parameters['in_reply_to_status_id'] = (string) $inReplyToStatusId;
-		if($lat != null) $parameters['lat'] = (float) $lat;
-		if($long != null) $parameters['long'] = (float) $long;
-		if($placeId != null) $parameters['place_id'] = (string) $placeId;
-		if($displayCoordinates) $parameters['display_coordinates'] = 'true';
+		if($inReplyToStatusId != null) {
+			$parameters['in_reply_to_status_id'] = (string) $inReplyToStatusId;
+		}
+		if($lat != null) {
+			$parameters['lat'] = (float) $lat;
+		}
+		if($long != null) {
+			$parameters['long'] = (float) $long;
+		}
+		if($placeId != null) {
+			$parameters['place_id'] = (string) $placeId;
+		}
+		if($displayCoordinates) {
+			$parameters['display_coordinates'] = 'true';
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/update.json', $parameters, true, 'POST');
@@ -1015,11 +1137,15 @@ 
 	public function statusesRetweets($id, $count = null)
 	{
 		// validate
-		if($count != null && $count > 100) throw new TwitterException('Count may not be greater than 100.');
+		if($count != null && $count > 100) {
+			throw new TwitterException('Count may not be greater than 100.');
+		}
 
 		// build parameters
 		$parameters = null;
-		if($count != null) $parameters['count'] = (int) $count;
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/retweets/'. $id .'.json', $parameters);
@@ -1037,12 +1163,18 @@ 
 	public function statusesIdRetweetedBy($id, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if($count != null && $count > 200) {
+			throw new TwitterException('Count may not be greater than 200.');
+		}
 
 		// build parameters
 		$parameters = null;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/'. (string) $id .'/retweeted_by.json', $parameters, true);
@@ -1060,12 +1192,18 @@ 
 	public function statusesIdRetweetedByIds($id, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if($count != null && $count > 200) {
+			throw new TwitterException('Count may not be greater than 200.');
+		}
 
 		// build parameters
 		$parameters = null;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/'. (string) $id .'/retweeted_by/ids.json', $parameters, true);
@@ -1085,12 +1223,20 @@ 
 	public function usersShow($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 
 		// make the call
 		return (array) $this->doCall('users/show.json', $parameters);
@@ -1112,11 +1258,17 @@ 
 		$screenNames = (array) $screenNames;
 
 		// validate
-		if(empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
+		if(empty($userIds) && empty($screenNames)) {
+			throw new TwitterException('Specify an userId or a screenName.');
+		}
 
 		// build parameters
-		if(!empty($userIds)) $parameters['user_id'] = implode(',', $userIds);
-		if(!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
+		if(!empty($userIds)) {
+			$parameters['user_id'] = implode(',', $userIds);
+		}
+		if(!empty($screenNames)) {
+			$parameters['screen_name'] = implode(',', $screenNames);
+		}
 
 		// make the call
 		return (array) $this->doCall('users/lookup.json', $parameters, true);
@@ -1137,8 +1289,12 @@ 
 	{
 		// build parameters
 		$parameters['q'] = (string) $q;
-		if($perPage != null) $parameters['per_page'] = (int) $perPage;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($perPage != null) {
+			$parameters['per_page'] = (int) $perPage;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('users/search.json', $parameters, true);
@@ -1188,10 +1344,18 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (int) $cursor;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
+		if($cursor != null) {
+			$parameters['cursor'] = (int) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/friends.json', $parameters);
@@ -1212,10 +1376,18 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (int) $cursor;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
+		if($cursor != null) {
+			$parameters['cursor'] = (int) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall('statuses/followers.json', $parameters);
@@ -1246,7 +1418,9 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($exclude != null) $parameters['exclude'] = (string) $exclude;
+		if($exclude != null) {
+			$parameters['exclude'] = (string) $exclude;
+		}
 
 		// make the call
 		return (array) $this->doCall('trends/current.json', $parameters);
@@ -1264,8 +1438,12 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($exclude != null) $parameters['exclude'] = (string) $exclude;
-		if($date != null) $parameters['date'] = (string) $date;
+		if($exclude != null) {
+			$parameters['exclude'] = (string) $exclude;
+		}
+		if($date != null) {
+			$parameters['date'] = (string) $date;
+		}
 
 		// make the call
 		return (array) $this->doCall('trends/daily.json', $parameters);
@@ -1283,8 +1461,12 @@ 
 	{
 		// build parameters
 		$parameters = array();
-		if($exclude != null) $parameters['exclude'] = (string) $exclude;
-		if($date != null) $parameters['date'] = (string) $date;
+		if($exclude != null) {
+			$parameters['exclude'] = (string) $exclude;
+		}
+		if($date != null) {
+			$parameters['date'] = (string) $date;
+		}
 
 		// make the call
 		return (array) $this->doCall('trends/weekly.json', $parameters);
@@ -1307,12 +1489,18 @@ 
 		$allowedModes = array('public', 'private');
 
 		// validate
-		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: '. implode($allowedModes) .'.');
+		if($mode != null && !in_array($mode, $allowedModes)) {
+			throw new TwitterException('Invalid mode (), possible values are: '. implode($allowedModes) .'.');
+		}
 
 		// build parameters
 		$parameters['name'] = (string) $name;
-		if($mode != null) $parameters['mode'] = (string) $mode;
-		if($description != null) $parameters['description'] = (string) $description;
+		if($mode != null) {
+			$parameters['mode'] = (string) $mode;
+		}
+		if($description != null) {
+			$parameters['description'] = (string) $description;
+		}
 
 		// make the call
 		return (array) $this->doCall((string) $user .'/lists.json', $parameters, true, 'POST');
@@ -1329,7 +1517,9 @@ 
 	public function userLists($user, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($cursor != null) {
+			$parameters['cursor'] = (string) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall((string) $user .'/lists.json', $parameters, true);
@@ -1366,12 +1556,20 @@ 
 		$allowedModes = array('public', 'private');
 
 		// validate
-		if($mode != null && !in_array($mode, $allowedModes)) throw new TwitterException('Invalid mode (), possible values are: '. implode($allowedModes) .'.');
+		if($mode != null && !in_array($mode, $allowedModes)) {
+			throw new TwitterException('Invalid mode (), possible values are: '. implode($allowedModes) .'.');
+		}
 
 		// build parameters
-		if($name != null) $parameters['name'] = (string) $name;
-		if($mode != null) $parameters['mode'] = (string) $mode;
-		if($description != null) $parameters['description'] = (string) $description;
+		if($name != null) {
+			$parameters['name'] = (string) $name;
+		}
+		if($mode != null) {
+			$parameters['mode'] = (string) $mode;
+		}
+		if($description != null) {
+			$parameters['description'] = (string) $description;
+		}
 
 		// make the call
 		return (array) $this->doCall((string) $user .'/lists/'. (string) $id .'.json', $parameters, true, 'POST');
@@ -1392,14 +1590,24 @@ 
 	public function userListsIdStatuses($user, $id, $sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if($count != null && $count > 200) {
+			throw new TwitterException('Count may not be greater than 200.');
+		}
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['per_page'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['per_page'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall((string) $user .'/lists/'. (string) $id .'/statuses.json', $parameters);
@@ -1416,7 +1624,9 @@ 
 	public function userListsMemberships($user, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($cursor != null) {
+			$parameters['cursor'] = (string) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall((string) $user .'/lists/memberships.json', $parameters, true);
@@ -1433,7 +1643,9 @@ 
 	public function userListsSubscriptions($user, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($cursor != null) {
+			$parameters['cursor'] = (string) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall((string) $user .'/lists/subscriptions.json', $parameters, true);
@@ -1452,7 +1664,9 @@ 
 	public function userListMembers($user, $id, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($cursor != null) {
+			$parameters['cursor'] = (string) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall((string) $user .'/'. (string) $id .'/members.json', $parameters, true);
@@ -1515,8 +1729,11 @@ 
 		// catch exceptions
 		catch(TwitterException $e)
 		{
-			if($e->getMessage() == 'The specified user is not a member of this list') return false;
-			else throw $e;
+			if($e->getMessage() == 'The specified user is not a member of this list') {
+				return false;
+			} else {
+				throw $e;
+			}
 		}
 	}
 
@@ -1533,7 +1750,9 @@ 
 	public function userListSubscribers($user, $id, $cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($cursor != null) {
+			$parameters['cursor'] = (string) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall((string) $user .'/'. (string) $id .'/subscribers.json', $parameters, true);
@@ -1590,8 +1809,11 @@ 
 		// catch exceptions
 		catch(TwitterException $e)
 		{
-			if($e->getMessage() == 'The specified user is not a subscriber of this list') return false;
-			else throw $e;
+			if($e->getMessage() == 'The specified user is not a subscriber of this list') {
+				return false;
+			} else {
+				throw $e;
+			}
 		}
 
 	}
@@ -1610,14 +1832,24 @@ 
 	public function directMessages($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if($count != null && $count > 200) {
+			throw new TwitterException('Count may not be greater than 200.');
+		}
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('direct_messages.json', $parameters, true);
@@ -1636,14 +1868,24 @@ 
 	public function directMessagesSent($sinceId = null, $maxId = null, $count = null, $page = null)
 	{
 		// validate
-		if($count != null && $count > 200) throw new TwitterException('Count may not be greater than 200.');
+		if($count != null && $count > 200) {
+			throw new TwitterException('Count may not be greater than 200.');
+		}
 
 		// build parameters
 		$parameters = array();
-		if($sinceId != null) $parameters['since_id'] = (string) $sinceId;
-		if($maxId != null) $parameters['max_id'] = (string) $maxId;
-		if($count != null) $parameters['count'] = (int) $count;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($sinceId != null) {
+			$parameters['since_id'] = (string) $sinceId;
+		}
+		if($maxId != null) {
+			$parameters['max_id'] = (string) $maxId;
+		}
+		if($count != null) {
+			$parameters['count'] = (int) $count;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('direct_messages/sent.json', $parameters, true);
@@ -1663,13 +1905,21 @@ 
 	public function directMessagesNew($text, $id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
 		$parameters['text'] = (string) $text;
-		if($id != null) $parameters['user'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['user'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 
 		// make the call
 		return (array) $this->doCall('direct_messages/new.json', $parameters, true, 'POST');
@@ -1707,12 +1957,20 @@ 
 	public function friendshipsCreate($id = null, $userId = null, $screenName = null, $follow = false)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 		$parameters['follow'] = ($follow) ? 'true' : 'false';
 
 		// make the call
@@ -1732,12 +1990,20 @@ 
 	public function friendshipsDestroy($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 
 		// make the call
 		return (array) $this->doCall('friendships/destroy.json', $parameters, true, 'POST');
@@ -1774,14 +2040,26 @@ 
 	public function friendshipsShow($sourceId = null, $sourceScreenName = null, $targetId = null, $targetScreenName = null)
 	{
 		// validate
-		if($sourceId == '' && $sourceScreenName == '') throw new TwitterException('Specify an sourceId or a sourceScreenName.');
-		if($targetId == '' && $targetScreenName == '') throw new TwitterException('Specify an targetId or a targetScreenName.');
+		if($sourceId == '' && $sourceScreenName == '') {
+			throw new TwitterException('Specify an sourceId or a sourceScreenName.');
+		}
+		if($targetId == '' && $targetScreenName == '') {
+			throw new TwitterException('Specify an targetId or a targetScreenName.');
+		}
 
 		// build parameters
-		if($sourceId != null) $parameters['source_id'] = (string) $sourceId;
-		if($sourceScreenName != null) $parameters['source_screen_name'] = (string) $sourceScreenName;
-		if($targetId != null) $parameters['target_id'] = (string) $targetId;
-		if($targetScreenName != null) $parameters['target_screen_name'] = (string) $targetScreenName;
+		if($sourceId != null) {
+			$parameters['source_id'] = (string) $sourceId;
+		}
+		if($sourceScreenName != null) {
+			$parameters['source_screen_name'] = (string) $sourceScreenName;
+		}
+		if($targetId != null) {
+			$parameters['target_id'] = (string) $targetId;
+		}
+		if($targetScreenName != null) {
+			$parameters['target_screen_name'] = (string) $targetScreenName;
+		}
 
 		// make the call
 		return (array) $this->doCall('friendships/show.json', $parameters);
@@ -1797,7 +2075,9 @@ 
 	public function friendshipsIncoming($cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($cursor != null) {
+			$parameters['cursor'] = (string) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall('friendships/incoming.json', $parameters, true);
@@ -1813,7 +2093,9 @@ 
 	public function friendshipsOutgoing($cursor = null)
 	{
 		$parameters = null;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($cursor != null) {
+			$parameters['cursor'] = (string) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall('friendships/outgoing.json', $parameters, true);
@@ -1833,13 +2115,23 @@ 
 	public function friendsIds($id = null, $userId = null, $screenName = null, $cursor = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
+		if($cursor != null) {
+			$parameters['cursor'] = (string) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall('friends/ids.json', $parameters);
@@ -1858,13 +2150,23 @@ 
 	public function followersIds($id = null, $userId = null, $screenName = null, $cursor = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
-		if($cursor != null) $parameters['cursor'] = (string) $cursor;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
+		if($cursor != null) {
+			$parameters['cursor'] = (string) $cursor;
+		}
 
 		// make the call
 		return (array) $this->doCall('followers/ids.json', $parameters);
@@ -1911,8 +2213,11 @@ 
 		// catch exceptions
 		catch(TwitterException $e)
 		{
-			if($e->getMessage() == 'Logged out.') return true;
-			else throw $e;
+			if($e->getMessage() == 'Logged out.') {
+				return true;
+			} else {
+				throw $e;
+			}
 		}
 	}
 
@@ -1947,14 +2252,26 @@ 
 	public function accountUpdateProfileColors($profileBackgroundColor = null, $profileTextColor = null, $profileLinkColor = null, $profileSidebarFillColor = null, $profileSidebarBorderColor = null)
 	{
 		// validate
-		if($profileBackgroundColor == '' && $profileTextColor == '' && $profileLinkColor == '' && $profileSidebarFillColor == '' && $profileSidebarBorderColor == '') throw new TwitterException('Specify a profileBackgroundColor, profileTextColor, profileLinkColor, profileSidebarFillColor or a profileSidebarBorderColor.');
+		if($profileBackgroundColor == '' && $profileTextColor == '' && $profileLinkColor == '' && $profileSidebarFillColor == '' && $profileSidebarBorderColor == '') {
+			throw new TwitterException('Specify a profileBackgroundColor, profileTextColor, profileLinkColor, profileSidebarFillColor or a profileSidebarBorderColor.');
+		}
 
 		// build parameters
-		if($profileBackgroundColor != null) $parameters['profile_background_color'] = (string) $profileBackgroundColor;
-		if($profileTextColor != null) $parameters['profile_text_color'] = (string) $profileTextColor;
-		if($profileLinkColor != null) $parameters['profile_link_color'] = (string) $profileLinkColor;
-		if($profileSidebarFillColor != null) $parameters['profile_sidebar_fill_color'] = (string) $profileSidebarFillColor;
-		if($profileSidebarBorderColor != null) $parameters['profile_sidebar_border_color'] = (string) $profileSidebarBorderColor;
+		if($profileBackgroundColor != null) {
+			$parameters['profile_background_color'] = (string) $profileBackgroundColor;
+		}
+		if($profileTextColor != null) {
+			$parameters['profile_text_color'] = (string) $profileTextColor;
+		}
+		if($profileLinkColor != null) {
+			$parameters['profile_link_color'] = (string) $profileLinkColor;
+		}
+		if($profileSidebarFillColor != null) {
+			$parameters['profile_sidebar_fill_color'] = (string) $profileSidebarFillColor;
+		}
+		if($profileSidebarBorderColor != null) {
+			$parameters['profile_sidebar_border_color'] = (string) $profileSidebarBorderColor;
+		}
 
 		// make the call
 		return (array) $this->doCall('account/update_profile_colors.json', $parameters, true, 'POST');
@@ -1972,7 +2289,9 @@ 
 		throw new TwitterException('Not implemented');
 
 		// validate
-		if(!file_exists($image)) throw new TwitterException('Image ('. $image .') doesn\'t exists.');
+		if(!file_exists($image)) {
+			throw new TwitterException('Image ('. $image .') doesn\'t exists.');
+		}
 
 		// make the call
 		return (array) $this->doCall('account/update_profile_image.json', null, true, 'POST', $image);
@@ -1991,10 +2310,14 @@ 
 		throw new TwitterException('Not implemented');
 
 		// validate
-		if(!file_exists($image)) throw new TwitterException('Image ('. $image .') doesn\'t exists.');
+		if(!file_exists($image)) {
+			throw new TwitterException('Image ('. $image .') doesn\'t exists.');
+		}
 
 		// build parameters
-		if($tile) $parameters['tile'] = 'true';
+		if($tile) {
+			$parameters['tile'] = 'true';
+		}
 
 		// make the call
 		return (array) $this->doCall('account/update_profile_background_image.json', $parameters, true, 'POST', $image);
@@ -2014,10 +2337,18 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($name != null) $parameters['name'] = (string) $name;
-		if($url != null) $parameters['url'] = (string) $url;
-		if($location != null) $parameters['location'] = (string) $location;
-		if($description != null) $parameters['description'] = (string) $description;
+		if($name != null) {
+			$parameters['name'] = (string) $name;
+		}
+		if($url != null) {
+			$parameters['url'] = (string) $url;
+		}
+		if($location != null) {
+			$parameters['location'] = (string) $location;
+		}
+		if($description != null) {
+			$parameters['description'] = (string) $description;
+		}
 
 		// make the call
 		return (array) $this->doCall('account/update_profile.json', $parameters, true, 'POST');
@@ -2036,8 +2367,12 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($id != null) $parameters['id'] = (string) $id;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('favorites.json', $parameters, true);
@@ -2082,12 +2417,20 @@ 
 	public function notificationsFollow($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 
 		// make the call
 		return (array) $this->doCall('notifications/follow.json', $parameters, true, 'POST');
@@ -2105,12 +2448,20 @@ 
 	public function notificationsLeave($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 
 		// make the call
 		return (array) $this->doCall('notifications/leave.json', $parameters, true, 'POST');
@@ -2129,12 +2480,20 @@ 
 	public function blocksCreate($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 
 		// make the call
 		return (array) $this->doCall('blocks/create.json', $parameters, true, 'POST');
@@ -2152,12 +2511,20 @@ 
 	public function blocksDestroy($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 
 		// make the call
 		return (array) $this->doCall('blocks/destroy.json', $parameters, true, 'POST');
@@ -2175,12 +2542,20 @@ 
 	public function blocksExists($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 
 		try
 		{
@@ -2190,8 +2565,11 @@ 
 		// catch exceptions
 		catch(TwitterException $e)
 		{
-			if($e->getMessage() == 'You are not blocking this user.') return false;
-			else throw $e;
+			if($e->getMessage() == 'You are not blocking this user.') {
+				return false;
+			} else {
+				throw $e;
+			}
 		}
 	}
 
@@ -2206,7 +2584,9 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($page != null) $parameters['page'] = (int) $page;
+		if($page != null) {
+			$parameters['page'] = (int) $page;
+		}
 
 		// make the call
 		return (array) $this->doCall('blocks/blocking.json', $parameters, true);
@@ -2237,12 +2617,20 @@ 
 	public function reportSpam($id = null, $userId = null, $screenName = null)
 	{
 		// validate
-		if($id == '' && $userId == '' && $screenName == '') throw new TwitterException('Specify an id or an userId or a screenName.');
+		if($id == '' && $userId == '' && $screenName == '') {
+			throw new TwitterException('Specify an id or an userId or a screenName.');
+		}
 
 		// build parameters
-		if($id != null) $parameters['id'] = (string) $id;
-		if($userId != null) $parameters['user_id'] = (string) $userId;
-		if($screenName != null) $parameters['screen_name'] = (string) $screenName;
+		if($id != null) {
+			$parameters['id'] = (string) $id;
+		}
+		if($userId != null) {
+			$parameters['user_id'] = (string) $userId;
+		}
+		if($screenName != null) {
+			$parameters['screen_name'] = (string) $screenName;
+		}
 
 		// make the call
 		return (array) $this->doCall('report_spam.json', $parameters, true, 'POST');
@@ -2321,17 +2709,25 @@ 
 		$parameters = array();
 
 		// set callback
-		if($callbackURL != null) $parameters['oauth_callback'] = (string) $callbackURL;
+		if($callbackURL != null) {
+			$parameters['oauth_callback'] = (string) $callbackURL;
+		}
 
 		// make the call
 		$response = $this->doOAuthCall('request_token', $parameters);
 
 		// validate
-		if(!isset($response['oauth_token'], $response['oauth_token_secret'])) throw new TwitterException(implode(', ', array_keys($response)));
+		if(!isset($response['oauth_token'], $response['oauth_token_secret'])) {
+			throw new TwitterException(implode(', ', array_keys($response)));
+		}
 
 		// set some properties
-		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
-		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
+		if(isset($response['oauth_token'])) {
+			$this->setOAuthToken($response['oauth_token']);
+		}
+		if(isset($response['oauth_token_secret'])) {
+			$this->setOAuthTokenSecret($response['oauth_token_secret']);
+		}
 
 		// return
 		return $response;
@@ -2357,8 +2753,12 @@ 
 		$response = $this->doOAuthCall('access_token', $parameters);
 
 		// set some properties
-		if(isset($response['oauth_token'])) $this->setOAuthToken($response['oauth_token']);
-		if(isset($response['oauth_token_secret'])) $this->setOAuthTokenSecret($response['oauth_token_secret']);
+		if(isset($response['oauth_token'])) {
+			$this->setOAuthToken($response['oauth_token']);
+		}
+		if(isset($response['oauth_token_secret'])) {
+			$this->setOAuthTokenSecret($response['oauth_token_secret']);
+		}
 
 		// return
 		return $response;
@@ -2403,8 +2803,12 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($lat != null) $parameters['lat_for_trends'] = (float) $lat;
-		if($long != null) $parameters['long_for_trends'] = (float) $long;
+		if($lat != null) {
+			$parameters['lat_for_trends'] = (float) $lat;
+		}
+		if($long != null) {
+			$parameters['long_for_trends'] = (float) $long;
+		}
 
 		// make the call
 		return (array) $this->doCall('trends/available.json', $parameters);
@@ -2446,9 +2850,15 @@ 
 		// build parameters
 		$parameters['lat'] = (float) $lat;
 		$parameters['long'] = (float) $long;
-		if($accuracy != null) $parameters['accuracy'] = (string) $accuracy;
-		if($granularity != null) $parameters['granularity'] = (string) $granularity;
-		if($maxResults != null) $parameters['max_results'] = (int) $maxResults;
+		if($accuracy != null) {
+			$parameters['accuracy'] = (string) $accuracy;
+		}
+		if($granularity != null) {
+			$parameters['granularity'] = (string) $granularity;
+		}
+		if($maxResults != null) {
+			$parameters['max_results'] = (int) $maxResults;
+		}
 
 		// make the call
 		return (array) $this->doCall('geo/reverse_geocode.json', $parameters);
@@ -2466,7 +2876,9 @@ 
 	{
 		// build parameters
 		$parameters = null;
-		if($placeId != null) $parameters['place_id'] = (string) $placeId;
+		if($placeId != null) {
+			$parameters['place_id'] = (string) $placeId;
+		}
 
 		// make the call
 		return (array) $this->doCall('geo/id/'. (string) $id .'.json', $parameters);

class/wideimage/Operation/CorrectGamma.php

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     This file is part of WideImage.
 		
@@ -18,9 +18,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+	 * @package Internal/Operations
+	 **/
 	
 	/**
 	 * An Exception for when an invalid fit method is passed

class/wideimage/Operation/ApplyConvolution.php

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     This file is part of WideImage.
 		
@@ -18,9 +18,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+	 * @package Internal/Operations
+	 **/
 	
 	/**
 	 * An Exception for when an invalid fit method is passed

class/wideimage/Operation/Mirror.php

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     This file is part of WideImage.
 		
@@ -18,9 +18,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Operations
-  **/
+	 * @package Internal/Operations
+	 **/
 	
 	/**
 	 * An Exception for when an invalid fit method is passed

class/wideimage/Mapper/JPEG.php

Indentation +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 	/**
- * @author Gasper Kozak
- * @copyright 2007, 2008, 2009
+	 * @author Gasper Kozak
+	 * @copyright 2007, 2008, 2009
 
     This file is part of WideImage.
 		
@@ -18,9 +18,8 @@ 
     You should have received a copy of the GNU Lesser General Public License
     along with WideImage; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    * @package Internal/Mappers
-  **/
+	 * @package Internal/Mappers
+	 **/
 	
 	/**
 	 * Mapper class for GD files