mambax7 / references

rss.php

Indentation +47 added lines, -47 removed lines

@@ -28,11 +28,11 @@ 
 @$xoopsLogger->activated = false;
 
 if (!references_utils::getModuleOption('use_rss')) {
-    exit(_ERRORS);
+	exit(_ERRORS);
 }
 
 if (function_exists('mb_http_output')) {
-    mb_http_output('pass');
+	mb_http_output('pass');
 }
 $charset = 'utf-8';
 header('Content-Type:text/xml; charset=' . $charset);
@@ -42,52 +42,52 @@ 
 $tpl->xoops_setCacheTime(references_utils::getModuleOption('rss_cache_time'));    // Temps de cache en secondes
 $uid = references_utils::getCurrentUserID();
 if (!$tpl->is_cached('db:references_rss.tpl', $uid)) {
-    $categoryTitle = '';
-    global $xoopsConfig;
-    $sitename = htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES);
-    $email    = $xoopsConfig['adminmail'];
-    $slogan   = htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES);
+	$categoryTitle = '';
+	global $xoopsConfig;
+	$sitename = htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES);
+	$email    = $xoopsConfig['adminmail'];
+	$slogan   = htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES);
 
-    $tpl->assign('charset', $charset);
-    $tpl->assign('channel_title', xoops_utf8_encode($sitename));
-    $tpl->assign('channel_link', XOOPS_URL . '/');
-    $tpl->assign('channel_desc', xoops_utf8_encode($slogan));
-    $tpl->assign('channel_lastbuild', formatTimestamp(time(), 'rss'));
-    $tpl->assign('channel_webmaster', xoops_utf8_encode($email));
-    $tpl->assign('channel_editor', xoops_utf8_encode($email));
-    $tpl->assign('channel_category', xoops_utf8_encode($categoryTitle));
-    $tpl->assign('channel_generator', xoops_utf8_encode(references_utils::getModuleName()));
-    $tpl->assign('channel_language', _LANGCODE);
-    $tpl->assign('image_url', XOOPS_URL . '/assets/images/logo.gif');
-    $dimention = getimagesize(XOOPS_ROOT_PATH . '/assets/images/logo.gif');
-    if (empty($dimention[0])) {
-        $width = 88;
-    } else {
-        $width = ($dimention[0] > 144) ? 144 : $dimention[0];
-    }
-    if (empty($dimention[1])) {
-        $height = 31;
-    } else {
-        $height = ($dimention[1] > 400) ? 400 : $dimention[1];
-    }
-    $tpl->assign('image_width', $width);
-    $tpl->assign('image_height', $height);
-    $start = 0;
-    $limit = references_utils::getModuleOption('nb_perpage');
-    $items = array();
+	$tpl->assign('charset', $charset);
+	$tpl->assign('channel_title', xoops_utf8_encode($sitename));
+	$tpl->assign('channel_link', XOOPS_URL . '/');
+	$tpl->assign('channel_desc', xoops_utf8_encode($slogan));
+	$tpl->assign('channel_lastbuild', formatTimestamp(time(), 'rss'));
+	$tpl->assign('channel_webmaster', xoops_utf8_encode($email));
+	$tpl->assign('channel_editor', xoops_utf8_encode($email));
+	$tpl->assign('channel_category', xoops_utf8_encode($categoryTitle));
+	$tpl->assign('channel_generator', xoops_utf8_encode(references_utils::getModuleName()));
+	$tpl->assign('channel_language', _LANGCODE);
+	$tpl->assign('image_url', XOOPS_URL . '/assets/images/logo.gif');
+	$dimention = getimagesize(XOOPS_ROOT_PATH . '/assets/images/logo.gif');
+	if (empty($dimention[0])) {
+		$width = 88;
+	} else {
+		$width = ($dimention[0] > 144) ? 144 : $dimention[0];
+	}
+	if (empty($dimention[1])) {
+		$height = 31;
+	} else {
+		$height = ($dimention[1] > 400) ? 400 : $dimention[1];
+	}
+	$tpl->assign('image_width', $width);
+	$tpl->assign('image_height', $height);
+	$start = 0;
+	$limit = references_utils::getModuleOption('nb_perpage');
+	$items = array();
 
-    $items = $h_references_articles->getRecentArticles($start, $limit);
-    foreach ($items as $item) {
-        $titre       = htmlspecialchars($item->getVar('article_title', 'n'), ENT_QUOTES);
-        $description = htmlspecialchars($item->getVar('article_text'), ENT_QUOTES);
-        $link        = REFERENCES_URL;
-        $tpl->append('items', array(
-            'title'       => xoops_utf8_encode($titre),
-            'link'        => $link,
-            'guid'        => $link,
-            'pubdate'     => formatTimestamp($item->getVar('article_timestamp'), 'rss'),
-            'description' => xoops_utf8_encode($description)
-        ));
-    }
+	$items = $h_references_articles->getRecentArticles($start, $limit);
+	foreach ($items as $item) {
+		$titre       = htmlspecialchars($item->getVar('article_title', 'n'), ENT_QUOTES);
+		$description = htmlspecialchars($item->getVar('article_text'), ENT_QUOTES);
+		$link        = REFERENCES_URL;
+		$tpl->append('items', array(
+			'title'       => xoops_utf8_encode($titre),
+			'link'        => $link,
+			'guid'        => $link,
+			'pubdate'     => formatTimestamp($item->getVar('article_timestamp'), 'rss'),
+			'description' => xoops_utf8_encode($description)
+		));
+	}
 }
 $tpl->display('db:references_rss.tpl', $uid);

Spacing +8 added lines, -8 removed lines

@@ -22,8 +22,8 @@ 
 /**
  * Flux RSS
  */
-require __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 error_reporting(0);
 @$xoopsLogger->activated = false;
 
@@ -35,11 +35,11 @@ 
     mb_http_output('pass');
 }
 $charset = 'utf-8';
-header('Content-Type:text/xml; charset=' . $charset);
+header('Content-Type:text/xml; charset='.$charset);
 
 $tpl = new XoopsTpl();
-$tpl->xoops_setCaching(2);                                                        // 1 = Cache global, 2 = Cache individuel (par template)
-$tpl->xoops_setCacheTime(references_utils::getModuleOption('rss_cache_time'));    // Temps de cache en secondes
+$tpl->xoops_setCaching(2); // 1 = Cache global, 2 = Cache individuel (par template)
+$tpl->xoops_setCacheTime(references_utils::getModuleOption('rss_cache_time')); // Temps de cache en secondes
 $uid = references_utils::getCurrentUserID();
 if (!$tpl->is_cached('db:references_rss.tpl', $uid)) {
     $categoryTitle = '';
@@ -50,7 +50,7 @@ 
 
     $tpl->assign('charset', $charset);
     $tpl->assign('channel_title', xoops_utf8_encode($sitename));
-    $tpl->assign('channel_link', XOOPS_URL . '/');
+    $tpl->assign('channel_link', XOOPS_URL.'/');
     $tpl->assign('channel_desc', xoops_utf8_encode($slogan));
     $tpl->assign('channel_lastbuild', formatTimestamp(time(), 'rss'));
     $tpl->assign('channel_webmaster', xoops_utf8_encode($email));
@@ -58,8 +58,8 @@ 
     $tpl->assign('channel_category', xoops_utf8_encode($categoryTitle));
     $tpl->assign('channel_generator', xoops_utf8_encode(references_utils::getModuleName()));
     $tpl->assign('channel_language', _LANGCODE);
-    $tpl->assign('image_url', XOOPS_URL . '/assets/images/logo.gif');
-    $dimention = getimagesize(XOOPS_ROOT_PATH . '/assets/images/logo.gif');
+    $tpl->assign('image_url', XOOPS_URL.'/assets/images/logo.gif');
+    $dimention = getimagesize(XOOPS_ROOT_PATH.'/assets/images/logo.gif');
     if (empty($dimention[0])) {
         $width = 88;
     } else {

class/lite.php

Indentation +836 added lines, -836 removed lines

@@ -28,840 +28,840 @@
 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
-     */
-    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
-     */
-    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
-     */
-    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 && $this->_memoryCaching) {
-                $this->_memoryCacheAdd($data);
-            }
-            if ($this->_automaticSerialization && 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
-     */
-    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
-     */
-    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;
-            }
-            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 bool|string $group              name of the cache group
-     * @param string      $mode               flush cache mode : 'old', 'ingroup', 'notingroup',
-     *                                        'callback_myFunction'
-     * @return bool true if no problem
-     * @access public
-     */
-    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
-     */
-    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
-     */
-    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
-     */
-    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
-     */
-    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
-     */
-    public 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
-     * @return object
-     */
-    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
-     */
-    public function extendLife()
-    {
-        @touch($this->_file);
-    }
-
-    // --- Private methods ---
-
-    /**
-     * Compute & set the refresh time
-     *
-     * @access private
-     */
-    public 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
-     */
-    public 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 bool|string $group name of the cache group
-     * @param string      $mode  flush cache mode : 'old', 'ingroup', 'notingroup',
-     *                           'callback_myFunction'
-     * @return bool true if no problem
-     * @access private
-     */
-    public 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;
-                }
-            }
-            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
-     */
-    public 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;
-        }
-    }
-
-    /**
-     * Make a file name (with path)
-     *
-     * @param string $id    cache id
-     * @param string $group name of the group
-     * @access private
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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
-     */
-    public 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);
-        }
-    }
+	// --- 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
+	 */
+	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
+	 */
+	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
+	 */
+	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 && $this->_memoryCaching) {
+				$this->_memoryCacheAdd($data);
+			}
+			if ($this->_automaticSerialization && 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
+	 */
+	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
+	 */
+	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;
+			}
+			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 bool|string $group              name of the cache group
+	 * @param string      $mode               flush cache mode : 'old', 'ingroup', 'notingroup',
+	 *                                        'callback_myFunction'
+	 * @return bool true if no problem
+	 * @access public
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	public 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
+	 * @return object
+	 */
+	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
+	 */
+	public function extendLife()
+	{
+		@touch($this->_file);
+	}
+
+	// --- Private methods ---
+
+	/**
+	 * Compute & set the refresh time
+	 *
+	 * @access private
+	 */
+	public 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
+	 */
+	public 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 bool|string $group name of the cache group
+	 * @param string      $mode  flush cache mode : 'old', 'ingroup', 'notingroup',
+	 *                           'callback_myFunction'
+	 * @return bool true if no problem
+	 * @access private
+	 */
+	public 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;
+				}
+			}
+			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
+	 */
+	public 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;
+		}
+	}
+
+	/**
+	 * Make a file name (with path)
+	 *
+	 * @param string $id    cache id
+	 * @param string $group name of the group
+	 * @access private
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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
+	 */
+	public 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);
+		}
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -314,7 +314,7 @@ 
             'pearErrorMode'
         );
         if (in_array($name, $availableOptions)) {
-            $property        = '_' . $name;
+            $property        = '_'.$name;
             $this->$property = $value;
         }
     }
@@ -511,7 +511,7 @@ 
                 'counter' => $this->_memoryCachingCounter,
                 'array'   => $this->_memoryCachingArray
             );
-            $data  = serialize($array);
+            $data = serialize($array);
             $this->save($data, $id, $group);
         }
     }
