mambax7 / references

plugins/actions/twitter/Twitter.class.php

Braces +7 added lines, -4 removed lines

@@ -41,12 +41,13 @@ 
 		if ($bytes === false) {
 			$this->error = "Socket error: Error sending data.";
 			return false;
-		}
-		elseif ($bytes < strlen($to_send)) {
+		} elseif ($bytes < strlen($to_send)) {
 			$this->error = "Socket error: Could not send all data.";
 			return false;
 		}
-		if ($this->debug) echo "Sent:\n{$to_send}\n\n";
+		if ($this->debug) {
+			echo "Sent:\n{$to_send}\n\n";
+		}
 		$response = '';
 		while (!feof($fp)) {
 			$buf = fread($fp, 1024);
@@ -56,7 +57,9 @@ 
 			}
 			$response .= $buf;
 		}
-		if ($this->debug) echo "Received:\n{$response}";
+		if ($this->debug) {
+			echo "Received:\n{$response}";
+		}
 		$was_error = preg_match(
 			"#" .
 			preg_quote("<error>") .

plugins/actions/twitter/twitter.php

Braces +627 added lines, -215 removed lines

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