route4me / route4me-php-sdk

src/Route4Me/Territory.php

Indentation +9 added lines, -9 removed lines

@@ -97,19 +97,19 @@
 	
 	public function updateTerritory($params)
 	{
-	    //var_dump($params); die("");
+		//var_dump($params); die("");
 		$response = Route4Me::makeRequst(array(
 			'url'    => Endpoint::TERRITORY_V4,
 			'method' => 'PUT',
 			'query'  => array(
-                'territory_id'  => isset($params->territory_id) ? $params->territory_id : null
-            ),
-            'body'   => array(
-                'territory_name'   => isset($params->territory_name) ? $params->territory_name : null,
-                'member_id'        => isset($params->member_id) ? $params->member_id : null,
-                'territory_color'  => isset($params->territory_color) ? $params->territory_color : null,
-                'territory'        => isset($params->territory) ? $params->territory : null
-            ) 
+				'territory_id'  => isset($params->territory_id) ? $params->territory_id : null
+			),
+			'body'   => array(
+				'territory_name'   => isset($params->territory_name) ? $params->territory_name : null,
+				'member_id'        => isset($params->member_id) ? $params->member_id : null,
+				'territory_color'  => isset($params->territory_color) ? $params->territory_color : null,
+				'territory'        => isset($params->territory) ? $params->territory : null
+			) 
 
 		));
 

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 
 class Territory extends Common
 {
-	public $territory_id;  // Territory id
+	public $territory_id; // Territory id
 	public $territory_name; 
 	public $territory_color;
 	public $addresses;
@@ -29,7 +29,7 @@ 
 		
 		$territoryparameters = new Territory();
         
-		foreach($params as $key => $value) {
+		foreach ($params as $key => $value) {
 			if (property_exists($territoryparameters, $key)) {
 				$territoryparameters->{$key} = $value;
 			}

src/Route4Me/Common.php

Indentation +11 added lines, -11 removed lines

@@ -4,17 +4,17 @@
 
 class Common
 {
-    public static function getValue($array, $item, $default = null)
-    {
-        return (isset($array[$item])) ? $array[$item] : $default;
-    }
+	public static function getValue($array, $item, $default = null)
+	{
+		return (isset($array[$item])) ? $array[$item] : $default;
+	}
 
-    public function toArray()
-    {
-        $params = array_filter(get_object_vars($this), function($item) {
-            return ($item !== null) && !(is_array($item) && !count($item));
-        });
+	public function toArray()
+	{
+		$params = array_filter(get_object_vars($this), function($item) {
+			return ($item !== null) && !(is_array($item) && !count($item));
+		});
 
-        return $params;
-    }
+		return $params;
+	}
 }

src/Route4Me/OptimizationProblemParams.php

Indentation +72 added lines, -72 removed lines

@@ -7,94 +7,94 @@
 
 class OptimizationProblemParams extends Common
 {
-    public $optimization_problem_id;
-    public $reoptimize;
-    public $addresses = array();
-    public $parameters;
-    public $directions;
-    public $format;
-    public $route_path_output;
-    public $optimized_callback_url;
-    public $redirect = true;
+	public $optimization_problem_id;
+	public $reoptimize;
+	public $addresses = array();
+	public $parameters;
+	public $directions;
+	public $format;
+	public $route_path_output;
+	public $optimized_callback_url;
+	public $redirect = true;
 
-    public static function fromArray($params)
-    {
-        $param = new OptimizationProblemParams;
-        if (!isset($params['addresses'])) {
-            throw new BadParam('addresses must be provided.');
-        }
+	public static function fromArray($params)
+	{
+		$param = new OptimizationProblemParams;
+		if (!isset($params['addresses'])) {
+			throw new BadParam('addresses must be provided.');
+		}
 
-        if (!isset($params['parameters'])) {
-            throw new BadParam('parameters must be provided.');
-        }
+		if (!isset($params['parameters'])) {
+			throw new BadParam('parameters must be provided.');
+		}
 
-        if ($params['parameters'] instanceof RouteParameters) {
-            $param->setParameters($params['parameters']);
-        } else {
-            $param->setParameters(RouteParameters::fromArray($params['parameters']));
-        }
+		if ($params['parameters'] instanceof RouteParameters) {
+			$param->setParameters($params['parameters']);
+		} else {
+			$param->setParameters(RouteParameters::fromArray($params['parameters']));
+		}
 
-        foreach($params['addresses'] as $address) {
-            if (!($address instanceof Address)) {
-                $address = Address::fromArray($address);
-            }
+		foreach($params['addresses'] as $address) {
+			if (!($address instanceof Address)) {
+				$address = Address::fromArray($address);
+			}
             
-            $param->addAddress($address);
-        }
+			$param->addAddress($address);
+		}
 
-        $param->directions = self::getValue($params, 'directions');
-        $param->format = self::getValue($params, 'format');
-        $param->route_path_output = self::getValue($params, 'route_path_output');
-        $param->optimized_callback_url = self::getValue($params, 'optimized_callback_url');
-        $param->optimization_problem_id = self::getValue($params, 'optimization_problem_id');
-        $param->reoptimize = self::getValue($params, 'reoptimize');
-        $param->redirect = filter_var(
-            self::getValue($params, 'redirect', true), FILTER_VALIDATE_BOOLEAN);
+		$param->directions = self::getValue($params, 'directions');
+		$param->format = self::getValue($params, 'format');
+		$param->route_path_output = self::getValue($params, 'route_path_output');
+		$param->optimized_callback_url = self::getValue($params, 'optimized_callback_url');
+		$param->optimization_problem_id = self::getValue($params, 'optimization_problem_id');
+		$param->reoptimize = self::getValue($params, 'reoptimize');
+		$param->redirect = filter_var(
+			self::getValue($params, 'redirect', true), FILTER_VALIDATE_BOOLEAN);
 
-        return $param;
-    }
+		return $param;
+	}
 
-    public function __construct()
-    {
-        $this->parameters = new RouteParameters;
-    }
+	public function __construct()
+	{
+		$this->parameters = new RouteParameters;
+	}
 
-    public function setParameters(RouteParameters $params)
-    {
-        $this->parameters = $params;
+	public function setParameters(RouteParameters $params)
+	{
+		$this->parameters = $params;
         
-        return $this;
-    }
+		return $this;
+	}
 
-    public function addAddress(Address $address)
-    {
-        $this->addresses[] = $address;
+	public function addAddress(Address $address)
+	{
+		$this->addresses[] = $address;
         
-        return $this;
-    }
+		return $this;
+	}
     
-    public function getAddressesArray()
-    {
-        $addresses = array();
+	public function getAddressesArray()
+	{
+		$addresses = array();
         
-        foreach($this->addresses as $address) {
-            $addresses[] = $address->toArray();
-        }
+		foreach($this->addresses as $address) {
+			$addresses[] = $address->toArray();
+		}
         
-        return $addresses;
-    }
+		return $addresses;
+	}
 
-    public function getParametersArray()
-    {
-        return $this->parameters->toArray();
-    }
+	public function getParametersArray()
+	{
+		return $this->parameters->toArray();
+	}
 
-    public function setAddresses(array $addresses)
-    {
-        foreach ($addresses as $address) {
-            $this->addAddress($address);
-        }
+	public function setAddresses(array $addresses)
+	{
+		foreach ($addresses as $address) {
+			$this->addAddress($address);
+		}
         
-        return $this;
-    }
+		return $this;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
             $param->setParameters(RouteParameters::fromArray($params['parameters']));
         }
 
-        foreach($params['addresses'] as $address) {
+        foreach ($params['addresses'] as $address) {
             if (!($address instanceof Address)) {
                 $address = Address::fromArray($address);
             }
@@ -77,7 +77,7 @@ 
     {
         $addresses = array();
         
-        foreach($this->addresses as $address) {
+        foreach ($this->addresses as $address) {
             $addresses[] = $address->toArray();
         }
         

src/Route4Me/MyQ.php

Indentation +191 added lines, -191 removed lines

@@ -11,213 +11,213 @@
 class MyQException extends \Exception {}
 
 class MyQ {
-    /** @var string|null $username contains the username used to authenticate with the MyQ API */
-    protected $username = null;
-    /** @var string|null $password contains the password used to authenticate with the MyQ API */
-    protected $password = null;
-    /** @var string|null $appId is the application ID used to register with the MyQ API */
-    protected $appId = 'NWknvuBd7LoFHfXmKNMBcgajXtZEgKUh4V7WNzMidrpUUluDpVYVZx+xT4PCM5Kx';
-    //protected $appId = 'Vj8pQggXLhLy0WHahglCD4N1nAkkXQtGYpq2HrHD7H1nvmbT55KqtN6RSF4ILB%2fi';
-    /** @var string|null $securityToken is the auth token returned after a successful login */
-    protected $securityToken = null;
-    /** @var string|null $userAgent is the User-Agent header value sent with each API request */
-    protected $userAgent = 'Chamberlain/3.4.1';
-    /** @var string|null $culture is the API culture code for the API */
-    protected $culture = 'en';
-    /** @var string|null $contentType is the content type used for all cURL requests */
-    protected $contentType = 'application/json';
-    /** @var array $headers contain HTTP headers for cURL requests */
-    protected $_headers = array();
-    protected $_deviceId = null;
-    protected $_locationName = null;
-    protected $_doorName = null;
-    protected $_loginUrl = 'https://myqexternal.myqdevice.com/api/v4/User/Validate';
-    protected $_getDeviceDetailUrl = 'https://myqexternal.myqdevice.com/api/v4/userdevicedetails/get?&filterOn=true';
-    protected $_putDeviceStateUrl = '/api/v4/DeviceAttribute/PutDeviceAttribute';
-    /** @var resource|null $_conn is the web connection to the MyQ API */
-    protected $_conn = null;
+	/** @var string|null $username contains the username used to authenticate with the MyQ API */
+	protected $username = null;
+	/** @var string|null $password contains the password used to authenticate with the MyQ API */
+	protected $password = null;
+	/** @var string|null $appId is the application ID used to register with the MyQ API */
+	protected $appId = 'NWknvuBd7LoFHfXmKNMBcgajXtZEgKUh4V7WNzMidrpUUluDpVYVZx+xT4PCM5Kx';
+	//protected $appId = 'Vj8pQggXLhLy0WHahglCD4N1nAkkXQtGYpq2HrHD7H1nvmbT55KqtN6RSF4ILB%2fi';
+	/** @var string|null $securityToken is the auth token returned after a successful login */
+	protected $securityToken = null;
+	/** @var string|null $userAgent is the User-Agent header value sent with each API request */
+	protected $userAgent = 'Chamberlain/3.4.1';
+	/** @var string|null $culture is the API culture code for the API */
+	protected $culture = 'en';
+	/** @var string|null $contentType is the content type used for all cURL requests */
+	protected $contentType = 'application/json';
+	/** @var array $headers contain HTTP headers for cURL requests */
+	protected $_headers = array();
+	protected $_deviceId = null;
+	protected $_locationName = null;
+	protected $_doorName = null;
+	protected $_loginUrl = 'https://myqexternal.myqdevice.com/api/v4/User/Validate';
+	protected $_getDeviceDetailUrl = 'https://myqexternal.myqdevice.com/api/v4/userdevicedetails/get?&filterOn=true';
+	protected $_putDeviceStateUrl = '/api/v4/DeviceAttribute/PutDeviceAttribute';
+	/** @var resource|null $_conn is the web connection to the MyQ API */
+	protected $_conn = null;
     
-    /**
-     * Initializes class. Optionally allows user to override variables
-     *
-     * @param array $params A associative array for overwriting class variables
-     *
-     * @return MyQ
-     */
-    public function __construct ($params = array())
-    {
-        // Overwrite class variables
-        foreach ($params as $k => $v) {
-            $this->$k = $v;
-        }
-        
-        // Initialize cURL request headers
-        if (sizeof($this->_headers) == 0) {
-            $this->_headers = array (
-                'MyQApplicationId' => $this->appId,
-                'Culture' => $this->culture,
-                'Content-Type' => $this->contentType,
-                'User-Agent' => $this->userAgent,
-            );
-        }
-        
-        // Initialize cURL connection
-        $this->_init();
-        
-        return $this;
-    }
+	/**
+	 * Initializes class. Optionally allows user to override variables
+	 *
+	 * @param array $params A associative array for overwriting class variables
+	 *
+	 * @return MyQ
+	 */
+	public function __construct ($params = array())
+	{
+		// Overwrite class variables
+		foreach ($params as $k => $v) {
+			$this->$k = $v;
+		}
+        
+		// Initialize cURL request headers
+		if (sizeof($this->_headers) == 0) {
+			$this->_headers = array (
+				'MyQApplicationId' => $this->appId,
+				'Culture' => $this->culture,
+				'Content-Type' => $this->contentType,
+				'User-Agent' => $this->userAgent,
+			);
+		}
+        
+		// Initialize cURL connection
+		$this->_init();
+        
+		return $this;
+	}
     
-    /**
-     * Perform a login request
-     *
-     * @param string|null $username Username to use when logging in
-     * @param string|null $password Password to use for logging in
-     *
-     * @return MyQ
-     */
-    public function login ($username = null, $password = null)
-    {
-        // Set username/password if not null
-        if (!is_null($username)) {
-            $this->username = $username;
-        }
-        
-        if (!is_null($password)) {
-            $this->password = $password;
-        }
-        
-        // confirm that we have a valid username/password
-        $error = array();
-        if (is_null($this->username)) {
-            $error[] = 'username';
-        }
-        
-        if (is_null($this->password)) {
-            $error[] = 'password';
-        }
-        
-        if (sizeof($error) > 0) {
-            throw new MyQException('Missing required auth credential: ' . implode(',', $error));
-        }
-        
-        $this->_login();
-    }
+	/**
+	 * Perform a login request
+	 *
+	 * @param string|null $username Username to use when logging in
+	 * @param string|null $password Password to use for logging in
+	 *
+	 * @return MyQ
+	 */
+	public function login ($username = null, $password = null)
+	{
+		// Set username/password if not null
+		if (!is_null($username)) {
+			$this->username = $username;
+		}
+        
+		if (!is_null($password)) {
+			$this->password = $password;
+		}
+        
+		// confirm that we have a valid username/password
+		$error = array();
+		if (is_null($this->username)) {
+			$error[] = 'username';
+		}
+        
+		if (is_null($this->password)) {
+			$error[] = 'password';
+		}
+        
+		if (sizeof($error) > 0) {
+			throw new MyQException('Missing required auth credential: ' . implode(',', $error));
+		}
+        
+		$this->_login();
+	}
     
-    public function getState()
-    {
-        $this->_getDetails();
-        $timeInState = time() - $this->_doorStateTime;
-        echo implode(',', array (
-            $this->_locationName,
-            $this->_doorName,
-            $this->_doorState,
-            (int)$timeInState,
-        ));
-    }
+	public function getState()
+	{
+		$this->_getDetails();
+		$timeInState = time() - $this->_doorStateTime;
+		echo implode(',', array (
+			$this->_locationName,
+			$this->_doorName,
+			$this->_doorState,
+			(int)$timeInState,
+		));
+	}
     
-    public function getDetails()
-    {
-        return $this->_getDetails();
-    }
+	public function getDetails()
+	{
+		return $this->_getDetails();
+	}
     
-    private function _init()
-    {
-        if (!isset($this->_conn)) {
-            $this->_conn = curl_init();
+	private function _init()
+	{
+		if (!isset($this->_conn)) {
+			$this->_conn = curl_init();
             
-            curl_setopt_array($this->_conn, array (
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_ENCODING       => "",
-                CURLOPT_MAXREDIRS      => 10,
-                CURLOPT_TIMEOUT        => 30,
-                CURLOPT_HTTP_VERSION   => CURL_HTTP_VERSION_1_1,
-                CURLOPT_FAILONERROR    => true,
-                CURLOPT_FOLLOWLOCATION => true,
-                CURLOPT_FRESH_CONNECT  => true,
-                CURLOPT_FORBID_REUSE   => true,
-                CURLOPT_USERAGENT      => $this->userAgent,
-            ));
-        }
-        
-        $this->_setHeaders();
-    }
-    private function _setHeaders()
-    {
-        $headers = array();
-        
-        foreach ($this->_headers as $k => $v) {
-            $headers[] = "$k: $v";
-        }
-        
-        curl_setopt($this->_conn, CURLOPT_HTTPHEADER, $headers);
-    }
+			curl_setopt_array($this->_conn, array (
+				CURLOPT_RETURNTRANSFER => true,
+				CURLOPT_ENCODING       => "",
+				CURLOPT_MAXREDIRS      => 10,
+				CURLOPT_TIMEOUT        => 30,
+				CURLOPT_HTTP_VERSION   => CURL_HTTP_VERSION_1_1,
+				CURLOPT_FAILONERROR    => true,
+				CURLOPT_FOLLOWLOCATION => true,
+				CURLOPT_FRESH_CONNECT  => true,
+				CURLOPT_FORBID_REUSE   => true,
+				CURLOPT_USERAGENT      => $this->userAgent,
+			));
+		}
+        
+		$this->_setHeaders();
+	}
+	private function _setHeaders()
+	{
+		$headers = array();
+        
+		foreach ($this->_headers as $k => $v) {
+			$headers[] = "$k: $v";
+		}
+        
+		curl_setopt($this->_conn, CURLOPT_HTTPHEADER, $headers);
+	}
     
-    private function _login()
-    {
-        $this->_init();
+	private function _login()
+	{
+		$this->_init();
         
-        curl_setopt($this->_conn, CURLOPT_CUSTOMREQUEST, 'POST');
-        curl_setopt($this->_conn, CURLOPT_URL, $this->_loginUrl);
+		curl_setopt($this->_conn, CURLOPT_CUSTOMREQUEST, 'POST');
+		curl_setopt($this->_conn, CURLOPT_URL, $this->_loginUrl);
         
-        $post = json_encode(array('username' => $this->username, 'password' => $this->password));
+		$post = json_encode(array('username' => $this->username, 'password' => $this->password));
         
-        curl_setopt($this->_conn, CURLOPT_POSTFIELDS, $post);
+		curl_setopt($this->_conn, CURLOPT_POSTFIELDS, $post);
         
-        $output = curl_exec($this->_conn);
+		$output = curl_exec($this->_conn);
         
-        $data = json_decode($output);
+		$data = json_decode($output);
         
-        if ($data == false || !isset($data->SecurityToken)) {
-            throw new MyQException("Error processing login request: $output");
-        }
+		if ($data == false || !isset($data->SecurityToken)) {
+			throw new MyQException("Error processing login request: $output");
+		}
         
-        $this->_headers['SecurityToken'] = $data->SecurityToken;
+		$this->_headers['SecurityToken'] = $data->SecurityToken;
         
-        return $this;
-    }
+		return $this;
+	}
     
-    private function _getDetails()
-    {
-        $this->_init();
-        
-        curl_setopt($this->_conn, CURLOPT_CUSTOMREQUEST, 'GET');
-        curl_setopt($this->_conn, CURLOPT_URL, $this->_getDeviceDetailUrl);
-        
-        $output = curl_exec($this->_conn);
-        
-        $data = json_decode($output);
-        
-        if ($data == false || !isset($data->Devices)) {
-            throw new MyQException("Error fetching device details: $output");
-        }
-        
-        // Find our door device ID
-        foreach ($data->Devices as $device) {
-            if (stripos($device->MyQDeviceTypeName, "Gateway") !== false) {
-                // Find location name
-                foreach ($device->Attributes as $attr) {
-                    if ($attr->AttributeDisplayName == 'desc') {
-                        $this->_locationName = $attr->Value;
-                    }
-                }
-            }
+	private function _getDetails()
+	{
+		$this->_init();
+        
+		curl_setopt($this->_conn, CURLOPT_CUSTOMREQUEST, 'GET');
+		curl_setopt($this->_conn, CURLOPT_URL, $this->_getDeviceDetailUrl);
+        
+		$output = curl_exec($this->_conn);
+        
+		$data = json_decode($output);
+        
+		if ($data == false || !isset($data->Devices)) {
+			throw new MyQException("Error fetching device details: $output");
+		}
+        
+		// Find our door device ID
+		foreach ($data->Devices as $device) {
+			if (stripos($device->MyQDeviceTypeName, "Gateway") !== false) {
+				// Find location name
+				foreach ($device->Attributes as $attr) {
+					if ($attr->AttributeDisplayName == 'desc') {
+						$this->_locationName = $attr->Value;
+					}
+				}
+			}
             
-            $this->_deviceId = $device->MyQDeviceId;
+			$this->_deviceId = $device->MyQDeviceId;
             
-            foreach ($device->Attributes as $attr) {
-                switch ($attr->AttributeDisplayName) {
-                    case 'desc':
-                        $this->_doorName = $attr->Value;
-                        break;
-                    case 'doorstate':
-                        $this->_doorState = $attr->Value;
-                        // UpdatedTime is a timestamp in ms, so we truncate
-                        $this->_doorStateTime = (int)$attr->UpdatedTime / 1000;
-                        break;
-                    default:
-                        continue;
-                }
-            }
-        }
-    }
+			foreach ($device->Attributes as $attr) {
+				switch ($attr->AttributeDisplayName) {
+					case 'desc':
+						$this->_doorName = $attr->Value;
+						break;
+					case 'doorstate':
+						$this->_doorState = $attr->Value;
+						// UpdatedTime is a timestamp in ms, so we truncate
+						$this->_doorStateTime = (int)$attr->UpdatedTime / 1000;
+						break;
+					default:
+						continue;
+				}
+			}
+		}
+	}
 }

Switch Indentation +10 added lines, -10 removed lines

@@ -206,16 +206,16 @@
             
             foreach ($device->Attributes as $attr) {
                 switch ($attr->AttributeDisplayName) {
-                    case 'desc':
-                        $this->_doorName = $attr->Value;
-                        break;
-                    case 'doorstate':
-                        $this->_doorState = $attr->Value;
-                        // UpdatedTime is a timestamp in ms, so we truncate
-                        $this->_doorStateTime = (int)$attr->UpdatedTime / 1000;
-                        break;
-                    default:
-                        continue;
+                case 'desc':
+                    $this->_doorName = $attr->Value;
+                    break;
+                case 'doorstate':
+                    $this->_doorState = $attr->Value;
+                    // UpdatedTime is a timestamp in ms, so we truncate
+                    $this->_doorStateTime = (int)$attr->UpdatedTime / 1000;
+                    break;
+                default:
+                    continue;
                 }
             }
         }

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
      *
      * @return MyQ
      */
-    public function __construct ($params = array())
+    public function __construct($params = array())
     {
         // Overwrite class variables
         foreach ($params as $k => $v) {
@@ -52,8 +52,8 @@ 
         }
         
         // Initialize cURL request headers
-        if (sizeof($this->_headers) == 0) {
-            $this->_headers = array (
+        if (sizeof($this->_headers)==0) {
+            $this->_headers = array(
                 'MyQApplicationId' => $this->appId,
                 'Culture' => $this->culture,
                 'Content-Type' => $this->contentType,
@@ -75,7 +75,7 @@ 
      *
      * @return MyQ
      */
-    public function login ($username = null, $password = null)
+    public function login($username = null, $password = null)
     {
         // Set username/password if not null
         if (!is_null($username)) {
@@ -96,8 +96,8 @@ 
             $error[] = 'password';
         }
         
-        if (sizeof($error) > 0) {
-            throw new MyQException('Missing required auth credential: ' . implode(',', $error));
+        if (sizeof($error)>0) {
+            throw new MyQException('Missing required auth credential: '.implode(',', $error));
         }
         
         $this->_login();
@@ -107,7 +107,7 @@ 
     {
         $this->_getDetails();
         $timeInState = time() - $this->_doorStateTime;
-        echo implode(',', array (
+        echo implode(',', array(
             $this->_locationName,
             $this->_doorName,
             $this->_doorState,
@@ -125,7 +125,7 @@ 
         if (!isset($this->_conn)) {
             $this->_conn = curl_init();
             
-            curl_setopt_array($this->_conn, array (
+            curl_setopt_array($this->_conn, array(
                 CURLOPT_RETURNTRANSFER => true,
                 CURLOPT_ENCODING       => "",
                 CURLOPT_MAXREDIRS      => 10,
@@ -167,7 +167,7 @@ 
         
         $data = json_decode($output);
         
-        if ($data == false || !isset($data->SecurityToken)) {
+        if ($data==false || !isset($data->SecurityToken)) {
             throw new MyQException("Error processing login request: $output");
         }
         
@@ -187,16 +187,16 @@ 
         
         $data = json_decode($output);
         
-        if ($data == false || !isset($data->Devices)) {
+        if ($data==false || !isset($data->Devices)) {
             throw new MyQException("Error fetching device details: $output");
         }
         
         // Find our door device ID
         foreach ($data->Devices as $device) {
-            if (stripos($device->MyQDeviceTypeName, "Gateway") !== false) {
+            if (stripos($device->MyQDeviceTypeName, "Gateway")!==false) {
                 // Find location name
                 foreach ($device->Attributes as $attr) {
-                    if ($attr->AttributeDisplayName == 'desc') {
+                    if ($attr->AttributeDisplayName=='desc') {
                         $this->_locationName = $attr->Value;
                     }
                 }

src/Route4Me/Exception/myErrorHandler.php

Indentation +4 added lines, -4 removed lines

@@ -3,9 +3,9 @@
 
 class myErrorHandler extends \Exception
 {
-    public function proc_error($errno, $errstr, $errfile, $errline) 
-    {
-        echo "line: $errline --- ".$errstr."<br>";
+	public function proc_error($errno, $errstr, $errfile, $errline) 
+	{
+		echo "line: $errline --- ".$errstr."<br>";
     
-    }
+	}
 }

src/Route4Me/curl_http_client.php

Indentation +369 added lines, -369 removed lines

@@ -3,373 +3,373 @@ 
 
 class CurlHttpClient
 {
-    var $ch ;
-    var $debug = false;
-    var $error_msg;
+	var $ch ;
+	var $debug = false;
+	var $error_msg;
 
-    function CurlHttpClient($debug = false)
-    {
-        $this->debug = $debug;
-        $this->init();
-    }
+	function CurlHttpClient($debug = false)
+	{
+		$this->debug = $debug;
+		$this->init();
+	}
     
-    function init()
-    {
-        // initialize curl handle
-        $this->ch = curl_init();
-        //set various options
-        //set error in case http return code bigger than 300
-        curl_setopt($this->ch, CURLOPT_FAILONERROR, true);
-        // use gzip if possible
-        curl_setopt($this->ch,CURLOPT_ENCODING , 'gzip, deflate');
-        // do not veryfy ssl
-        // this is important for windows
-        // as well for being able to access pages with non valid cert
-        curl_setopt($this->ch, CURLOPT_SSL_VERIFYPEER, 0);
-    }
+	function init()
+	{
+		// initialize curl handle
+		$this->ch = curl_init();
+		//set various options
+		//set error in case http return code bigger than 300
+		curl_setopt($this->ch, CURLOPT_FAILONERROR, true);
+		// use gzip if possible
+		curl_setopt($this->ch,CURLOPT_ENCODING , 'gzip, deflate');
+		// do not veryfy ssl
+		// this is important for windows
+		// as well for being able to access pages with non valid cert
+		curl_setopt($this->ch, CURLOPT_SSL_VERIFYPEER, 0);
+	}
     
-    /**
-     * Set username/pass for basic http auth
-     * @param string user
-     * @param string pass
-     * @access public
-     */
-    function setCredentials($username,$password)
-    {
-        curl_setopt($this->ch, CURLOPT_USERPWD, "$username:$password");
-    }
+	/**
+	 * Set username/pass for basic http auth
+	 * @param string user
+	 * @param string pass
+	 * @access public
+	 */
+	function setCredentials($username,$password)
+	{
+		curl_setopt($this->ch, CURLOPT_USERPWD, "$username:$password");
+	}
     
-    /**
-     * Set referrer
-     * @param string referrer url 
-     * @access public
-     */
-    function setReferrer($referrer_url)
-    {
-        curl_setopt($this->ch, CURLOPT_REFERER, $referrer_url);
-    }
+	/**
+	 * Set referrer
+	 * @param string referrer url 
+	 * @access public
+	 */
+	function setReferrer($referrer_url)
+	{
+		curl_setopt($this->ch, CURLOPT_REFERER, $referrer_url);
+	}
     
-    /**
-     * Set client's userAgent
-     * @param string user agent
-     * @access public
-     */
-    function setUserAgent($userAgent)
-    {
-        curl_setopt($this->ch, CURLOPT_USERAGENT, $userAgent);
-    }
+	/**
+	 * Set client's userAgent
+	 * @param string user agent
+	 * @access public
+	 */
+	function setUserAgent($userAgent)
+	{
+		curl_setopt($this->ch, CURLOPT_USERAGENT, $userAgent);
+	}
     
-    /**
-     * Set to receive output headers in all output functions
-     * @param boolean true to include all response headers with output, false otherwise
-     * @access public
-     */
-    function includeResponseHeaders($value)
-    {
-        curl_setopt($this->ch, CURLOPT_HEADER, $value);
-    }
+	/**
+	 * Set to receive output headers in all output functions
+	 * @param boolean true to include all response headers with output, false otherwise
+	 * @access public
+	 */
+	function includeResponseHeaders($value)
+	{
+		curl_setopt($this->ch, CURLOPT_HEADER, $value);
+	}
     
-    /**
-     * Set proxy to use for each curl request
-     * @param string proxy
-     * @access public
-     */
-    function setProxy($proxy)
-    {
-        curl_setopt($this->ch, CURLOPT_PROXY, $proxy);
-    }
+	/**
+	 * Set proxy to use for each curl request
+	 * @param string proxy
+	 * @access public
+	 */
+	function setProxy($proxy)
+	{
+		curl_setopt($this->ch, CURLOPT_PROXY, $proxy);
+	}
     
-    /**
-     * Send post data to target URL     
-     * return data returned from url or false if error occured
-     * @param string url
-     * @param mixed post data (assoc array ie. $foo['post_var_name'] = $value or as string like var=val1&var2=val2)
-     * @param string ip address to bind (default null)
-     * @param int timeout in sec for complete curl operation (default 10)
-     * @return string data
-     * @access public
-     */
-    function sendPostData($url, $postdata, $ip=null, $timeout=10)
-    {
-        //set various curl options first
-        // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL,$url);
-        // return into a variable rather than displaying it
-        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+	/**
+	 * Send post data to target URL     
+	 * return data returned from url or false if error occured
+	 * @param string url
+	 * @param mixed post data (assoc array ie. $foo['post_var_name'] = $value or as string like var=val1&var2=val2)
+	 * @param string ip address to bind (default null)
+	 * @param int timeout in sec for complete curl operation (default 10)
+	 * @return string data
+	 * @access public
+	 */
+	function sendPostData($url, $postdata, $ip=null, $timeout=10)
+	{
+		//set various curl options first
+		// set url to post to
+		curl_setopt($this->ch, CURLOPT_URL,$url);
+		// return into a variable rather than displaying it
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
         
-        //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug)
-            {
-                echo "Binding to ip $ip\n";
-            }
-            curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
-        }
+		//bind to specific ip address if it is sent trough arguments
+		if($ip) {
+			if($this->debug)
+			{
+				echo "Binding to ip $ip\n";
+			}
+			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+		}
         
-        //set curl function timeout to $timeout
-        curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
+		//set curl function timeout to $timeout
+		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
         
-        //set method to post
-        curl_setopt($this->ch, CURLOPT_POST, true);
-        // set post string
-        curl_setopt($this->ch, CURLOPT_POSTFIELDS, $postdata);
+		//set method to post
+		curl_setopt($this->ch, CURLOPT_POST, true);
+		// set post string
+		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $postdata);
         
-        //and finally send curl request
-        $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
-                echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
-            }
-            return false;
-        } else {
-            return $result;
-        }
-    }
+		//and finally send curl request
+		$result = curl_exec_redir($this->ch);
+		if(curl_errno($this->ch)) {
+			if($this->debug) {
+				echo "Error Occured in Curl\n";
+				echo "Error number: " .curl_errno($this->ch) ."\n";
+				echo "Error message: " .curl_error($this->ch)."\n";
+			}
+			return false;
+		} else {
+			return $result;
+		}
+	}
     
-    /**
-     * fetch data from target URL     
-     * return data returned from url or false if error occured
-     * @param string url     
-     * @param string ip address to bind (default null)
-     * @param int timeout in sec for complete curl operation (default 5)
-     * @return string data
-     * @access public
-     */
-    function fetchUrl($url, $ip=null, $timeout=5)
-    {
-        // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL,$url);
+	/**
+	 * fetch data from target URL     
+	 * return data returned from url or false if error occured
+	 * @param string url     
+	 * @param string ip address to bind (default null)
+	 * @param int timeout in sec for complete curl operation (default 5)
+	 * @return string data
+	 * @access public
+	 */
+	function fetchUrl($url, $ip=null, $timeout=5)
+	{
+		// set url to post to
+		curl_setopt($this->ch, CURLOPT_URL,$url);
         
-        //set method to get
-        curl_setopt($this->ch, CURLOPT_HTTPGET,true);
-        // return into a variable rather than displaying it
-        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+		//set method to get
+		curl_setopt($this->ch, CURLOPT_HTTPGET,true);
+		// return into a variable rather than displaying it
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
         
-        //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
-                echo "Binding to ip $ip\n";
-            }
+		//bind to specific ip address if it is sent trough arguments
+		if($ip) {
+			if($this->debug) {
+				echo "Binding to ip $ip\n";
+			}
             
-            curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
-        }
+			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+		}
         
-        //set curl function timeout to $timeout
-        curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
+		//set curl function timeout to $timeout
+		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
         
-        //and finally send curl request
-        $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
-                echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
-            }
-            return false;
-        } else {
-            return $result;
-        }
-    }
+		//and finally send curl request
+		$result = curl_exec_redir($this->ch);
+		if(curl_errno($this->ch)) {
+			if($this->debug) {
+				echo "Error Occured in Curl\n";
+				echo "Error number: " .curl_errno($this->ch) ."\n";
+				echo "Error message: " .curl_error($this->ch)."\n";
+			}
+			return false;
+		} else {
+			return $result;
+		}
+	}
     
-    /**
-     * Fetch data from target URL
-     * and store it directly to file          
-     * @param string url     
-     * @param resource value stream resource(ie. fopen)
-     * @param string ip address to bind (default null)
-     * @param int timeout in sec for complete curl operation (default 5)
-     * @return boolean true on success false othervise
-     * @access public
-     */
-    function fetchIntoFile($url, $fp, $ip=null, $timeout=5)
-    {
-        // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL,$url);
-        //set method to get
-        curl_setopt($this->ch, CURLOPT_HTTPGET, true);
-        // store data into file rather than displaying it
-        curl_setopt($this->ch, CURLOPT_FILE, $fp);
+	/**
+	 * Fetch data from target URL
+	 * and store it directly to file          
+	 * @param string url     
+	 * @param resource value stream resource(ie. fopen)
+	 * @param string ip address to bind (default null)
+	 * @param int timeout in sec for complete curl operation (default 5)
+	 * @return boolean true on success false othervise
+	 * @access public
+	 */
+	function fetchIntoFile($url, $fp, $ip=null, $timeout=5)
+	{
+		// set url to post to
+		curl_setopt($this->ch, CURLOPT_URL,$url);
+		//set method to get
+		curl_setopt($this->ch, CURLOPT_HTTPGET, true);
+		// store data into file rather than displaying it
+		curl_setopt($this->ch, CURLOPT_FILE, $fp);
         
-        //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
-                echo "Binding to ip $ip\n";
-            }
-            curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
-        }
+		//bind to specific ip address if it is sent trough arguments
+		if($ip) {
+			if($this->debug) {
+				echo "Binding to ip $ip\n";
+			}
+			curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
+		}
         
-        //set curl function timeout to $timeout
-        curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
+		//set curl function timeout to $timeout
+		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
         
-        //and finally send curl request
-        $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
-                echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
-            }
+		//and finally send curl request
+		$result = curl_exec_redir($this->ch);
+		if(curl_errno($this->ch)) {
+			if($this->debug) {
+				echo "Error Occured in Curl\n";
+				echo "Error number: " .curl_errno($this->ch) ."\n";
+				echo "Error message: " .curl_error($this->ch)."\n";
+			}
             
-            return false;
-        } else  {
-            return true;
-        }
-    }
+			return false;
+		} else  {
+			return true;
+		}
+	}
     
-    /**
-     * Send multipart post data to the target URL     
-     * return data returned from url or false if error occured
-     * (contribution by vule nikolic, vule@dinke.net)
-     * @param string url
-     * @param array assoc post data array ie. $foo['post_var_name'] = $value
-     * @param array assoc $file_field_array, contains file_field name = value - path pairs
-     * @param string ip address to bind (default null)
-     * @param int timeout in sec for complete curl operation (default 30 sec)
-     * @return string data
-     * @access public
-     */
-    function sendMultipartPostData($url, $postdata, $file_field_array=array(), $ip=null, $timeout=30)
-    {
-        //set various curl options first
-        // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL, $url);
-        // return into a variable rather than displaying it
-        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
+	/**
+	 * Send multipart post data to the target URL     
+	 * return data returned from url or false if error occured
+	 * (contribution by vule nikolic, vule@dinke.net)
+	 * @param string url
+	 * @param array assoc post data array ie. $foo['post_var_name'] = $value
+	 * @param array assoc $file_field_array, contains file_field name = value - path pairs
+	 * @param string ip address to bind (default null)
+	 * @param int timeout in sec for complete curl operation (default 30 sec)
+	 * @return string data
+	 * @access public
+	 */
+	function sendMultipartPostData($url, $postdata, $file_field_array=array(), $ip=null, $timeout=30)
+	{
+		//set various curl options first
+		// set url to post to
+		curl_setopt($this->ch, CURLOPT_URL, $url);
+		// return into a variable rather than displaying it
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
         
-        //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
-                echo "Binding to ip $ip\n";
-            }
+		//bind to specific ip address if it is sent trough arguments
+		if($ip) {
+			if($this->debug) {
+				echo "Binding to ip $ip\n";
+			}
             
-            curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
-        }
+			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+		}
         
-        //set curl function timeout to $timeout
-        curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
-        //set method to post
-        curl_setopt($this->ch, CURLOPT_POST, true);
-        // disable Expect header
-        // hack to make it working
-        $headers = array("Expect: ");
-        curl_setopt($this->ch, CURLOPT_HTTPHEADER, $headers);
-        // initialize result post array
-        $result_post = array();
-        //generate post string
-        $post_array = array();
-        $post_string_array = array();
+		//set curl function timeout to $timeout
+		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
+		//set method to post
+		curl_setopt($this->ch, CURLOPT_POST, true);
+		// disable Expect header
+		// hack to make it working
+		$headers = array("Expect: ");
+		curl_setopt($this->ch, CURLOPT_HTTPHEADER, $headers);
+		// initialize result post array
+		$result_post = array();
+		//generate post string
+		$post_array = array();
+		$post_string_array = array();
         
-        if(!is_array($postdata)) {
-            return false;
-        }
+		if(!is_array($postdata)) {
+			return false;
+		}
         
-        foreach($postdata as $key=>$value) {
-            $post_array[$key] = $value;
-            $post_string_array[] = urlencode($key)."=".urlencode($value);
-        }
+		foreach($postdata as $key=>$value) {
+			$post_array[$key] = $value;
+			$post_string_array[] = urlencode($key)."=".urlencode($value);
+		}
         
-        $post_string = implode("&",$post_string_array);
-        if($this->debug) {
-            echo "Post String: $post_string\n";
-        }
+		$post_string = implode("&",$post_string_array);
+		if($this->debug) {
+			echo "Post String: $post_string\n";
+		}
         
-        // set post string
-        //curl_setopt($this->ch, CURLOPT_POSTFIELDS, $post_string);
-        // set multipart form data - file array field-value pairs
-        if(!empty($file_field_array)) {
-            foreach($file_field_array as $var_name => $var_value) {
-                if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
-                $file_field_array[$var_name] = "@".$var_value;
-            }
-        }
+		// set post string
+		//curl_setopt($this->ch, CURLOPT_POSTFIELDS, $post_string);
+		// set multipart form data - file array field-value pairs
+		if(!empty($file_field_array)) {
+			foreach($file_field_array as $var_name => $var_value) {
+				if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+				$file_field_array[$var_name] = "@".$var_value;
+			}
+		}
         
-        // set post data
-        $result_post = array_merge($post_array, $file_field_array);
-        curl_setopt($this->ch, CURLOPT_POSTFIELDS, $result_post);
+		// set post data
+		$result_post = array_merge($post_array, $file_field_array);
+		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $result_post);
         
-        //and finally send curl request
-        $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
-                echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
-            }
+		//and finally send curl request
+		$result = curl_exec_redir($this->ch);
+		if(curl_errno($this->ch)) {
+			if($this->debug) {
+				echo "Error Occured in Curl\n";
+				echo "Error number: " .curl_errno($this->ch) ."\n";
+				echo "Error message: " .curl_error($this->ch)."\n";
+			}
             
-            return false;
-        } else {
-            return $result;
-        }
-    }
+			return false;
+		} else {
+			return $result;
+		}
+	}
     
-    /**
-     * Set file location where cookie data will be stored and send on each new request
-     * @param string absolute path to cookie file (must be in writable dir)
-     * @access public
-     */
-    function storeCookies($cookie_file)
-    {
-        // use cookies on each request (cookies stored in $cookie_file)
-        curl_setopt ($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
-        curl_setopt ($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
-    }
+	/**
+	 * Set file location where cookie data will be stored and send on each new request
+	 * @param string absolute path to cookie file (must be in writable dir)
+	 * @access public
+	 */
+	function storeCookies($cookie_file)
+	{
+		// use cookies on each request (cookies stored in $cookie_file)
+		curl_setopt ($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
+		curl_setopt ($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
+	}
     
-    /**
-     * Set custom cookie
-     * @param string cookie
-     * @access public
-     */
-    function setCookie($cookie)
-    {        
-        curl_setopt ($this->ch, CURLOPT_COOKIE, $cookie);
-    }
+	/**
+	 * Set custom cookie
+	 * @param string cookie
+	 * @access public
+	 */
+	function setCookie($cookie)
+	{        
+		curl_setopt ($this->ch, CURLOPT_COOKIE, $cookie);
+	}
     
-    /**
-     * Get last URL info 
-     * usefull when original url was redirected to other location    
-     * @access public
-     * @return string url
-     */
-    function getEffectiveUrl()
-    {
-        return curl_getinfo($this->ch, CURLINFO_EFFECTIVE_URL);
-    }
+	/**
+	 * Get last URL info 
+	 * usefull when original url was redirected to other location    
+	 * @access public
+	 * @return string url
+	 */
+	function getEffectiveUrl()
+	{
+		return curl_getinfo($this->ch, CURLINFO_EFFECTIVE_URL);
+	}
     
-    /**
-     * Get http response code     
-     * @access public
-     * @return int
-     */
-    function getHttpResponseCode()
-    {
-        return curl_getinfo($this->ch, CURLINFO_HTTP_CODE);
-    }
+	/**
+	 * Get http response code     
+	 * @access public
+	 * @return int
+	 */
+	function getHttpResponseCode()
+	{
+		return curl_getinfo($this->ch, CURLINFO_HTTP_CODE);
+	}
     
-    /**
-     * Return last error message and error number
-     * @return string error msg
-     * @access public
-     */
-    function getErrorMsg()
-    {
-        $err = "Error number: " .curl_errno($this->ch) ."\n";
-        $err .="Error message: " .curl_error($this->ch)."\n";
-        return $err;
-    }
+	/**
+	 * Return last error message and error number
+	 * @return string error msg
+	 * @access public
+	 */
+	function getErrorMsg()
+	{
+		$err = "Error number: " .curl_errno($this->ch) ."\n";
+		$err .="Error message: " .curl_error($this->ch)."\n";
+		return $err;
+	}
     
-    /**
-     * Close curl session and free resource
-     * Usually no need to call this function directly
-     * in case you do you have to call init() to recreate curl
-     * @access public
-     */
-    function close()
-    {
-        //close curl session and free up resources
-        curl_close($this->ch);
-    }
+	/**
+	 * Close curl session and free resource
+	 * Usually no need to call this function directly
+	 * in case you do you have to call init() to recreate curl
+	 * @access public
+	 */
+	function close()
+	{
+		//close curl session and free up resources
+		curl_close($this->ch);
+	}
 }
 
 /**
@@ -378,58 +378,58 @@ 
  */
 function curlExecRedir($ch)
 {
-    static $curl_loops = 0;
-    static $curl_max_loops = 20;
+	static $curl_loops = 0;
+	static $curl_max_loops = 20;
     
-    if ($curl_loops++ >= $curl_max_loops) {
-        $curl_loops = 0;
-        return FALSE;
-    }
+	if ($curl_loops++ >= $curl_max_loops) {
+		$curl_loops = 0;
+		return FALSE;
+	}
     
-    curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
-    curl_setopt($ch, CURLOPT_HEADER, true);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($ch, CURLOPT_VERBOSE, false);
-    $data = curl_exec($ch);
-    $data = str_replace("\r", "\n", str_replace("\r\n", "\n", $data));
-    list($header, $data) = explode("\n\n", $data, 2);
-    $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+	curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
+	curl_setopt($ch, CURLOPT_HEADER, true);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($ch, CURLOPT_VERBOSE, false);
+	$data = curl_exec($ch);
+	$data = str_replace("\r", "\n", str_replace("\r\n", "\n", $data));
+	list($header, $data) = explode("\n\n", $data, 2);
+	$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     
-    //echo "*** Got HTTP code: $http_code ***\n";
-    //echo "**  Got headers: \n$header\n\n";
+	//echo "*** Got HTTP code: $http_code ***\n";
+	//echo "**  Got headers: \n$header\n\n";
     
-    if ( $http_code == 301 || $http_code == 302 ) {
-        // If we're redirected, we should revert to GET
-        curl_setopt($ch, CURLOPT_HTTPGET,true);
+	if ( $http_code == 301 || $http_code == 302 ) {
+		// If we're redirected, we should revert to GET
+		curl_setopt($ch, CURLOPT_HTTPGET,true);
         
-        $matches = array();
-        preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
-        $url = @parse_url(trim($matches[1]));
+		$matches = array();
+		preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
+		$url = @parse_url(trim($matches[1]));
         
-        if (!$url) {
-            //couldn't process the url to redirect to
-            $curl_loops = 0;
-            return $data;
-        }
+		if (!$url) {
+			//couldn't process the url to redirect to
+			$curl_loops = 0;
+			return $data;
+		}
         
-        $last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
-        if (empty($url['scheme']))
-            $url['scheme'] = $last_url['scheme'];
+		$last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
+		if (empty($url['scheme']))
+			$url['scheme'] = $last_url['scheme'];
         
-        if (empty($url['host']))
-            $url['host'] = $last_url['host'];
+		if (empty($url['host']))
+			$url['host'] = $last_url['host'];
         
-        if (empty($url['path']))
-            $url['path'] = $last_url['path'];
+		if (empty($url['path']))
+			$url['path'] = $last_url['path'];
         
-        $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
-        //echo "Being redirected to $new_url\n";
-        curl_setopt($ch, CURLOPT_URL, $new_url);
+		$new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
+		//echo "Being redirected to $new_url\n";
+		curl_setopt($ch, CURLOPT_URL, $new_url);
         
-        return curl_exec_redir($ch);
-    } else {
-        $curl_loops=0;
-        return $data;
-    }
+		return curl_exec_redir($ch);
+	} else {
+		$curl_loops=0;
+		return $data;
+	}
 }
 ?>

Spacing +58 added lines, -58 removed lines

@@ -3,7 +3,7 @@ 
 
 class CurlHttpClient
 {
-    var $ch ;
+    var $ch;
     var $debug = false;
     var $error_msg;
 
@@ -21,7 +21,7 @@ 
         //set error in case http return code bigger than 300
         curl_setopt($this->ch, CURLOPT_FAILONERROR, true);
         // use gzip if possible
-        curl_setopt($this->ch,CURLOPT_ENCODING , 'gzip, deflate');
+        curl_setopt($this->ch, CURLOPT_ENCODING, 'gzip, deflate');
         // do not veryfy ssl
         // this is important for windows
         // as well for being able to access pages with non valid cert
@@ -34,7 +34,7 @@ 
      * @param string pass
      * @access public
      */
-    function setCredentials($username,$password)
+    function setCredentials($username, $password)
     {
         curl_setopt($this->ch, CURLOPT_USERPWD, "$username:$password");
     }
@@ -89,21 +89,21 @@ 
      * @return string data
      * @access public
      */
-    function sendPostData($url, $postdata, $ip=null, $timeout=10)
+    function sendPostData($url, $postdata, $ip = null, $timeout = 10)
     {
         //set various curl options first
         // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL,$url);
+        curl_setopt($this->ch, CURLOPT_URL, $url);
         // return into a variable rather than displaying it
-        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
         
         //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug)
+        if ($ip) {
+            if ($this->debug)
             {
                 echo "Binding to ip $ip\n";
             }
-            curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+            curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
         }
         
         //set curl function timeout to $timeout
@@ -116,11 +116,11 @@ 
         
         //and finally send curl request
         $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
+        if (curl_errno($this->ch)) {
+            if ($this->debug) {
                 echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
+                echo "Error number: ".curl_errno($this->ch)."\n";
+                echo "Error message: ".curl_error($this->ch)."\n";
             }
             return false;
         } else {
@@ -137,23 +137,23 @@ 
      * @return string data
      * @access public
      */
-    function fetchUrl($url, $ip=null, $timeout=5)
+    function fetchUrl($url, $ip = null, $timeout = 5)
     {
         // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL,$url);
+        curl_setopt($this->ch, CURLOPT_URL, $url);
         
         //set method to get
-        curl_setopt($this->ch, CURLOPT_HTTPGET,true);
+        curl_setopt($this->ch, CURLOPT_HTTPGET, true);
         // return into a variable rather than displaying it
-        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
         
         //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
+        if ($ip) {
+            if ($this->debug) {
                 echo "Binding to ip $ip\n";
             }
             
-            curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+            curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
         }
         
         //set curl function timeout to $timeout
@@ -161,11 +161,11 @@ 
         
         //and finally send curl request
         $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
+        if (curl_errno($this->ch)) {
+            if ($this->debug) {
                 echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
+                echo "Error number: ".curl_errno($this->ch)."\n";
+                echo "Error message: ".curl_error($this->ch)."\n";
             }
             return false;
         } else {
@@ -183,18 +183,18 @@ 
      * @return boolean true on success false othervise
      * @access public
      */
-    function fetchIntoFile($url, $fp, $ip=null, $timeout=5)
+    function fetchIntoFile($url, $fp, $ip = null, $timeout = 5)
     {
         // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL,$url);
+        curl_setopt($this->ch, CURLOPT_URL, $url);
         //set method to get
         curl_setopt($this->ch, CURLOPT_HTTPGET, true);
         // store data into file rather than displaying it
         curl_setopt($this->ch, CURLOPT_FILE, $fp);
         
         //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
+        if ($ip) {
+            if ($this->debug) {
                 echo "Binding to ip $ip\n";
             }
             curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
@@ -205,15 +205,15 @@ 
         
         //and finally send curl request
         $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
+        if (curl_errno($this->ch)) {
+            if ($this->debug) {
                 echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
+                echo "Error number: ".curl_errno($this->ch)."\n";
+                echo "Error message: ".curl_error($this->ch)."\n";
             }
             
             return false;
-        } else  {
+        } else {
             return true;
         }
     }
@@ -230,7 +230,7 @@ 
      * @return string data
      * @access public
      */
-    function sendMultipartPostData($url, $postdata, $file_field_array=array(), $ip=null, $timeout=30)
+    function sendMultipartPostData($url, $postdata, $file_field_array = array(), $ip = null, $timeout = 30)
     {
         //set various curl options first
         // set url to post to
@@ -239,12 +239,12 @@ 
         curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
         
         //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
+        if ($ip) {
+            if ($this->debug) {
                 echo "Binding to ip $ip\n";
             }
             
-            curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+            curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
         }
         
         //set curl function timeout to $timeout
@@ -261,26 +261,26 @@ 
         $post_array = array();
         $post_string_array = array();
         
-        if(!is_array($postdata)) {
+        if (!is_array($postdata)) {
             return false;
         }
         
-        foreach($postdata as $key=>$value) {
+        foreach ($postdata as $key=>$value) {
             $post_array[$key] = $value;
             $post_string_array[] = urlencode($key)."=".urlencode($value);
         }
         
-        $post_string = implode("&",$post_string_array);
-        if($this->debug) {
+        $post_string = implode("&", $post_string_array);
+        if ($this->debug) {
             echo "Post String: $post_string\n";
         }
         
         // set post string
         //curl_setopt($this->ch, CURLOPT_POSTFIELDS, $post_string);
         // set multipart form data - file array field-value pairs
-        if(!empty($file_field_array)) {
-            foreach($file_field_array as $var_name => $var_value) {
-                if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+        if (!empty($file_field_array)) {
+            foreach ($file_field_array as $var_name => $var_value) {
+                if (strpos(PHP_OS, "WIN")!==false) $var_value = str_replace("/", "\\", $var_value); // win hack
                 $file_field_array[$var_name] = "@".$var_value;
             }
         }
@@ -291,11 +291,11 @@ 
         
         //and finally send curl request
         $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
+        if (curl_errno($this->ch)) {
+            if ($this->debug) {
                 echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
+                echo "Error number: ".curl_errno($this->ch)."\n";
+                echo "Error message: ".curl_error($this->ch)."\n";
             }
             
             return false;
@@ -312,8 +312,8 @@ 
     function storeCookies($cookie_file)
     {
         // use cookies on each request (cookies stored in $cookie_file)
-        curl_setopt ($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
-        curl_setopt ($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
+        curl_setopt($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
+        curl_setopt($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
     }
     
     /**
@@ -323,7 +323,7 @@ 
      */
     function setCookie($cookie)
     {        
-        curl_setopt ($this->ch, CURLOPT_COOKIE, $cookie);
+        curl_setopt($this->ch, CURLOPT_COOKIE, $cookie);
     }
     
     /**
@@ -354,8 +354,8 @@ 
      */
     function getErrorMsg()
     {
-        $err = "Error number: " .curl_errno($this->ch) ."\n";
-        $err .="Error message: " .curl_error($this->ch)."\n";
+        $err = "Error number: ".curl_errno($this->ch)."\n";
+        $err .= "Error message: ".curl_error($this->ch)."\n";
         return $err;
     }
     
@@ -381,7 +381,7 @@ 
     static $curl_loops = 0;
     static $curl_max_loops = 20;
     
-    if ($curl_loops++ >= $curl_max_loops) {
+    if ($curl_loops++>=$curl_max_loops) {
         $curl_loops = 0;
         return FALSE;
     }
@@ -398,9 +398,9 @@ 
     //echo "*** Got HTTP code: $http_code ***\n";
     //echo "**  Got headers: \n$header\n\n";
     
-    if ( $http_code == 301 || $http_code == 302 ) {
+    if ($http_code==301 || $http_code==302) {
         // If we're redirected, we should revert to GET
-        curl_setopt($ch, CURLOPT_HTTPGET,true);
+        curl_setopt($ch, CURLOPT_HTTPGET, true);
         
         $matches = array();
         preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
@@ -422,13 +422,13 @@ 
         if (empty($url['path']))
             $url['path'] = $last_url['path'];
         
-        $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
+        $new_url = $url['scheme'].'://'.$url['host'].$url['path'].(!empty($url['query']) ? '?'.$url['query'] : '');
         //echo "Being redirected to $new_url\n";
         curl_setopt($ch, CURLOPT_URL, $new_url);
         
         return curl_exec_redir($ch);
     } else {
-        $curl_loops=0;
+        $curl_loops = 0;
         return $data;
     }
 }

Braces +13 added lines, -7 removed lines

@@ -280,7 +280,10 @@ 
         // set multipart form data - file array field-value pairs
         if(!empty($file_field_array)) {
             foreach($file_field_array as $var_name => $var_value) {
-                if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+                if(strpos(PHP_OS, "WIN") !== false) {
+                	$var_value = str_replace("/", "\\", $var_value);
+                }
+                // win hack
                 $file_field_array[$var_name] = "@".$var_value;
             }
         }
@@ -413,14 +416,17 @@ 
         }
         
         $last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
-        if (empty($url['scheme']))
-            $url['scheme'] = $last_url['scheme'];
+        if (empty($url['scheme'])) {
+                    $url['scheme'] = $last_url['scheme'];
+        }
         
-        if (empty($url['host']))
-            $url['host'] = $last_url['host'];
+        if (empty($url['host'])) {
+                    $url['host'] = $last_url['host'];
+        }
         
-        if (empty($url['path']))
-            $url['path'] = $last_url['path'];
+        if (empty($url['path'])) {
+                    $url['path'] = $last_url['path'];
+        }
         
         $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
         //echo "Being redirected to $new_url\n";

src/Route4Me/RouteParameters.php

Indentation +66 added lines, -66 removed lines

@@ -5,74 +5,74 @@
 
 class RouteParameters extends Common
 {
-    public $is_upload;
-    public $rt;
-    public $route_name;
-    public $route_date;
-    public $route_time;
-    public $shared_publicly;
-    public $disable_optimization;
-    public $optimize;
-    public $lock_last;
-    public $vehicle_capacity;
-    public $vehicle_max_distance_mi;
-    public $distance_unit;
-    public $travel_mode;
-    public $avoid;
-    public $vehicle_id;
-    public $dev_lat;
-    public $dev_lng;
-    public $route_max_duration;
-    public $route_email;
-    public $route_type = "api";
-    public $store_route = true;
-    public $metric;
-    public $algorithm_type;
-    public $member_id;
-    public $ip;
-    public $dm;
-    public $dirm;
-    public $parts;
-    public $device_id;
-    public $device_type;
-    public $has_trailer;
-    public $trailer_weight_t;
-    public $limited_weight_t;
-    public $weight_per_axle_t;
-    public $truck_height_meters;
-    public $truck_width_meters;
-    public $truck_length_meters;
-    public $truck_hazardous_goods;
+	public $is_upload;
+	public $rt;
+	public $route_name;
+	public $route_date;
+	public $route_time;
+	public $shared_publicly;
+	public $disable_optimization;
+	public $optimize;
+	public $lock_last;
+	public $vehicle_capacity;
+	public $vehicle_max_distance_mi;
+	public $distance_unit;
+	public $travel_mode;
+	public $avoid;
+	public $vehicle_id;
+	public $dev_lat;
+	public $dev_lng;
+	public $route_max_duration;
+	public $route_email;
+	public $route_type = "api";
+	public $store_route = true;
+	public $metric;
+	public $algorithm_type;
+	public $member_id;
+	public $ip;
+	public $dm;
+	public $dirm;
+	public $parts;
+	public $device_id;
+	public $device_type;
+	public $has_trailer;
+	public $trailer_weight_t;
+	public $limited_weight_t;
+	public $weight_per_axle_t;
+	public $truck_height_meters;
+	public $truck_width_meters;
+	public $truck_length_meters;
+	public $truck_hazardous_goods;
     
-    public $vehicle_max_cargo_weight;
-    public $vehicle_max_cargo_volume;
-    public $subtour_max_revenue;
-    public $avoidance_zones;
-    public $driver_id;
-    public $parts_min;
-    public $first_drive_then_wait_between_stops;
-    public $truck_height;
-    public $truck_width;
-    public $truck_length;
-    public $optimization_quality;
-    public $override_addresses;
-    public $max_tour_size;
-    public $min_tour_size;
-    public $uturn;
-    public $leftturn;
-    public $rightturn;
+	public $vehicle_max_cargo_weight;
+	public $vehicle_max_cargo_volume;
+	public $subtour_max_revenue;
+	public $avoidance_zones;
+	public $driver_id;
+	public $parts_min;
+	public $first_drive_then_wait_between_stops;
+	public $truck_height;
+	public $truck_width;
+	public $truck_length;
+	public $optimization_quality;
+	public $override_addresses;
+	public $max_tour_size;
+	public $min_tour_size;
+	public $uturn;
+	public $leftturn;
+	public $rightturn;
     
-    public $optimized_callback_url;
+	public $optimized_callback_url;
 
-    public static function fromArray(array $params)
-    {
-        $routeParams = new RouteParameters();
-        foreach($params as $key => $value) {
-            if (property_exists($routeParams, $key)) {
-                $routeParams->{$key} = $value;
-            }
-        }
+	public static function fromArray(array $params)
+	{
+		$routeParams = new RouteParameters();
+		foreach($params as $key => $value) {
+			if (property_exists($routeParams, $key)) {
+				$routeParams->{$key} = $value;
+			}
+		}
 
-        return $routeParams;
-    }
+		return $routeParams;
+	}
 }

src/Route4Me/Enum/Metric.php

Indentation +5 added lines, -5 removed lines

@@ -3,9 +3,9 @@
 
 class Metric
 {
-    const EUCLIDEAN = 1; //measures point to point distance as a straight line
-    const MANHATTAN = 2; //measures point to point distance as taxicab geometry line
-    const GEODESIC  = 3; //measures point to point distance approximating curvature of the earth
-    const MATRIX    = 4; //measures point to point distance by traversing the actual road network
-    const EXACT_2D  = 5; //measures point to point distance using 2d rectilinear distance
+	const EUCLIDEAN = 1; //measures point to point distance as a straight line
+	const MANHATTAN = 2; //measures point to point distance as taxicab geometry line
+	const GEODESIC  = 3; //measures point to point distance approximating curvature of the earth
+	const MATRIX    = 4; //measures point to point distance by traversing the actual road network
+	const EXACT_2D  = 5; //measures point to point distance using 2d rectilinear distance
 }

src/Route4Me/Enum/ActivityTypes.php

Indentation +28 added lines, -28 removed lines

@@ -3,34 +3,34 @@
 
 class ActivityTypes
 {
-    const AREA_REMOVED              = 'area-removed';
-    const AREA_ADDED                = 'area-added';
-    const AREA_UPDATED              = 'area-updated';
-    const DELETE_DESTINATION        = 'delete-destination';
-    const INSERT_DESTINATION        = 'insert-destination';
-    const DESTINATION_OUT_SEQUENCE  = 'destination-out-sequence';
-    const DRIVER_ARRIVED_EARLY      = 'driver-arrived-early';
-    const DRIVER_ARRIVED_LATE       = 'driver-arrived-late';
-    const DRIVER_ARRIVED_ON_TIME    = 'driver-arrived-on-time';
-    const GEOFENCE_LEFT             = 'geofence-left';
-    const GEOFENCE_ENTERED          = 'geofence-entered';
-    const MARK_DESTINATION_DEPARTED = 'mark-destination-departed';
-    const MARK_DESTINATION_VISITED  = 'mark-destination-visited';
-    const MEMBER_CREATED            = 'member-created';
-    const MEMBER_DELETED            = 'member-deleted';
-    const MEMBER_MODIFIED           = 'member-modified';
-    const MOVE_DESTINATION          = 'move-destination';
-    const NOTE_INSERT               = 'note-insert';
-    const ROUTE_DELETE              = 'route-delete';
-    const ROUTE_OPTIMIZED           = 'route-optimized';
-    const ROUTE_OWNER_CHANGED       = 'route-owner-changed';
-    const ROUTE_DUPLICATE           = 'route-duplicate';
-    const UPDATE_DESTINATIONS       = 'update-destinations';
-    const USER_MESSAGE              = 'user_message';
+	const AREA_REMOVED              = 'area-removed';
+	const AREA_ADDED                = 'area-added';
+	const AREA_UPDATED              = 'area-updated';
+	const DELETE_DESTINATION        = 'delete-destination';
+	const INSERT_DESTINATION        = 'insert-destination';
+	const DESTINATION_OUT_SEQUENCE  = 'destination-out-sequence';
+	const DRIVER_ARRIVED_EARLY      = 'driver-arrived-early';
+	const DRIVER_ARRIVED_LATE       = 'driver-arrived-late';
+	const DRIVER_ARRIVED_ON_TIME    = 'driver-arrived-on-time';
+	const GEOFENCE_LEFT             = 'geofence-left';
+	const GEOFENCE_ENTERED          = 'geofence-entered';
+	const MARK_DESTINATION_DEPARTED = 'mark-destination-departed';
+	const MARK_DESTINATION_VISITED  = 'mark-destination-visited';
+	const MEMBER_CREATED            = 'member-created';
+	const MEMBER_DELETED            = 'member-deleted';
+	const MEMBER_MODIFIED           = 'member-modified';
+	const MOVE_DESTINATION          = 'move-destination';
+	const NOTE_INSERT               = 'note-insert';
+	const ROUTE_DELETE              = 'route-delete';
+	const ROUTE_OPTIMIZED           = 'route-optimized';
+	const ROUTE_OWNER_CHANGED       = 'route-owner-changed';
+	const ROUTE_DUPLICATE           = 'route-duplicate';
+	const UPDATE_DESTINATIONS       = 'update-destinations';
+	const USER_MESSAGE              = 'user_message';
 
-    static function getConstants() {
-        $atc = new \ReflectionClass('Route4Me\\Enum\\ActivityTypes');
-        return $atc->getConstants();
-    }
+	static function getConstants() {
+		$atc = new \ReflectionClass('Route4Me\\Enum\\ActivityTypes');
+		return $atc->getConstants();
+	}
 }