@@ -623,9 +623,9 @@ 
     public function _cleanDir($dir, $group = false, $mode = 'ingroup')
     {
         if ($this->_fileNameProtection) {
-            $motif = $group ? 'cache_' . md5($group) . '_' : 'cache_';
+            $motif = $group ? 'cache_'.md5($group).'_' : 'cache_';
         } else {
-            $motif = $group ? 'cache_' . $group . '_' : 'cache_';
+            $motif = $group ? 'cache_'.$group.'_' : 'cache_';
         }
         if ($this->_memoryCaching) {
             foreach ($this->_memoryCachingArray as $key => $v) {
@@ -645,7 +645,7 @@ 
         while ($file = readdir($dh)) {
             if (($file !== '.') && ($file !== '..')) {
                 if (substr($file, 0, 6) === 'cache_') {
-                    $file2 = $dir . $file;
+                    $file2 = $dir.$file;
                     if (is_file($file2)) {
                         switch (substr($mode, 0, 9)) {
                             case 'old':
@@ -676,7 +676,7 @@ 
                         }
                     }
                     if (is_dir($file2) and ($this->_hashedDirectoryLevel > 0)) {
-                        $result = ($result and $this->_cleanDir($file2 . '/', $group, $mode));
+                        $result = ($result and $this->_cleanDir($file2.'/', $group, $mode));
                     }
                 }
             }
@@ -712,19 +712,19 @@ 
     public function _setFileName($id, $group)
     {
         if ($this->_fileNameProtection) {
-            $suffix = 'cache_' . md5($group) . '_' . md5($id);
+            $suffix = 'cache_'.md5($group).'_'.md5($id);
         } else {
-            $suffix = 'cache_' . $group . '_' . $id;
+            $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) . '/';
+                $root = $root.'cache_'.substr($hash, 0, $i + 1).'/';
             }
         }
         $this->_fileName = $suffix;
-        $this->_file     = $root . $suffix;
+        $this->_file     = $root.$suffix;
     }
 
     /**
@@ -790,7 +790,7 @@ 
             $hash = md5($this->_fileName);
             $root = $this->_cacheDir;
             for ($i = 0; $i < $this->_hashedDirectoryLevel; ++$i) {
-                $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
+                $root = $root.'cache_'.substr($hash, 0, $i + 1).'/';
                 if (!(@is_dir($root))) {
                     @mkdir($root, $this->_hashedDirectoryUmask);
                 }
@@ -816,7 +816,7 @@ 
             return true;
         }
 
-        return $this->raiseError('Cache_Lite : Unable to write cache file : ' . $this->_file, -1);
+        return $this->raiseError('Cache_Lite : Unable to write cache file : '.$this->_file, -1);
     }
 
     /**

class/references_handlers.php

Indentation +27 added lines, -27 removed lines

@@ -24,34 +24,34 @@
  */
 class references_handler
 {
-    public         $h_references_articles   = null;
-    public         $h_references_categories = null;
-    private static $instance                = false;
+	public         $h_references_articles   = null;
+	public         $h_references_categories = null;
+	private static $instance                = false;
 
-    /**
-     * Singleton
-     */
-    private function __construct()
-    {
-        $handlersNames = array('references_articles', 'references_categories');
-        foreach ($handlersNames as $handlerName) {
-            $internalName        = 'h_' . $handlerName;
-            $this->$internalName = xoops_getModuleHandler($handlerName, REFERENCES_DIRNAME);
-        }
-    }
+	/**
+	 * Singleton
+	 */
+	private function __construct()
+	{
+		$handlersNames = array('references_articles', 'references_categories');
+		foreach ($handlersNames as $handlerName) {
+			$internalName        = 'h_' . $handlerName;
+			$this->$internalName = xoops_getModuleHandler($handlerName, REFERENCES_DIRNAME);
+		}
+	}
 
-    /**
-     * Retourne l'instance unique de la clanss
-     *
-     * @return object
-     */
-    public static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
+	/**
+	 * Retourne l'instance unique de la clanss
+	 *
+	 * @return object
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     {
         $handlersNames = array('references_articles', 'references_categories');
         foreach ($handlersNames as $handlerName) {
-            $internalName        = 'h_' . $handlerName;
+            $internalName        = 'h_'.$handlerName;
             $this->$internalName = xoops_getModuleHandler($handlerName, REFERENCES_DIRNAME);
         }
     }

category.php

Indentation +16 added lines, -16 removed lines

@@ -34,21 +34,21 @@ 
 
 $category_id = isset($_GET['category_id']) ? (int)$_GET['category_id'] : 0;
 if ($category_id == 0) {
-    header('Location: index.php', true, 301);
-    exit;
-    //references_utils::redirect('', 'index.php', 0);
+	header('Location: index.php', true, 301);
+	exit;
+	//references_utils::redirect('', 'index.php', 0);
 }
 // Chargement de la catégorie
 $category = null;
 $category = $h_references_categories->get($category_id);
 if (!is_object($category)) {
-    references_utils::redirect(_MD_REFERENCES_ERROR2, 'index.php', 4);
+	references_utils::redirect(_MD_REFERENCES_ERROR2, 'index.php', 4);
 }
 
 // Vérification des permissions
 $handlers = references_handler::getInstance();
 if (!$handlers->h_references_categories->userCanSeeCategory($category)) {
-    references_utils::redirect(_NOPERM, 'index.php', 4);
+	references_utils::redirect(_NOPERM, 'index.php', 4);
 }
 
 $xoopsTpl->assign('category', $category->toArray());
@@ -64,9 +64,9 @@ 
 $xoTheme->addScript(REFERENCES_JS_URL . 'js/mootools.js');
 $xoTheme->addScript(REFERENCES_JS_URL . 'js/mootools-1.2-more.js');
 if (isset($xoopsConfig) && file_exists(REFERENCES_PATH . 'language/' . $xoopsConfig['language'] . '/slimbox.js')) {
-    $xoTheme->addScript(REFERENCES_URL . 'language/' . $xoopsConfig['language'] . '/slimbox.js');
+	$xoTheme->addScript(REFERENCES_URL . 'language/' . $xoopsConfig['language'] . '/slimbox.js');
 } else {
-    $xoTheme->addScript(REFERENCES_JS_URL . 'js/slimbox.js');
+	$xoTheme->addScript(REFERENCES_JS_URL . 'js/slimbox.js');
 }
 
 $categoriesSelect = $h_references_categories->getCategoriesSelect('categoriesSelect', $category->getVar('category_id'));
@@ -78,15 +78,15 @@ 
 $xoopsTpl->assign('thumbsWidth', references_utils::getModuleOption('thumbs_width'));
 $xoopsTpl->assign('thumbsHeight', references_utils::getModuleOption('thumbs_height'));
 if ($limit > 0) {
-    $items          = array();
-    $items          = $h_references_articles->getRecentArticles($start, $limit, references_utils::getModuleOption('sort_field'), references_utils::getModuleOption('sort_order'), true, $category_id);
-    $categoryTitle  = $category->getVar('category_title');
-    $categoryWeight = $category->getVar('category_weight');
-    if (count($items) > 0) {
-        foreach ($items as $item) {
-            $xoopsTpl->append('articles', $item->toArray());
-        }
-    }
+	$items          = array();
+	$items          = $h_references_articles->getRecentArticles($start, $limit, references_utils::getModuleOption('sort_field'), references_utils::getModuleOption('sort_order'), true, $category_id);
+	$categoryTitle  = $category->getVar('category_title');
+	$categoryWeight = $category->getVar('category_weight');
+	if (count($items) > 0) {
+		foreach ($items as $item) {
+			$xoopsTpl->append('articles', $item->toArray());
+		}
+	}
 }
 $xoopsTpl->assign('isAdmin', references_utils::isAdmin());
 $title = $category->getVar('category_title', 'n') . ' - ' . $xoopsModule->name();

Spacing +13 added lines, -13 removed lines

@@ -24,15 +24,15 @@ 
  *
  * @param integer $category_id Le numéro de la catégorie
  */
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 $xoopsOption['template_main'] = 'references_category.tpl';
-require XOOPS_ROOT_PATH . '/header.php';
+require XOOPS_ROOT_PATH.'/header.php';
 
-$baseurl = REFERENCES_URL . basename(__FILE__);
+$baseurl = REFERENCES_URL.basename(__FILE__);
 $limit   = references_utils::getModuleOption('items_index_page');
 $start   = $index = 0;
 
-$category_id = isset($_GET['category_id']) ? (int)$_GET['category_id'] : 0;
+$category_id = isset($_GET['category_id']) ? (int) $_GET['category_id'] : 0;
 if ($category_id == 0) {
     header('Location: index.php', true, 301);
     exit;
@@ -61,18 +61,18 @@ 
 $xoopsTpl->assign('use_rss', references_utils::getModuleOption('use_rss'));
 
 // MooTools
-$xoTheme->addScript(REFERENCES_JS_URL . 'js/mootools.js');
-$xoTheme->addScript(REFERENCES_JS_URL . 'js/mootools-1.2-more.js');
-if (isset($xoopsConfig) && file_exists(REFERENCES_PATH . 'language/' . $xoopsConfig['language'] . '/slimbox.js')) {
-    $xoTheme->addScript(REFERENCES_URL . 'language/' . $xoopsConfig['language'] . '/slimbox.js');
+$xoTheme->addScript(REFERENCES_JS_URL.'js/mootools.js');
+$xoTheme->addScript(REFERENCES_JS_URL.'js/mootools-1.2-more.js');
+if (isset($xoopsConfig) && file_exists(REFERENCES_PATH.'language/'.$xoopsConfig['language'].'/slimbox.js')) {
+    $xoTheme->addScript(REFERENCES_URL.'language/'.$xoopsConfig['language'].'/slimbox.js');
 } else {
-    $xoTheme->addScript(REFERENCES_JS_URL . 'js/slimbox.js');
+    $xoTheme->addScript(REFERENCES_JS_URL.'js/slimbox.js');
 }
 
 $categoriesSelect = $h_references_categories->getCategoriesSelect('categoriesSelect', $category->getVar('category_id'));
 $xoopsTpl->assign('categoriesSelect', $categoriesSelect);
-$xoTheme->addStylesheet(REFERENCES_JS_URL . 'css/slimbox.css');
-$xoTheme->addStylesheet(REFERENCES_JS_URL . 'css/accordion.css');
+$xoTheme->addStylesheet(REFERENCES_JS_URL.'css/slimbox.css');
+$xoTheme->addStylesheet(REFERENCES_JS_URL.'css/accordion.css');
 
 // ****************************************************************************************************************************
 $xoopsTpl->assign('thumbsWidth', references_utils::getModuleOption('thumbs_width'));
@@ -89,6 +89,6 @@ 
     }
 }
 $xoopsTpl->assign('isAdmin', references_utils::isAdmin());
-$title = $category->getVar('category_title', 'n') . ' - ' . $xoopsModule->name();
+$title = $category->getVar('category_title', 'n').' - '.$xoopsModule->name();
 references_utils::setMetas($title, $title);
-require XOOPS_ROOT_PATH . '/footer.php';
+require XOOPS_ROOT_PATH.'/footer.php';

list.tag.php

Spacing +2 added lines, -2 removed lines

@@ -18,5 +18,5 @@
  *
  * ****************************************************************************
  */
-require __DIR__ . '/header.php';
-require XOOPS_ROOT_PATH . '/modules/tag/list.tag.php';
+require __DIR__.'/header.php';
+require XOOPS_ROOT_PATH.'/modules/tag/list.tag.php';

config.php

Indentation +18 added lines, -18 removed lines

@@ -19,27 +19,27 @@
  * ****************************************************************************
  */
 if (!defined('REFERENCES_CACHE_PATH')) {
-    // Le chemin du cache (il est conseillé de le mettre en dehors de la portée du web)
-    define('REFERENCES_CACHE_PATH', XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . REFERENCES_DIRNAME . '_cache' . DIRECTORY_SEPARATOR);
+	// Le chemin du cache (il est conseillé de le mettre en dehors de la portée du web)
+	define('REFERENCES_CACHE_PATH', XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . REFERENCES_DIRNAME . '_cache' . DIRECTORY_SEPARATOR);
 
-    // Thumbs / Vignettes prefixe
-    define('REFERENCES_THUMBS_PREFIX', 'thumb_');        // Thumbs prefix (when thumbs are automatically created)
+	// Thumbs / Vignettes prefixe
+	define('REFERENCES_THUMBS_PREFIX', 'thumb_');        // Thumbs prefix (when thumbs are automatically created)
 
-    // Short text length / Longueur des textes raccourcis
-    define('REFERENCES_SHORTEN_TEXT', '200');        // Characters count / Nombre de caract�res
+	// Short text length / Longueur des textes raccourcis
+	define('REFERENCES_SHORTEN_TEXT', '200');        // Characters count / Nombre de caract�res
 
-    define('REFERENCES_METAGEN_MAX_KEYWORDS', 40);
-    define('REFERENCES_METAGEN_KEYWORDS_ORDER', 0);
+	define('REFERENCES_METAGEN_MAX_KEYWORDS', 40);
+	define('REFERENCES_METAGEN_KEYWORDS_ORDER', 0);
 
-    // Automatically fill the manual date when creating a reference ? / Remplir automatiquement la date manuelle lorsqu'on crée une référence
-    define('REFERENCES_AUTO_FILL_MANUAL_DATE', true);
+	// Automatically fill the manual date when creating a reference ? / Remplir automatiquement la date manuelle lorsqu'on crée une référence
+	define('REFERENCES_AUTO_FILL_MANUAL_DATE', true);
 
-    /**
-     * Si la valeur est à false, alors dans les listes de recherche, côté admin, on recherche tout ce qui contient quelque chose.
-     * Par exemple si on tape "a", le module trouvera "abajour" et "cartable".
-     * Par contre si on met cette valeur à true alors le module cherchera tout ce qui commence par ...
-     * Par exemple si on tape "a", lemodule trouvera "abajour" MAIS PAS "cartable"
-     * PAR CONTRE "%a" trouvera tout ce qui contient la lettre a
-     */
-    define('REFERENCES_EXACT_SEARCH', true);
+	/**
+	 * Si la valeur est à false, alors dans les listes de recherche, côté admin, on recherche tout ce qui contient quelque chose.
+	 * Par exemple si on tape "a", le module trouvera "abajour" et "cartable".
+	 * Par contre si on met cette valeur à true alors le module cherchera tout ce qui commence par ...
+	 * Par exemple si on tape "a", lemodule trouvera "abajour" MAIS PAS "cartable"
+	 * PAR CONTRE "%a" trouvera tout ce qui contient la lettre a
+	 */
+	define('REFERENCES_EXACT_SEARCH', true);
 }

Spacing +3 added lines, -3 removed lines

@@ -20,13 +20,13 @@
  */
 if (!defined('REFERENCES_CACHE_PATH')) {
     // Le chemin du cache (il est conseillé de le mettre en dehors de la portée du web)
-    define('REFERENCES_CACHE_PATH', XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . REFERENCES_DIRNAME . '_cache' . DIRECTORY_SEPARATOR);
+    define('REFERENCES_CACHE_PATH', XOOPS_UPLOAD_PATH.DIRECTORY_SEPARATOR.REFERENCES_DIRNAME.'_cache'.DIRECTORY_SEPARATOR);
 
     // Thumbs / Vignettes prefixe
-    define('REFERENCES_THUMBS_PREFIX', 'thumb_');        // Thumbs prefix (when thumbs are automatically created)
+    define('REFERENCES_THUMBS_PREFIX', 'thumb_'); // Thumbs prefix (when thumbs are automatically created)
 
     // Short text length / Longueur des textes raccourcis
-    define('REFERENCES_SHORTEN_TEXT', '200');        // Characters count / Nombre de caract�res
+    define('REFERENCES_SHORTEN_TEXT', '200'); // Characters count / Nombre de caract�res
 
     define('REFERENCES_METAGEN_MAX_KEYWORDS', 40);
     define('REFERENCES_METAGEN_KEYWORDS_ORDER', 0);

header.php

Indentation +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
  * ****************************************************************************
  */
 if (file_exists('../../mainfile.php')) {
-    require __DIR__ . '/../../mainfile.php';
+	require __DIR__ . '/../../mainfile.php';
 } elseif (file_exists('../../../mainfile.php')) {
-    require __DIR__ . '/../../../mainfile.php';
+	require __DIR__ . '/../../../mainfile.php';
 }
 require_once XOOPS_ROOT_PATH . '/modules/references/include/common.php';

Spacing +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@
  * ****************************************************************************
  */
 if (file_exists('../../mainfile.php')) {
-    require __DIR__ . '/../../mainfile.php';
+    require __DIR__.'/../../mainfile.php';
 } elseif (file_exists('../../../mainfile.php')) {
-    require __DIR__ . '/../../../mainfile.php';
+    require __DIR__.'/../../../mainfile.php';
 }
-require_once XOOPS_ROOT_PATH . '/modules/references/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/references/include/common.php';

plugins/actions/newcategory/plugins.php

Indentation +38 added lines, -38 removed lines

@@ -25,44 +25,44 @@
  */
 class referencesNewcategoryAction extends references_action
 {
-    public function registerEvents()
-    {
-        /**
-         * La liste des évènements traités par le plugin se présente sous la forme d'un tableau compposé comme ceci :
-         *
-         * Indice   Signification
-         * ----------------------
-         *    0        Evènement sur lequel se raccrocher (voir class/references_plugins.php::EVENT_ON_PRODUCT_CREATE
-         *    1        Priorité du plugin (de 1 à 5)
-         *    2        Script Php à inclure
-         *    3        Classe à instancier
-         *    4        Méthode à appeler
-         */
-        $events   = array();
-        $events[] = array(
-            references_plugins::EVENT_ON_CATEGORY_CREATE,
-            references_plugins::EVENT_PRIORITY_1,
-            basename(__FILE__),
-            __CLASS__,
-            'fireNewCategory'
-        );
+	public function registerEvents()
+	{
+		/**
+		 * La liste des évènements traités par le plugin se présente sous la forme d'un tableau compposé comme ceci :
+		 *
+		 * Indice   Signification
+		 * ----------------------
+		 *    0        Evènement sur lequel se raccrocher (voir class/references_plugins.php::EVENT_ON_PRODUCT_CREATE
+		 *    1        Priorité du plugin (de 1 à 5)
+		 *    2        Script Php à inclure
+		 *    3        Classe à instancier
+		 *    4        Méthode à appeler
+		 */
+		$events   = array();
+		$events[] = array(
+			references_plugins::EVENT_ON_CATEGORY_CREATE,
+			references_plugins::EVENT_PRIORITY_1,
+			basename(__FILE__),
+			__CLASS__,
+			'fireNewCategory'
+		);
 
-        return $events;
-    }
+		return $events;
+	}
 
-    /**
-     * Méthode appelée pour indiquer qu'une nouvelle catégorie de références a été créée
-     *
-     * @param object $parameters La catégorie qui vient d'être publiée
-     * @return void
-     */
-    public function fireNewCategory($parameters)
-    {
-        $category                = $parameters['category'];
-        $notification_handler    = xoops_getHandler('notification');
-        $params                  = array();
-        $params['CATEGORY_URL']  = $category->getUrl();
-        $params['CATEGORY_NAME'] = $category->getVar('category_title');
-        $notification_handler->triggerEvent('global', 0, 'new_category', $params);
-    }
+	/**
+	 * Méthode appelée pour indiquer qu'une nouvelle catégorie de références a été créée
+	 *
+	 * @param object $parameters La catégorie qui vient d'être publiée
+	 * @return void
+	 */
+	public function fireNewCategory($parameters)
+	{
+		$category                = $parameters['category'];
+		$notification_handler    = xoops_getHandler('notification');
+		$params                  = array();
+		$params['CATEGORY_URL']  = $category->getUrl();
+		$params['CATEGORY_NAME'] = $category->getVar('category_title');
+		$notification_handler->triggerEvent('global', 0, 'new_category', $params);
+	}
 }

plugins/actions/twitter/twitter.php

Indentation +2487 added lines, -2487 removed lines

@@ -41,2493 +41,2493 @@
  */
 class Twitter
 {
-    // internal constant to enable/disable debugging
-    const DEBUG = false;
-
-    // url for the twitter-api
-    const API_URL        = 'https://api.twitter.com/1';
-    const SECURE_API_URL = 'https://api.twitter.com';
-
-    // port for the twitter-api
-    const API_PORT        = 443;
-    const SECURE_API_PORT = 443;
-
-    // current version
-    const VERSION = '2.0.1';
-
-    /**
-     * A cURL instance
-     *
-     * @var    resource
-     */
-    private $curl;
-
-    /**
-     * The consumer key
-     *
-     * @var    string
-     */
-    private $consumerKey;
-
-    /**
-     * The consumer secret
-     *
-     * @var    string
-     */
-    private $consumerSecret;
-
-    /**
-     * The oAuth-token
-     *
-     * @var    string
-     */
-    private $oAuthToken = '';
-
-    /**
-     * The oAuth-token-secret
-     *
-     * @var    string
-     */
-    private $oAuthTokenSecret = '';
-
-    /**
-     * The timeout
-     *
-     * @var    int
-     */
-    private $timeOut = 60;
-
-    /**
-     * The user agent
-     *
-     * @var    string
-     */
-    private $userAgent;
-
-    // class methods
-    /**
-     * Default constructor
-     *
-     *
-     * @param    string $consumerKey    The consumer key to use.
-     * @param    string $consumerSecret The consumer secret to use.
-     */
-    public function __construct($consumerKey, $consumerSecret)
-    {
-        $this->setConsumerKey($consumerKey);
-        $this->setConsumerSecret($consumerSecret);
-    }
-
-    /**
-     * Default destructor
-     *
-     * @return    void
-     */
-    public function __destruct()
-    {
-        if ($this->curl != null) curl_close($this->curl);
-    }
-
-    /**
-     * Format the parameters as a querystring
-     *
-     * @return    string
-     * @param    array $parameters
-     */
-    private function buildQuery(array $parameters)
-    {
-        // no parameters?
-        if (empty($parameters)) return '';
-
-        // encode the keys
-        $keys = self::urlencode_rfc3986(array_keys($parameters));
-
-        // encode the values
-        $values = self::urlencode_rfc3986(array_values($parameters));
-
-        // reset the parameters
-        $parameters = array_combine($keys, $values);
-
-        // sort parameters by key
-        uksort($parameters, 'strcmp');
-
-        // loop parameters
-        foreach ($parameters as $key => $value) {
-            // sort by value
-            if (is_array($value)) $parameters[$key] = natsort($value);
-        }
-
-        // process parameters
-        foreach ($parameters as $key => $value) $chunks[] = $key . '=' . str_replace('%25', '%', $value);
-
-        // return
-        return implode('&', $chunks);
-    }
-
-    /**
-     * All OAuth 1.0 requests use the same basic algorithm for creating a signature base string and a signature.
-     * The signature base string is composed of the HTTP method being used, followed by an ampersand ("&") and then the URL-encoded base URL being accessed,
-     * complete with path (but not query parameters), followed by an ampersand ("&").
-     * Then, you take all query parameters and POST body parameters (when the POST body is of the URL-encoded type, otherwise the POST body is ignored),
-     * including the OAuth parameters necessary for negotiation with the request at hand, and sort them in lexicographical order by first parameter name and
-     * then parameter value (for duplicate parameters), all the while ensuring that both the key and the value for each parameter are URL encoded in isolation.
-     * Instead of using the equals ("=") sign to mark the key/value relationship, you use the URL-encoded form of "%3D". Each parameter is then joined by the
-     * URL-escaped ampersand sign, "%26".
-     *
-     * @return    string
-     * @param    string $url
-     * @param    string $method
-     * @param    array  $parameters
-     */
-    private function calculateBaseString($url, $method, array $parameters)
-    {
-        // redefine
-        $url        = (string)$url;
-        $parameters = (array)$parameters;
-
-        // init var
-        $pairs  = array();
-        $chunks = array();
-
-        // sort parameters by key
-        uksort($parameters, 'strcmp');
-
-        // loop parameters
-        foreach ($parameters as $key => $value) {
-            // sort by value
-            if (is_array($value)) $parameters[$key] = natsort($value);
-        }
-
-        // process queries
-        foreach ($parameters as $key => $value) {
-            $chunks[] = self::urlencode_rfc3986($key) . '%3D' . self::urlencode_rfc3986($value);
-        }
-
-        // buils base
-        $base = $method . '&';
-        $base .= urlencode($url) . '&';
-        $base .= implode('%26', $chunks);
-
-        // return
-        return $base;
-    }
-
-    /**
-     * Build the Authorization header
-     * @later: fix me
-     *
-     *
-     * @param    array $parameters
-     * @param null     $url
-     * @return string
-     */
-    private function calculateHeader(array $parameters, $url = null)
-    {
-        // redefine
-        $url = (string)$url;
-
-        // divide into parts
-        $parts = parse_url($url);
-
-        // init var
-        $chunks = array();
-
-        // process queries
-        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 .= implode(',', $chunks);
-
-        // prepend name and OAuth part
-        return $return;
-    }
-
-    /**
-     * Make an call to the oAuth
-     * @todo    refactor me
-     *
-     *
-     * @param    string $method
-     * @param array     $parameters [optional] $parameters
-     * @return array
-     * @throws TwitterException
-     */
-    private function doOAuthCall($method, array $parameters = null)
-    {
-        // redefine
-        $method = (string)$method;
-
-        // append default parameters
-        $parameters['oauth_consumer_key']     = $this->getConsumerKey();
-        $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);
-
-        // add sign into the parameters
-        $parameters['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
-
-        // calculate header
-        $header = $this->calculateHeader($parameters, self::SECURE_API_URL . '/oauth/' . $method);
-
-        // set options
-        $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;
-        $options[CURLOPT_RETURNTRANSFER] = true;
-        $options[CURLOPT_TIMEOUT]        = (int)$this->getTimeOut();
-        $options[CURLOPT_SSL_VERIFYPEER] = false;
-        $options[CURLOPT_SSL_VERIFYHOST] = false;
-        $options[CURLOPT_HTTPHEADER]     = array('Expect:');
-        $options[CURLOPT_POST]           = 1;
-        $options[CURLOPT_POSTFIELDS]     = $this->buildQuery($parameters);
-
-        // init
-        if ($this->curl == null) $this->curl = curl_init();
-
-        // set options
-        curl_setopt_array($this->curl, $options);
-
-        // execute
-        $response = curl_exec($this->curl);
-        $headers  = curl_getinfo($this->curl);
-
-        // fetch errors
-        $errorNumber  = curl_errno($this->curl);
-        $errorMessage = curl_error($this->curl);
-
-        // error?
-        if ($errorNumber != '') throw new TwitterException($errorMessage, $errorNumber);
-
-        // init var
-        $return = array();
-
-        // parse the string
-        parse_str($response, $return);
-
-        // return
-        return $return;
-    }
-
-    /**
-     * Make the call
-     *
-     *
-     * @param    string $url
-     * @param array     $parameters
-     * @param bool      $authenticate
-     * @param string    $method
-     * @param null      $filePath
-     * @param bool      $expectJSON
-     * @return string
-     * @throws TwitterException
-     * @internal param $array [optiona] $aParameters
-     * @internal param $bool [optional] $authenticate
-     * @internal param $bool [optional] $usePost
-     */
-    private function doCall($url, array $parameters = null, $authenticate = false, $method = 'GET', $filePath = null, $expectJSON = true)
-    {
-        // allowed methods
-        $allowedMethods = array('GET', 'POST');
-
-        // redefine
-        $url          = (string)$url;
-        $parameters   = (array)$parameters;
-        $authenticate = (bool)$authenticate;
-        $method       = (string)$method;
-        $expectJSON   = (bool)$expectJSON;
-
-        // validate method
-        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_timestamp']        = time();
-        $oauth['oauth_token']            = $this->getOAuthToken();
-        $oauth['oauth_signature_method'] = 'HMAC-SHA1';
-        $oauth['oauth_version']          = '1.0';
-
-        // set data
-        $data = $oauth;
-        if (!empty($parameters)) $data = array_merge($data, $parameters);
-
-        // calculate the base string
-        $base = $this->calculateBaseString(self::API_URL . '/' . $url, $method, $data);
-
-        // add sign into the parameters
-        $oauth['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
-
-        $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') {
-            // file provided?
-            if ($filePath != null) {
-                // build a boundary
-                $boundary = md5(time());
-
-                // process file
-                $fileInfo = pathinfo($filePath);
-
-                // 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';
-
-                // init var
-                $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";
-
-                // build headers
-                $headers[] = 'Content-Type: multipart/form-data; boundary=' . $boundary;
-                $headers[] = 'Content-Length: ' . strlen($content);
-
-                // set content
-                $options[CURLOPT_POSTFIELDS] = $content;
-            } // no file
-            else $options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
-
-            // enable post
-            $options[CURLOPT_POST] = 1;
-        } else {
-            // add the parameters into the querystring
-            if (!empty($parameters)) $url .= '?' . $this->buildQuery($parameters);
-        }
-
-        // set options
-        $options[CURLOPT_URL]            = self::API_URL . '/' . $url;
-        $options[CURLOPT_PORT]           = self::API_PORT;
-        $options[CURLOPT_USERAGENT]      = $this->getUserAgent();
-        $options[CURLOPT_FOLLOWLOCATION] = true;
-        $options[CURLOPT_RETURNTRANSFER] = true;
-        $options[CURLOPT_TIMEOUT]        = (int)$this->getTimeOut();
-        $options[CURLOPT_SSL_VERIFYPEER] = false;
-        $options[CURLOPT_SSL_VERIFYHOST] = false;
-        $options[CURLOPT_HTTP_VERSION]   = CURL_HTTP_VERSION_1_1;
-        $options[CURLOPT_HTTPHEADER]     = $headers;
-
-        // init
-        if ($this->curl == null) $this->curl = curl_init();
-
-        // set options
-        curl_setopt_array($this->curl, $options);
-
-        // execute
-        $response = curl_exec($this->curl);
-        $headers  = curl_getinfo($this->curl);
-
-        // fetch errors
-        $errorNumber  = curl_errno($this->curl);
-        $errorMessage = curl_error($this->curl);
-
-        // we don't expext JSON, return the 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);
-
-        // we expect JSON, so decode it
-        $json = @json_decode($response, true);
-
-        // validate JSON
-        if ($json === null) {
-            // should we provide debug information
-            if (self::DEBUG) {
-                // make it output proper
-                echo '<pre>';
-
-                // dump the header-information
-                var_dump($headers);
-
-                // dump the error
-                var_dump($errorMessage);
-
-                // dump the raw response
-                var_dump($response);
-
-                // end proper format
-                echo '</pre>';
-            }
-
-            // throw exception
-            throw new TwitterException('Invalid response.');
-        }
-
-        // any errors
-        if (isset($json['errors'])) {
-            // should we provide debug information
-            if (self::DEBUG) {
-                // make it output proper
-                echo '<pre>';
-
-                // dump the header-information
-                var_dump($headers);
-
-                // dump the error
-                var_dump($errorMessage);
-
-                // dump the raw response
-                var_dump($response);
-
-                // end proper format
-                echo '</pre>';
-            }
-
-            // throw exception
-            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'])) {
-            // should we provide debug information
-            if (self::DEBUG) {
-                // make it output proper
-                echo '<pre>';
-
-                // dump the header-information
-                var_dump($headers);
-
-                // dump the raw response
-                var_dump($response);
-
-                // end proper format
-                echo '</pre>';
-            }
-
-            // throw exception
-            throw new TwitterException($json['error']);
-        }
-
-        // return
-        return $json;
-    }
-
-    /**
-     * Get the consumer key
-     *
-     * @return    string
-     */
-    private function getConsumerKey()
-    {
-        return $this->consumerKey;
-    }
-
-    /**
-     * Get the consumer secret
-     *
-     * @return    string
-     */
-    private function getConsumerSecret()
-    {
-        return $this->consumerSecret;
-    }
-
-    /**
-     * Get the oAuth-token
-     *
-     * @return    string
-     */
-    private function getOAuthToken()
-    {
-        return $this->oAuthToken;
-    }
-
-    /**
-     * Get the oAuth-token-secret
-     *
-     * @return    string
-     */
-    private function getOAuthTokenSecret()
-    {
-        return $this->oAuthTokenSecret;
-    }
-
-    /**
-     * Get the timeout
-     *
-     * @return    int
-     */
-    public function getTimeOut()
-    {
-        return (int)$this->timeOut;
-    }
-
-    /**
-     * Get the useragent that will be used. Our version will be prepended to yours.
-     * It will look like: "PHP Twitter/<version> <your-user-agent>"
-     *
-     * @return    string
-     */
-    public function getUserAgent()
-    {
-        return (string)'PHP Twitter/' . self::VERSION . ' ' . $this->userAgent;
-    }
-
-    /**
-     * Set the consumer key
-     *
-     * @return    void
-     * @param    string $key The consumer key to use.
-     */
-    private function setConsumerKey($key)
-    {
-        $this->consumerKey = (string)$key;
-    }
-
-    /**
-     * Set the consumer secret
-     *
-     * @return    void
-     * @param    string $secret The consumer secret to use.
-     */
-    private function setConsumerSecret($secret)
-    {
-        $this->consumerSecret = (string)$secret;
-    }
-
-    /**
-     * Set the oAuth-token
-     *
-     * @return    void
-     * @param    string $token The token to use.
-     */
-    public function setOAuthToken($token)
-    {
-        $this->oAuthToken = (string)$token;
-    }
-
-    /**
-     * Set the oAuth-secret
-     *
-     * @return    void
-     * @param    string $secret The secret to use.
-     */
-    public function setOAuthTokenSecret($secret)
-    {
-        $this->oAuthTokenSecret = (string)$secret;
-    }
-
-    /**
-     * Set the timeout
-     *
-     * @return    void
-     * @param    int $seconds The timeout in seconds
-     */
-    public function setTimeOut($seconds)
-    {
-        $this->timeOut = (int)$seconds;
-    }
-
-    /**
-     * Get the useragent that will be used. Our version will be prepended to yours.
-     * It will look like: "PHP Twitter/<version> <your-user-agent>"
-     *
-     * @return    void
-     * @param    string $userAgent Your user-agent, it should look like <app-name>/<app-version>
-     */
-    public function setUserAgent($userAgent)
-    {
-        $this->userAgent = (string)$userAgent;
-    }
-
-    /**
-     * Build the signature for the data
-     *
-     * @return    string
-     * @param    string $key  The key to use for signing.
-     * @param    string $data The data that has to be signed.
-     */
-    private function hmacsha1($key, $data)
-    {
-        return base64_encode(hash_hmac('SHA1', $data, $key, true));
-    }
-
-    /**
-     * URL-encode method for internatl use
-     *
-     * @return    string
-     * @param    mixed $value The value to encode.
-     */
-    private static function urlencode_rfc3986($value)
-    {
-        if (is_array($value)) {
-            return array_map(array('Twitter', 'urlencode_rfc3986'), $value);
-        } else {
-            $search  = array('+', ' ', '%7E', '%');
-            $replace = array('%20', '%20', '~', '%25');
-
-            return str_replace($search, $replace, urlencode($value));
-        }
-    }
-
-
-    // Timeline resources
-    /**
-     * Returns the 20 most recent statuses from non-protected users who have set a custom user icon.
-     * The public timeline is cached for 60 seconds and requesting it more often than that is unproductive and a waste of resources.
-     *
-     * @return    array
-     * @param    bool [optional] $skipUser    When true each tweet returned in a timeline will not contain an entire user object. Instead, the user node will contain only an id element to indicate the numerical ID of the Twitter user that set the status.
-     */
-    public function statusesPublicTimeline($skipUser = false)
-    {
-        // redefine
-        $skipUser = (bool)$skipUser;
-
-        // build parameters
-        $parameters = array();
-        if ($skipUser) $parameters['skip_user'] = 'true';
-
-        // make the call
-        return (array)$this->doCall('statuses/public_timeline.json', $parameters);
-    }
-
-    /**
-     * Returns the 20 most recent statuses posted by the authenticating user and that user's friends. This is the equivalent of /timeline/home on the Web.
-     *
-     * @return    array
-     * @param    string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @param    string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @param    int    [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
-     * @param    int    [optional] $page            Specifies the page of results to retrieve.
-     * @param    bool   [optional] $skipUser    When true each tweet returned in a timeline will not contain an entire user object. Instead, the user node will contain only an id element to indicate the numerical ID of the Twitter user that set the status.
-     */
-    public function statusesHomeTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $skipUser = false)
-    {
-        // redefine
-        $skipUser = (bool)$skipUser;
-
-        // 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';
-
-        // make the call
-        return (array)$this->doCall('statuses/home_timeline.json', $parameters, true);
-    }
-
-    /**
-     * Returns the 20 most recent statuses, including retweets, posted by the authenticating user and that user's friends.
-     * This is the equivalent of /timeline/home on the Web.
-     *
-     * Usage note: This home_timeline call is identical to statuses/friends_timeline, except that home_timeline also contains retweets, while statuses/friends_timeline does not for backwards compatibility reasons.
-     * In a future version of the API, statuses/friends_timeline will be deprected and replaced by home_timeline.
-     *
-     * @return    array
-     * @param    string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @param    string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @param    int    [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
-     * @param    int    [optional] $page            Specifies the page of results to retrieve.
-     * @param    bool   [optional] $skipUser    When true each tweet returned in a timeline will not contain an entire user object. Instead, the user node will contain only an id element to indicate the numerical ID of the Twitter user that set the status.
-     */
-    public function statusesFriendsTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $skipUser = false)
-    {
-        // redefine
-        $skipUser = (bool)$skipUser;
-
-        // 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';
-
-        // make the call
-        return (array)$this->doCall('statuses/friends_timeline.json', $parameters, true);
-    }
-
-    /**
-     * Returns the 20 most recent statuses posted from the authenticating user. It's also possible to request another user's timeline via the id parameter.
-     * This is the equivalent of the Web / page for your own user, or the profile page for a third party.
-     *
-     * For backwards compatibility reasons, retweets are stripped out of the user_timeline when calling in XML or JSON (they appear with 'RT' in RSS and Atom).
-     * If you'd like them included, you can merge them in from statuses retweeted_by_me.
-     *
-     * @return    array
-     * @param    string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @param    string [optional] $userId        Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     * @param    string [optional] $screenName    Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @param    string [optional] $sinceId        Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @param    string [optional] $maxId            Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @param    int    [optional] $count            Specifies the number of records to retrieve. May not be greater than 200.
-     * @param    int    [optional] $page                Specifies the page of results to retrieve.
-     * @param    bool   [optional] $skipUser        When true each tweet returned in a timeline will not contain an entire user object. Instead, the user node will contain only an id element to indicate the numerical ID of the Twitter user that set the status.
-     */
-    public function statusesUserTimeline($id = null, $userId = null, $screenName = null, $sinceId = null, $maxId = null, $count = null, $page = null, $skipUser = false)
-    {
-        // redefine
-        $skipUser = (bool)$skipUser;
-
-        // 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';
-
-        // make the call
-        return (array)$this->doCall('statuses/user_timeline.json', $parameters, true);
-    }
-
-    /**
-     * Returns the 20 most recent mentions (status containing @username) for the authenticating user.
-     *
-     *
-     * @param null $sinceId
-     * @param null $maxId
-     * @param null $count
-     * @param null $page
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
-     * @internal param $int [optional] $page            Specifies the page of results to retrieve.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('statuses/mentions.json', $parameters);
-    }
-
-    /**
-     * Returns the 20 most recent retweets posted by the authenticating user.
-     *
-     *
-     * @param null $sinceId
-     * @param null $maxId
-     * @param null $count
-     * @param null $page
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
-     * @internal param $int [optional] $page            Specifies the page of results to retrieve.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('statuses/retweeted_by_me.json', $parameters);
-    }
-
-    /**
-     * Returns the 20 most recent retweets posted by the authenticating user's friends.
-     *
-     *
-     * @param null $sinceId
-     * @param null $maxId
-     * @param null $count
-     * @param null $page
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
-     * @internal param $int [optional] $page            Specifies the page of results to retrieve.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('statuses/retweeted_by_me.json', $parameters);
-    }
-
-
-    // Tweets resources
-    /**
-     * Returns the 20 most recent tweets of the authenticated user that have been retweeted by others.
-     *
-     *
-     * @param null $sinceId
-     * @param null $maxId
-     * @param null $count
-     * @param null $page
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
-     * @internal param $int [optional] $page            Specifies the page of results to retrieve.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('statuses/retweets_of_me.json', $parameters);
-    }
-
-    /**
-     * Returns a single status, specified by the id parameter below. The status's author will be returned inline.
-     *
-     * @return    array
-     * @param    string $id The numerical ID of the desired status.
-     */
-    public function statusesShow($id)
-    {
-        // build parameters
-        $parameters['id'] = (string)$id;
-
-        // make the call
-        return (array)$this->doCall('statuses/show.json', $parameters);
-    }
-
-    /**
-     * Updates the authenticating user's status. A status update with text identical to the authenticating user's text identical to the authenticating user's current status will be ignored to prevent duplicates.
-     *
-     * @return    array
-     * @param    string $status The text of your status update, up to 140 characters. URL encode as necessary.
-     * @param           string  [optional] $inReplyToStatusId        The ID of an existing status that the update is in reply to.
-     * @param           float   [optional] $lat                    The location's latitude that this tweet refers to.
-     * @param           float   [optional] $long                    The location's longitude that this tweet refers to.
-     * @param           string  [optional] $placeId                A place in the world. These IDs can be retrieved from geo/reverse_geocode.
-     * @param           bool    [optional] $displayCoordinates        Whether or not to put a pin on the exact coordinates a tweet has been sent from.
-     */
-    public function statusesUpdate($status, $inReplyToStatusId = null, $lat = null, $long = null, $placeId = null, $displayCoordinates = false)
-    {
-        // 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';
-
-        // make the call
-        return (array)$this->doCall('statuses/update.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Destroys the status specified by the required ID parameter.
-     * Usage note: The authenticating user must be the author of the specified status.
-     *
-     * @return    bool
-     * @param    string $id The numerical ID of the desired status.
-     */
-    public function statusesDestroy($id)
-    {
-        // build parameters
-        $parameters['id'] = (string)$id;
-
-        // make the call
-        return (array)$this->doCall('statuses/destroy.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Retweets a tweet. Returns the original tweet with retweet details embedded.
-     *
-     * @return    array
-     * @param    string $id The numerical ID of the desired status.
-     */
-    public function statusesRetweet($id)
-    {
-        // make the call
-        return (array)$this->doCall('statuses/retweet/' . $id . '.json', null, true, 'POST');
-    }
-
-    /**
-     * Returns up to 100 of the first retweets of a given tweet.
-     *
-     *
-     * @param    string $id The numerical ID of the desired status.
-     * @param           int [optional] $count    Specifies the number of records to retrieve. May not be greater than 100.
-     * @return array
-     * @throws TwitterException
-     */
-    public function statusesRetweets($id, $count = null)
-    {
-        // validate
-        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;
-
-        // make the call
-        return (array)$this->doCall('statuses/retweets/' . $id . '.json', $parameters);
-    }
-
-    /**
-     * Show user objects of up to 100 members who retweeted the status.
-     *
-     *
-     * @param    string $id The numerical ID of the desired status.
-     * @param null      $count
-     * @param null      $page
-     * @return array
-     * @throws TwitterException
-     * @internal param $int [optional] $count    Specifies the number of records to retrieve. May not be greater than 200.
-     * @internal param $int [optional] $page        Specifies the page of results to retrieve.
-     */
-    public function statusesIdRetweetedBy($id, $count = null, $page = null)
-    {
-        // validate
-        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;
-
-        // make the call
-        return (array)$this->doCall('statuses/' . (string)$id . '/retweeted_by.json', $parameters, true);
-    }
-
-    /**
-     * Show user ids of up to 100 users who retweeted the status.
-     *
-     *
-     * @param    string $id The numerical ID of the desired status.
-     * @param null      $count
-     * @param null      $page
-     * @return array
-     * @throws TwitterException
-     * @internal param $int [optional] $count    Specifies the number of records to retrieve. May not be greater than 200.
-     * @internal param $int [optional] $page        Specifies the page of results to retrieve.
-     */
-    public function statusesIdRetweetedByIds($id, $count = null, $page = null)
-    {
-        // validate
-        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;
-
-        // make the call
-        return (array)$this->doCall('statuses/' . (string)$id . '/retweeted_by/ids.json', $parameters, true);
-    }
-
-
-    // User resources
-    /**
-     * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
-     * The author's most recent status will be returned inline.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     * @internal param $string [optional] $screenName    Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('users/show.json', $parameters);
-    }
-
-    /**
-     * Return up to 100 users worth of extended information, specified by either ID, screen name, or combination of the two.
-     * The author's most recent status (if the authenticating user has permission) will be returned inline.
-     *
-     *
-     * @param null $userIds
-     * @param null $screenNames
-     * @return array
-     * @throws TwitterException
-     * @internal param $mixed [optional] $userIds        A comma separated list of user IDs, up to 100 in total.
-     * @internal param $mixed [optional] $screenNames    A comma separated list of screen names, up to 100 in total.
-     */
-    public function usersLookup($userIds = null, $screenNames = null)
-    {
-        // redefine
-        $userIds     = (array)$userIds;
-        $screenNames = (array)$screenNames;
-
-        // validate
-        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);
-
-        // make the call
-        return (array)$this->doCall('users/lookup.json', $parameters, true);
-
-    }
-
-    /**
-     * Run a search for users similar to the Find People button on Twitter.com; the same results returned by people search on Twitter.com will be returned by using this API.
-     * Usage note: It is only possible to retrieve the first 1000 matches from this API.
-     *
-     * @return    array
-     * @param    string $q  The search query term.
-     * @param           int [optional] $perPage    Specifies the number of results to retrieve.
-     * @param           int [optional] $page        Specifies the page of results to retrieve.
-     */
-    public function usersSearch($q, $perPage = null, $page = null)
-    {
-        // build parameters
-        $parameters['q'] = (string)$q;
-        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);
-
-    }
-
-    /**
-     * Access to Twitter's suggested user list. This returns the list of suggested user categories. The category can be used in the users/suggestions/category  endpoint to get the users in that category.
-     *
-     * @return    array
-     */
-    public function usersSuggestions()
-    {
-        return (array)$this->doCall('users/suggestions.json', null, true);
-    }
-
-    /**
-     * Access the users in a given category of the Twitter suggested user list.
-     * It is recommended that end clients cache this data for no more than one hour.
-     *
-     * @return    array
-     * @param    string $slug The short name of list or a category.
-     */
-    public function usersSuggestionsSlug($slug)
-    {
-        return (array)$this->doCall('users/suggestions/' . (string)$slug . '.json');
-    }
-
-    /**
-     * Returns a user's friends, each with current status inline. They are ordered by the order in which the user followed them, most recently followed first, 100 at a time.
-     * (Please note that the result set isn't guaranteed to be 100 every time as suspended users will be filtered out.)
-     *
-     * Use the cursor option to access older friends.
-     * With no user specified, request defaults to the authenticated user's friends.
-     * It's also possible to request another user's friends list via the id, screen_name or user_id parameter.
-     *
-     * @return    array
-     * @param    string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @param    string [optional] $userId        Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     * @param    string [optional] $screenName    Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @param    int    [optional] $cursor            Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    public function statusesFriends($id = null, $userId = null, $screenName = null, $cursor = null)
-    {
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('statuses/friends.json', $parameters);
-    }
-
-    /**
-     * Returns the authenticating user's followers, each with current status inline. They are ordered by the order in which they followed the user, 100 at a time. (Please note that the result set isn't guaranteed to be 100 every time as suspended users will be filtered out.)
-     * Use the cursor parameter to access earlier followers.
-     *
-     * @return    array
-     * @param    string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @param    string [optional] $userId        Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     * @param    string [optional] $screenName    Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @param    int    [optional] $cursor            Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    public function statusesFollowers($id = null, $userId = null, $screenName = null, $cursor = null)
-    {
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('statuses/followers.json', $parameters);
-    }
-
-
-    // Trends resources
-    /**
-     * Returns the top ten topics that are currently trending on Twitter.
-     * The response includes the time of the request, the name of each trend, and the url to the Twitter Search results page for that topic.
-     *
-     * @return    array
-     */
-    public function trends()
-    {
-        return (array)$this->doCall('trends.json');
-    }
-
-    /**
-     * Returns the current top 10 trending topics on Twitter.
-     * The response includes the time of the request, the name of each trending topic, and query used on Twitter Search results page for that topic.
-     *
-     * @return    array
-     * @param    string [optional] $exclude    Setting this equal to hashtags will remove all hashtags from the trends list.
-     */
-    public function trendsCurrent($exclude = null)
-    {
-        // build parameters
-        $parameters = array();
-        if ($exclude != null) $parameters['exclude'] = (string)$exclude;
-
-        // make the call
-        return (array)$this->doCall('trends/current.json', $parameters);
-    }
-
-    /**
-     * Returns the top 20 trending topics for each hour in a given day.
-     *
-     * @return    array
-     * @param    string [optional] $exclude    Setting this equal to hashtags will remove all hashtags from the trends list.
-     * @param    string [optional] $date        Permits specifying a start date for the report. The date should be formatted YYYY-MM-DD.
-     */
-    public function trendsDaily($exclude = null, $date = null)
-    {
-        // build parameters
-        $parameters = array();
-        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);
-    }
-
-    /**
-     * Returns the top 30 trending topics for each day in a given week.
-     *
-     * @return    array
-     * @param    string [optional] $exclude    Setting this equal to hashtags will remove all hashtags from the trends list.
-     * @param    string [optional] $date        Permits specifying a start date for the report. The date should be formatted YYYY-MM-DD.
-     */
-    public function trendsWeekly($exclude = null, $date = null)
-    {
-        // build parameters
-        $parameters = array();
-        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);
-    }
-
-
-    // List resources
-    /**
-     * Creates a new list for the authenticated user. Accounts are limited to 20 lists.
-     *
-     *
-     * @param    string $user The user.
-     * @param    string $name The name of the list you are creating.
-     * @param null      $mode
-     * @param null      $description
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $mode            Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
-     * @internal param $string [optional] $description    The description of the list you are creating.
-     */
-    public function userListsCreate($user, $name, $mode = null, $description = null)
-    {
-        // possible modes
-        $allowedModes = array('public', 'private');
-
-        // validate
-        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;
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/lists.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * List the lists of the specified user. Private lists will be included if the authenticated users is the same as the user who's lists are being returned.
-     *
-     * @return    array
-     * @param    string $user  The user.
-     * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    public function userLists($user, $cursor = null)
-    {
-        $parameters = null;
-        if ($cursor != null) $parameters['cursor'] = (string)$cursor;
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/lists.json', $parameters, true);
-    }
-
-    /**
-     * Show the specified list. Private lists will only be shown if the authenticated user owns the specified list.
-     *
-     * @return    array
-     * @param    string $user The user.
-     * @param    string $id   The id of the list.
-     */
-    public function userListsId($user, $id)
-    {
-        // make the call
-        return (array)$this->doCall((string)$user . '/lists/' . (string)$id . '.json', null, true);
-    }
-
-    /**
-     * Updates the specified list.
-     *
-     *
-     * @param    string $user The user.
-     * @param    string $id   The id of the list.
-     * @param null      $name
-     * @param null      $mode
-     * @param null      $description
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $name            The name of the list you are creating.
-     * @internal param $string [optional] $mode            Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
-     * @internal param $string [optional] $description    The description of the list you are creating.
-     */
-    public function userListsIdUpdate($user, $id, $name = null, $mode = null, $description = null)
-    {
-        // possible modes
-        $allowedModes = array('public', 'private');
-
-        // validate
-        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;
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/lists/' . (string)$id . '.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Show tweet timeline for members of the specified list.
-     *
-     *
-     * @param    string $user The user.
-     * @param    string $id   The id of the list.
-     * @param null      $sinceId
-     * @param null      $maxId
-     * @param null      $count
-     * @param null      $page
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
-     * @internal param $int [optional] $page            Specifies the page of results to retrieve.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/lists/' . (string)$id . '/statuses.json', $parameters);
-    }
-
-    /**
-     * List the lists the specified user has been added to.
-     *
-     * @return    array
-     * @param    string $user  The user.
-     * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    public function userListsMemberships($user, $cursor = null)
-    {
-        $parameters = null;
-        if ($cursor != null) $parameters['cursor'] = (string)$cursor;
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/lists/memberships.json', $parameters, true);
-    }
-
-    /**
-     * List the lists the specified user follows.
-     *
-     * @return    array
-     * @param    string $user  The user.
-     * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    public function userListsSubscriptions($user, $cursor = null)
-    {
-        $parameters = null;
-        if ($cursor != null) $parameters['cursor'] = (string)$cursor;
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/lists/subscriptions.json', $parameters, true);
-    }
-
-
-    // List Members resources
-    /**
-     * Returns the members of the specified list.
-     *
-     * @return    array
-     * @param    string $user  The user.
-     * @param    string $id    The id of the list.
-     * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    public function userListMembers($user, $id, $cursor = null)
-    {
-        $parameters = null;
-        if ($cursor != null) $parameters['cursor'] = (string)$cursor;
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/' . (string)$id . '/members.json', $parameters, true);
-    }
-
-    /**
-     * Add a member to a list. The authenticated user must own the list to be able to add members to it. Lists are limited to having 500 members.
-     *
-     * @return    array
-     * @param    string $user   The user.
-     * @param    string $id     The id of the list.
-     * @param    string $userId The id or screen name of the user to add as a member of the list.
-     */
-    public function userListMembersCreate($user, $id, $userId)
-    {
-        // build parameters
-        $parameters['id'] = (string)$userId;
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/' . (string)$id . '/members.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Removes the specified member from the list. The authenticated user must be the list's owner to remove members from the list.
-     *
-     * @return    mixed
-     * @param    string $user   The user.
-     * @param    string $id     The id of the list.
-     * @param    string $userId Specfies the ID of the user for whom to return results for.
-     */
-    public function userListMembersDelete($user, $id, $userId)
-    {
-        // build parameters
-        $parameters['id']      = (string)$userId;
-        $parameters['_method'] = 'DELETE';
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/' . (string)$id . '/members.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Check if a user is a member of the specified list.
-     *
-     *
-     * @param    string $user   The user.
-     * @param    string $id     The id of the list.
-     * @param    string $userId Specfies the ID of the user for whom to return results for.
-     * @return mixed
-     * @throws TwitterException
-     */
-    public function userListMembersId($user, $id, $userId)
-    {
-        try {
-            // make the call
-            return (array)$this->doCall((string)$user . '/' . (string)$id . '/members/' . (string)$userId . '.json', null, true);
-        } // catch exceptions
-        catch (TwitterException $e) {
-            if ($e->getMessage() === 'The specified user is not a member of this list') {
-                return false;
-            } else throw $e;
-        }
-    }
-
-
-    // List Subscribers resources
-    /**
-     * Returns the subscribers of the specified list.
-     *
-     * @return    array
-     * @param    string $user  The user.
-     * @param    string $id    The id of the list.
-     * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    public function userListSubscribers($user, $id, $cursor = null)
-    {
-        $parameters = null;
-        if ($cursor != null) $parameters['cursor'] = (string)$cursor;
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/' . (string)$id . '/subscribers.json', $parameters, true);
-    }
-
-    /**
-     * Make the authenticated user follow the specified list.
-     *
-     * @return    array
-     * @param    string $user The user.
-     * @param    string $id   The id of the list.
-     */
-    public function userListSubscribersCreate($user, $id)
-    {
-        // make the call
-        return (array)$this->doCall((string)$user . '/' . (string)$id . '/subscribers.json', null, true, 'POST');
-    }
-
-    /**
-     * Unsubscribes the authenticated user form the specified list.
-     *
-     * @return    array
-     * @param    string $user The user.
-     * @param    string $id   The id of the list.
-     */
-    public function userListSubscribersDelete($user, $id)
-    {
-        // build parameters
-        $parameters['_method'] = 'DELETE';
-
-        // make the call
-        return (array)$this->doCall((string)$user . '/' . (string)$id . '/subscribers.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Check if the specified user is a subscriber of the specified list.
-     *
-     *
-     * @param    string $user   The user.
-     * @param    string $id     The id of the list.
-     * @param    string $userId Specfies the ID of the user for whom to return results for.
-     * @return mixed
-     * @throws TwitterException
-     */
-    public function userListSubscribersId($user, $id, $userId)
-    {
-        try {
-            // make the call
-            return (array)$this->doCall((string)$user . '/' . (string)$id . '/subscribers/' . (string)$userId . '.json', null, true);
-        } // catch exceptions
-        catch (TwitterException $e) {
-            if ($e->getMessage() === 'The specified user is not a subscriber of this list') {
-                return false;
-            } else throw $e;
-        }
-
-    }
-
-
-    // Direct Messages resources
-    /**
-     * Returns a list of the 20 most recent direct messages sent to the authenticating user.
-     *
-     *
-     * @param null $sinceId
-     * @param null $maxId
-     * @param null $count
-     * @param null $page
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
-     * @internal param $int [optional] $page            Specifies the page of results to retrieve.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('direct_messages.json', $parameters, true);
-    }
-
-    /**
-     * Returns a list of the 20 most recent direct messages sent by the authenticating user.
-     *
-     *
-     * @param null $sinceId
-     * @param null $maxId
-     * @param null $count
-     * @param null $page
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
-     * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
-     * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
-     * @internal param $int [optional] $page            Specifies the page of results to retrieve.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('direct_messages/sent.json', $parameters, true);
-    }
-
-    /**
-     * Sends a new direct message to the specified user from the authenticating user.
-     * Requires both the user and text parameters. Returns the sent message in the requested format when successful.
-     *
-     *
-     * @param    string $text The text of your direct message. Be sure to URL encode as necessary, and keep it under 140 characters.
-     * @param null      $id
-     * @param null      $userId
-     * @param null      $screenName
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('direct_messages/new.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Destroys the direct message specified in the required ID parameter. The authenticating user must be the recipient of the specified direct message.
-     *
-     * @return    array
-     * @param    string $id The ID of the desired direct message.
-     */
-    public function directMessagesDestroy($id)
-    {
-        // build parameters
-        $parameters['id'] = (string)$id;
-
-        // make the call
-        return (array)$this->doCall('direct_messages/destroy.json', $parameters, true, 'POST');
-    }
-
-
-    // Friendship resources
-    /**
-     * Allows the authenticating users to follow the user specified in the ID parameter.
-     * Returns the befriended user in the requested format when successful.
-     * Returns a string describing the failure condition when unsuccessful.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @param bool $follow
-     * @return mixed
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     * @internal param $bool [optional] $follow            Returns public statuses that reference the given set of users.
-     */
-    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.');
-
-        // 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;
-        $parameters['follow'] = $follow ? 'true' : 'false';
-
-        // make the call
-        return (array)$this->doCall('friendships/create.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Allows the authenticating users to unfollow the user specified in the ID parameter.
-     * Returns the unfollowed user in the requested format when successful. Returns a string describing the failure condition when unsuccessful.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('friendships/destroy.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Tests for the existence of friendship between two users. Will return true if user_a follows user_b, otherwise will return false.
-     *
-     * @return    bool
-     * @param    string $userA The ID or screen_name of the subject user.
-     * @param    string $userB The ID or screen_name of the user to test for following.
-     */
-    public function friendshipsExists($userA, $userB)
-    {
-        // build parameters
-        $parameters['user_a'] = (string)$userA;
-        $parameters['user_b'] = (string)$userB;
-
-        // make the call
-        return (bool)$this->doCall('friendships/exists.json', $parameters);
-    }
-
-    /**
-     * Returns detailed information about the relationship between two users.
-     *
-     *
-     * @param null $sourceId
-     * @param null $sourceScreenName
-     * @param null $targetId
-     * @param null $targetScreenName
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $sourceId                The user_id of the subject user.
-     * @internal param $string [optional] $sourceScreenName        The screen_name of the subject user.
-     * @internal param $string [optional] $targetId                The screen_name of the subject user.
-     * @internal param $string [optional] $targetScreenName        The screen_name of the target user.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('friendships/show.json', $parameters);
-    }
-
-    /**
-     * Returns an array of numeric IDs for every user who has a pending request to follow the authenticating user.
-     *
-     * @return    array
-     * @param    string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    public function friendshipsIncoming($cursor = null)
-    {
-        $parameters = null;
-        if ($cursor != null) $parameters['cursor'] = (string)$cursor;
-
-        // make the call
-        return (array)$this->doCall('friendships/incoming.json', $parameters, true);
-    }
-
-    /**
-     * Returns an array of numeric IDs for every protected user for whom the authenticating user has a pending follow request.
-     *
-     * @return    array
-     * @param    string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    public function friendshipsOutgoing($cursor = null)
-    {
-        $parameters = null;
-        if ($cursor != null) $parameters['cursor'] = (string)$cursor;
-
-        // make the call
-        return (array)$this->doCall('friendships/outgoing.json', $parameters, true);
-    }
-
-
-    // Friends and Followers resources
-    /**
-     * Returns an array of numeric IDs for every user the specified user is following.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @param null $cursor
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     * @internal param $string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('friends/ids.json', $parameters);
-    }
-
-    /**
-     * Returns an array of numeric IDs for every user following the specified user.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @param null $cursor
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     * @internal param $string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('followers/ids.json', $parameters);
-    }
-
-
-    // Account resources
-    /**
-     * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful; returns a 401 status code and an error message if not. Use this method to test if supplied user credentials are valid.
-     *
-     * @return    array
-     */
-    public function accountVerifyCredentials()
-    {
-        // make the call
-        return (array)$this->doCall('account/verify_credentials.json', null, true);
-    }
-
-    /**
-     *
-     * @return    array
-     */
-    public function accountRateLimitStatus()
-    {
-        // make the call
-        return (array)$this->doCall('account/rate_limit_status.json', null);
-    }
-
-    /**
-     * Ends the session of the authenticating user, returning a null cookie. Use this method to sign users out of client-facing applications like widgets.
-     * @return bool
-     * @throws TwitterException
-     */
-    public function accountEndSession()
-    {
-        try {
-            // make the call
-            $this->doCall('account/end_session.json', null, true, 'POST');
-        } // catch exceptions
-        catch (TwitterException $e) {
-            if ($e->getMessage() === 'Logged out.') {
-                return true;
-            } else throw $e;
-        }
-    }
-
-    /**
-     * Sets which device Twitter delivers updates to for the authenticating user. Sending none as the device parameter will disable IM or SMS updates.
-     *
-     * @return    array
-     * @param    string $device Delivery device type to send updates to.
-     */
-    public function accountUpdateDeliveryDevices($device)
-    {
-        // build parameters
-        $parameters['device'] = (string)$device;
-
-        // make the call
-        return (array)$this->doCall('account/update_delivery_device.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Sets one or more hex values that control the color scheme of the authenticating user's profile page on twitter.com.
-     * Each parameter's value must be a valid hexidecimal value, and may be either three or six characters (ex: #fff or #ffffff).
-     *
-     *
-     * @param null $profileBackgroundColor
-     * @param null $profileTextColor
-     * @param null $profileLinkColor
-     * @param null $profileSidebarFillColor
-     * @param null $profileSidebarBorderColor
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $profileBackgroundColor        Profile background color.
-     * @internal param $string [optional] $profileTextColor                Profile text color.
-     * @internal param $string [optional] $profileLinkColor                Profile link color.
-     * @internal param $string [optional] $profileSidebarFillColor        Profile sidebar's background color.
-     * @internal param $string [optional] $profileSidebarBorderColor        Profile sidebar's border color.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('account/update_profile_colors.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Updates the authenticating user's profile image.
-     *
-     *
-     * @param    string $image The path to the avatar image for the profile. Must be a valid GIF, JPG, or PNG image of less than 700 kilobytes in size. Images with width larger than 500 pixels will be scaled down.
-     * @return array
-     * @throws TwitterException
-     */
-    public function accountUpdateProfileImage($image)
-    {
-        throw new TwitterException('Not implemented');
-
-        // validate
-        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);
-    }
-
-    /**
-     * Updates the authenticating user's profile background image.
-     *
-     *
-     * @param    string $image The path to the background image for the profile. Must be a valid GIF, JPG, or PNG image of less than 800 kilobytes in size. Images with width larger than 2048 pixels will be forceably scaled down.
-     * @param    bool   $tile  Whether or not to tile the background image. If set to true the background image will be displayed tiled. The image will not be tiled otherwise.
-     * @return array
-     * @throws TwitterException
-     */
-    public function accountUpdateProfileBackgroundImage($image, $tile = false)
-    {
-        throw new TwitterException('Not implemented');
-
-        // validate
-        if (!file_exists($image)) throw new TwitterException('Image (' . $image . ') doesn\'t exists.');
-
-        // build parameters
-        if ($tile) $parameters['tile'] = 'true';
-
-        // make the call
-        return (array)$this->doCall('account/update_profile_background_image.json', $parameters, true, 'POST', $image);
-    }
-
-    /**
-     * Sets values that users are able to set under the "Account" tab of their settings page. Only the parameters specified will be updated.
-     *
-     * @return    array
-     * @param    string [optional] $name            Full name associated with the profile. Maximum of 20 characters.
-     * @param    string [optional] $url            URL associated with the profile. Will be prepended with "http://" if not present. Maximum of 100 characters.
-     * @param    string [optional] $location        The city or country describing where the user of the account is located. The contents are not normalized or geocoded in any way. Maximum of 30 characters.
-     * @param    string [optional] $description    A description of the user owning the account. Maximum of 160 characters.
-     */
-    public function accountUpdateProfile($name = null, $url = null, $location = null, $description = null)
-    {
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('account/update_profile.json', $parameters, true, 'POST');
-    }
-
-
-    // Favorites resources
-    /**
-     * Returns the 20 most recent favorite statuses for the authenticating user or user specified by the ID parameter in the requested format.
-     *
-     * @return    array
-     * @param    string [optional] $id    Specifies the ID or screen name of the user for whom to return results for.
-     * @param    int    [optional] $page        Specifies the page of results to retrieve.
-     */
-    public function favorites($id = null, $page = null)
-    {
-        // build parameters
-        $parameters = null;
-        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);
-    }
-
-    /**
-     * Favorites the status specified in the ID parameter as the authenticating user. Returns the favorite status when successful.
-     *
-     * @return    array
-     * @param    string $id The numerical ID of the desired status.
-     */
-    public function favoritesCreate($id)
-    {
-        // make the call
-        return (array)$this->doCall('favorites/create/' . $id . '.json', null, true, 'POST');
-    }
-
-    /**
-     * Un-favorites the status specified in the ID parameter as the authenticating user. Returns the un-favorited status in the requested format when successful.
-     *
-     * @return    array
-     * @param    string $id The numerical ID of the desired status.
-     */
-    public function favoritesDestroy($id)
-    {
-        // make the call
-        return (array)$this->doCall('favorites/destroy/' . $id . '.json', null, true, 'POST');
-    }
-
-
-    // Notification resources
-    /**
-     * Enables device notifications for updates from the specified user. Returns the specified user when successful.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('notifications/follow.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Disables notifications for updates from the specified user to the authenticating user. Returns the specified user when successful.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('notifications/leave.json', $parameters, true, 'POST');
-    }
-
-
-    // Block resources
-    /**
-     * Blocks the user specified in the ID parameter as the authenticating user. Destroys a friendship to the blocked user if it exists. Returns the blocked user in the requested format when successful.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('blocks/create.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Un-blocks the user specified in the ID parameter for the authenticating user. Returns the un-blocked user in the requested format when successful.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('blocks/destroy.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Un-blocks the user specified in the ID parameter for the authenticating user. Returns the un-blocked user in the requested format when successful.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @return mixed
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     */
-    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.');
-
-        // 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;
-
-        try {
-            // make the call
-            return (array)$this->doCall('blocks/exists.json', $parameters, true);
-        } // catch exceptions
-        catch (TwitterException $e) {
-            if ($e->getMessage() === 'You are not blocking this user.') {
-                return false;
-            } else throw $e;
-        }
-    }
-
-    /**
-     * Returns an array of user objects that the authenticating user is blocking.
-     *
-     * @return    array
-     * @param    int [optional] $page        Specifies the page of results to retrieve. Note: there are pagination limits. See the FAQ for details.
-     */
-    public function blocksBlocking($page = null)
-    {
-        // build parameters
-        $parameters = null;
-        if ($page != null) $parameters['page'] = (int)$page;
-
-        // make the call
-        return (array)$this->doCall('blocks/blocking.json', $parameters, true);
-    }
-
-    /**
-     * Returns an array of numeric user ids the authenticating user is blocking.
-     *
-     * @return    array
-     */
-    public function blocksBlockingIds()
-    {
-        // make the call
-        return (array)$this->doCall('blocks/blocking/ids.json', null, true);
-    }
-
-
-    // Spam Reporting resources
-    /**
-     * The user specified in the id is blocked by the authenticated user and reported as a spammer.
-     *
-     *
-     * @param null $id
-     * @param null $userId
-     * @param null $screenName
-     * @return array
-     * @throws TwitterException
-     * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
-     * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
-     * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
-     */
-    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.');
-
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('report_spam.json', $parameters, true, 'POST');
-    }
-
-
-    // Saved Searches resources
-    /**
-     * Returns the authenticated user's saved search queries.
-     *
-     * @return    array
-     */
-    public function savedSearches()
-    {
-        // make the call
-        return (array)$this->doCall('saved_searches.json', null, true);
-    }
-
-    /**
-     * Retrieve the data for a saved search owned by the authenticating user specified by the given id.
-     *
-     * @return    array
-     * @param    string $id The ID of the desired saved search.
-     */
-    public function savedSearchesShow($id)
-    {
-        // build parameters
-        $parameters['id'] = (string)$id;
-
-        // make the call
-        return (array)$this->doCall('saved_searches/show.json', $parameters, true);
-    }
-
-    /**
-     * Creates a saved search for the authenticated user.
-     *
-     * @return    array
-     * @param    string $query The query of the search the user would like to save.
-     */
-    public function savedSearchesCreate($query)
-    {
-        // build parameters
-        $parameters['query'] = (string)$query;
-
-        // make the call
-        return (array)$this->doCall('saved_searches/create.json', $parameters, true, 'POST');
-    }
-
-    /**
-     * Destroys a saved search for the authenticated user. The search specified by id must be owned by the authenticating user.
-     * REMARK: This method seems not to work    @later
-     *
-     * @return    array
-     * @param    string $id The ID of the desired saved search.
-     */
-    public function savedSearchesDestroy($id)
-    {
-        return (array)$this->doCall('saved_searches/destroy/' . (string)$id . '.json', null, true, 'POST');
-    }
-
-
-    // OAuth resources
-    /**
-     * Allows a Consumer application to obtain an OAuth Request Token to request user authorization.
-     * This method fulfills Secion 6.1 of the OAuth 1.0 authentication flow.
-     *
-     *
-     * @param    string $callbackURL
-     * @return array An array containg the token and the secret
-     * @throws TwitterException
-     */
-    public function oAuthRequestToken($callbackURL = null)
-    {
-        // init var
-        $parameters = array();
-
-        // set callback
-        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)));
-
-        // 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']);
-
-        // return
-        return $response;
-    }
-
-    /**
-     * Allows a Consumer application to exchange the OAuth Request Token for an OAuth Access Token.
-     * This method fulfills Secion 6.3 of the OAuth 1.0 authentication flow.
-     *
-     * @return    array
-     * @param    string $token
-     * @param    string $verifier
-     */
-    public function oAuthAccessToken($token, $verifier)
-    {
-        // init var
-        $parameters                   = array();
-        $parameters['oauth_token']    = (string)$token;
-        $parameters['oauth_verifier'] = (string)$verifier;
-
-        // make the call
-        $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']);
-
-        // return
-        return $response;
-    }
-
-    /**
-     * Will redirect to the page to authorize the applicatione
-     *
-     * @return    void
-     */
-    public function oAuthAuthorize()
-    {
-        header('Location: ' . self::SECURE_API_URL . '/oauth/authorize?oauth_token=' . $this->oAuthToken);
-    }
-
-    /**
-     * Allows a Consumer application to use an OAuth request_token to request user authorization. This method is a replacement fulfills Secion 6.2 of the OAuth 1.0 authentication flow for applications using the Sign in with Twitter authentication flow. The method will use the currently logged in user as the account to for access authorization unless the force_login parameter is set to true
-     * REMARK: This method seems not to work    @later
-     *
-     * @return    void
-     */
-    public function oAuthAuthenticate()
-    {
-        // make the call
-        return $this->doOAuthCall('authenticate');
-    }
-
-
-    // Local Trends resources
-    /**
-     * Returns the locations that Twitter has trending topic information for.
-     * The response is an array of "locations" that encode the location's WOEID (a Yahoo! Where On Earth ID) and some other human-readable information such as a canonical name and country the location belongs in.
-     * The WOEID that is returned in the location object is to be used when querying for a specific trend.
-     *
-     * @return    array
-     * @param    float [optional] $lat    If passed in conjunction with long, then the available trend locations will be sorted by distance to the lat  and long passed in. The sort is nearest to furthest.
-     * @param    float [optional] $long    If passed in conjunction with lat, then the available trend locations will be sorted by distance to the lat  and long passed in. The sort is nearest to furthest.
-     */
-    public function trendsAvailable($lat = null, $long = null)
-    {
-        // build parameters
-        $parameters = null;
-        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);
-    }
-
-    /**
-     * Returns the top 10 trending topics for a specific location Twitter has trending topic information for.
-     * The response is an array of "trend" objects that encode the name of the trending topic, the query parameter that can be used to search for the topic on Search, and the direct URL that can be issued against Search.
-     * This information is cached for five minutes, and therefore users are discouraged from querying these endpoints faster than once every five minutes. Global trends information is also available from this API by using a WOEID of 1.
-     * REMARK: This method seems not to work    @later
-     *
-     * @return    array
-     * @param    string $woeid The WOEID of the location to be querying for.
-     */
-    public function trendsLocation($woeid)
-    {
-        // make the call
-        return (array)$this->doCall('trends/location/' . (string)$woeid . '.json');
-    }
-
-
-    // Geo resources
-    /**
-     * Search for places (cities and neighborhoods) that can be attached to a statuses/update. Given a latitude and a longitude, return a list of all the valid places that can be used as a place_id when updating a status.
-     * Conceptually, a query can be made from the user's location, retrieve a list of places, have the user validate the location he or she is at, and then send the ID of this location up with a call to statuses/update.
-     * There are multiple granularities of places that can be returned -- "neighborhoods", "cities", etc. At this time, only United States data is available through this method.
-     * This API call is meant to be an informative call and will deliver generalized results about geography.
-     *
-     * @return    array
-     * @param    float $lat   The location's latitude that this tweet refers to.
-     * @param    float $long  The location's longitude that this tweet refers to.
-     * @param          string [optional] $accuracy        A hint on the "region" in which to search. If a number, then this is a radius in meters, but it can also take a string that is suffixed with ft to specify feet. If this is not passed in, then it is assumed to be 0m. If coming from a device, in practice, this value is whatever accuracy the device has measuring its location (whether it be coming from a GPS, WiFi triangulation, etc.).
-     * @param          string [optional] $granularity    The minimal granularity of data to return. If this is not passed in, then neighborhood is assumed. city can also be passed.
-     * @param          int    [optional] $maxResults        A hint as to the number of results to return. This does not guarantee that the number of results returned will equal max_results, but instead informs how many "nearby" results to return. Ideally, only pass in the number of places you intend to display to the user here.
-     */
-    public function geoReverseGeoCode($lat, $long, $accuracy = null, $granularity = null, $maxResults = null)
-    {
-        // 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;
-
-        // make the call
-        return (array)$this->doCall('geo/reverse_geocode.json', $parameters);
-    }
-
-    /**
-     * Find out more details of a place that was returned from the geo/reverse_geocode method.
-     *
-     * @return    array
-     * @param    string $id
-     * @param           string [optional] $placeId    A place in the world. These IDs can be retrieved from geo/reverse_geocode.
-     */
-    public function geoId($id, $placeId = null)
-    {
-        // build parameters
-        $parameters = null;
-        if ($placeId != null) $parameters['place_id'] = (string)$placeId;
-
-        // make the call
-        return (array)$this->doCall('geo/id/' . (string)$id . '.json', $parameters);
-    }
-
-
-    // Help resources
-    /**
-     * Test
-     * REMARK: this methods seems not to work, so don't rely on it
-     *
-     * @return    bool
-     */
-    public function helpTest()
-    {
-        // make the call
-        return ($this->doCall('help/test', null, null, 'GET', null, false) == 'ok');
-    }
+	// internal constant to enable/disable debugging
+	const DEBUG = false;
+
+	// url for the twitter-api
+	const API_URL        = 'https://api.twitter.com/1';
+	const SECURE_API_URL = 'https://api.twitter.com';
+
+	// port for the twitter-api
+	const API_PORT        = 443;
+	const SECURE_API_PORT = 443;
+
+	// current version
+	const VERSION = '2.0.1';
+
+	/**
+	 * A cURL instance
+	 *
+	 * @var    resource
+	 */
+	private $curl;
+
+	/**
+	 * The consumer key
+	 *
+	 * @var    string
+	 */
+	private $consumerKey;
+
+	/**
+	 * The consumer secret
+	 *
+	 * @var    string
+	 */
+	private $consumerSecret;
+
+	/**
+	 * The oAuth-token
+	 *
+	 * @var    string
+	 */
+	private $oAuthToken = '';
+
+	/**
+	 * The oAuth-token-secret
+	 *
+	 * @var    string
+	 */
+	private $oAuthTokenSecret = '';
+
+	/**
+	 * The timeout
+	 *
+	 * @var    int
+	 */
+	private $timeOut = 60;
+
+	/**
+	 * The user agent
+	 *
+	 * @var    string
+	 */
+	private $userAgent;
+
+	// class methods
+	/**
+	 * Default constructor
+	 *
+	 *
+	 * @param    string $consumerKey    The consumer key to use.
+	 * @param    string $consumerSecret The consumer secret to use.
+	 */
+	public function __construct($consumerKey, $consumerSecret)
+	{
+		$this->setConsumerKey($consumerKey);
+		$this->setConsumerSecret($consumerSecret);
+	}
+
+	/**
+	 * Default destructor
+	 *
+	 * @return    void
+	 */
+	public function __destruct()
+	{
+		if ($this->curl != null) curl_close($this->curl);
+	}
+
+	/**
+	 * Format the parameters as a querystring
+	 *
+	 * @return    string
+	 * @param    array $parameters
+	 */
+	private function buildQuery(array $parameters)
+	{
+		// no parameters?
+		if (empty($parameters)) return '';
+
+		// encode the keys
+		$keys = self::urlencode_rfc3986(array_keys($parameters));
+
+		// encode the values
+		$values = self::urlencode_rfc3986(array_values($parameters));
+
+		// reset the parameters
+		$parameters = array_combine($keys, $values);
+
+		// sort parameters by key
+		uksort($parameters, 'strcmp');
+
+		// loop parameters
+		foreach ($parameters as $key => $value) {
+			// sort by value
+			if (is_array($value)) $parameters[$key] = natsort($value);
+		}
+
+		// process parameters
+		foreach ($parameters as $key => $value) $chunks[] = $key . '=' . str_replace('%25', '%', $value);
+
+		// return
+		return implode('&', $chunks);
+	}
+
+	/**
+	 * All OAuth 1.0 requests use the same basic algorithm for creating a signature base string and a signature.
+	 * The signature base string is composed of the HTTP method being used, followed by an ampersand ("&") and then the URL-encoded base URL being accessed,
+	 * complete with path (but not query parameters), followed by an ampersand ("&").
+	 * Then, you take all query parameters and POST body parameters (when the POST body is of the URL-encoded type, otherwise the POST body is ignored),
+	 * including the OAuth parameters necessary for negotiation with the request at hand, and sort them in lexicographical order by first parameter name and
+	 * then parameter value (for duplicate parameters), all the while ensuring that both the key and the value for each parameter are URL encoded in isolation.
+	 * Instead of using the equals ("=") sign to mark the key/value relationship, you use the URL-encoded form of "%3D". Each parameter is then joined by the
+	 * URL-escaped ampersand sign, "%26".
+	 *
+	 * @return    string
+	 * @param    string $url
+	 * @param    string $method
+	 * @param    array  $parameters
+	 */
+	private function calculateBaseString($url, $method, array $parameters)
+	{
+		// redefine
+		$url        = (string)$url;
+		$parameters = (array)$parameters;
+
+		// init var
+		$pairs  = array();
+		$chunks = array();
+
+		// sort parameters by key
+		uksort($parameters, 'strcmp');
+
+		// loop parameters
+		foreach ($parameters as $key => $value) {
+			// sort by value
+			if (is_array($value)) $parameters[$key] = natsort($value);
+		}
+
+		// process queries
+		foreach ($parameters as $key => $value) {
+			$chunks[] = self::urlencode_rfc3986($key) . '%3D' . self::urlencode_rfc3986($value);
+		}
+
+		// buils base
+		$base = $method . '&';
+		$base .= urlencode($url) . '&';
+		$base .= implode('%26', $chunks);
+
+		// return
+		return $base;
+	}
+
+	/**
+	 * Build the Authorization header
+	 * @later: fix me
+	 *
+	 *
+	 * @param    array $parameters
+	 * @param null     $url
+	 * @return string
+	 */
+	private function calculateHeader(array $parameters, $url = null)
+	{
+		// redefine
+		$url = (string)$url;
+
+		// divide into parts
+		$parts = parse_url($url);
+
+		// init var
+		$chunks = array();
+
+		// process queries
+		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 .= implode(',', $chunks);
+
+		// prepend name and OAuth part
+		return $return;
+	}
+
+	/**
+	 * Make an call to the oAuth
+	 * @todo    refactor me
+	 *
+	 *
+	 * @param    string $method
+	 * @param array     $parameters [optional] $parameters
+	 * @return array
+	 * @throws TwitterException
+	 */
+	private function doOAuthCall($method, array $parameters = null)
+	{
+		// redefine
+		$method = (string)$method;
+
+		// append default parameters
+		$parameters['oauth_consumer_key']     = $this->getConsumerKey();
+		$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);
+
+		// add sign into the parameters
+		$parameters['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
+
+		// calculate header
+		$header = $this->calculateHeader($parameters, self::SECURE_API_URL . '/oauth/' . $method);
+
+		// set options
+		$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;
+		$options[CURLOPT_RETURNTRANSFER] = true;
+		$options[CURLOPT_TIMEOUT]        = (int)$this->getTimeOut();
+		$options[CURLOPT_SSL_VERIFYPEER] = false;
+		$options[CURLOPT_SSL_VERIFYHOST] = false;
+		$options[CURLOPT_HTTPHEADER]     = array('Expect:');
+		$options[CURLOPT_POST]           = 1;
+		$options[CURLOPT_POSTFIELDS]     = $this->buildQuery($parameters);
+
+		// init
+		if ($this->curl == null) $this->curl = curl_init();
+
+		// set options
+		curl_setopt_array($this->curl, $options);
+
+		// execute
+		$response = curl_exec($this->curl);
+		$headers  = curl_getinfo($this->curl);
+
+		// fetch errors
+		$errorNumber  = curl_errno($this->curl);
+		$errorMessage = curl_error($this->curl);
+
+		// error?
+		if ($errorNumber != '') throw new TwitterException($errorMessage, $errorNumber);
+
+		// init var
+		$return = array();
+
+		// parse the string
+		parse_str($response, $return);
+
+		// return
+		return $return;
+	}
+
+	/**
+	 * Make the call
+	 *
+	 *
+	 * @param    string $url
+	 * @param array     $parameters
+	 * @param bool      $authenticate
+	 * @param string    $method
+	 * @param null      $filePath
+	 * @param bool      $expectJSON
+	 * @return string
+	 * @throws TwitterException
+	 * @internal param $array [optiona] $aParameters
+	 * @internal param $bool [optional] $authenticate
+	 * @internal param $bool [optional] $usePost
+	 */
+	private function doCall($url, array $parameters = null, $authenticate = false, $method = 'GET', $filePath = null, $expectJSON = true)
+	{
+		// allowed methods
+		$allowedMethods = array('GET', 'POST');
+
+		// redefine
+		$url          = (string)$url;
+		$parameters   = (array)$parameters;
+		$authenticate = (bool)$authenticate;
+		$method       = (string)$method;
+		$expectJSON   = (bool)$expectJSON;
+
+		// validate method
+		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_timestamp']        = time();
+		$oauth['oauth_token']            = $this->getOAuthToken();
+		$oauth['oauth_signature_method'] = 'HMAC-SHA1';
+		$oauth['oauth_version']          = '1.0';
+
+		// set data
+		$data = $oauth;
+		if (!empty($parameters)) $data = array_merge($data, $parameters);
+
+		// calculate the base string
+		$base = $this->calculateBaseString(self::API_URL . '/' . $url, $method, $data);
+
+		// add sign into the parameters
+		$oauth['oauth_signature'] = $this->hmacsha1($this->getConsumerSecret() . '&' . $this->getOAuthTokenSecret(), $base);
+
+		$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') {
+			// file provided?
+			if ($filePath != null) {
+				// build a boundary
+				$boundary = md5(time());
+
+				// process file
+				$fileInfo = pathinfo($filePath);
+
+				// 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';
+
+				// init var
+				$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";
+
+				// build headers
+				$headers[] = 'Content-Type: multipart/form-data; boundary=' . $boundary;
+				$headers[] = 'Content-Length: ' . strlen($content);
+
+				// set content
+				$options[CURLOPT_POSTFIELDS] = $content;
+			} // no file
+			else $options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
+
+			// enable post
+			$options[CURLOPT_POST] = 1;
+		} else {
+			// add the parameters into the querystring
+			if (!empty($parameters)) $url .= '?' . $this->buildQuery($parameters);
+		}
+
+		// set options
+		$options[CURLOPT_URL]            = self::API_URL . '/' . $url;
+		$options[CURLOPT_PORT]           = self::API_PORT;
+		$options[CURLOPT_USERAGENT]      = $this->getUserAgent();
+		$options[CURLOPT_FOLLOWLOCATION] = true;
+		$options[CURLOPT_RETURNTRANSFER] = true;
+		$options[CURLOPT_TIMEOUT]        = (int)$this->getTimeOut();
+		$options[CURLOPT_SSL_VERIFYPEER] = false;
+		$options[CURLOPT_SSL_VERIFYHOST] = false;
+		$options[CURLOPT_HTTP_VERSION]   = CURL_HTTP_VERSION_1_1;
+		$options[CURLOPT_HTTPHEADER]     = $headers;
+
+		// init
+		if ($this->curl == null) $this->curl = curl_init();
+
+		// set options
+		curl_setopt_array($this->curl, $options);
+
+		// execute
+		$response = curl_exec($this->curl);
+		$headers  = curl_getinfo($this->curl);
+
+		// fetch errors
+		$errorNumber  = curl_errno($this->curl);
+		$errorMessage = curl_error($this->curl);
+
+		// we don't expext JSON, return the 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);
+
+		// we expect JSON, so decode it
+		$json = @json_decode($response, true);
+
+		// validate JSON
+		if ($json === null) {
+			// should we provide debug information
+			if (self::DEBUG) {
+				// make it output proper
+				echo '<pre>';
+
+				// dump the header-information
+				var_dump($headers);
+
+				// dump the error
+				var_dump($errorMessage);
+
+				// dump the raw response
+				var_dump($response);
+
+				// end proper format
+				echo '</pre>';
+			}
+
+			// throw exception
+			throw new TwitterException('Invalid response.');
+		}
+
+		// any errors
+		if (isset($json['errors'])) {
+			// should we provide debug information
+			if (self::DEBUG) {
+				// make it output proper
+				echo '<pre>';
+
+				// dump the header-information
+				var_dump($headers);
+
+				// dump the error
+				var_dump($errorMessage);
+
+				// dump the raw response
+				var_dump($response);
+
+				// end proper format
+				echo '</pre>';
+			}
+
+			// throw exception
+			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'])) {
+			// should we provide debug information
+			if (self::DEBUG) {
+				// make it output proper
+				echo '<pre>';
+
+				// dump the header-information
+				var_dump($headers);
+
+				// dump the raw response
+				var_dump($response);
+
+				// end proper format
+				echo '</pre>';
+			}
+
+			// throw exception
+			throw new TwitterException($json['error']);
+		}
+
+		// return
+		return $json;
+	}
+
+	/**
+	 * Get the consumer key
+	 *
+	 * @return    string
+	 */
+	private function getConsumerKey()
+	{
+		return $this->consumerKey;
+	}
+
+	/**
+	 * Get the consumer secret
+	 *
+	 * @return    string
+	 */
+	private function getConsumerSecret()
+	{
+		return $this->consumerSecret;
+	}
+
+	/**
+	 * Get the oAuth-token
+	 *
+	 * @return    string
+	 */
+	private function getOAuthToken()
+	{
+		return $this->oAuthToken;
+	}
+
+	/**
+	 * Get the oAuth-token-secret
+	 *
+	 * @return    string
+	 */
+	private function getOAuthTokenSecret()
+	{
+		return $this->oAuthTokenSecret;
+	}
+
+	/**
+	 * Get the timeout
+	 *
+	 * @return    int
+	 */
+	public function getTimeOut()
+	{
+		return (int)$this->timeOut;
+	}
+
+	/**
+	 * Get the useragent that will be used. Our version will be prepended to yours.
+	 * It will look like: "PHP Twitter/<version> <your-user-agent>"
+	 *
+	 * @return    string
+	 */
+	public function getUserAgent()
+	{
+		return (string)'PHP Twitter/' . self::VERSION . ' ' . $this->userAgent;
+	}
+
+	/**
+	 * Set the consumer key
+	 *
+	 * @return    void
+	 * @param    string $key The consumer key to use.
+	 */
+	private function setConsumerKey($key)
+	{
+		$this->consumerKey = (string)$key;
+	}
+
+	/**
+	 * Set the consumer secret
+	 *
+	 * @return    void
+	 * @param    string $secret The consumer secret to use.
+	 */
+	private function setConsumerSecret($secret)
+	{
+		$this->consumerSecret = (string)$secret;
+	}
+
+	/**
+	 * Set the oAuth-token
+	 *
+	 * @return    void
+	 * @param    string $token The token to use.
+	 */
+	public function setOAuthToken($token)
+	{
+		$this->oAuthToken = (string)$token;
+	}
+
+	/**
+	 * Set the oAuth-secret
+	 *
+	 * @return    void
+	 * @param    string $secret The secret to use.
+	 */
+	public function setOAuthTokenSecret($secret)
+	{
+		$this->oAuthTokenSecret = (string)$secret;
+	}
+
+	/**
+	 * Set the timeout
+	 *
+	 * @return    void
+	 * @param    int $seconds The timeout in seconds
+	 */
+	public function setTimeOut($seconds)
+	{
+		$this->timeOut = (int)$seconds;
+	}
+
+	/**
+	 * Get the useragent that will be used. Our version will be prepended to yours.
+	 * It will look like: "PHP Twitter/<version> <your-user-agent>"
+	 *
+	 * @return    void
+	 * @param    string $userAgent Your user-agent, it should look like <app-name>/<app-version>
+	 */
+	public function setUserAgent($userAgent)
+	{
+		$this->userAgent = (string)$userAgent;
+	}
+
+	/**
+	 * Build the signature for the data
+	 *
+	 * @return    string
+	 * @param    string $key  The key to use for signing.
+	 * @param    string $data The data that has to be signed.
+	 */
+	private function hmacsha1($key, $data)
+	{
+		return base64_encode(hash_hmac('SHA1', $data, $key, true));
+	}
+
+	/**
+	 * URL-encode method for internatl use
+	 *
+	 * @return    string
+	 * @param    mixed $value The value to encode.
+	 */
+	private static function urlencode_rfc3986($value)
+	{
+		if (is_array($value)) {
+			return array_map(array('Twitter', 'urlencode_rfc3986'), $value);
+		} else {
+			$search  = array('+', ' ', '%7E', '%');
+			$replace = array('%20', '%20', '~', '%25');
+
+			return str_replace($search, $replace, urlencode($value));
+		}
+	}
+
+
+	// Timeline resources
+	/**
+	 * Returns the 20 most recent statuses from non-protected users who have set a custom user icon.
+	 * The public timeline is cached for 60 seconds and requesting it more often than that is unproductive and a waste of resources.
+	 *
+	 * @return    array
+	 * @param    bool [optional] $skipUser    When true each tweet returned in a timeline will not contain an entire user object. Instead, the user node will contain only an id element to indicate the numerical ID of the Twitter user that set the status.
+	 */
+	public function statusesPublicTimeline($skipUser = false)
+	{
+		// redefine
+		$skipUser = (bool)$skipUser;
+
+		// build parameters
+		$parameters = array();
+		if ($skipUser) $parameters['skip_user'] = 'true';
+
+		// make the call
+		return (array)$this->doCall('statuses/public_timeline.json', $parameters);
+	}
+
+	/**
+	 * Returns the 20 most recent statuses posted by the authenticating user and that user's friends. This is the equivalent of /timeline/home on the Web.
+	 *
+	 * @return    array
+	 * @param    string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param    string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param    int    [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param    int    [optional] $page            Specifies the page of results to retrieve.
+	 * @param    bool   [optional] $skipUser    When true each tweet returned in a timeline will not contain an entire user object. Instead, the user node will contain only an id element to indicate the numerical ID of the Twitter user that set the status.
+	 */
+	public function statusesHomeTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $skipUser = false)
+	{
+		// redefine
+		$skipUser = (bool)$skipUser;
+
+		// 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';
+
+		// make the call
+		return (array)$this->doCall('statuses/home_timeline.json', $parameters, true);
+	}
+
+	/**
+	 * Returns the 20 most recent statuses, including retweets, posted by the authenticating user and that user's friends.
+	 * This is the equivalent of /timeline/home on the Web.
+	 *
+	 * Usage note: This home_timeline call is identical to statuses/friends_timeline, except that home_timeline also contains retweets, while statuses/friends_timeline does not for backwards compatibility reasons.
+	 * In a future version of the API, statuses/friends_timeline will be deprected and replaced by home_timeline.
+	 *
+	 * @return    array
+	 * @param    string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param    string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param    int    [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param    int    [optional] $page            Specifies the page of results to retrieve.
+	 * @param    bool   [optional] $skipUser    When true each tweet returned in a timeline will not contain an entire user object. Instead, the user node will contain only an id element to indicate the numerical ID of the Twitter user that set the status.
+	 */
+	public function statusesFriendsTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $skipUser = false)
+	{
+		// redefine
+		$skipUser = (bool)$skipUser;
+
+		// 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';
+
+		// make the call
+		return (array)$this->doCall('statuses/friends_timeline.json', $parameters, true);
+	}
+
+	/**
+	 * Returns the 20 most recent statuses posted from the authenticating user. It's also possible to request another user's timeline via the id parameter.
+	 * This is the equivalent of the Web / page for your own user, or the profile page for a third party.
+	 *
+	 * For backwards compatibility reasons, retweets are stripped out of the user_timeline when calling in XML or JSON (they appear with 'RT' in RSS and Atom).
+	 * If you'd like them included, you can merge them in from statuses retweeted_by_me.
+	 *
+	 * @return    array
+	 * @param    string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @param    string [optional] $userId        Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param    string [optional] $screenName    Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param    string [optional] $sinceId        Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param    string [optional] $maxId            Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param    int    [optional] $count            Specifies the number of records to retrieve. May not be greater than 200.
+	 * @param    int    [optional] $page                Specifies the page of results to retrieve.
+	 * @param    bool   [optional] $skipUser        When true each tweet returned in a timeline will not contain an entire user object. Instead, the user node will contain only an id element to indicate the numerical ID of the Twitter user that set the status.
+	 */
+	public function statusesUserTimeline($id = null, $userId = null, $screenName = null, $sinceId = null, $maxId = null, $count = null, $page = null, $skipUser = false)
+	{
+		// redefine
+		$skipUser = (bool)$skipUser;
+
+		// 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';
+
+		// make the call
+		return (array)$this->doCall('statuses/user_timeline.json', $parameters, true);
+	}
+
+	/**
+	 * Returns the 20 most recent mentions (status containing @username) for the authenticating user.
+	 *
+	 *
+	 * @param null $sinceId
+	 * @param null $maxId
+	 * @param null $count
+	 * @param null $page
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
+	 * @internal param $int [optional] $page            Specifies the page of results to retrieve.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('statuses/mentions.json', $parameters);
+	}
+
+	/**
+	 * Returns the 20 most recent retweets posted by the authenticating user.
+	 *
+	 *
+	 * @param null $sinceId
+	 * @param null $maxId
+	 * @param null $count
+	 * @param null $page
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
+	 * @internal param $int [optional] $page            Specifies the page of results to retrieve.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('statuses/retweeted_by_me.json', $parameters);
+	}
+
+	/**
+	 * Returns the 20 most recent retweets posted by the authenticating user's friends.
+	 *
+	 *
+	 * @param null $sinceId
+	 * @param null $maxId
+	 * @param null $count
+	 * @param null $page
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
+	 * @internal param $int [optional] $page            Specifies the page of results to retrieve.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('statuses/retweeted_by_me.json', $parameters);
+	}
+
+
+	// Tweets resources
+	/**
+	 * Returns the 20 most recent tweets of the authenticated user that have been retweeted by others.
+	 *
+	 *
+	 * @param null $sinceId
+	 * @param null $maxId
+	 * @param null $count
+	 * @param null $page
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
+	 * @internal param $int [optional] $page            Specifies the page of results to retrieve.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('statuses/retweets_of_me.json', $parameters);
+	}
+
+	/**
+	 * Returns a single status, specified by the id parameter below. The status's author will be returned inline.
+	 *
+	 * @return    array
+	 * @param    string $id The numerical ID of the desired status.
+	 */
+	public function statusesShow($id)
+	{
+		// build parameters
+		$parameters['id'] = (string)$id;
+
+		// make the call
+		return (array)$this->doCall('statuses/show.json', $parameters);
+	}
+
+	/**
+	 * Updates the authenticating user's status. A status update with text identical to the authenticating user's text identical to the authenticating user's current status will be ignored to prevent duplicates.
+	 *
+	 * @return    array
+	 * @param    string $status The text of your status update, up to 140 characters. URL encode as necessary.
+	 * @param           string  [optional] $inReplyToStatusId        The ID of an existing status that the update is in reply to.
+	 * @param           float   [optional] $lat                    The location's latitude that this tweet refers to.
+	 * @param           float   [optional] $long                    The location's longitude that this tweet refers to.
+	 * @param           string  [optional] $placeId                A place in the world. These IDs can be retrieved from geo/reverse_geocode.
+	 * @param           bool    [optional] $displayCoordinates        Whether or not to put a pin on the exact coordinates a tweet has been sent from.
+	 */
+	public function statusesUpdate($status, $inReplyToStatusId = null, $lat = null, $long = null, $placeId = null, $displayCoordinates = false)
+	{
+		// 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';
+
+		// make the call
+		return (array)$this->doCall('statuses/update.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Destroys the status specified by the required ID parameter.
+	 * Usage note: The authenticating user must be the author of the specified status.
+	 *
+	 * @return    bool
+	 * @param    string $id The numerical ID of the desired status.
+	 */
+	public function statusesDestroy($id)
+	{
+		// build parameters
+		$parameters['id'] = (string)$id;
+
+		// make the call
+		return (array)$this->doCall('statuses/destroy.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Retweets a tweet. Returns the original tweet with retweet details embedded.
+	 *
+	 * @return    array
+	 * @param    string $id The numerical ID of the desired status.
+	 */
+	public function statusesRetweet($id)
+	{
+		// make the call
+		return (array)$this->doCall('statuses/retweet/' . $id . '.json', null, true, 'POST');
+	}
+
+	/**
+	 * Returns up to 100 of the first retweets of a given tweet.
+	 *
+	 *
+	 * @param    string $id The numerical ID of the desired status.
+	 * @param           int [optional] $count    Specifies the number of records to retrieve. May not be greater than 100.
+	 * @return array
+	 * @throws TwitterException
+	 */
+	public function statusesRetweets($id, $count = null)
+	{
+		// validate
+		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;
+
+		// make the call
+		return (array)$this->doCall('statuses/retweets/' . $id . '.json', $parameters);
+	}
+
+	/**
+	 * Show user objects of up to 100 members who retweeted the status.
+	 *
+	 *
+	 * @param    string $id The numerical ID of the desired status.
+	 * @param null      $count
+	 * @param null      $page
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $int [optional] $count    Specifies the number of records to retrieve. May not be greater than 200.
+	 * @internal param $int [optional] $page        Specifies the page of results to retrieve.
+	 */
+	public function statusesIdRetweetedBy($id, $count = null, $page = null)
+	{
+		// validate
+		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;
+
+		// make the call
+		return (array)$this->doCall('statuses/' . (string)$id . '/retweeted_by.json', $parameters, true);
+	}
+
+	/**
+	 * Show user ids of up to 100 users who retweeted the status.
+	 *
+	 *
+	 * @param    string $id The numerical ID of the desired status.
+	 * @param null      $count
+	 * @param null      $page
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $int [optional] $count    Specifies the number of records to retrieve. May not be greater than 200.
+	 * @internal param $int [optional] $page        Specifies the page of results to retrieve.
+	 */
+	public function statusesIdRetweetedByIds($id, $count = null, $page = null)
+	{
+		// validate
+		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;
+
+		// make the call
+		return (array)$this->doCall('statuses/' . (string)$id . '/retweeted_by/ids.json', $parameters, true);
+	}
+
+
+	// User resources
+	/**
+	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
+	 * The author's most recent status will be returned inline.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @internal param $string [optional] $screenName    Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('users/show.json', $parameters);
+	}
+
+	/**
+	 * Return up to 100 users worth of extended information, specified by either ID, screen name, or combination of the two.
+	 * The author's most recent status (if the authenticating user has permission) will be returned inline.
+	 *
+	 *
+	 * @param null $userIds
+	 * @param null $screenNames
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $mixed [optional] $userIds        A comma separated list of user IDs, up to 100 in total.
+	 * @internal param $mixed [optional] $screenNames    A comma separated list of screen names, up to 100 in total.
+	 */
+	public function usersLookup($userIds = null, $screenNames = null)
+	{
+		// redefine
+		$userIds     = (array)$userIds;
+		$screenNames = (array)$screenNames;
+
+		// validate
+		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);
+
+		// make the call
+		return (array)$this->doCall('users/lookup.json', $parameters, true);
+
+	}
+
+	/**
+	 * Run a search for users similar to the Find People button on Twitter.com; the same results returned by people search on Twitter.com will be returned by using this API.
+	 * Usage note: It is only possible to retrieve the first 1000 matches from this API.
+	 *
+	 * @return    array
+	 * @param    string $q  The search query term.
+	 * @param           int [optional] $perPage    Specifies the number of results to retrieve.
+	 * @param           int [optional] $page        Specifies the page of results to retrieve.
+	 */
+	public function usersSearch($q, $perPage = null, $page = null)
+	{
+		// build parameters
+		$parameters['q'] = (string)$q;
+		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);
+
+	}
+
+	/**
+	 * Access to Twitter's suggested user list. This returns the list of suggested user categories. The category can be used in the users/suggestions/category  endpoint to get the users in that category.
+	 *
+	 * @return    array
+	 */
+	public function usersSuggestions()
+	{
+		return (array)$this->doCall('users/suggestions.json', null, true);
+	}
+
+	/**
+	 * Access the users in a given category of the Twitter suggested user list.
+	 * It is recommended that end clients cache this data for no more than one hour.
+	 *
+	 * @return    array
+	 * @param    string $slug The short name of list or a category.
+	 */
+	public function usersSuggestionsSlug($slug)
+	{
+		return (array)$this->doCall('users/suggestions/' . (string)$slug . '.json');
+	}
+
+	/**
+	 * Returns a user's friends, each with current status inline. They are ordered by the order in which the user followed them, most recently followed first, 100 at a time.
+	 * (Please note that the result set isn't guaranteed to be 100 every time as suspended users will be filtered out.)
+	 *
+	 * Use the cursor option to access older friends.
+	 * With no user specified, request defaults to the authenticated user's friends.
+	 * It's also possible to request another user's friends list via the id, screen_name or user_id parameter.
+	 *
+	 * @return    array
+	 * @param    string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @param    string [optional] $userId        Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param    string [optional] $screenName    Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param    int    [optional] $cursor            Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function statusesFriends($id = null, $userId = null, $screenName = null, $cursor = null)
+	{
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('statuses/friends.json', $parameters);
+	}
+
+	/**
+	 * Returns the authenticating user's followers, each with current status inline. They are ordered by the order in which they followed the user, 100 at a time. (Please note that the result set isn't guaranteed to be 100 every time as suspended users will be filtered out.)
+	 * Use the cursor parameter to access earlier followers.
+	 *
+	 * @return    array
+	 * @param    string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @param    string [optional] $userId        Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @param    string [optional] $screenName    Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @param    int    [optional] $cursor            Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function statusesFollowers($id = null, $userId = null, $screenName = null, $cursor = null)
+	{
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('statuses/followers.json', $parameters);
+	}
+
+
+	// Trends resources
+	/**
+	 * Returns the top ten topics that are currently trending on Twitter.
+	 * The response includes the time of the request, the name of each trend, and the url to the Twitter Search results page for that topic.
+	 *
+	 * @return    array
+	 */
+	public function trends()
+	{
+		return (array)$this->doCall('trends.json');
+	}
+
+	/**
+	 * Returns the current top 10 trending topics on Twitter.
+	 * The response includes the time of the request, the name of each trending topic, and query used on Twitter Search results page for that topic.
+	 *
+	 * @return    array
+	 * @param    string [optional] $exclude    Setting this equal to hashtags will remove all hashtags from the trends list.
+	 */
+	public function trendsCurrent($exclude = null)
+	{
+		// build parameters
+		$parameters = array();
+		if ($exclude != null) $parameters['exclude'] = (string)$exclude;
+
+		// make the call
+		return (array)$this->doCall('trends/current.json', $parameters);
+	}
+
+	/**
+	 * Returns the top 20 trending topics for each hour in a given day.
+	 *
+	 * @return    array
+	 * @param    string [optional] $exclude    Setting this equal to hashtags will remove all hashtags from the trends list.
+	 * @param    string [optional] $date        Permits specifying a start date for the report. The date should be formatted YYYY-MM-DD.
+	 */
+	public function trendsDaily($exclude = null, $date = null)
+	{
+		// build parameters
+		$parameters = array();
+		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);
+	}
+
+	/**
+	 * Returns the top 30 trending topics for each day in a given week.
+	 *
+	 * @return    array
+	 * @param    string [optional] $exclude    Setting this equal to hashtags will remove all hashtags from the trends list.
+	 * @param    string [optional] $date        Permits specifying a start date for the report. The date should be formatted YYYY-MM-DD.
+	 */
+	public function trendsWeekly($exclude = null, $date = null)
+	{
+		// build parameters
+		$parameters = array();
+		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);
+	}
+
+
+	// List resources
+	/**
+	 * Creates a new list for the authenticated user. Accounts are limited to 20 lists.
+	 *
+	 *
+	 * @param    string $user The user.
+	 * @param    string $name The name of the list you are creating.
+	 * @param null      $mode
+	 * @param null      $description
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $mode            Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
+	 * @internal param $string [optional] $description    The description of the list you are creating.
+	 */
+	public function userListsCreate($user, $name, $mode = null, $description = null)
+	{
+		// possible modes
+		$allowedModes = array('public', 'private');
+
+		// validate
+		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;
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/lists.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * List the lists of the specified user. Private lists will be included if the authenticated users is the same as the user who's lists are being returned.
+	 *
+	 * @return    array
+	 * @param    string $user  The user.
+	 * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function userLists($user, $cursor = null)
+	{
+		$parameters = null;
+		if ($cursor != null) $parameters['cursor'] = (string)$cursor;
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/lists.json', $parameters, true);
+	}
+
+	/**
+	 * Show the specified list. Private lists will only be shown if the authenticated user owns the specified list.
+	 *
+	 * @return    array
+	 * @param    string $user The user.
+	 * @param    string $id   The id of the list.
+	 */
+	public function userListsId($user, $id)
+	{
+		// make the call
+		return (array)$this->doCall((string)$user . '/lists/' . (string)$id . '.json', null, true);
+	}
+
+	/**
+	 * Updates the specified list.
+	 *
+	 *
+	 * @param    string $user The user.
+	 * @param    string $id   The id of the list.
+	 * @param null      $name
+	 * @param null      $mode
+	 * @param null      $description
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $name            The name of the list you are creating.
+	 * @internal param $string [optional] $mode            Whether your list is public or private. Values can be public or private. Lists are public by default if no mode is specified.
+	 * @internal param $string [optional] $description    The description of the list you are creating.
+	 */
+	public function userListsIdUpdate($user, $id, $name = null, $mode = null, $description = null)
+	{
+		// possible modes
+		$allowedModes = array('public', 'private');
+
+		// validate
+		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;
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/lists/' . (string)$id . '.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Show tweet timeline for members of the specified list.
+	 *
+	 *
+	 * @param    string $user The user.
+	 * @param    string $id   The id of the list.
+	 * @param null      $sinceId
+	 * @param null      $maxId
+	 * @param null      $count
+	 * @param null      $page
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
+	 * @internal param $int [optional] $page            Specifies the page of results to retrieve.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/lists/' . (string)$id . '/statuses.json', $parameters);
+	}
+
+	/**
+	 * List the lists the specified user has been added to.
+	 *
+	 * @return    array
+	 * @param    string $user  The user.
+	 * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function userListsMemberships($user, $cursor = null)
+	{
+		$parameters = null;
+		if ($cursor != null) $parameters['cursor'] = (string)$cursor;
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/lists/memberships.json', $parameters, true);
+	}
+
+	/**
+	 * List the lists the specified user follows.
+	 *
+	 * @return    array
+	 * @param    string $user  The user.
+	 * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function userListsSubscriptions($user, $cursor = null)
+	{
+		$parameters = null;
+		if ($cursor != null) $parameters['cursor'] = (string)$cursor;
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/lists/subscriptions.json', $parameters, true);
+	}
+
+
+	// List Members resources
+	/**
+	 * Returns the members of the specified list.
+	 *
+	 * @return    array
+	 * @param    string $user  The user.
+	 * @param    string $id    The id of the list.
+	 * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function userListMembers($user, $id, $cursor = null)
+	{
+		$parameters = null;
+		if ($cursor != null) $parameters['cursor'] = (string)$cursor;
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/' . (string)$id . '/members.json', $parameters, true);
+	}
+
+	/**
+	 * Add a member to a list. The authenticated user must own the list to be able to add members to it. Lists are limited to having 500 members.
+	 *
+	 * @return    array
+	 * @param    string $user   The user.
+	 * @param    string $id     The id of the list.
+	 * @param    string $userId The id or screen name of the user to add as a member of the list.
+	 */
+	public function userListMembersCreate($user, $id, $userId)
+	{
+		// build parameters
+		$parameters['id'] = (string)$userId;
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/' . (string)$id . '/members.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Removes the specified member from the list. The authenticated user must be the list's owner to remove members from the list.
+	 *
+	 * @return    mixed
+	 * @param    string $user   The user.
+	 * @param    string $id     The id of the list.
+	 * @param    string $userId Specfies the ID of the user for whom to return results for.
+	 */
+	public function userListMembersDelete($user, $id, $userId)
+	{
+		// build parameters
+		$parameters['id']      = (string)$userId;
+		$parameters['_method'] = 'DELETE';
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/' . (string)$id . '/members.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Check if a user is a member of the specified list.
+	 *
+	 *
+	 * @param    string $user   The user.
+	 * @param    string $id     The id of the list.
+	 * @param    string $userId Specfies the ID of the user for whom to return results for.
+	 * @return mixed
+	 * @throws TwitterException
+	 */
+	public function userListMembersId($user, $id, $userId)
+	{
+		try {
+			// make the call
+			return (array)$this->doCall((string)$user . '/' . (string)$id . '/members/' . (string)$userId . '.json', null, true);
+		} // catch exceptions
+		catch (TwitterException $e) {
+			if ($e->getMessage() === 'The specified user is not a member of this list') {
+				return false;
+			} else throw $e;
+		}
+	}
+
+
+	// List Subscribers resources
+	/**
+	 * Returns the subscribers of the specified list.
+	 *
+	 * @return    array
+	 * @param    string $user  The user.
+	 * @param    string $id    The id of the list.
+	 * @param           string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function userListSubscribers($user, $id, $cursor = null)
+	{
+		$parameters = null;
+		if ($cursor != null) $parameters['cursor'] = (string)$cursor;
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/' . (string)$id . '/subscribers.json', $parameters, true);
+	}
+
+	/**
+	 * Make the authenticated user follow the specified list.
+	 *
+	 * @return    array
+	 * @param    string $user The user.
+	 * @param    string $id   The id of the list.
+	 */
+	public function userListSubscribersCreate($user, $id)
+	{
+		// make the call
+		return (array)$this->doCall((string)$user . '/' . (string)$id . '/subscribers.json', null, true, 'POST');
+	}
+
+	/**
+	 * Unsubscribes the authenticated user form the specified list.
+	 *
+	 * @return    array
+	 * @param    string $user The user.
+	 * @param    string $id   The id of the list.
+	 */
+	public function userListSubscribersDelete($user, $id)
+	{
+		// build parameters
+		$parameters['_method'] = 'DELETE';
+
+		// make the call
+		return (array)$this->doCall((string)$user . '/' . (string)$id . '/subscribers.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Check if the specified user is a subscriber of the specified list.
+	 *
+	 *
+	 * @param    string $user   The user.
+	 * @param    string $id     The id of the list.
+	 * @param    string $userId Specfies the ID of the user for whom to return results for.
+	 * @return mixed
+	 * @throws TwitterException
+	 */
+	public function userListSubscribersId($user, $id, $userId)
+	{
+		try {
+			// make the call
+			return (array)$this->doCall((string)$user . '/' . (string)$id . '/subscribers/' . (string)$userId . '.json', null, true);
+		} // catch exceptions
+		catch (TwitterException $e) {
+			if ($e->getMessage() === 'The specified user is not a subscriber of this list') {
+				return false;
+			} else throw $e;
+		}
+
+	}
+
+
+	// Direct Messages resources
+	/**
+	 * Returns a list of the 20 most recent direct messages sent to the authenticating user.
+	 *
+	 *
+	 * @param null $sinceId
+	 * @param null $maxId
+	 * @param null $count
+	 * @param null $page
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
+	 * @internal param $int [optional] $page            Specifies the page of results to retrieve.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('direct_messages.json', $parameters, true);
+	}
+
+	/**
+	 * Returns a list of the 20 most recent direct messages sent by the authenticating user.
+	 *
+	 *
+	 * @param null $sinceId
+	 * @param null $maxId
+	 * @param null $count
+	 * @param null $page
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $sinceId    Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @internal param $string [optional] $maxId        Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @internal param $int [optional] $count        Specifies the number of records to retrieve. May not be greater than 200.
+	 * @internal param $int [optional] $page            Specifies the page of results to retrieve.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('direct_messages/sent.json', $parameters, true);
+	}
+
+	/**
+	 * Sends a new direct message to the specified user from the authenticating user.
+	 * Requires both the user and text parameters. Returns the sent message in the requested format when successful.
+	 *
+	 *
+	 * @param    string $text The text of your direct message. Be sure to URL encode as necessary, and keep it under 140 characters.
+	 * @param null      $id
+	 * @param null      $userId
+	 * @param null      $screenName
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('direct_messages/new.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Destroys the direct message specified in the required ID parameter. The authenticating user must be the recipient of the specified direct message.
+	 *
+	 * @return    array
+	 * @param    string $id The ID of the desired direct message.
+	 */
+	public function directMessagesDestroy($id)
+	{
+		// build parameters
+		$parameters['id'] = (string)$id;
+
+		// make the call
+		return (array)$this->doCall('direct_messages/destroy.json', $parameters, true, 'POST');
+	}
+
+
+	// Friendship resources
+	/**
+	 * Allows the authenticating users to follow the user specified in the ID parameter.
+	 * Returns the befriended user in the requested format when successful.
+	 * Returns a string describing the failure condition when unsuccessful.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @param bool $follow
+	 * @return mixed
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @internal param $bool [optional] $follow            Returns public statuses that reference the given set of users.
+	 */
+	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.');
+
+		// 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;
+		$parameters['follow'] = $follow ? 'true' : 'false';
+
+		// make the call
+		return (array)$this->doCall('friendships/create.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Allows the authenticating users to unfollow the user specified in the ID parameter.
+	 * Returns the unfollowed user in the requested format when successful. Returns a string describing the failure condition when unsuccessful.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('friendships/destroy.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Tests for the existence of friendship between two users. Will return true if user_a follows user_b, otherwise will return false.
+	 *
+	 * @return    bool
+	 * @param    string $userA The ID or screen_name of the subject user.
+	 * @param    string $userB The ID or screen_name of the user to test for following.
+	 */
+	public function friendshipsExists($userA, $userB)
+	{
+		// build parameters
+		$parameters['user_a'] = (string)$userA;
+		$parameters['user_b'] = (string)$userB;
+
+		// make the call
+		return (bool)$this->doCall('friendships/exists.json', $parameters);
+	}
+
+	/**
+	 * Returns detailed information about the relationship between two users.
+	 *
+	 *
+	 * @param null $sourceId
+	 * @param null $sourceScreenName
+	 * @param null $targetId
+	 * @param null $targetScreenName
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $sourceId                The user_id of the subject user.
+	 * @internal param $string [optional] $sourceScreenName        The screen_name of the subject user.
+	 * @internal param $string [optional] $targetId                The screen_name of the subject user.
+	 * @internal param $string [optional] $targetScreenName        The screen_name of the target user.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('friendships/show.json', $parameters);
+	}
+
+	/**
+	 * Returns an array of numeric IDs for every user who has a pending request to follow the authenticating user.
+	 *
+	 * @return    array
+	 * @param    string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function friendshipsIncoming($cursor = null)
+	{
+		$parameters = null;
+		if ($cursor != null) $parameters['cursor'] = (string)$cursor;
+
+		// make the call
+		return (array)$this->doCall('friendships/incoming.json', $parameters, true);
+	}
+
+	/**
+	 * Returns an array of numeric IDs for every protected user for whom the authenticating user has a pending follow request.
+	 *
+	 * @return    array
+	 * @param    string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	public function friendshipsOutgoing($cursor = null)
+	{
+		$parameters = null;
+		if ($cursor != null) $parameters['cursor'] = (string)$cursor;
+
+		// make the call
+		return (array)$this->doCall('friendships/outgoing.json', $parameters, true);
+	}
+
+
+	// Friends and Followers resources
+	/**
+	 * Returns an array of numeric IDs for every user the specified user is following.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @param null $cursor
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @internal param $string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('friends/ids.json', $parameters);
+	}
+
+	/**
+	 * Returns an array of numeric IDs for every user following the specified user.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @param null $cursor
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 * @internal param $string [optional] $cursor    Breaks the results into pages. This is recommended for users who are following many users. Provide a value of -1  to begin paging. Provide values as returned to in the response body's next_cursor  and previous_cursor attributes to page back and forth in the list.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('followers/ids.json', $parameters);
+	}
+
+
+	// Account resources
+	/**
+	 * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful; returns a 401 status code and an error message if not. Use this method to test if supplied user credentials are valid.
+	 *
+	 * @return    array
+	 */
+	public function accountVerifyCredentials()
+	{
+		// make the call
+		return (array)$this->doCall('account/verify_credentials.json', null, true);
+	}
+
+	/**
+	 *
+	 * @return    array
+	 */
+	public function accountRateLimitStatus()
+	{
+		// make the call
+		return (array)$this->doCall('account/rate_limit_status.json', null);
+	}
+
+	/**
+	 * Ends the session of the authenticating user, returning a null cookie. Use this method to sign users out of client-facing applications like widgets.
+	 * @return bool
+	 * @throws TwitterException
+	 */
+	public function accountEndSession()
+	{
+		try {
+			// make the call
+			$this->doCall('account/end_session.json', null, true, 'POST');
+		} // catch exceptions
+		catch (TwitterException $e) {
+			if ($e->getMessage() === 'Logged out.') {
+				return true;
+			} else throw $e;
+		}
+	}
+
+	/**
+	 * Sets which device Twitter delivers updates to for the authenticating user. Sending none as the device parameter will disable IM or SMS updates.
+	 *
+	 * @return    array
+	 * @param    string $device Delivery device type to send updates to.
+	 */
+	public function accountUpdateDeliveryDevices($device)
+	{
+		// build parameters
+		$parameters['device'] = (string)$device;
+
+		// make the call
+		return (array)$this->doCall('account/update_delivery_device.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Sets one or more hex values that control the color scheme of the authenticating user's profile page on twitter.com.
+	 * Each parameter's value must be a valid hexidecimal value, and may be either three or six characters (ex: #fff or #ffffff).
+	 *
+	 *
+	 * @param null $profileBackgroundColor
+	 * @param null $profileTextColor
+	 * @param null $profileLinkColor
+	 * @param null $profileSidebarFillColor
+	 * @param null $profileSidebarBorderColor
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $profileBackgroundColor        Profile background color.
+	 * @internal param $string [optional] $profileTextColor                Profile text color.
+	 * @internal param $string [optional] $profileLinkColor                Profile link color.
+	 * @internal param $string [optional] $profileSidebarFillColor        Profile sidebar's background color.
+	 * @internal param $string [optional] $profileSidebarBorderColor        Profile sidebar's border color.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('account/update_profile_colors.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Updates the authenticating user's profile image.
+	 *
+	 *
+	 * @param    string $image The path to the avatar image for the profile. Must be a valid GIF, JPG, or PNG image of less than 700 kilobytes in size. Images with width larger than 500 pixels will be scaled down.
+	 * @return array
+	 * @throws TwitterException
+	 */
+	public function accountUpdateProfileImage($image)
+	{
+		throw new TwitterException('Not implemented');
+
+		// validate
+		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);
+	}
+
+	/**
+	 * Updates the authenticating user's profile background image.
+	 *
+	 *
+	 * @param    string $image The path to the background image for the profile. Must be a valid GIF, JPG, or PNG image of less than 800 kilobytes in size. Images with width larger than 2048 pixels will be forceably scaled down.
+	 * @param    bool   $tile  Whether or not to tile the background image. If set to true the background image will be displayed tiled. The image will not be tiled otherwise.
+	 * @return array
+	 * @throws TwitterException
+	 */
+	public function accountUpdateProfileBackgroundImage($image, $tile = false)
+	{
+		throw new TwitterException('Not implemented');
+
+		// validate
+		if (!file_exists($image)) throw new TwitterException('Image (' . $image . ') doesn\'t exists.');
+
+		// build parameters
+		if ($tile) $parameters['tile'] = 'true';
+
+		// make the call
+		return (array)$this->doCall('account/update_profile_background_image.json', $parameters, true, 'POST', $image);
+	}
+
+	/**
+	 * Sets values that users are able to set under the "Account" tab of their settings page. Only the parameters specified will be updated.
+	 *
+	 * @return    array
+	 * @param    string [optional] $name            Full name associated with the profile. Maximum of 20 characters.
+	 * @param    string [optional] $url            URL associated with the profile. Will be prepended with "http://" if not present. Maximum of 100 characters.
+	 * @param    string [optional] $location        The city or country describing where the user of the account is located. The contents are not normalized or geocoded in any way. Maximum of 30 characters.
+	 * @param    string [optional] $description    A description of the user owning the account. Maximum of 160 characters.
+	 */
+	public function accountUpdateProfile($name = null, $url = null, $location = null, $description = null)
+	{
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('account/update_profile.json', $parameters, true, 'POST');
+	}
+
+
+	// Favorites resources
+	/**
+	 * Returns the 20 most recent favorite statuses for the authenticating user or user specified by the ID parameter in the requested format.
+	 *
+	 * @return    array
+	 * @param    string [optional] $id    Specifies the ID or screen name of the user for whom to return results for.
+	 * @param    int    [optional] $page        Specifies the page of results to retrieve.
+	 */
+	public function favorites($id = null, $page = null)
+	{
+		// build parameters
+		$parameters = null;
+		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);
+	}
+
+	/**
+	 * Favorites the status specified in the ID parameter as the authenticating user. Returns the favorite status when successful.
+	 *
+	 * @return    array
+	 * @param    string $id The numerical ID of the desired status.
+	 */
+	public function favoritesCreate($id)
+	{
+		// make the call
+		return (array)$this->doCall('favorites/create/' . $id . '.json', null, true, 'POST');
+	}
+
+	/**
+	 * Un-favorites the status specified in the ID parameter as the authenticating user. Returns the un-favorited status in the requested format when successful.
+	 *
+	 * @return    array
+	 * @param    string $id The numerical ID of the desired status.
+	 */
+	public function favoritesDestroy($id)
+	{
+		// make the call
+		return (array)$this->doCall('favorites/destroy/' . $id . '.json', null, true, 'POST');
+	}
+
+
+	// Notification resources
+	/**
+	 * Enables device notifications for updates from the specified user. Returns the specified user when successful.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('notifications/follow.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Disables notifications for updates from the specified user to the authenticating user. Returns the specified user when successful.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('notifications/leave.json', $parameters, true, 'POST');
+	}
+
+
+	// Block resources
+	/**
+	 * Blocks the user specified in the ID parameter as the authenticating user. Destroys a friendship to the blocked user if it exists. Returns the blocked user in the requested format when successful.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('blocks/create.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Un-blocks the user specified in the ID parameter for the authenticating user. Returns the un-blocked user in the requested format when successful.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('blocks/destroy.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Un-blocks the user specified in the ID parameter for the authenticating user. Returns the un-blocked user in the requested format when successful.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @return mixed
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 */
+	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.');
+
+		// 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;
+
+		try {
+			// make the call
+			return (array)$this->doCall('blocks/exists.json', $parameters, true);
+		} // catch exceptions
+		catch (TwitterException $e) {
+			if ($e->getMessage() === 'You are not blocking this user.') {
+				return false;
+			} else throw $e;
+		}
+	}
+
+	/**
+	 * Returns an array of user objects that the authenticating user is blocking.
+	 *
+	 * @return    array
+	 * @param    int [optional] $page        Specifies the page of results to retrieve. Note: there are pagination limits. See the FAQ for details.
+	 */
+	public function blocksBlocking($page = null)
+	{
+		// build parameters
+		$parameters = null;
+		if ($page != null) $parameters['page'] = (int)$page;
+
+		// make the call
+		return (array)$this->doCall('blocks/blocking.json', $parameters, true);
+	}
+
+	/**
+	 * Returns an array of numeric user ids the authenticating user is blocking.
+	 *
+	 * @return    array
+	 */
+	public function blocksBlockingIds()
+	{
+		// make the call
+		return (array)$this->doCall('blocks/blocking/ids.json', null, true);
+	}
+
+
+	// Spam Reporting resources
+	/**
+	 * The user specified in the id is blocked by the authenticated user and reported as a spammer.
+	 *
+	 *
+	 * @param null $id
+	 * @param null $userId
+	 * @param null $screenName
+	 * @return array
+	 * @throws TwitterException
+	 * @internal param $string [optional] $id            Specifies the ID or screen name of the user for whom to return results for.
+	 * @internal param $string [optional] $userId        Specfies the screen name of the user for whom to return results for. Helpful for disambiguating when a valid screen name is also a user ID.
+	 * @internal param $string [optional] $screenName    Specfies the ID of the user for whom to return results for. Helpful for disambiguating when a valid user ID is also a valid screen name.
+	 */
+	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.');
+
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('report_spam.json', $parameters, true, 'POST');
+	}
+
+
+	// Saved Searches resources
+	/**
+	 * Returns the authenticated user's saved search queries.
+	 *
+	 * @return    array
+	 */
+	public function savedSearches()
+	{
+		// make the call
+		return (array)$this->doCall('saved_searches.json', null, true);
+	}
+
+	/**
+	 * Retrieve the data for a saved search owned by the authenticating user specified by the given id.
+	 *
+	 * @return    array
+	 * @param    string $id The ID of the desired saved search.
+	 */
+	public function savedSearchesShow($id)
+	{
+		// build parameters
+		$parameters['id'] = (string)$id;
+
+		// make the call
+		return (array)$this->doCall('saved_searches/show.json', $parameters, true);
+	}
+
+	/**
+	 * Creates a saved search for the authenticated user.
+	 *
+	 * @return    array
+	 * @param    string $query The query of the search the user would like to save.
+	 */
+	public function savedSearchesCreate($query)
+	{
+		// build parameters
+		$parameters['query'] = (string)$query;
+
+		// make the call
+		return (array)$this->doCall('saved_searches/create.json', $parameters, true, 'POST');
+	}
+
+	/**
+	 * Destroys a saved search for the authenticated user. The search specified by id must be owned by the authenticating user.
+	 * REMARK: This method seems not to work    @later
+	 *
+	 * @return    array
+	 * @param    string $id The ID of the desired saved search.
+	 */
+	public function savedSearchesDestroy($id)
+	{
+		return (array)$this->doCall('saved_searches/destroy/' . (string)$id . '.json', null, true, 'POST');
+	}
+
+
+	// OAuth resources
+	/**
+	 * Allows a Consumer application to obtain an OAuth Request Token to request user authorization.
+	 * This method fulfills Secion 6.1 of the OAuth 1.0 authentication flow.
+	 *
+	 *
+	 * @param    string $callbackURL
+	 * @return array An array containg the token and the secret
+	 * @throws TwitterException
+	 */
+	public function oAuthRequestToken($callbackURL = null)
+	{
+		// init var
+		$parameters = array();
+
+		// set callback
+		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)));
+
+		// 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']);
+
+		// return
+		return $response;
+	}
+
+	/**
+	 * Allows a Consumer application to exchange the OAuth Request Token for an OAuth Access Token.
+	 * This method fulfills Secion 6.3 of the OAuth 1.0 authentication flow.
+	 *
+	 * @return    array
+	 * @param    string $token
+	 * @param    string $verifier
+	 */
+	public function oAuthAccessToken($token, $verifier)
+	{
+		// init var
+		$parameters                   = array();
+		$parameters['oauth_token']    = (string)$token;
+		$parameters['oauth_verifier'] = (string)$verifier;
+
+		// make the call
+		$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']);
+
+		// return
+		return $response;
+	}
+
+	/**
+	 * Will redirect to the page to authorize the applicatione
+	 *
+	 * @return    void
+	 */
+	public function oAuthAuthorize()
+	{
+		header('Location: ' . self::SECURE_API_URL . '/oauth/authorize?oauth_token=' . $this->oAuthToken);
+	}
+
+	/**
+	 * Allows a Consumer application to use an OAuth request_token to request user authorization. This method is a replacement fulfills Secion 6.2 of the OAuth 1.0 authentication flow for applications using the Sign in with Twitter authentication flow. The method will use the currently logged in user as the account to for access authorization unless the force_login parameter is set to true
+	 * REMARK: This method seems not to work    @later
+	 *
+	 * @return    void
+	 */
+	public function oAuthAuthenticate()
+	{
+		// make the call
+		return $this->doOAuthCall('authenticate');
+	}
+
+
+	// Local Trends resources
+	/**
+	 * Returns the locations that Twitter has trending topic information for.
+	 * The response is an array of "locations" that encode the location's WOEID (a Yahoo! Where On Earth ID) and some other human-readable information such as a canonical name and country the location belongs in.
+	 * The WOEID that is returned in the location object is to be used when querying for a specific trend.
+	 *
+	 * @return    array
+	 * @param    float [optional] $lat    If passed in conjunction with long, then the available trend locations will be sorted by distance to the lat  and long passed in. The sort is nearest to furthest.
+	 * @param    float [optional] $long    If passed in conjunction with lat, then the available trend locations will be sorted by distance to the lat  and long passed in. The sort is nearest to furthest.
+	 */
+	public function trendsAvailable($lat = null, $long = null)
+	{
+		// build parameters
+		$parameters = null;
+		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);
+	}
+
+	/**
+	 * Returns the top 10 trending topics for a specific location Twitter has trending topic information for.
+	 * The response is an array of "trend" objects that encode the name of the trending topic, the query parameter that can be used to search for the topic on Search, and the direct URL that can be issued against Search.
+	 * This information is cached for five minutes, and therefore users are discouraged from querying these endpoints faster than once every five minutes. Global trends information is also available from this API by using a WOEID of 1.
+	 * REMARK: This method seems not to work    @later
+	 *
+	 * @return    array
+	 * @param    string $woeid The WOEID of the location to be querying for.
+	 */
+	public function trendsLocation($woeid)
+	{
+		// make the call
+		return (array)$this->doCall('trends/location/' . (string)$woeid . '.json');
+	}
+
+
+	// Geo resources
+	/**
+	 * Search for places (cities and neighborhoods) that can be attached to a statuses/update. Given a latitude and a longitude, return a list of all the valid places that can be used as a place_id when updating a status.
+	 * Conceptually, a query can be made from the user's location, retrieve a list of places, have the user validate the location he or she is at, and then send the ID of this location up with a call to statuses/update.
+	 * There are multiple granularities of places that can be returned -- "neighborhoods", "cities", etc. At this time, only United States data is available through this method.
+	 * This API call is meant to be an informative call and will deliver generalized results about geography.
+	 *
+	 * @return    array
+	 * @param    float $lat   The location's latitude that this tweet refers to.
+	 * @param    float $long  The location's longitude that this tweet refers to.
+	 * @param          string [optional] $accuracy        A hint on the "region" in which to search. If a number, then this is a radius in meters, but it can also take a string that is suffixed with ft to specify feet. If this is not passed in, then it is assumed to be 0m. If coming from a device, in practice, this value is whatever accuracy the device has measuring its location (whether it be coming from a GPS, WiFi triangulation, etc.).
+	 * @param          string [optional] $granularity    The minimal granularity of data to return. If this is not passed in, then neighborhood is assumed. city can also be passed.
+	 * @param          int    [optional] $maxResults        A hint as to the number of results to return. This does not guarantee that the number of results returned will equal max_results, but instead informs how many "nearby" results to return. Ideally, only pass in the number of places you intend to display to the user here.
+	 */
+	public function geoReverseGeoCode($lat, $long, $accuracy = null, $granularity = null, $maxResults = null)
+	{
+		// 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;
+
+		// make the call
+		return (array)$this->doCall('geo/reverse_geocode.json', $parameters);
+	}
+
+	/**
+	 * Find out more details of a place that was returned from the geo/reverse_geocode method.
+	 *
+	 * @return    array
+	 * @param    string $id
+	 * @param           string [optional] $placeId    A place in the world. These IDs can be retrieved from geo/reverse_geocode.
+	 */
+	public function geoId($id, $placeId = null)
+	{
+		// build parameters
+		$parameters = null;
+		if ($placeId != null) $parameters['place_id'] = (string)$placeId;
+
+		// make the call
+		return (array)$this->doCall('geo/id/' . (string)$id . '.json', $parameters);
+	}
+
+
+	// Help resources
+	/**
+	 * Test
+	 * REMARK: this methods seems not to work, so don't rely on it
+	 *
+	 * @return    bool
+	 */
+	public function helpTest()
+	{
+		// make the call
+		return ($this->doCall('help/test', null, null, 'GET', null, false) == 'ok');
+	}
 }
 
 /**

Spacing +289 added lines, -289 removed lines

@@ -158,7 +158,7 @@ 
         }
 
         // 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);
@@ -182,8 +182,8 @@ 
     private function calculateBaseString($url, $method, array $parameters)
     {
         // redefine
-        $url        = (string)$url;
-        $parameters = (array)$parameters;
+        $url        = (string) $url;
+        $parameters = (array) $parameters;
 
         // init var
         $pairs  = array();
@@ -200,12 +200,12 @@ 
 
         // process queries
         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
@@ -224,7 +224,7 @@ 
     private function calculateHeader(array $parameters, $url = null)
     {
         // redefine
-        $url = (string)$url;
+        $url = (string) $url;
 
         // divide into parts
         $parts = parse_url($url);
@@ -233,10 +233,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
@@ -256,31 +256,31 @@ 
     private function doOAuthCall($method, array $parameters = null)
     {
         // redefine
-        $method = (string)$method;
+        $method = (string) $method;
 
         // 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;
         $options[CURLOPT_RETURNTRANSFER] = true;
-        $options[CURLOPT_TIMEOUT]        = (int)$this->getTimeOut();
+        $options[CURLOPT_TIMEOUT]        = (int) $this->getTimeOut();
         $options[CURLOPT_SSL_VERIFYPEER] = false;
         $options[CURLOPT_SSL_VERIFYHOST] = false;
         $options[CURLOPT_HTTPHEADER]     = array('Expect:');
@@ -336,18 +336,18 @@ 
         $allowedMethods = array('GET', 'POST');
 
         // redefine
-        $url          = (string)$url;
-        $parameters   = (array)$parameters;
-        $authenticate = (bool)$authenticate;
-        $method       = (string)$method;
-        $expectJSON   = (bool)$expectJSON;
+        $url          = (string) $url;
+        $parameters   = (array) $parameters;
+        $authenticate = (bool) $authenticate;
+        $method       = (string) $method;
+        $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';
@@ -358,12 +358,12 @@ 
         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
@@ -384,14 +384,14 @@ 
                 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;
@@ -402,16 +402,16 @@ 
             $options[CURLOPT_POST] = 1;
         } 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;
         $options[CURLOPT_RETURNTRANSFER] = true;
-        $options[CURLOPT_TIMEOUT]        = (int)$this->getTimeOut();
+        $options[CURLOPT_TIMEOUT]        = (int) $this->getTimeOut();
         $options[CURLOPT_SSL_VERIFYPEER] = false;
         $options[CURLOPT_SSL_VERIFYHOST] = false;
         $options[CURLOPT_HTTP_VERSION]   = CURL_HTTP_VERSION_1_1;
@@ -562,7 +562,7 @@ 
      */
     public function getTimeOut()
     {
-        return (int)$this->timeOut;
+        return (int) $this->timeOut;
     }
 
     /**
@@ -573,7 +573,7 @@ 
      */
     public function getUserAgent()
     {
-        return (string)'PHP Twitter/' . self::VERSION . ' ' . $this->userAgent;
+        return (string) 'PHP Twitter/'.self::VERSION.' '.$this->userAgent;
     }
 
     /**
@@ -584,7 +584,7 @@ 
      */
     private function setConsumerKey($key)
     {
-        $this->consumerKey = (string)$key;
+        $this->consumerKey = (string) $key;
     }
 
     /**
@@ -595,7 +595,7 @@ 
      */
     private function setConsumerSecret($secret)
     {
-        $this->consumerSecret = (string)$secret;
+        $this->consumerSecret = (string) $secret;
     }
 
     /**
@@ -606,7 +606,7 @@ 
      */
     public function setOAuthToken($token)
     {
-        $this->oAuthToken = (string)$token;
+        $this->oAuthToken = (string) $token;
     }
 
     /**
@@ -617,7 +617,7 @@ 
      */
     public function setOAuthTokenSecret($secret)
     {
-        $this->oAuthTokenSecret = (string)$secret;
+        $this->oAuthTokenSecret = (string) $secret;
     }
 
     /**
@@ -628,7 +628,7 @@ 
      */
     public function setTimeOut($seconds)
     {
-        $this->timeOut = (int)$seconds;
+        $this->timeOut = (int) $seconds;
     }
 
     /**
@@ -640,7 +640,7 @@ 
      */
     public function setUserAgent($userAgent)
     {
-        $this->userAgent = (string)$userAgent;
+        $this->userAgent = (string) $userAgent;
     }
 
     /**
@@ -685,14 +685,14 @@ 
     public function statusesPublicTimeline($skipUser = false)
     {
         // redefine
-        $skipUser = (bool)$skipUser;
+        $skipUser = (bool) $skipUser;
 
         // build parameters
         $parameters = array();
         if ($skipUser) $parameters['skip_user'] = 'true';
 
         // make the call
-        return (array)$this->doCall('statuses/public_timeline.json', $parameters);
+        return (array) $this->doCall('statuses/public_timeline.json', $parameters);
     }
 
     /**
@@ -708,18 +708,18 @@ 
     public function statusesHomeTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $skipUser = false)
     {
         // redefine
-        $skipUser = (bool)$skipUser;
+        $skipUser = (bool) $skipUser;
 
         // 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;
         if ($skipUser) $parameters['skip_user'] = 'true';
 
         // make the call
-        return (array)$this->doCall('statuses/home_timeline.json', $parameters, true);
+        return (array) $this->doCall('statuses/home_timeline.json', $parameters, true);
     }
 
     /**
@@ -739,18 +739,18 @@ 
     public function statusesFriendsTimeline($sinceId = null, $maxId = null, $count = null, $page = null, $skipUser = false)
     {
         // redefine
-        $skipUser = (bool)$skipUser;
+        $skipUser = (bool) $skipUser;
 
         // 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;
         if ($skipUser) $parameters['skip_user'] = 'true';
 
         // make the call
-        return (array)$this->doCall('statuses/friends_timeline.json', $parameters, true);
+        return (array) $this->doCall('statuses/friends_timeline.json', $parameters, true);
     }
 
     /**
@@ -773,21 +773,21 @@ 
     public function statusesUserTimeline($id = null, $userId = null, $screenName = null, $sinceId = null, $maxId = null, $count = null, $page = null, $skipUser = false)
     {
         // redefine
-        $skipUser = (bool)$skipUser;
+        $skipUser = (bool) $skipUser;
 
         // 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 ($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);
+        return (array) $this->doCall('statuses/user_timeline.json', $parameters, true);
     }
 
     /**
@@ -812,13 +812,13 @@ 
 
         // 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);
+        return (array) $this->doCall('statuses/mentions.json', $parameters);
     }
 
     /**
@@ -843,13 +843,13 @@ 
 
         // 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);
+        return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters);
     }
 
     /**
@@ -874,13 +874,13 @@ 
 
         // 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);
+        return (array) $this->doCall('statuses/retweeted_by_me.json', $parameters);
     }
 
 
@@ -907,13 +907,13 @@ 
 
         // 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);
+        return (array) $this->doCall('statuses/retweets_of_me.json', $parameters);
     }
 
     /**
@@ -925,10 +925,10 @@ 
     public function statusesShow($id)
     {
         // build parameters
-        $parameters['id'] = (string)$id;
+        $parameters['id'] = (string) $id;
 
         // make the call
-        return (array)$this->doCall('statuses/show.json', $parameters);
+        return (array) $this->doCall('statuses/show.json', $parameters);
     }
 
     /**
@@ -945,15 +945,15 @@ 
     public function statusesUpdate($status, $inReplyToStatusId = null, $lat = null, $long = null, $placeId = null, $displayCoordinates = false)
     {
         // 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;
+        $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';
 
         // make the call
-        return (array)$this->doCall('statuses/update.json', $parameters, true, 'POST');
+        return (array) $this->doCall('statuses/update.json', $parameters, true, 'POST');
     }
 
     /**
@@ -966,10 +966,10 @@ 
     public function statusesDestroy($id)
     {
         // build parameters
-        $parameters['id'] = (string)$id;
+        $parameters['id'] = (string) $id;
 
         // make the call
-        return (array)$this->doCall('statuses/destroy.json', $parameters, true, 'POST');
+        return (array) $this->doCall('statuses/destroy.json', $parameters, true, 'POST');
     }
 
     /**
@@ -981,7 +981,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');
     }
 
     /**
@@ -1000,10 +1000,10 @@ 
 
         // 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);
     }
 
     /**
@@ -1025,11 +1025,11 @@ 
 
         // 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);
     }
 
     /**
@@ -1051,11 +1051,11 @@ 
 
         // 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);
     }
 
 
@@ -1080,12 +1080,12 @@ 
         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);
+        return (array) $this->doCall('users/show.json', $parameters);
     }
 
     /**
@@ -1103,8 +1103,8 @@ 
     public function usersLookup($userIds = null, $screenNames = null)
     {
         // redefine
-        $userIds     = (array)$userIds;
-        $screenNames = (array)$screenNames;
+        $userIds     = (array) $userIds;
+        $screenNames = (array) $screenNames;
 
         // validate
         if (empty($userIds) && empty($screenNames)) throw new TwitterException('Specify an userId or a screenName.');
@@ -1114,7 +1114,7 @@ 
         if (!empty($screenNames)) $parameters['screen_name'] = implode(',', $screenNames);
 
         // make the call
-        return (array)$this->doCall('users/lookup.json', $parameters, true);
+        return (array) $this->doCall('users/lookup.json', $parameters, true);
 
     }
 
@@ -1130,12 +1130,12 @@ 
     public function usersSearch($q, $perPage = null, $page = null)
     {
         // build parameters
-        $parameters['q'] = (string)$q;
-        if ($perPage != null) $parameters['per_page'] = (int)$perPage;
-        if ($page != null) $parameters['page'] = (int)$page;
+        $parameters['q'] = (string) $q;
+        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);
+        return (array) $this->doCall('users/search.json', $parameters, true);
 
     }
 
@@ -1146,7 +1146,7 @@ 
      */
     public function usersSuggestions()
     {
-        return (array)$this->doCall('users/suggestions.json', null, true);
+        return (array) $this->doCall('users/suggestions.json', null, true);
     }
 
     /**
@@ -1158,7 +1158,7 @@ 
      */
     public function usersSuggestionsSlug($slug)
     {
-        return (array)$this->doCall('users/suggestions/' . (string)$slug . '.json');
+        return (array) $this->doCall('users/suggestions/'.(string) $slug.'.json');
     }
 
     /**
@@ -1179,13 +1179,13 @@ 
     {
         // 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);
+        return (array) $this->doCall('statuses/friends.json', $parameters);
     }
 
     /**
@@ -1202,13 +1202,13 @@ 
     {
         // 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);
+        return (array) $this->doCall('statuses/followers.json', $parameters);
     }
 
 
@@ -1221,7 +1221,7 @@ 
      */
     public function trends()
     {
-        return (array)$this->doCall('trends.json');
+        return (array) $this->doCall('trends.json');
     }
 
     /**
@@ -1235,10 +1235,10 @@ 
     {
         // 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);
+        return (array) $this->doCall('trends/current.json', $parameters);
     }
 
     /**
@@ -1252,11 +1252,11 @@ 
     {
         // 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);
+        return (array) $this->doCall('trends/daily.json', $parameters);
     }
 
     /**
@@ -1270,11 +1270,11 @@ 
     {
         // 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);
+        return (array) $this->doCall('trends/weekly.json', $parameters);
     }
 
 
@@ -1298,15 +1298,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;
+        $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.json', $parameters, true, 'POST');
+        return (array) $this->doCall((string) $user.'/lists.json', $parameters, true, 'POST');
     }
 
     /**
@@ -1319,10 +1319,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);
     }
 
     /**
@@ -1335,7 +1335,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);
     }
 
     /**
@@ -1359,15 +1359,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');
     }
 
     /**
@@ -1394,13 +1394,13 @@ 
 
         // 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);
     }
 
     /**
@@ -1413,10 +1413,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);
     }
 
     /**
@@ -1429,10 +1429,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);
     }
 
 
@@ -1448,10 +1448,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);
     }
 
     /**
@@ -1465,10 +1465,10 @@ 
     public function userListMembersCreate($user, $id, $userId)
     {
         // build parameters
-        $parameters['id'] = (string)$userId;
+        $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');
     }
 
     /**
@@ -1482,11 +1482,11 @@ 
     public function userListMembersDelete($user, $id, $userId)
     {
         // build parameters
-        $parameters['id']      = (string)$userId;
+        $parameters['id']      = (string) $userId;
         $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');
     }
 
     /**
@@ -1503,7 +1503,7 @@ 
     {
         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) {
             if ($e->getMessage() === 'The specified user is not a member of this list') {
@@ -1525,10 +1525,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);
     }
 
     /**
@@ -1541,7 +1541,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');
     }
 
     /**
@@ -1557,7 +1557,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');
     }
 
     /**
@@ -1574,7 +1574,7 @@ 
     {
         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) {
             if ($e->getMessage() === 'The specified user is not a subscriber of this list') {
@@ -1608,13 +1608,13 @@ 
 
         // 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);
+        return (array) $this->doCall('direct_messages.json', $parameters, true);
     }
 
     /**
@@ -1639,13 +1639,13 @@ 
 
         // 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);
+        return (array) $this->doCall('direct_messages/sent.json', $parameters, true);
     }
 
     /**
@@ -1669,13 +1669,13 @@ 
         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;
+        $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;
 
         // make the call
-        return (array)$this->doCall('direct_messages/new.json', $parameters, true, 'POST');
+        return (array) $this->doCall('direct_messages/new.json', $parameters, true, 'POST');
     }
 
     /**
@@ -1687,10 +1687,10 @@ 
     public function directMessagesDestroy($id)
     {
         // build parameters
-        $parameters['id'] = (string)$id;
+        $parameters['id'] = (string) $id;
 
         // make the call
-        return (array)$this->doCall('direct_messages/destroy.json', $parameters, true, 'POST');
+        return (array) $this->doCall('direct_messages/destroy.json', $parameters, true, 'POST');
     }
 
 
@@ -1718,13 +1718,13 @@ 
         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
-        return (array)$this->doCall('friendships/create.json', $parameters, true, 'POST');
+        return (array) $this->doCall('friendships/create.json', $parameters, true, 'POST');
     }
 
     /**
@@ -1747,12 +1747,12 @@ 
         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');
+        return (array) $this->doCall('friendships/destroy.json', $parameters, true, 'POST');
     }
 
     /**
@@ -1765,11 +1765,11 @@ 
     public function friendshipsExists($userA, $userB)
     {
         // build parameters
-        $parameters['user_a'] = (string)$userA;
-        $parameters['user_b'] = (string)$userB;
+        $parameters['user_a'] = (string) $userA;
+        $parameters['user_b'] = (string) $userB;
 
         // make the call
-        return (bool)$this->doCall('friendships/exists.json', $parameters);
+        return (bool) $this->doCall('friendships/exists.json', $parameters);
     }
 
     /**
@@ -1794,13 +1794,13 @@ 
         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);
+        return (array) $this->doCall('friendships/show.json', $parameters);
     }
 
     /**
@@ -1812,10 +1812,10 @@ 
     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);
+        return (array) $this->doCall('friendships/incoming.json', $parameters, true);
     }
 
     /**
@@ -1827,10 +1827,10 @@ 
     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);
+        return (array) $this->doCall('friendships/outgoing.json', $parameters, true);
     }
 
 
@@ -1856,13 +1856,13 @@ 
         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);
+        return (array) $this->doCall('friends/ids.json', $parameters);
     }
 
     /**
@@ -1886,13 +1886,13 @@ 
         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);
+        return (array) $this->doCall('followers/ids.json', $parameters);
     }
 
 
@@ -1905,7 +1905,7 @@ 
     public function accountVerifyCredentials()
     {
         // make the call
-        return (array)$this->doCall('account/verify_credentials.json', null, true);
+        return (array) $this->doCall('account/verify_credentials.json', null, true);
     }
 
     /**
@@ -1915,7 +1915,7 @@ 
     public function accountRateLimitStatus()
     {
         // make the call
-        return (array)$this->doCall('account/rate_limit_status.json', null);
+        return (array) $this->doCall('account/rate_limit_status.json', null);
     }
 
     /**
@@ -1945,10 +1945,10 @@ 
     public function accountUpdateDeliveryDevices($device)
     {
         // build parameters
-        $parameters['device'] = (string)$device;
+        $parameters['device'] = (string) $device;
 
         // make the call
-        return (array)$this->doCall('account/update_delivery_device.json', $parameters, true, 'POST');
+        return (array) $this->doCall('account/update_delivery_device.json', $parameters, true, 'POST');
     }
 
     /**
@@ -1977,14 +1977,14 @@ 
         ) 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');
+        return (array) $this->doCall('account/update_profile_colors.json', $parameters, true, 'POST');
     }
 
     /**
@@ -2000,10 +2000,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.');
 
         // make the call
-        return (array)$this->doCall('account/update_profile_image.json', null, true, 'POST', $image);
+        return (array) $this->doCall('account/update_profile_image.json', null, true, 'POST', $image);
     }
 
     /**
@@ -2020,13 +2020,13 @@ 
         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';
 
         // make the call
-        return (array)$this->doCall('account/update_profile_background_image.json', $parameters, true, 'POST', $image);
+        return (array) $this->doCall('account/update_profile_background_image.json', $parameters, true, 'POST', $image);
     }
 
     /**
@@ -2042,13 +2042,13 @@ 
     {
         // 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');
+        return (array) $this->doCall('account/update_profile.json', $parameters, true, 'POST');
     }
 
 
@@ -2064,11 +2064,11 @@ 
     {
         // 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);
+        return (array) $this->doCall('favorites.json', $parameters, true);
     }
 
     /**
@@ -2080,7 +2080,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');
     }
 
     /**
@@ -2092,7 +2092,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');
     }
 
 
@@ -2116,12 +2116,12 @@ 
         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');
+        return (array) $this->doCall('notifications/follow.json', $parameters, true, 'POST');
     }
 
     /**
@@ -2143,12 +2143,12 @@ 
         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');
+        return (array) $this->doCall('notifications/leave.json', $parameters, true, 'POST');
     }
 
 
@@ -2172,12 +2172,12 @@ 
         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');
+        return (array) $this->doCall('blocks/create.json', $parameters, true, 'POST');
     }
 
     /**
@@ -2199,12 +2199,12 @@ 
         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');
+        return (array) $this->doCall('blocks/destroy.json', $parameters, true, 'POST');
     }
 
     /**
@@ -2226,13 +2226,13 @@ 
         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 {
             // make the call
-            return (array)$this->doCall('blocks/exists.json', $parameters, true);
+            return (array) $this->doCall('blocks/exists.json', $parameters, true);
         } // catch exceptions
         catch (TwitterException $e) {
             if ($e->getMessage() === 'You are not blocking this user.') {
@@ -2251,10 +2251,10 @@ 
     {
         // 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);
+        return (array) $this->doCall('blocks/blocking.json', $parameters, true);
     }
 
     /**
@@ -2265,7 +2265,7 @@ 
     public function blocksBlockingIds()
     {
         // make the call
-        return (array)$this->doCall('blocks/blocking/ids.json', null, true);
+        return (array) $this->doCall('blocks/blocking/ids.json', null, true);
     }
 
 
@@ -2289,12 +2289,12 @@ 
         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');
+        return (array) $this->doCall('report_spam.json', $parameters, true, 'POST');
     }
 
 
@@ -2307,7 +2307,7 @@ 
     public function savedSearches()
     {
         // make the call
-        return (array)$this->doCall('saved_searches.json', null, true);
+        return (array) $this->doCall('saved_searches.json', null, true);
     }
 
     /**
@@ -2319,10 +2319,10 @@ 
     public function savedSearchesShow($id)
     {
         // build parameters
-        $parameters['id'] = (string)$id;
+        $parameters['id'] = (string) $id;
 
         // make the call
-        return (array)$this->doCall('saved_searches/show.json', $parameters, true);
+        return (array) $this->doCall('saved_searches/show.json', $parameters, true);
     }
 
     /**
@@ -2334,10 +2334,10 @@ 
     public function savedSearchesCreate($query)
     {
         // build parameters
-        $parameters['query'] = (string)$query;
+        $parameters['query'] = (string) $query;
 
         // make the call
-        return (array)$this->doCall('saved_searches/create.json', $parameters, true, 'POST');
+        return (array) $this->doCall('saved_searches/create.json', $parameters, true, 'POST');
     }
 
     /**
@@ -2349,7 +2349,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');
     }
 
 
@@ -2369,7 +2369,7 @@ 
         $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);
@@ -2397,8 +2397,8 @@ 
     {
         // init var
         $parameters                   = array();
-        $parameters['oauth_token']    = (string)$token;
-        $parameters['oauth_verifier'] = (string)$verifier;
+        $parameters['oauth_token']    = (string) $token;
+        $parameters['oauth_verifier'] = (string) $verifier;
 
         // make the call
         $response = $this->doOAuthCall('access_token', $parameters);
@@ -2418,7 +2418,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);
     }
 
     /**
@@ -2448,11 +2448,11 @@ 
     {
         // 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);
+        return (array) $this->doCall('trends/available.json', $parameters);
     }
 
     /**
@@ -2467,7 +2467,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');
     }
 
 
@@ -2488,14 +2488,14 @@ 
     public function geoReverseGeoCode($lat, $long, $accuracy = null, $granularity = null, $maxResults = null)
     {
         // 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;
+        $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;
 
         // make the call
-        return (array)$this->doCall('geo/reverse_geocode.json', $parameters);
+        return (array) $this->doCall('geo/reverse_geocode.json', $parameters);
     }
 
     /**
@@ -2509,10 +2509,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 +611 added lines, -204 removed lines

@@ -125,7 +125,9 @@ 
      */
     public function __destruct()
     {
-        if ($this->curl != null) curl_close($this->curl);
+        if ($this->curl != null) {
+        	curl_close($this->curl);
+        }
     }
 
     /**
@@ -137,7 +139,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));
@@ -154,11 +158,15 @@ 
         // loop parameters
         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);
@@ -195,7 +203,9 @@ 
         // loop parameters
         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
@@ -233,7 +243,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'] . '", ';
@@ -288,7 +300,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);
@@ -302,7 +316,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();
@@ -343,7 +359,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();
@@ -355,7 +373,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);
@@ -380,8 +400,11 @@ 
                 $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';
+                } elseif ($fileInfo['extension'] === 'gif') {
+                	$mimeType = 'image/gif';
+                } elseif ($fileInfo['extension'] === 'png') {
+                	$mimeType = 'image/png';
+                }
 
                 // init var
                 $content = '--' . $boundary . "\r\n";
@@ -396,13 +419,17 @@ 
                 // set content
                 $options[CURLOPT_POSTFIELDS] = $content;
             } // no file
-            else $options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
+            else {
+            	$options[CURLOPT_POSTFIELDS] = $this->buildQuery($parameters);
+            }
 
             // enable post
             $options[CURLOPT_POST] = 1;
         } else {
             // add the parameters into the querystring
-            if (!empty($parameters)) $url .= '?' . $this->buildQuery($parameters);
+            if (!empty($parameters)) {
+            	$url .= '?' . $this->buildQuery($parameters);
+            }
         }
 
         // set options
@@ -418,7 +445,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);
@@ -432,7 +461,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);
@@ -487,7 +518,9 @@ 
             // throw exception
             if (isset($json['errors'][0]['message'])) {
                 throw new TwitterException($json['errors'][0]['message']);
-            } else throw new TwitterException('Invalid response.');
+            } else {
+            	throw new TwitterException('Invalid response.');
+            }
         }
 
         // any error
@@ -689,7 +722,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);
@@ -712,11 +747,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);
@@ -743,11 +788,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);
@@ -777,14 +832,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);
@@ -808,14 +879,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);
@@ -839,14 +920,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);
@@ -870,14 +961,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);
@@ -903,14 +1004,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);
@@ -946,11 +1057,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');
@@ -996,11 +1117,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);
@@ -1021,12 +1146,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);
@@ -1047,12 +1178,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);
@@ -1077,12 +1214,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);
@@ -1107,11 +1252,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);
@@ -1131,8 +1282,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);
@@ -1179,10 +1334,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);
@@ -1202,10 +1365,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);
@@ -1235,7 +1406,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);
@@ -1252,8 +1425,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);
@@ -1270,8 +1447,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);
@@ -1298,12 +1479,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');
@@ -1319,7 +1506,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);
@@ -1359,12 +1548,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');
@@ -1390,14 +1587,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);
@@ -1413,7 +1620,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);
@@ -1429,7 +1638,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);
@@ -1448,7 +1659,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);
@@ -1508,7 +1721,9 @@ 
         catch (TwitterException $e) {
             if ($e->getMessage() === 'The specified user is not a member of this list') {
                 return false;
-            } else throw $e;
+            } else {
+            	throw $e;
+            }
         }
     }
 
@@ -1525,7 +1740,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);
@@ -1579,7 +1796,9 @@ 
         catch (TwitterException $e) {
             if ($e->getMessage() === 'The specified user is not a subscriber of this list') {
                 return false;
-            } else throw $e;
+            } else {
+            	throw $e;
+            }
         }
 
     }
@@ -1604,14 +1823,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);
@@ -1635,14 +1864,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);
@@ -1666,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');
@@ -1715,12 +1962,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
@@ -1744,12 +1999,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');
@@ -1790,14 +2053,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);
@@ -1812,7 +2087,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);
@@ -1827,7 +2104,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);
@@ -1853,13 +2132,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);
@@ -1883,13 +2172,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);
@@ -1932,7 +2231,9 @@ 
         catch (TwitterException $e) {
             if ($e->getMessage() === 'Logged out.') {
                 return true;
-            } else throw $e;
+            } else {
+            	throw $e;
+            }
         }
     }
 
@@ -1974,14 +2275,26 @@ 
         // validate
         if ($profileBackgroundColor == '' && $profileTextColor == '' && $profileLinkColor == '' && $profileSidebarFillColor == ''
             && $profileSidebarBorderColor == ''
-        ) throw new TwitterException('Specify a profileBackgroundColor, profileTextColor, profileLinkColor, profileSidebarFillColor or a 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');
@@ -2000,7 +2313,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);
@@ -2020,10 +2335,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);
@@ -2042,10 +2361,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');
@@ -2064,8 +2391,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);
@@ -2113,12 +2444,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');
@@ -2140,12 +2479,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');
@@ -2169,12 +2516,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');
@@ -2196,12 +2551,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');
@@ -2223,12 +2586,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 {
             // make the call
@@ -2237,7 +2608,9 @@ 
         catch (TwitterException $e) {
             if ($e->getMessage() === 'You are not blocking this user.') {
                 return false;
-            } else throw $e;
+            } else {
+            	throw $e;
+            }
         }
     }
 
@@ -2251,7 +2624,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);
@@ -2286,12 +2661,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');
@@ -2369,17 +2752,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;
@@ -2404,8 +2795,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;
@@ -2448,8 +2843,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);
@@ -2490,9 +2889,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);
@@ -2509,7 +2914,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);