mmainstreet / jodel-web

php/DatabaseConnect.php

Indentation +1 added lines, -1 removed lines

@@ -40,6 +40,6 @@
 			 ) DEFAULT CHARSET=utf8";
   if(!$db->query($query))
   {
-    throw new Exception($db->error($mysqli));
+	throw new Exception($db->error($mysqli));
   }
 

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 
 }
 $db = new DatabaseConnect();
-if ($db->connect_errno) {
+if ($db->connect_errno)
+{
   echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
         Server ist hops gegangen. Wegen '.$db -> connect_error;
 }

php/Requests/GetKarma.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 
 class GetKarma extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/users/karma';
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		return '/v2/users/karma';
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }
 

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class GetKarma extends AbstractRequest {
+class GetKarma extends AbstractRequest
+{
 		
     function getApiEndPoint()
     {

php/Requests/GetPostDetails.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 
 class GetPostDetails extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $_GET['postID'];
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $_GET['postID'];
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }
 

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class GetPostDetails extends AbstractRequest {
+class GetPostDetails extends AbstractRequest
+{
 		
     function getApiEndPoint()
     {

php/Requests/SetLocation.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class SetLocation extends AbstractRequest {
+class SetLocation extends AbstractRequest
+{
 		 /**
      * @var Location
      */

Indentation +30 added lines, -30 removed lines

@@ -3,37 +3,37 @@
 
 class UpdateLocation extends AbstractRequest {
 		 /**
-     * @var Location
-     */
-    public $location;
-    /**
-     * @return Location
-     */
-    public function getLocation()
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation($location)
-    {
-        $this->location = $location;
-    }
+		  * @var Location
+		  */
+	public $location;
+	/**
+	 * @return Location
+	 */
+	public function getLocation()
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation($location)
+	{
+		$this->location = $location;
+	}
 		
-    function getApiEndPoint()
-    {
-        return '/v2/users/location';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/users/location';
+	}
+	function getPayload()
+	{
+		return array(
 					"location" => $this->getLocation()->toArray(),
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

php/Requests/CreateUser.php

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
 
-class CreateUser extends AbstractRequest {
+class CreateUser extends AbstractRequest
+{
     /**
      * @var Location
      */
@@ -25,7 +26,7 @@ 
 		return $this->deviceUid;
 	}
 	public function setDeviceUid($deviceUid)
-    {
+	{
 			$this->deviceUid = $deviceUid;
 	}
     public function generateDeviceUid()
@@ -36,7 +37,8 @@ 
     {
         $str = '';
         $max = mb_strlen($keyspace, '8bit') - 1;
-        for ($i = 0; $i < $length; ++$i) {
+        for ($i = 0; $i < $length; ++$i)
+        {
             $str .= $keyspace[random_int(0, $max)];
         }
         return $str;

Indentation +46 added lines, -46 removed lines

@@ -1,53 +1,53 @@ 
 <?php
 
 class CreateUser extends AbstractRequest {
-    /**
-     * @var Location
-     */
-    private $location;
-    private $deviceUid;
-    /**
-     * @return Location
-     */
-    private function getLocation()
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation(Location $location)
-    {
-        $this->location = $location;
-    }
-    private function getDeviceUid()
-    {
+	/**
+	 * @var Location
+	 */
+	private $location;
+	private $deviceUid;
+	/**
+	 * @return Location
+	 */
+	private function getLocation()
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation(Location $location)
+	{
+		$this->location = $location;
+	}
+	private function getDeviceUid()
+	{
 		return $this->deviceUid;
 	}
 	public function setDeviceUid($deviceUid)
-    {
+	{
 			$this->deviceUid = $deviceUid;
 	}
-    private function generateDeviceUid()
-    {
-        return $this->random_str(64, 'abcdef0123456789');
-    }
+	private function generateDeviceUid()
+	{
+		return $this->random_str(64, 'abcdef0123456789');
+	}
     
-    private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
-    {
-        $str = '';
-        $max = mb_strlen($keyspace, '8bit') - 1;
-        for ($i = 0; $i < $length; ++$i) {
-            $str .= $keyspace[random_int(0, $max)];
-        }
-        return $str;
-    }
-    public function getApiEndPoint()
-    {
-        return '/v2/users';
-    }
-    public function getPayload()
-    {
+	private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+	{
+		$str = '';
+		$max = mb_strlen($keyspace, '8bit') - 1;
+		for ($i = 0; $i < $length; ++$i) {
+			$str .= $keyspace[random_int(0, $max)];
+		}
+		return $str;
+	}
+	public function getApiEndPoint()
+	{
+		return '/v2/users';
+	}
+	public function getPayload()
+	{
 			if(!isset($this->deviceUid))
 			{
 				$this->setDeviceUid($this->generateDeviceUid());
@@ -58,9 +58,9 @@ 
 					"client_id" => self::CLIENTID,
 					"device_uid" => $this->getDeviceUid(),
 			);
-    }
-    public function getMethod()
-    {
-        return 'POST';
-    }
+	}
+	public function getMethod()
+	{
+		return 'POST';
+	}
 }

php/Requests/GetPosts.php

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
     {
         $apiEndPoint = $this->getUrl();
         //echo $GLOBALS['lastPostId'];
-        if ($this->getLastPostId() != "") {
+        if ($this->getLastPostId() != "")
+        {
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
 		}
         return $apiEndPoint;

Indentation +44 added lines, -44 removed lines

@@ -4,25 +4,25 @@ 
 {
 	public $lastPostId;
 
-    /**
-     * @var Location
-     */
-    public $location;
-    public $url;
+	/**
+	 * @var Location
+	 */
+	public $location;
+	public $url;
 
         
-    function setUrl ($url)
-    {
-            $this->url = $url;
-    }
+	function setUrl ($url)
+	{
+			$this->url = $url;
+	}
     
-    function getUrl ()
-    {
-        return $this->url;
-    }
+	function getUrl ()
+	{
+		return $this->url;
+	}
 		
-    function setLastPostId ($lastPostId)
-    {
+	function setLastPostId ($lastPostId)
+	{
 			$this->lastPostId = $lastPostId;
 	}
 	
@@ -31,38 +31,38 @@ 
 		return $this->lastPostId;
 	}
     
-    function getApiEndPoint()
-    {
-        $apiEndPoint = $this->getUrl();
+	function getApiEndPoint()
+	{
+		$apiEndPoint = $this->getUrl();
 
-        if ($this->getLastPostId() != "") {
+		if ($this->getLastPostId() != "") {
 			$apiEndPoint = $this->getUrl() . '?after=' . $this->getLastPostId();
 		}
-        return $apiEndPoint;
-    }
-    function getPayload()
-    {
-        if($this->version == 'v3')
-        {
-            $this->location = new Location();
-            $this->location->setLat(52.520006);
-            $this->location->setLng(13.404954);
-            $this->location->setCityName('Berlin');
+		return $apiEndPoint;
+	}
+	function getPayload()
+	{
+		if($this->version == 'v3')
+		{
+			$this->location = new Location();
+			$this->location->setLat(52.520006);
+			$this->location->setLng(13.404954);
+			$this->location->setCityName('Berlin');
 
 
-            return array(
-                "location" => $this->location->toArray(),
-                "stickies" => 'false',
-            );
-        }
-        else
-        {
-            return array(
-            );
-        }
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+			return array(
+				"location" => $this->location->toArray(),
+				"stickies" => 'false',
+			);
+		}
+		else
+		{
+			return array(
+			);
+		}
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }

php/Requests/Upvote.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class Upvote extends AbstractRequest {
+class Upvote extends AbstractRequest
+{
 		
     function getApiEndPoint()
     {

Indentation +14 added lines, -14 removed lines

@@ -1,21 +1,21 @@
 <?php
 class Upvote extends AbstractRequest {
 		
-    public $postId;
+	public $postId;
 
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $this->postId . '/upvote';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $this->postId . '/upvote';
+	}
+	function getPayload()
+	{
+		return array(
 					"reason_code" => -1,
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

php/Requests/AbstractRequest.php

Braces +13 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 abstract class AbstractRequest
-{	
+{
     CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
     CONST APIURL = 'https://api.go-tellm.com/api';
     const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
@@ -19,7 +19,8 @@ 
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = "";
-		if(isset($this->payLoad["device_uid"])) {
+		if(isset($this->payLoad["device_uid"]))
+		{
 			$device_uid = $this->payLoad["device_uid"];
 		}
 				
@@ -28,7 +29,8 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if ($this->getAccessToken())
+        {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -39,7 +41,8 @@ 
         */
         
 
-        switch ($this->getMethod()) {
+        switch ($this->getMethod())
+        {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -50,7 +53,8 @@ 
                 $result = Requests::put($url, $header, $this->payLoad);
                 break;
         }
-        switch ($result->status_code) {
+        switch ($result->status_code)
+        {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -90,10 +94,12 @@ 
     public function getSignHeaders()
     {
 			$payload_accessToken;
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == null)
+			{
 				$payload_accessToken = "";
 			}
-			else {
+			else
+			{
 				$payload_accessToken = $this->getAccessToken();
 			}
 			

Indentation +123 added lines, -123 removed lines

@@ -2,19 +2,19 @@ 
 
 abstract class AbstractRequest
 {	
-    const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    const APIURL = 'https://api.go-tellm.com/api';
-    const SECRET = 'plerFToqEdWlzShdZlTywaCHRuzlKIMsNmOJVDGE';
-    const USERAGENT = 'Jodel/4.31.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
-    const CLIENT_TYPE = 'android_4.31.1';
+	const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
+	const APIURL = 'https://api.go-tellm.com/api';
+	const SECRET = 'plerFToqEdWlzShdZlTywaCHRuzlKIMsNmOJVDGE';
+	const USERAGENT = 'Jodel/4.31.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
+	const CLIENT_TYPE = 'android_4.31.1';
     
-    private $accessToken = null;
-    private $payLoad;
-    public $expects = "";
-    public $version = 'v2';
+	private $accessToken = null;
+	private $payLoad;
+	public $expects = "";
+	public $version = 'v2';
 
-    public function execute()
-    {
+	public function execute()
+	{
 		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
@@ -24,90 +24,90 @@ 
 		}
 				
 				
-        $this->payLoad = json_encode($this->payLoad);
-        $header = $this->getSignHeaders();
-        $url = $this->getFullUrl();
+		$this->payLoad = json_encode($this->payLoad);
+		$header = $this->getSignHeaders();
+		$url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
-            $header['Authorization'] = "Bearer " . $this->getAccessToken();
-        }
-        //Comment out to debug the Request:
+		if ($this->getAccessToken()) {
+			$header['Authorization'] = "Bearer " . $this->getAccessToken();
+		}
+		//Comment out to debug the Request:
         
-        /*
+		/*
         var_dump($url);
         var_dump($header);
         var_dump($this->payLoad);
         */
-        /*
+		/*
         $options = array(
             'timeout' => 100,
             'connect_timeout' => 100,
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
-            case 'POST':
-                $result = Requests::post($url, $header, $this->payLoad);
-                break;
-            case 'GET':
-                if($this->version == 'v3')
-                {
-                    $result = Requests::get($url, $header);
-                }
-                else
-                {
-                    $result = Requests::get($url, $header);
-                }
-                break;
-            case 'PUT':
-                $result = Requests::put($url, $header, $this->payLoad);
-                break;
-        }
-        switch ($result->status_code) {
-            case 200:
-                $result = json_decode($result->body, true);
-                break;
-            case 204:
-                $result = "Success";
-                break;
-            case 401:
+		switch ($this->getMethod()) {
+			case 'POST':
+				$result = Requests::post($url, $header, $this->payLoad);
+				break;
+			case 'GET':
+				if($this->version == 'v3')
+				{
+					$result = Requests::get($url, $header);
+				}
+				else
+				{
+					$result = Requests::get($url, $header);
+				}
+				break;
+			case 'PUT':
+				$result = Requests::put($url, $header, $this->payLoad);
+				break;
+		}
+		switch ($result->status_code) {
+			case 200:
+				$result = json_decode($result->body, true);
+				break;
+			case 204:
+				$result = "Success";
+				break;
+			case 401:
 				//throw new \Exception('Unauthorized');
-                break;
-            case 404:
-                //echo "Es wurde bereits gevoted";
+				break;
+			case 404:
+				//echo "Es wurde bereits gevoted";
 			case 477:
-                //echo "Es wurde bereits gevoted";
-                //throw  new \Exception('Signing failed!');
-                break;
-            case 429:
-            	exit("Error 429: Too Many Requests");
-            	break;
-            case 403:
-                exit("Error 403: Access denied");
-                break;
-            default:
-                throw  new \Exception('Unknown Error: '.$result->status_code);
-        }
+				//echo "Es wurde bereits gevoted";
+				//throw  new \Exception('Signing failed!');
+				break;
+			case 429:
+				exit("Error 429: Too Many Requests");
+				break;
+			case 403:
+				exit("Error 403: Access denied");
+				break;
+			default:
+				throw  new \Exception('Unknown Error: '.$result->status_code);
+		}
 
-        if($device_uid != "")
-        {
+		if($device_uid != "")
+		{
 			$result[0] = $result;
 			$result[1] = $device_uid;
 		}
 
         
-        /*var_dump($result);*/
+		/*var_dump($result);*/
         
 
-        return $result;
-    }
-    abstract function getPayload();
-    /**
-     * Gets Sign headers
-     * @return array headers
-     */
-    private function getSignHeaders()
-    {
+		return $result;
+	}
+	abstract function getPayload();
+	/**
+	 * Gets Sign headers
+	 * @return array headers
+	 */
+	private function getSignHeaders()
+	{
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
 			}
@@ -116,54 +116,54 @@ 
 			}
 			
 			
-        $headers = array(
-            "Connection" => "keep-alive",
-            "Accept-Encoding" => "gzip",
-            "Content-Type" => "application/json; charset=UTF-8",
-            "User-Agent" => self::USERAGENT
-        );
-        $timestamp = new DateTime();
-        $timestamp = $timestamp->format(DateTime::ATOM);
-        $timestamp = substr($timestamp, 0, -6);
-        $timestamp .= "Z";
-        $urlParts = parse_url($this->getFullUrl());
-        $url2 = "";
-        $req = [$this->getMethod(),
-            $urlParts['host'],
-            "443",
-            $urlParts['path'],
-            $payload_accessToken,
-            $timestamp,
-            $url2,
-            $this->payLoad];
-        $reqString = implode("%", $req);
-        $secret = self::SECRET;
-        $signature = hash_hmac('sha1', $reqString, $secret);
-        $signature = strtoupper($signature);
-        $headers['X-Authorization'] = 'HMAC ' . $signature;
-        $headers['X-Client-Type'] = self::CLIENT_TYPE;
-        $headers['X-Timestamp'] = $timestamp;
-        $headers['X-Api-Version'] = '0.2';
-        return $headers;
-    }
-    private function getFullUrl()
-    {
-        return self::APIURL . $this->getApiEndPoint();
-    }
-    abstract function getApiEndPoint();
-    abstract function getMethod();
-    /**
-     * @return string
-     */
-    private function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-    /**
-     * @param string $accessToken
-     */
-    public function setAccessToken($accessToken)
-    {
-        $this->accessToken = $accessToken;
-    }
+		$headers = array(
+			"Connection" => "keep-alive",
+			"Accept-Encoding" => "gzip",
+			"Content-Type" => "application/json; charset=UTF-8",
+			"User-Agent" => self::USERAGENT
+		);
+		$timestamp = new DateTime();
+		$timestamp = $timestamp->format(DateTime::ATOM);
+		$timestamp = substr($timestamp, 0, -6);
+		$timestamp .= "Z";
+		$urlParts = parse_url($this->getFullUrl());
+		$url2 = "";
+		$req = [$this->getMethod(),
+			$urlParts['host'],
+			"443",
+			$urlParts['path'],
+			$payload_accessToken,
+			$timestamp,
+			$url2,
+			$this->payLoad];
+		$reqString = implode("%", $req);
+		$secret = self::SECRET;
+		$signature = hash_hmac('sha1', $reqString, $secret);
+		$signature = strtoupper($signature);
+		$headers['X-Authorization'] = 'HMAC ' . $signature;
+		$headers['X-Client-Type'] = self::CLIENT_TYPE;
+		$headers['X-Timestamp'] = $timestamp;
+		$headers['X-Api-Version'] = '0.2';
+		return $headers;
+	}
+	private function getFullUrl()
+	{
+		return self::APIURL . $this->getApiEndPoint();
+	}
+	abstract function getApiEndPoint();
+	abstract function getMethod();
+	/**
+	 * @return string
+	 */
+	private function getAccessToken()
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken($accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
 }

php/Requests/libary/Requests/Cookie/Jar.php

Braces +40 added lines, -20 removed lines

@@ -25,7 +25,8 @@ 
 	 *
 	 * @param array $cookies Existing cookie values
 	 */
-	public function __construct($cookies = array()) {
+	public function __construct($cookies = array())
+	{
 		$this->cookies = $cookies;
 	}
 
@@ -35,8 +36,10 @@ 
 	 * @param string|Requests_Cookie $cookie
 	 * @return Requests_Cookie
 	 */
-	public function normalize_cookie($cookie, $key = null) {
-		if ($cookie instanceof Requests_Cookie) {
+	public function normalize_cookie($cookie, $key = null)
+	{
+		if ($cookie instanceof Requests_Cookie)
+		{
 			return $cookie;
 		}
 
@@ -50,7 +53,8 @@ 
 	 * @deprecated Use {@see Requests_Cookie_Jar::normalize_cookie}
 	 * @return Requests_Cookie
 	 */
-	public function normalizeCookie($cookie, $key = null) {
+	public function normalizeCookie($cookie, $key = null)
+	{
 		return $this->normalize_cookie($cookie, $key);
 	}
 
@@ -60,7 +64,8 @@ 
 	 * @param string $key Item key
 	 * @return boolean Does the item exist?
 	 */
-	public function offsetExists($key) {
+	public function offsetExists($key)
+	{
 		return isset($this->cookies[$key]);
 	}
 
@@ -70,8 +75,10 @@ 
 	 * @param string $key Item key
 	 * @return string Item value
 	 */
-	public function offsetGet($key) {
-		if (!isset($this->cookies[$key])) {
+	public function offsetGet($key)
+	{
+		if (!isset($this->cookies[$key]))
+		{
 			return null;
 		}
 
@@ -86,8 +93,10 @@ 
 	 * @param string $key Item name
 	 * @param string $value Item value
 	 */
-	public function offsetSet($key, $value) {
-		if ($key === null) {
+	public function offsetSet($key, $value)
+	{
+		if ($key === null)
+		{
 			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 
@@ -99,7 +108,8 @@ 
 	 *
 	 * @param string $key
 	 */
-	public function offsetUnset($key) {
+	public function offsetUnset($key)
+	{
 		unset($this->cookies[$key]);
 	}
 
@@ -108,7 +118,8 @@ 
 	 *
 	 * @return ArrayIterator
 	 */
-	public function getIterator() {
+	public function getIterator()
+	{
 		return new ArrayIterator($this->cookies);
 	}
 
@@ -117,7 +128,8 @@ 
 	 *
 	 * @param Requests_Hooker $hooks Hooking system
 	 */
-	public function register(Requests_Hooker $hooks) {
+	public function register(Requests_Hooker $hooks)
+	{
 		$hooks->register('requests.before_request', array($this, 'before_request'));
 		$hooks->register('requests.before_redirect_check', array($this, 'before_redirect_check'));
 	}
@@ -133,22 +145,28 @@ 
 	 * @param string $type
 	 * @param array $options
 	 */
-	public function before_request($url, &$headers, &$data, &$type, &$options) {
-		if (!$url instanceof Requests_IRI) {
+	public function before_request($url, &$headers, &$data, &$type, &$options)
+	{
+		if (!$url instanceof Requests_IRI)
+		{
 			$url = new Requests_IRI($url);
 		}
 
-		if (!empty($this->cookies)) {
+		if (!empty($this->cookies))
+		{
 			$cookies = array();
-			foreach ($this->cookies as $key => $cookie) {
+			foreach ($this->cookies as $key => $cookie)
+			{
 				$cookie = $this->normalize_cookie($cookie, $key);
 
 				// Skip expired cookies
-				if ($cookie->is_expired()) {
+				if ($cookie->is_expired())
+				{
 					continue;
 				}
 
-				if ($cookie->domain_matches($url->host)) {
+				if ($cookie->domain_matches($url->host))
+				{
 					$cookies[] = $cookie->format_for_header();
 				}
 			}
@@ -162,9 +180,11 @@ 
 	 *
 	 * @var Requests_Response $response
 	 */
-	public function before_redirect_check(Requests_Response &$return) {
+	public function before_redirect_check(Requests_Response &$return)
+	{
 		$url = $return->url;
-		if (!$url instanceof Requests_IRI) {
+		if (!$url instanceof Requests_IRI)
+		{
 			$url = new Requests_IRI($url);
 		}