route4me / route4me-php-sdk

examples/Order/GetOrders.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Order;

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 	namespace Route4Me;
 	
-	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+	$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
     require $vdir.'/../vendor/autoload.php';
 	

examples/Order/UpdateOrder.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Order;

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 	namespace Route4Me;
 	
-	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+	$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
     require $vdir.'/../vendor/autoload.php';
 	

examples/Members/member_validate_session.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Member;

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 	namespace Route4Me;
 	
-	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+	$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
     require $vdir.'/../vendor/autoload.php';
 	

examples/Members/get_users.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 	
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\Route4Me;
 	use Route4Me\Member;

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 	namespace Route4Me;
 	
-	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+	$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
     require $vdir.'/../vendor/autoload.php';
 	

src/Route4Me/Route4Me.php

Doc Comments +3 added lines

@@ -204,6 +204,9 @@
         }
     }
 
+	/**
+	 * @param string $url
+	 */
 	public static function makeUrlRequst($url, $options) {
 		$method = isset($options['method']) ? $options['method'] : 'GET';
         $query = isset($options['query']) ?

Indentation +125 added lines, -125 removed lines

@@ -6,37 +6,37 @@ 
 
 class Route4Me
 {
-    static public $apiKey;
-    static public $baseUrl = 'https://route4me.com';
+	static public $apiKey;
+	static public $baseUrl = 'https://route4me.com';
 
-    public static function setApiKey($apiKey)
-    {
-        self::$apiKey = $apiKey;
-    }
+	public static function setApiKey($apiKey)
+	{
+		self::$apiKey = $apiKey;
+	}
 
-    public static function getApiKey()
-    {
-        return self::$apiKey;
-    }
+	public static function getApiKey()
+	{
+		return self::$apiKey;
+	}
 
-    public static function setBaseUrl($baseUrl)
-    {
-        self::$baseUrl = $baseUrl;
-    }
+	public static function setBaseUrl($baseUrl)
+	{
+		self::$baseUrl = $baseUrl;
+	}
 
-    public static function getBaseUrl()
-    {
-        return self::$baseUrl;
-    }
+	public static function getBaseUrl()
+	{
+		return self::$baseUrl;
+	}
 	
 	public static function fileUploadRequest($options) {
 		$query = isset($options['query']) ?
-            array_filter($options['query']) : array();
+			array_filter($options['query']) : array();
 
 		if (sizeof($query)==0) return null;
 
 		$body = isset($options['body']) ?
-            array_filter($options['body']) : null;
+			array_filter($options['body']) : null;
 			
 		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
 		if ($fname=='') return null;
@@ -46,8 +46,8 @@ 
 		$fp=fopen(realpath($fname),"r");
 		
 		$url = self::$baseUrl.$options['url'] . '?' . http_build_query(array_merge(
-            array( 'api_key' => self::getApiKey()), $query)
-        );
+			array( 'api_key' => self::getApiKey()), $query)
+		);
 		
 		//self::simplePrint($body);die("");
 		//echo "url=".$url."<br>";die("");
@@ -55,12 +55,12 @@ 
 		$ch = curl_init($url);
 		
 		$curlOpts = array(
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE
-        );
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE
+		);
 		
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
 		
@@ -76,62 +76,62 @@ 
 		fclose($fp);
 		//var_dump($result); die('');
 		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		curl_close($ch);
 		//echo "code = $code <br>";
 		$json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
 	}
 
-    public static function makeRequst($options) {
-        $method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query']) : array();
+	public static function makeRequst($options) {
+		$method = isset($options['method']) ? $options['method'] : 'GET';
+		$query = isset($options['query']) ?
+			array_filter($options['query']) : array();
 		//echo "query=".$query['member_id'];die("");
-        $body = isset($options['body']) ?
-            array_filter($options['body']) : null;
+		$body = isset($options['body']) ?
+			array_filter($options['body']) : null;
 		$file = isset($options['FILE']) ? $options['FILE'] : null;
-        $headers = array(
-            "User-Agent: Route4Me php-sdk"
-        );
+		$headers = array(
+			"User-Agent: Route4Me php-sdk"
+		);
         
-        if (isset($options['HTTPHEADER'])) {
-            $headers[]=$options['HTTPHEADER'];
-        }
+		if (isset($options['HTTPHEADER'])) {
+			$headers[]=$options['HTTPHEADER'];
+		}
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
-        }
-        //self::simplePrint($headers); die("");
-        $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
-        ));
+			foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		}
+		//self::simplePrint($headers); die("");
+		$ch = curl_init();
+		$url = $options['url'] . '?' . http_build_query(array_merge(
+			$query, array( 'api_key' => self::getApiKey())
+		));
 		
 		//$jfile=json_encode($body); echo $jfile; die("");
 
-        //self::simplePrint($headers); die("");
+		//self::simplePrint($headers); die("");
 		$baseUrl=self::getBaseUrl();
 		
 		if (strpos($url,'move_route_destination')>0) $baseUrl='https://www.route4me.com';
-        $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => $headers
-        );
+		$curlOpts = arraY(
+			CURLOPT_URL            => $baseUrl. $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => $headers
+		);
 		
 		//echo "url=".$baseUrl.$url."<br>";die("");
-        curl_setopt_array($ch, $curlOpts);
+		curl_setopt_array($ch, $curlOpts);
 		
 		if ($file !=null) {
 			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
@@ -140,21 +140,21 @@ 
 			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
 		}
 		
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
 			if (isset($body)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
-            break;
+			break;
 		case 'DELETEARRAY':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
 			//$jfile=json_encode($body); echo $jfile; die("");
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
 			if (isset($query)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
 			}
@@ -163,9 +163,9 @@ 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
 			break;
-        case 'POST':
+		case 'POST':
 			if (isset($query)) {
-            	curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
+				curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
             
 			//echo json_encode($body); die("");
@@ -174,10 +174,10 @@ 
 			} 
 			break;
 		case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
 		//var_dump($result); die("");
 		$isxml=FALSE;
 		$jxml="";
@@ -188,58 +188,58 @@ 
 			$isxml = TRUE;
 		}
 		
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 		
 		if ($isxml) {
 			$json = $jxml;
 		} else $json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
 
 	public static function makeUrlRequst($url, $options) {
 		$method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query']) : array();
-        $body = isset($options['body']) ?
-            array_filter($options['body']) : null;
-        $ch = curl_init();
+		$query = isset($options['query']) ?
+			array_filter($options['query']) : array();
+		$body = isset($options['body']) ?
+			array_filter($options['body']) : null;
+		$ch = curl_init();
 		
 		$curlOpts = arraY(
-            CURLOPT_URL            => $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => array(
-                'User-Agent' => 'Route4Me php-sdk'
-            )
-        );
+			CURLOPT_URL            => $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => array(
+				'User-Agent' => 'Route4Me php-sdk'
+			)
+		);
 		
 		curl_setopt_array($ch, $curlOpts);
 		
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
 			if (isset($body)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
-            break;
+			break;
 		case 'DELETEARRAY':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
 			if (isset($query)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
 			}
@@ -248,10 +248,10 @@ 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
 			break;
-        case 'POST':
+		case 'POST':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); 
 			if (isset($query)) {
-            	curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
 
 			if (isset($body)) {
@@ -259,8 +259,8 @@ 
 			} 
 			break;
 		case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
 		$result = curl_exec($ch);
         
@@ -273,21 +273,21 @@ 
 			$isxml = TRUE;
 		}
 		
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 		
 		if ($isxml) {
 			$json = $jxml;
 		} else $json = json_decode($result, true);
 		
 		
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
 	}
 	
 	/**

Spacing +23 added lines, -23 removed lines

@@ -43,10 +43,10 @@ 
 
 		$rpath = realpath($fname);
 		
-		$fp=fopen(realpath($fname),"r");
+		$fp = fopen(realpath($fname), "r");
 		
-		$url = self::$baseUrl.$options['url'] . '?' . http_build_query(array_merge(
-            array( 'api_key' => self::getApiKey()), $query)
+		$url = self::$baseUrl.$options['url'].'?'.http_build_query(array_merge(
+            array('api_key' => self::getApiKey()), $query)
         );
 		
 		//self::simplePrint($body);die("");
@@ -80,7 +80,7 @@ 
 		//echo "code = $code <br>";
 		$json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));
@@ -102,26 +102,26 @@ 
         );
         
         if (isset($options['HTTPHEADER'])) {
-            $headers[]=$options['HTTPHEADER'];
+            $headers[] = $options['HTTPHEADER'];
         }
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		    foreach ($options['HTTPHEADERS'] As $header) $headers[] = $header;
         }
         //self::simplePrint($headers); die("");
         $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
+        $url = $options['url'].'?'.http_build_query(array_merge(
+            $query, array('api_key' => self::getApiKey())
         ));
 		
 		//$jfile=json_encode($body); echo $jfile; die("");
 
         //self::simplePrint($headers); die("");
-		$baseUrl=self::getBaseUrl();
+		$baseUrl = self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://www.route4me.com';
+		if (strpos($url, 'move_route_destination')>0) $baseUrl = 'https://www.route4me.com';
         $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
+            CURLOPT_URL            => $baseUrl.$url,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT        => 60,
             CURLOPT_FOLLOWLOCATION => true,
@@ -133,14 +133,14 @@ 
 		//echo "url=".$baseUrl.$url."<br>";die("");
         curl_setopt_array($ch, $curlOpts);
 		
-		if ($file !=null) {
+		if ($file!=null) {
 			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-			$fp=fopen($file,'r');
-			curl_setopt($ch, CURLOPT_INFILE , $fp);
+			$fp = fopen($file, 'r');
+			curl_setopt($ch, CURLOPT_INFILE, $fp);
 			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
 		}
 		
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -165,7 +165,7 @@ 
 			break;
         case 'POST':
 			if (isset($query)) {
-            	curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
+            	curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
             
 			//echo json_encode($body); die("");
@@ -179,8 +179,8 @@ 
 
         $result = curl_exec($ch);
 		//var_dump($result); die("");
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -195,7 +195,7 @@ 
 			$json = $jxml;
 		} else $json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));
@@ -226,7 +226,7 @@ 
 		
 		curl_setopt_array($ch, $curlOpts);
 		
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -264,8 +264,8 @@ 
 
 		$result = curl_exec($ch);
         
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -281,7 +281,7 @@ 
 		} else $json = json_decode($result, true);
 		
 		
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));

Braces +18 added lines, -6 removed lines

@@ -33,13 +33,17 @@ 
 		$query = isset($options['query']) ?
             array_filter($options['query']) : array();
 
-		if (sizeof($query)==0) return null;
+		if (sizeof($query)==0) {
+			return null;
+		}
 
 		$body = isset($options['body']) ?
             array_filter($options['body']) : null;
 			
 		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
-		if ($fname=='') return null;
+		if ($fname=='') {
+			return null;
+		}
 
 		$rpath = realpath($fname);
 		
@@ -106,7 +110,9 @@ 
         }
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		    foreach ($options['HTTPHEADERS'] As $header) {
+		    	$headers[]=$header;
+		    }
         }
         //self::simplePrint($headers); die("");
         $ch = curl_init();
@@ -119,7 +125,9 @@ 
         //self::simplePrint($headers); die("");
 		$baseUrl=self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://www.route4me.com';
+		if (strpos($url,'move_route_destination')>0) {
+			$baseUrl='https://www.route4me.com';
+		}
         $curlOpts = arraY(
             CURLOPT_URL            => $baseUrl. $url,
             CURLOPT_RETURNTRANSFER => true,
@@ -193,7 +201,9 @@ 
 		
 		if ($isxml) {
 			$json = $jxml;
-		} else $json = json_decode($result, true);
+		} else {
+			$json = json_decode($result, true);
+		}
 		//var_dump($json); die("");
         if (200 == $code) {
             return $json;
@@ -278,7 +288,9 @@ 
 		
 		if ($isxml) {
 			$json = $jxml;
-		} else $json = json_decode($result, true);
+		} else {
+			$json = json_decode($result, true);
+		}
 		
 		
         if (200 == $code) {

examples/GarageDoorOpener/myq_login.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
-    require $vdir.'/../vendor/autoload.php';
+	require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\MyQ;
 	

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-	$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+	$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
     require $vdir.'/../vendor/autoload.php';
 	
 	use Route4Me\MyQ;

src/Route4Me/Member.php

Indentation +146 added lines, -146 removed lines

@@ -68,60 +68,60 @@ 
 		
 		public static function fromArray(array $params) {
 			$member= new Member();
-	        foreach($params as $key => $value) {
-	            if (property_exists($member, $key)) {
-	                $member->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($member, $key)) {
+					$member->{$key} = $value;
+				}
 			}
 			
 			return $member;
 		}
 		
 		public static function getUsers()
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET'
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET'
+			));
 			//var_dump($response); die("");
 			return $response;
 		}
 		
 		public static function getUser($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	            	'member_id' => isset($params['member_id']) ? $params['member_id'] : null
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'member_id' => isset($params['member_id']) ? $params['member_id'] : null
 				)
-	        ));
+			));
 			//var_dump($response); die("");
 			return $response;
 		}
 		
 		public static function getUserLocations($param)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUserLocations,
-	            'method' => 'GET',
-	            'query'  => array(
-	            	'query' => $param
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUserLocations,
+				'method' => 'GET',
+				'query'  => array(
+					'query' => $param
 				)
-	        ));
+			));
 			//var_dump($response); die("");
 			return $response;
 		}
 		
 		public static function addDeviceRecord($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlDevice,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlDevice,
+				'method' => 'POST',
+				'body'  => array(
 					'device_id' => 	isset($body->device_id) ? $body->device_id: null,
-	                'device_type' => isset($body->device_type) ? $body->device_type : null,
-	                'format' => isset($body->format) ? $body->format : null
+					'device_type' => isset($body->device_type) ? $body->device_type : null,
+					'format' => isset($body->format) ? $body->format : null
 				)
 
 			));
@@ -129,25 +129,25 @@ 
 		}
 		
 		public static function createMember($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'body'  => array(
 					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
-	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
-	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
-	                'route_count' => isset($body->route_count) ? $body->route_count : null,
-	                'member_email' => isset($body->member_email) ? $body->member_email : null,
-	                'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
-	                'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
-	                'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
-	                'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
-	                'member_password' => isset($body->member_password) ? $body->member_password : null,
-	                'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
-	                'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
-	                'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
-	                'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
+					'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
+					'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
+					'route_count' => isset($body->route_count) ? $body->route_count : null,
+					'member_email' => isset($body->member_email) ? $body->member_email : null,
+					'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
+					'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
+					'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
+					'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
+					'member_password' => isset($body->member_password) ? $body->member_password : null,
+					'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
+					'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
+					'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
+					'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
 				)
 
 			));
@@ -155,26 +155,26 @@ 
 		}
 
 		public static function updateMember($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'body'  => array(
 					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
-	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
-	                'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
-	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
-	                'route_count' => isset($body->route_count) ? $body->route_count : null,
-	                'member_email' => isset($body->member_email) ? $body->member_email : null,
-	                'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
-	                'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
-	                'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
-	                'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
-	                'member_password' => isset($body->member_password) ? $body->member_password : null,
-	                'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
-	                'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
-	                'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
-	                'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
+					'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
+					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
+					'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
+					'route_count' => isset($body->route_count) ? $body->route_count : null,
+					'member_email' => isset($body->member_email) ? $body->member_email : null,
+					'HIDE_VISITED_ADDRESSES' => isset($body->HIDE_VISITED_ADDRESSES) ? $body->HIDE_VISITED_ADDRESSES : null,
+					'READONLY_USER' => isset($body->READONLY_USER) ? $body->READONLY_USER : null,
+					'date_of_birth' => isset($body->date_of_birth) ? $body->date_of_birth : null,
+					'member_first_name' => isset($body->member_first_name) ? $body->member_first_name : null,
+					'member_password' => isset($body->member_password) ? $body->member_password : null,
+					'HIDE_NONFUTURE_ROUTES' => isset($body->HIDE_NONFUTURE_ROUTES) ? $body->HIDE_NONFUTURE_ROUTES : null,
+					'member_last_name' => isset($body->member_last_name) ? $body->member_last_name : null,
+					'SHOW_ALL_VEHICLES' => isset($body->SHOW_ALL_VEHICLES) ? $body->SHOW_ALL_VEHICLES : null,
+					'SHOW_ALL_DRIVERS' => isset($body->SHOW_ALL_DRIVERS) ? $body->SHOW_ALL_DRIVERS : null
 				)
 
 			));
@@ -182,11 +182,11 @@ 
 		}
 
 		public static function deleteMember($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETE',
+				'body'  => array(
 					'member_id' => 	isset($body->member_id) ? $body->member_id: null
 				)
 
@@ -195,50 +195,50 @@ 
 		}
 		
 		public static function newAccountRegistration($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlRegistr,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlRegistr,
+				'method' => 'POST',
+				'body'  => array(
 					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
-	                'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null,
-	                'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null,
-	                'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName: null,
-	                'strLastName' => 	isset($body->strLastName) ? $body->strLastName: null,
-	                'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry: null,
-	                'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms: null,
-	                'plan' => 	isset($body->plan) ? $body->plan: null,
-	                'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType: null,
-	                'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false,
-	                'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false
+					'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null,
+					'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null,
+					'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName: null,
+					'strLastName' => 	isset($body->strLastName) ? $body->strLastName: null,
+					'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry: null,
+					'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms: null,
+					'plan' => 	isset($body->plan) ? $body->plan: null,
+					'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType: null,
+					'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false,
+					'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false
 				)
 			));
 			return $response;
 		}
 		
 		public static function validateSession($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlSessValid,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlSessValid,
+				'method' => 'GET',
+				'query'  => array(
 					'session_guid' => 	isset($params->session_guid) ? $params->session_guid: null,
-	                'member_id' => isset($params->member_id) ? $params->member_id : null,
-	                'format' => isset($params->format) ? $params->format : null
+					'member_id' => isset($params->member_id) ? $params->member_id : null,
+					'format' => isset($params->format) ? $params->format : null
 				)
 			));
 			return $response;
 		}
 		
 		public static function memberAuthentication($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlAuthen,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlAuthen,
+				'method' => 'POST',
+				'body'  => array(
 					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
-	                'strPassword' => isset($body->strPassword) ? $body->strPassword : null,
-	                'format' => isset($body->format) ? $body->format : null
+					'strPassword' => isset($body->strPassword) ? $body->strPassword : null,
+					'format' => isset($body->format) ? $body->format : null
 				)
 
 			));
@@ -246,18 +246,18 @@ 
 		}
 		
 		public static function webinarRegistration($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlWebinar,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlWebinar,
+				'method' => 'POST',
+				'body'  => array(
 					'email_address' => 	isset($body->email_address) ? $body->email_address: null,
-	                'first_name' => isset($body->first_name) ? $body->first_name : null,
-	                'last_name' => isset($body->last_name) ? $body->last_name : null,
-	                'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
-	                'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
-	                'member_id' => isset($body->member_id) ? $body->member_id : null,
-	                'webiinar_date' => isset($body->webiinar_date) ? $body->webiinar_date : null,
+					'first_name' => isset($body->first_name) ? $body->first_name : null,
+					'last_name' => isset($body->last_name) ? $body->last_name : null,
+					'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
+					'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
+					'member_id' => isset($body->member_id) ? $body->member_id : null,
+					'webiinar_date' => isset($body->webiinar_date) ? $body->webiinar_date : null,
 				)
 
 			));
@@ -265,19 +265,19 @@ 
 		}
 		
 		public static function purchaseUserLicense($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlLicense,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlLicense,
+				'method' => 'POST',
+				'body'  => array(
 					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
-	                'session_guid' => isset($body->session_guid) ? $body->session_guid : null,
-	                'device_id' => isset($body->device_id) ? $body->device_id : null,
-	                'device_type' => isset($body->device_type) ? $body->device_type : null,
-	                'subscription_name' => isset($body->subscription_name) ? $body->subscription_name : null,
-	                'token' => isset($body->token) ? $body->token : null,
-	                'payload' => isset($body->payload) ? $body->payload : null,
-	                'format' => isset($body->format) ? $body->format : null,
+					'session_guid' => isset($body->session_guid) ? $body->session_guid : null,
+					'device_id' => isset($body->device_id) ? $body->device_id : null,
+					'device_type' => isset($body->device_type) ? $body->device_type : null,
+					'subscription_name' => isset($body->subscription_name) ? $body->subscription_name : null,
+					'token' => isset($body->token) ? $body->token : null,
+					'payload' => isset($body->payload) ? $body->payload : null,
+					'format' => isset($body->format) ? $body->format : null,
 				)
 
 			));
@@ -285,24 +285,24 @@ 
 		}
 		
 		public static function newMemberConfigKey($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'POST',
+				'body'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
-	                'config_value' => isset($body->config_value) ? $body->config_value : null
+					'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));
 			return $response;
 		}
 		
 		public static function removeMemberConfigKey($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'DELETE',
+				'body'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null
 				)
 			));
@@ -310,11 +310,11 @@ 
 		}
 		
 		public static function getMemberConfigData($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'GET',
+				'query'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null
 				)
 			));
@@ -322,13 +322,13 @@ 
 		}
 
 		public static function updateMemberConfigKey($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiMemberConfig,
-	            'method' => 'PUT',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiMemberConfig,
+				'method' => 'PUT',
+				'body'  => array(
 					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
-	                'config_value' => isset($body->config_value) ? $body->config_value : null
+					'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));
 			return $response;

Spacing +25 added lines, -25 removed lines

@@ -64,11 +64,11 @@ 
 		public $config_key;
 		public $config_value;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
-			$member= new Member();
-	        foreach($params as $key => $value) {
+			$member = new Member();
+	        foreach ($params as $key => $value) {
 	            if (property_exists($member, $key)) {
 	                $member->{$key} = $value;
 	            }
@@ -119,7 +119,7 @@ 
 	            'url'    => self::$apiUrlDevice,
 	            'method' => 'POST',
 	            'body'  => array(
-					'device_id' => 	isset($body->device_id) ? $body->device_id: null,
+					'device_id' => 	isset($body->device_id) ? $body->device_id : null,
 	                'device_type' => isset($body->device_type) ? $body->device_type : null,
 	                'format' => isset($body->format) ? $body->format : null
 				)
@@ -134,7 +134,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
+					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES : null,
 	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
 	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
 	                'route_count' => isset($body->route_count) ? $body->route_count : null,
@@ -160,9 +160,9 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'PUT',
 	            'body'  => array(
-					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
+					'member_id' => 	isset($body->member_id) ? $body->member_id : null,
 	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
-	                'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
+	                'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES : null,
 	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
 	                'route_count' => isset($body->route_count) ? $body->route_count : null,
 	                'member_email' => isset($body->member_email) ? $body->member_email : null,
@@ -187,7 +187,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'member_id' => 	isset($body->member_id) ? $body->member_id: null
+					'member_id' => 	isset($body->member_id) ? $body->member_id : null
 				)
 
 			));
@@ -200,17 +200,17 @@ 
 	            'url'    => self::$apiUrlRegistr,
 	            'method' => 'POST',
 	            'body'  => array(
-					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
+					'strEmail' => 	isset($body->strEmail) ? $body->strEmail : null,
 	                'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null,
 	                'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null,
-	                'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName: null,
-	                'strLastName' => 	isset($body->strLastName) ? $body->strLastName: null,
-	                'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry: null,
-	                'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms: null,
-	                'plan' => 	isset($body->plan) ? $body->plan: null,
-	                'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType: null,
-	                'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false,
-	                'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false
+	                'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName : null,
+	                'strLastName' => 	isset($body->strLastName) ? $body->strLastName : null,
+	                'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry : null,
+	                'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms : null,
+	                'plan' => 	isset($body->plan) ? $body->plan : null,
+	                'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType : null,
+	                'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing : false,
+	                'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail : false
 				)
 			));
 			return $response;
@@ -222,7 +222,7 @@ 
 	            'url'    => self::$apiUrlSessValid,
 	            'method' => 'GET',
 	            'query'  => array(
-					'session_guid' => 	isset($params->session_guid) ? $params->session_guid: null,
+					'session_guid' => 	isset($params->session_guid) ? $params->session_guid : null,
 	                'member_id' => isset($params->member_id) ? $params->member_id : null,
 	                'format' => isset($params->format) ? $params->format : null
 				)
@@ -236,7 +236,7 @@ 
 	            'url'    => self::$apiUrlAuthen,
 	            'method' => 'POST',
 	            'body'  => array(
-					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
+					'strEmail' => 	isset($body->strEmail) ? $body->strEmail : null,
 	                'strPassword' => isset($body->strPassword) ? $body->strPassword : null,
 	                'format' => isset($body->format) ? $body->format : null
 				)
@@ -251,7 +251,7 @@ 
 	            'url'    => self::$apiUrlWebinar,
 	            'method' => 'POST',
 	            'body'  => array(
-					'email_address' => 	isset($body->email_address) ? $body->email_address: null,
+					'email_address' => 	isset($body->email_address) ? $body->email_address : null,
 	                'first_name' => isset($body->first_name) ? $body->first_name : null,
 	                'last_name' => isset($body->last_name) ? $body->last_name : null,
 	                'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
@@ -270,7 +270,7 @@ 
 	            'url'    => self::$apiUrlLicense,
 	            'method' => 'POST',
 	            'body'  => array(
-					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
+					'member_id' => 	isset($body->member_id) ? $body->member_id : null,
 	                'session_guid' => isset($body->session_guid) ? $body->session_guid : null,
 	                'device_id' => isset($body->device_id) ? $body->device_id : null,
 	                'device_type' => isset($body->device_type) ? $body->device_type : null,
@@ -290,7 +290,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'POST',
 	            'body'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null,
 	                'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));
@@ -303,7 +303,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null
 				)
 			));
 			return $response;
@@ -315,7 +315,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'GET',
 	            'query'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null
 				)
 			));
 			return $response;
@@ -327,7 +327,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'PUT',
 	            'body'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null,
 	                'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));

examples/Optimizations/hybridOptimization.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 require $vdir.'/../vendor/autoload.php';
 
 use Route4Me\OptimizationProblem;
-use Route4Me\Route;
 use Route4Me\Route4Me;
 
 /* The example demonstrates process of creating a Hybrid Optimization using scheduling addresses and orders.

Indentation +183 added lines, -183 removed lines

@@ -25,222 +25,222 @@
 /* Add Address Book Locations with schedules */
 
 if (($handle = fopen("$source_file", "r")) !== FALSE) {
-        $columns = fgetcsv($handle, $max_line_length, $delemietr);
-        if (!$columns) {
-            $error['message'] = 'Empty';
-             return ($error);
-        }
+		$columns = fgetcsv($handle, $max_line_length, $delemietr);
+		if (!$columns) {
+			$error['message'] = 'Empty';
+			 return ($error);
+		}
         
-        $iRow=1;
+		$iRow=1;
         
-        while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
-            //if ($iRow==1) {$iRow++; continue;}
+		while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
+			//if ($iRow==1) {$iRow++; continue;}
             
-            if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) { // ignore blank lines
-                    //$data1 = $rows[0].", ".$rows[1].", ".$rows[3];
-                    
-                    $schedule="";
-                    $mode="";
-                    
-                    if (isset($rows[8])) {
-                        if (AddressBookLocation::validateScheduleMode($rows[8])) {
-                            $schedule='"mode":"'.$rows[8].'",'; 
-                            $mode=$rows[8];
-                        }
-                        else {echo "$iRow --> Wrong schedule mode parameter <br>"; $schedule="";}
-                    }
-                    else {echo "$iRow --> The schedule mode parameter is not set <br>"; $schedule="";}
-                    
-                    if ($schedule=="") {$iRow++; continue;}
-                    
-                    if (isset($rows[9])) {
-                        if (AddressBookLocation::validateScheduleEnable($rows[9])) { 
-                            $schedule.='"enabled":'.$rows[9].',';
-                        }
-                        else {echo "$iRow --> The schedule enabled parameter is not set <br>"; $schedule="";}
-                    }
-                    
-                    if ($schedule=="") {$iRow++; continue;}
-                    
-                    if (isset($rows[10])) {
-                        if (AddressBookLocation::validateScheduleEvery($rows[10])) {
-                            $schedule.='"'.$mode.'":{'.'"every":'.$rows[10].','; 
-                            if ($mode=='daily') {
-                                $schedule=trim($schedule,',');
-                                $schedule.='}';
-                            }
-                        }
-                        else {echo "$iRow --> The parameter sched_every is not set <br>"; $schedule=""; }
-                    }
-                    
-                    if ($schedule=="") {$iRow++; continue;}
-                    
-                    if ($mode!='daily') {
-                        switch ($mode) {
-                            case 'weekly':
-                                if (isset($rows[11])) {
-                                    if (AddressBookLocation::validateScheduleWeekDays($rows[11])) {
-                                         $schedule.='"weekdays":['.$rows[11].']}';
-                                    }
-                                    else {echo "$iRow --> Wrong weekdays <br>";$schedule="";}
-                                }
-                                else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule="";}
-                                break;
-                            case 'monthly':
-                                $monthlyMode="";
-                                if (isset($rows[12])) {
-                                    if (AddressBookLocation::validateScheduleMonthlyMode($rows[12])) {
-                                         $monthlyMode=$rows[12];
-                                         $schedule.='"mode": "'.$rows[12].'",';
-                                    }
-                                    else {echo "$iRow --> Wrong monthly mode <br>"; $schedule="";}
-                                }
-                                else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule="";}
+			if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) { // ignore blank lines
+					//$data1 = $rows[0].", ".$rows[1].", ".$rows[3];
+                    
+					$schedule="";
+					$mode="";
+                    
+					if (isset($rows[8])) {
+						if (AddressBookLocation::validateScheduleMode($rows[8])) {
+							$schedule='"mode":"'.$rows[8].'",'; 
+							$mode=$rows[8];
+						}
+						else {echo "$iRow --> Wrong schedule mode parameter <br>"; $schedule="";}
+					}
+					else {echo "$iRow --> The schedule mode parameter is not set <br>"; $schedule="";}
+                    
+					if ($schedule=="") {$iRow++; continue;}
+                    
+					if (isset($rows[9])) {
+						if (AddressBookLocation::validateScheduleEnable($rows[9])) { 
+							$schedule.='"enabled":'.$rows[9].',';
+						}
+						else {echo "$iRow --> The schedule enabled parameter is not set <br>"; $schedule="";}
+					}
+                    
+					if ($schedule=="") {$iRow++; continue;}
+                    
+					if (isset($rows[10])) {
+						if (AddressBookLocation::validateScheduleEvery($rows[10])) {
+							$schedule.='"'.$mode.'":{'.'"every":'.$rows[10].','; 
+							if ($mode=='daily') {
+								$schedule=trim($schedule,',');
+								$schedule.='}';
+							}
+						}
+						else {echo "$iRow --> The parameter sched_every is not set <br>"; $schedule=""; }
+					}
+                    
+					if ($schedule=="") {$iRow++; continue;}
+                    
+					if ($mode!='daily') {
+						switch ($mode) {
+							case 'weekly':
+								if (isset($rows[11])) {
+									if (AddressBookLocation::validateScheduleWeekDays($rows[11])) {
+										 $schedule.='"weekdays":['.$rows[11].']}';
+									}
+									else {echo "$iRow --> Wrong weekdays <br>";$schedule="";}
+								}
+								else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule="";}
+								break;
+							case 'monthly':
+								$monthlyMode="";
+								if (isset($rows[12])) {
+									if (AddressBookLocation::validateScheduleMonthlyMode($rows[12])) {
+										 $monthlyMode=$rows[12];
+										 $schedule.='"mode": "'.$rows[12].'",';
+									}
+									else {echo "$iRow --> Wrong monthly mode <br>"; $schedule="";}
+								}
+								else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule="";}
                                 
-                                if ($monthlyMode!="") {
-                                    switch ($monthlyMode) {
-                                        case 'dates':
-                                            if (isset($rows[13])) {
-                                                if (AddressBookLocation::validateScheduleMonthlyDates($rows[13])) {
-                                                     $schedule.='"dates":['.$rows[13].']}';
-                                                }
-                                                else {echo "$iRow --> Wrong monthly dates <br>"; $schedule="";}
-                                            }
-                                            break;
-                                        case 'nth':
-                                            if (isset($rows[16])) {
-                                                if (AddressBookLocation::validateScheduleNthN($rows[16])) {
-                                                     $schedule.='"nth":{"n":'.$rows[16].',';
-                                                }
-                                                else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule="";}
-                                            }
-                                            else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule="";}
+								if ($monthlyMode!="") {
+									switch ($monthlyMode) {
+										case 'dates':
+											if (isset($rows[13])) {
+												if (AddressBookLocation::validateScheduleMonthlyDates($rows[13])) {
+													 $schedule.='"dates":['.$rows[13].']}';
+												}
+												else {echo "$iRow --> Wrong monthly dates <br>"; $schedule="";}
+											}
+											break;
+										case 'nth':
+											if (isset($rows[16])) {
+												if (AddressBookLocation::validateScheduleNthN($rows[16])) {
+													 $schedule.='"nth":{"n":'.$rows[16].',';
+												}
+												else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule="";}
+											}
+											else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule="";}
                                             
-                                            if ($schedule!="") {
-                                                if (isset($rows[17])) {
-                                                    if (AddressBookLocation::validateScheduleNthWhat($rows[17])) {
-                                                         $schedule.='"what":'.$rows[17].'}}';
-                                                    }
-                                                    else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule="";}
-                                                }
-                                                else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule="";}
-                                            }
+											if ($schedule!="") {
+												if (isset($rows[17])) {
+													if (AddressBookLocation::validateScheduleNthWhat($rows[17])) {
+														 $schedule.='"what":'.$rows[17].'}}';
+													}
+													else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule="";}
+												}
+												else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule="";}
+											}
                                             
-                                            break;
-                                    }
-                                }
-                                break;
-                            default:
-                                $schedule=="";
-                                break;
-                        }
+											break;
+									}
+								}
+								break;
+							default:
+								$schedule=="";
+								break;
+						}
                         
-                    }
+					}
                     
-                    if ($schedule=="") {$iRow++; continue;}
+					if ($schedule=="") {$iRow++; continue;}
                     
-                    $schedule=strtolower($schedule);
+					$schedule=strtolower($schedule);
                     
-                    $schedule='[{'.$schedule.'}]';
+					$schedule='[{'.$schedule.'}]';
 
-                    //echo "$iRow --> ".$schedule."<br>";
-                    $oSchedule= json_decode($schedule,TRUE);
-                    
-                    //echo "<br>"; var_dump($oSchedule); echo "<br>";
-                    
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
-                        "cached_lat"    => $rows[0],
-                        "cached_lng"    => $rows[1],
-                        "address_alias"     => $rows[2],
-                        "address_1"     => $rows[3],
-                        "address_city"     => isset($rows[4]) ? $rows[4] : null,
-                        "address_state_id"     => isset($rows[5]) ? $rows[5] : null,
-                        "address_zip"     => isset($rows[6]) ? "$rows[6]" : null,
-                        "address_phone_number"  => isset($rows[7]) ? $rows[7] : null,
-                        "schedule" => isset($oSchedule) ? $oSchedule : null,
-                    ));
-                    
-                    $abContacts=new AddressBookLocation();
+					//echo "$iRow --> ".$schedule."<br>";
+					$oSchedule= json_decode($schedule,TRUE);
+                    
+					//echo "<br>"; var_dump($oSchedule); echo "<br>";
+                    
+					$AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+						"cached_lat"    => $rows[0],
+						"cached_lng"    => $rows[1],
+						"address_alias"     => $rows[2],
+						"address_1"     => $rows[3],
+						"address_city"     => isset($rows[4]) ? $rows[4] : null,
+						"address_state_id"     => isset($rows[5]) ? $rows[5] : null,
+						"address_zip"     => isset($rows[6]) ? "$rows[6]" : null,
+						"address_phone_number"  => isset($rows[7]) ? $rows[7] : null,
+						"schedule" => isset($oSchedule) ? $oSchedule : null,
+					));
+                    
+					$abContacts=new AddressBookLocation();
     
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
-                    
-                    echo "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly <br>"; //temporarry
-              }
-              else echo "$iRow --> Wrong Address or latitude or longitude <br>";
-              $iRow++;
-            }
-    }
+					$abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
+                    
+					echo "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly <br>"; //temporarry
+			  }
+			  else echo "$iRow --> Wrong Address or latitude or longitude <br>";
+			  $iRow++;
+			}
+	}
 
 /* Get Hybrid Optimization */
 
-    $ep = time()+604800;
-    $sched_date = date("Y-m-d", $ep);
+	$ep = time()+604800;
+	$sched_date = date("Y-m-d", $ep);
 
-    $hybridParams = array(
-        "target_date_string" => $sched_date,
-        "timezone_offset_minutes" => 480
-    );
+	$hybridParams = array(
+		"target_date_string" => $sched_date,
+		"timezone_offset_minutes" => 480
+	);
     
-    $optimization = new OptimizationProblem(); 
-    $hybridOptimization = $optimization->getHybridOptimization($hybridParams);
+	$optimization = new OptimizationProblem(); 
+	$hybridOptimization = $optimization->getHybridOptimization($hybridParams);
     
-    if ($hybridOptimization!=null) {
+	if ($hybridOptimization!=null) {
         
-        if (isset($hybridOptimization['optimization_problem_id'])) {
-            $optid = $hybridOptimization['optimization_problem_id'];
+		if (isset($hybridOptimization['optimization_problem_id'])) {
+			$optid = $hybridOptimization['optimization_problem_id'];
             
-            echo "Hibrid optimization with optimization_problem_id=$optid <br><br>";
+			echo "Hibrid optimization with optimization_problem_id=$optid <br><br>";
             
-            /* Add depots to the Hybrid Optimization */
-            $depotfile = "depots.csv";
+			/* Add depots to the Hybrid Optimization */
+			$depotfile = "depots.csv";
             
-            if (($handle = fopen("$depotfile", "r")) !== FALSE) {
+			if (($handle = fopen("$depotfile", "r")) !== FALSE) {
                 
-                $columns = fgetcsv($handle, $max_line_length, $delemietr);
+				$columns = fgetcsv($handle, $max_line_length, $delemietr);
                 
-                if (!$columns) {
-                    $error['message'] = 'Empty';
-                     return ($error);
-                }
+				if (!$columns) {
+					$error['message'] = 'Empty';
+					 return ($error);
+				}
                 
-                $depotsParams = array(
-                    'optimization_problem_id' => $optid,
-                    'delete_old_depots'  => true,
-                );
+				$depotsParams = array(
+					'optimization_problem_id' => $optid,
+					'delete_old_depots'  => true,
+				);
                 
-                $iRow=1;
-                $depotAddresses = array();
+				$iRow=1;
+				$depotAddresses = array();
                 
-                while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
-                    if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) {
-                        $depotAddress['lat']= $rows[0];
-                        $depotAddress['lng']= $rows[1];
-                        $depotAddress['address']= $rows[3];   
-                        array_push($depotAddresses,$depotAddress);
-                    }
-                }
+				while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
+					if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) {
+						$depotAddress['lat']= $rows[0];
+						$depotAddress['lng']= $rows[1];
+						$depotAddress['address']= $rows[3];   
+						array_push($depotAddresses,$depotAddress);
+					}
+				}
                 
-                $depotsParams['new_depots'] = $depotAddresses;
+				$depotsParams['new_depots'] = $depotAddresses;
                 
-                $optProblem = new OptimizationProblem();
+				$optProblem = new OptimizationProblem();
                 
-                $resultDepots = $optProblem->addDepotsToHybrid($depotsParams);
+				$resultDepots = $optProblem->addDepotsToHybrid($depotsParams);
                 
-                var_dump($resultDepots);
+				var_dump($resultDepots);
                 
-                /* Reoptimize hybrid optimization */
+				/* Reoptimize hybrid optimization */
                 
-                if ($resultDepots!=null) {
-                    $problemParams = array(
-                        'optimization_problem_id'  =>  $optid
-                    );
-                    $problem = OptimizationProblem::reoptimize($problemParams);
-                    
-                    Route4Me::simplePrint($problem);
-                }
-            }
+				if ($resultDepots!=null) {
+					$problemParams = array(
+						'optimization_problem_id'  =>  $optid
+					);
+					$problem = OptimizationProblem::reoptimize($problemParams);
+                    
+					Route4Me::simplePrint($problem);
+				}
+			}
                 
-        }
+		}
 
-    }
+	}
 ?>
\ No newline at end of file

Switch Indentation +48 added lines, -48 removed lines

@@ -77,62 +77,62 @@
                     
                     if ($mode!='daily') {
                         switch ($mode) {
-                            case 'weekly':
-                                if (isset($rows[11])) {
-                                    if (AddressBookLocation::validateScheduleWeekDays($rows[11])) {
-                                         $schedule.='"weekdays":['.$rows[11].']}';
-                                    }
-                                    else {echo "$iRow --> Wrong weekdays <br>";$schedule="";}
+                        case 'weekly':
+                            if (isset($rows[11])) {
+                                if (AddressBookLocation::validateScheduleWeekDays($rows[11])) {
+                                     $schedule.='"weekdays":['.$rows[11].']}';
                                 }
-                                else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule="";}
-                                break;
-                            case 'monthly':
-                                $monthlyMode="";
-                                if (isset($rows[12])) {
-                                    if (AddressBookLocation::validateScheduleMonthlyMode($rows[12])) {
-                                         $monthlyMode=$rows[12];
-                                         $schedule.='"mode": "'.$rows[12].'",';
-                                    }
-                                    else {echo "$iRow --> Wrong monthly mode <br>"; $schedule="";}
+                                else {echo "$iRow --> Wrong weekdays <br>";$schedule="";}
+                            }
+                            else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule="";}
+                            break;
+                        case 'monthly':
+                            $monthlyMode="";
+                            if (isset($rows[12])) {
+                                if (AddressBookLocation::validateScheduleMonthlyMode($rows[12])) {
+                                     $monthlyMode=$rows[12];
+                                     $schedule.='"mode": "'.$rows[12].'",';
                                 }
-                                else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule="";}
+                                else {echo "$iRow --> Wrong monthly mode <br>"; $schedule="";}
+                            }
+                            else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule="";}
                                 
-                                if ($monthlyMode!="") {
-                                    switch ($monthlyMode) {
-                                        case 'dates':
-                                            if (isset($rows[13])) {
-                                                if (AddressBookLocation::validateScheduleMonthlyDates($rows[13])) {
-                                                     $schedule.='"dates":['.$rows[13].']}';
-                                                }
-                                                else {echo "$iRow --> Wrong monthly dates <br>"; $schedule="";}
-                                            }
-                                            break;
-                                        case 'nth':
-                                            if (isset($rows[16])) {
-                                                if (AddressBookLocation::validateScheduleNthN($rows[16])) {
-                                                     $schedule.='"nth":{"n":'.$rows[16].',';
-                                                }
-                                                else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule="";}
-                                            }
-                                            else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule="";}
-                                            
-                                            if ($schedule!="") {
-                                                if (isset($rows[17])) {
-                                                    if (AddressBookLocation::validateScheduleNthWhat($rows[17])) {
-                                                         $schedule.='"what":'.$rows[17].'}}';
-                                                    }
-                                                    else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule="";}
-                                                }
-                                                else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule="";}
-                                            }
+                            if ($monthlyMode!="") {
+                                switch ($monthlyMode) {
+                                case 'dates':
+                                if (isset($rows[13])) {
+                                if (AddressBookLocation::validateScheduleMonthlyDates($rows[13])) {
+                                     $schedule.='"dates":['.$rows[13].']}';
+                                }
+                                else {echo "$iRow --> Wrong monthly dates <br>"; $schedule="";}
+                                }
+                                break;
+                                case 'nth':
+                                if (isset($rows[16])) {
+                                if (AddressBookLocation::validateScheduleNthN($rows[16])) {
+                                     $schedule.='"nth":{"n":'.$rows[16].',';
+                                }
+                                else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule="";}
+                                }
+                                else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule="";}
                                             
-                                            break;
+                                if ($schedule!="") {
+                                if (isset($rows[17])) {
+                                    if (AddressBookLocation::validateScheduleNthWhat($rows[17])) {
+                                         $schedule.='"what":'.$rows[17].'}}';
                                     }
+                                    else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule="";}
+                                }
+                                else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule="";}
                                 }
+                                            
                                 break;
-                            default:
-                                $schedule=="";
+                                }
+                                }
                                 break;
+                        default:
+                            $schedule=="";
+                            break;
                         }
                         
                     }

Spacing +54 added lines, -54 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Route4Me;
 
-$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
 require $vdir.'/../vendor/autoload.php';
 
@@ -17,113 +17,113 @@ 
 
 Route4Me::setApiKey('11111111111111111111111111111111');
 
-$source_file="addresses_1000.csv";
+$source_file = "addresses_1000.csv";
 $max_line_length = 512;
-$delemietr=',';
+$delemietr = ',';
 
 
 /* Add Address Book Locations with schedules */
 
-if (($handle = fopen("$source_file", "r")) !== FALSE) {
+if (($handle = fopen("$source_file", "r"))!==FALSE) {
         $columns = fgetcsv($handle, $max_line_length, $delemietr);
         if (!$columns) {
             $error['message'] = 'Empty';
              return ($error);
         }
         
-        $iRow=1;
+        $iRow = 1;
         
-        while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
+        while (($rows = fgetcsv($handle, $max_line_length, $delemietr))!==false) {
             //if ($iRow==1) {$iRow++; continue;}
             
-            if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) { // ignore blank lines
+            if ($rows[0] && $rows[1] && $rows[3] && array(null)!==$rows) { // ignore blank lines
                     //$data1 = $rows[0].", ".$rows[1].", ".$rows[3];
                     
-                    $schedule="";
-                    $mode="";
+                    $schedule = "";
+                    $mode = "";
                     
                     if (isset($rows[8])) {
                         if (AddressBookLocation::validateScheduleMode($rows[8])) {
-                            $schedule='"mode":"'.$rows[8].'",'; 
-                            $mode=$rows[8];
+                            $schedule = '"mode":"'.$rows[8].'",'; 
+                            $mode = $rows[8];
                         }
-                        else {echo "$iRow --> Wrong schedule mode parameter <br>"; $schedule="";}
+                        else {echo "$iRow --> Wrong schedule mode parameter <br>"; $schedule = ""; }
                     }
-                    else {echo "$iRow --> The schedule mode parameter is not set <br>"; $schedule="";}
+                    else {echo "$iRow --> The schedule mode parameter is not set <br>"; $schedule = ""; }
                     
-                    if ($schedule=="") {$iRow++; continue;}
+                    if ($schedule=="") {$iRow++; continue; }
                     
                     if (isset($rows[9])) {
                         if (AddressBookLocation::validateScheduleEnable($rows[9])) { 
-                            $schedule.='"enabled":'.$rows[9].',';
+                            $schedule .= '"enabled":'.$rows[9].',';
                         }
-                        else {echo "$iRow --> The schedule enabled parameter is not set <br>"; $schedule="";}
+                        else {echo "$iRow --> The schedule enabled parameter is not set <br>"; $schedule = ""; }
                     }
                     
-                    if ($schedule=="") {$iRow++; continue;}
+                    if ($schedule=="") {$iRow++; continue; }
                     
                     if (isset($rows[10])) {
                         if (AddressBookLocation::validateScheduleEvery($rows[10])) {
-                            $schedule.='"'.$mode.'":{'.'"every":'.$rows[10].','; 
+                            $schedule .= '"'.$mode.'":{'.'"every":'.$rows[10].','; 
                             if ($mode=='daily') {
-                                $schedule=trim($schedule,',');
-                                $schedule.='}';
+                                $schedule = trim($schedule, ',');
+                                $schedule .= '}';
                             }
                         }
-                        else {echo "$iRow --> The parameter sched_every is not set <br>"; $schedule=""; }
+                        else {echo "$iRow --> The parameter sched_every is not set <br>"; $schedule = ""; }
                     }
                     
-                    if ($schedule=="") {$iRow++; continue;}
+                    if ($schedule=="") {$iRow++; continue; }
                     
                     if ($mode!='daily') {
                         switch ($mode) {
                             case 'weekly':
                                 if (isset($rows[11])) {
                                     if (AddressBookLocation::validateScheduleWeekDays($rows[11])) {
-                                         $schedule.='"weekdays":['.$rows[11].']}';
+                                         $schedule .= '"weekdays":['.$rows[11].']}';
                                     }
-                                    else {echo "$iRow --> Wrong weekdays <br>";$schedule="";}
+                                    else {echo "$iRow --> Wrong weekdays <br>"; $schedule = ""; }
                                 }
-                                else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule="";}
+                                else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule = ""; }
                                 break;
                             case 'monthly':
-                                $monthlyMode="";
+                                $monthlyMode = "";
                                 if (isset($rows[12])) {
                                     if (AddressBookLocation::validateScheduleMonthlyMode($rows[12])) {
-                                         $monthlyMode=$rows[12];
-                                         $schedule.='"mode": "'.$rows[12].'",';
+                                         $monthlyMode = $rows[12];
+                                         $schedule .= '"mode": "'.$rows[12].'",';
                                     }
-                                    else {echo "$iRow --> Wrong monthly mode <br>"; $schedule="";}
+                                    else {echo "$iRow --> Wrong monthly mode <br>"; $schedule = ""; }
                                 }
-                                else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule="";}
+                                else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule = ""; }
                                 
                                 if ($monthlyMode!="") {
                                     switch ($monthlyMode) {
                                         case 'dates':
                                             if (isset($rows[13])) {
                                                 if (AddressBookLocation::validateScheduleMonthlyDates($rows[13])) {
-                                                     $schedule.='"dates":['.$rows[13].']}';
+                                                     $schedule .= '"dates":['.$rows[13].']}';
                                                 }
-                                                else {echo "$iRow --> Wrong monthly dates <br>"; $schedule="";}
+                                                else {echo "$iRow --> Wrong monthly dates <br>"; $schedule = ""; }
                                             }
                                             break;
                                         case 'nth':
                                             if (isset($rows[16])) {
                                                 if (AddressBookLocation::validateScheduleNthN($rows[16])) {
-                                                     $schedule.='"nth":{"n":'.$rows[16].',';
+                                                     $schedule .= '"nth":{"n":'.$rows[16].',';
                                                 }
-                                                else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule="";}
+                                                else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule = ""; }
                                             }
-                                            else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule="";}
+                                            else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule = ""; }
                                             
                                             if ($schedule!="") {
                                                 if (isset($rows[17])) {
                                                     if (AddressBookLocation::validateScheduleNthWhat($rows[17])) {
-                                                         $schedule.='"what":'.$rows[17].'}}';
+                                                         $schedule .= '"what":'.$rows[17].'}}';
                                                     }
-                                                    else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule="";}
+                                                    else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule = ""; }
                                                 }
-                                                else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule="";}
+                                                else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule = ""; }
                                             }
                                             
                                             break;
@@ -137,18 +137,18 @@ 
                         
                     }
                     
-                    if ($schedule=="") {$iRow++; continue;}
+                    if ($schedule=="") {$iRow++; continue; }
                     
-                    $schedule=strtolower($schedule);
+                    $schedule = strtolower($schedule);
                     
-                    $schedule='[{'.$schedule.'}]';
+                    $schedule = '[{'.$schedule.'}]';
 
                     //echo "$iRow --> ".$schedule."<br>";
-                    $oSchedule= json_decode($schedule,TRUE);
+                    $oSchedule = json_decode($schedule, TRUE);
                     
                     //echo "<br>"; var_dump($oSchedule); echo "<br>";
                     
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+                    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
                         "cached_lat"    => $rows[0],
                         "cached_lng"    => $rows[1],
                         "address_alias"     => $rows[2],
@@ -160,9 +160,9 @@ 
                         "schedule" => isset($oSchedule) ? $oSchedule : null,
                     ));
                     
-                    $abContacts=new AddressBookLocation();
+                    $abContacts = new AddressBookLocation();
     
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
+                    $abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
                     
                     echo "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly <br>"; //temporarry
               }
@@ -173,7 +173,7 @@ 
 
 /* Get Hybrid Optimization */
 
-    $ep = time()+604800;
+    $ep = time() + 604800;
     $sched_date = date("Y-m-d", $ep);
 
     $hybridParams = array(
@@ -194,7 +194,7 @@ 
             /* Add depots to the Hybrid Optimization */
             $depotfile = "depots.csv";
             
-            if (($handle = fopen("$depotfile", "r")) !== FALSE) {
+            if (($handle = fopen("$depotfile", "r"))!==FALSE) {
                 
                 $columns = fgetcsv($handle, $max_line_length, $delemietr);
                 
@@ -208,15 +208,15 @@ 
                     'delete_old_depots'  => true,
                 );
                 
-                $iRow=1;
+                $iRow = 1;
                 $depotAddresses = array();
                 
-                while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
-                    if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) {
-                        $depotAddress['lat']= $rows[0];
-                        $depotAddress['lng']= $rows[1];
-                        $depotAddress['address']= $rows[3];   
-                        array_push($depotAddresses,$depotAddress);
+                while (($rows = fgetcsv($handle, $max_line_length, $delemietr))!==false) {
+                    if ($rows[0] && $rows[1] && $rows[3] && array(null)!==$rows) {
+                        $depotAddress['lat'] = $rows[0];
+                        $depotAddress['lng'] = $rows[1];
+                        $depotAddress['address'] = $rows[3];   
+                        array_push($depotAddresses, $depotAddress);
                     }
                 }
                 

Braces +15 added lines, -27 removed lines

@@ -46,18 +46,15 @@ 
                         if (AddressBookLocation::validateScheduleMode($rows[8])) {
                             $schedule='"mode":"'.$rows[8].'",'; 
                             $mode=$rows[8];
-                        }
-                        else {echo "$iRow --> Wrong schedule mode parameter <br>"; $schedule="";}
-                    }
-                    else {echo "$iRow --> The schedule mode parameter is not set <br>"; $schedule="";}
+                        } else {echo "$iRow --> Wrong schedule mode parameter <br>"; $schedule="";}
+                    } else {echo "$iRow --> The schedule mode parameter is not set <br>"; $schedule="";}
                     
                     if ($schedule=="") {$iRow++; continue;}
                     
                     if (isset($rows[9])) {
                         if (AddressBookLocation::validateScheduleEnable($rows[9])) { 
                             $schedule.='"enabled":'.$rows[9].',';
-                        }
-                        else {echo "$iRow --> The schedule enabled parameter is not set <br>"; $schedule="";}
+                        } else {echo "$iRow --> The schedule enabled parameter is not set <br>"; $schedule="";}
                     }
                     
                     if ($schedule=="") {$iRow++; continue;}
@@ -69,8 +66,7 @@ 
                                 $schedule=trim($schedule,',');
                                 $schedule.='}';
                             }
-                        }
-                        else {echo "$iRow --> The parameter sched_every is not set <br>"; $schedule=""; }
+                        } else {echo "$iRow --> The parameter sched_every is not set <br>"; $schedule=""; }
                     }
                     
                     if ($schedule=="") {$iRow++; continue;}
@@ -81,10 +77,8 @@ 
                                 if (isset($rows[11])) {
                                     if (AddressBookLocation::validateScheduleWeekDays($rows[11])) {
                                          $schedule.='"weekdays":['.$rows[11].']}';
-                                    }
-                                    else {echo "$iRow --> Wrong weekdays <br>";$schedule="";}
-                                }
-                                else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule="";}
+                                    } else {echo "$iRow --> Wrong weekdays <br>";$schedule="";}
+                                } else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule="";}
                                 break;
                             case 'monthly':
                                 $monthlyMode="";
@@ -92,10 +86,8 @@ 
                                     if (AddressBookLocation::validateScheduleMonthlyMode($rows[12])) {
                                          $monthlyMode=$rows[12];
                                          $schedule.='"mode": "'.$rows[12].'",';
-                                    }
-                                    else {echo "$iRow --> Wrong monthly mode <br>"; $schedule="";}
-                                }
-                                else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule="";}
+                                    } else {echo "$iRow --> Wrong monthly mode <br>"; $schedule="";}
+                                } else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule="";}
                                 
                                 if ($monthlyMode!="") {
                                     switch ($monthlyMode) {
@@ -103,27 +95,22 @@ 
                                             if (isset($rows[13])) {
                                                 if (AddressBookLocation::validateScheduleMonthlyDates($rows[13])) {
                                                      $schedule.='"dates":['.$rows[13].']}';
-                                                }
-                                                else {echo "$iRow --> Wrong monthly dates <br>"; $schedule="";}
+                                                } else {echo "$iRow --> Wrong monthly dates <br>"; $schedule="";}
                                             }
                                             break;
                                         case 'nth':
                                             if (isset($rows[16])) {
                                                 if (AddressBookLocation::validateScheduleNthN($rows[16])) {
                                                      $schedule.='"nth":{"n":'.$rows[16].',';
-                                                }
-                                                else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule="";}
-                                            }
-                                            else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule="";}
+                                                } else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule="";}
+                                            } else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule="";}
                                             
                                             if ($schedule!="") {
                                                 if (isset($rows[17])) {
                                                     if (AddressBookLocation::validateScheduleNthWhat($rows[17])) {
                                                          $schedule.='"what":'.$rows[17].'}}';
-                                                    }
-                                                    else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule="";}
-                                                }
-                                                else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule="";}
+                                                    } else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule="";}
+                                                } else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule="";}
                                             }
                                             
                                             break;
@@ -165,8 +152,9 @@ 
                     $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
                     
                     echo "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly <br>"; //temporarry
+              } else {
+              	echo "$iRow --> Wrong Address or latitude or longitude <br>";
               }
-              else echo "$iRow --> Wrong Address or latitude or longitude <br>";
               $iRow++;
             }
     }

src/Route4Me/AddressBookLocation.php

Indentation +180 added lines, -180 removed lines

@@ -23,11 +23,11 @@ 
 		public $address_zip;
 		public $cached_lat;
 		public $cached_lng;
-        public $curbside_lat;
-        public $curbside_lng;
+		public $curbside_lat;
+		public $curbside_lng;
 		public $color;
-        public $address_custom_data;
-        public $schedule;
+		public $address_custom_data;
+		public $schedule;
 		
 		//public $offset;
 		//public $limit;
@@ -36,242 +36,242 @@ 
 		
 		public static function fromArray(array $params) {
 			$addressbooklocation = new AddressBookLocation();
-	        foreach($params as $key => $value) {
-	            if (property_exists($addressbooklocation, $key)) {
-	                $addressbooklocation->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($addressbooklocation, $key)) {
+					$addressbooklocation->{$key} = $value;
+				}
 			}
 			
 			return $addressbooklocation;
 		}
 		
 		public static function getAddressBookLocation($addressId)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'query' => $addressId,
-	                'limit' => 30
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'query' => $addressId,
+					'limit' => 30
+				)
+			));
 
 			return $ablocations;
 		}
 		
 		public static function searchRoutedLocation($params)
-	    {
-	    	$result= Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'display' => isset($params['display']) ? $params['display']: null,
-	                'query' => isset($params['query']) ? $params['query']: null,
-	                'fields' => isset($params['fields']) ? $params['fields']: null,
-	                'limit' => isset($params['limit']) ? $params['limit']: null,
-	                'offset' => isset($params['offset']) ? $params['offset'] : null,
-	            )
-	        ));
+		{
+			$result= Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'display' => isset($params['display']) ? $params['display']: null,
+					'query' => isset($params['query']) ? $params['query']: null,
+					'fields' => isset($params['fields']) ? $params['fields']: null,
+					'limit' => isset($params['limit']) ? $params['limit']: null,
+					'offset' => isset($params['offset']) ? $params['offset'] : null,
+				)
+			));
 
 			return $result;
 		}
 		
 		public static function getAddressBookLocations($params)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'limit' => isset($params->limit) ? $params->limit: null,
-	                'offset' => isset($params->offset) ? $params->offset : null,
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'limit' => isset($params->limit) ? $params->limit: null,
+					'offset' => isset($params->offset) ? $params->offset : null,
+				)
+			));
 
 			return $ablocations;
 		}
 		
 		public static function getAddressBookLocationsByIds($ids)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'address_id' => $ids
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'address_id' => $ids
+				)
+			));
 
 			return $ablocations;
 		}
 		
 		public static function addAdressBookLocation($params)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'body'  => array(
-	            	'address_1' => 	isset($params->address_1) ? $params->address_1: null,
-	            	'address_2' =>    isset($params->address_2) ? $params->address_2: null,
-	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
-	                'first_name' => isset($params->first_name) ? $params->first_name : null,
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
-	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
-                    'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
-	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
-	                'address_group' =>    isset($params->address_group) ? $params->address_group: null,
-	                'first_name' =>    isset($params->first_name) ? $params->first_name: null,
-	                'last_name' =>    isset($params->last_name) ? $params->last_name: null,
-                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
-                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
-                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
-                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
-	                'address_email' =>    isset($params->address_email) ? $params->address_email: null,
-	                'address_city' =>    isset($params->address_city) ? $params->address_city: null,
-	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
-	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
-	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
-	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
-	                'schedule' =>    isset($params->schedule) ? $params->schedule: null,
-	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
-	                'service_time' =>    isset($params->service_time) ? $params->service_time: null,
-	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
-	                'color' =>    isset($params->color) ? $params->color: null,
-	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
-	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
-	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
-	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
-	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
-	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
-	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
-	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
-	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'body'  => array(
+					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
+					'address_2' =>    isset($params->address_2) ? $params->address_2: null,
+					'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
+					'first_name' => isset($params->first_name) ? $params->first_name : null,
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
+					'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
+					'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
+					'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
+					'address_group' =>    isset($params->address_group) ? $params->address_group: null,
+					'first_name' =>    isset($params->first_name) ? $params->first_name: null,
+					'last_name' =>    isset($params->last_name) ? $params->last_name: null,
+					'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
+					'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
+					'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
+					'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
+					'address_email' =>    isset($params->address_email) ? $params->address_email: null,
+					'address_city' =>    isset($params->address_city) ? $params->address_city: null,
+					'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
+					'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
+					'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
+					'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
+					'schedule' =>    isset($params->schedule) ? $params->schedule: null,
+					'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
+					'service_time' =>    isset($params->service_time) ? $params->service_time: null,
+					'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
+					'color' =>    isset($params->color) ? $params->color: null,
+					'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
+					'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
+					'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
+					'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
+					'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
+					'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
+					'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
+					'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
+					'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
+				)
+			));
 
 			return $ablocations;
 		}
 		
 		public function deleteAdressBookLocation($address_ids)
-	    {
-	        $address = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETEARRAY',
-	            'query'  => array(
-	                'address_ids'     => $address_ids
-	            )
-	        ));
+		{
+			$address = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETEARRAY',
+				'query'  => array(
+					'address_ids'     => $address_ids
+				)
+			));
 	
-	        return $address;
-	    }
+			return $address;
+		}
 		
 		public function updateAdressBookLocation($params)
-	    {
-	    	//echo "address_id --> ".$params["address_id"]."<br";
-	        $address = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'query'   => $params,
+		{
+			//echo "address_id --> ".$params["address_id"]."<br";
+			$address = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'query'   => $params,
 
-	        ));
+			));
 	
-	        return $address;
-	    }
+			return $address;
+		}
 			
 		public static function get($params)
-	    {
-	    	$ablocations = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'ADD',
-	            'query'  => array(
-	                'first_name' => isset($params->first_name) ? $params->first_name : null,
-	                'address_1' => isset($params->address_1) ? $params->address_1: null,
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
-	            )
-	        ));
+		{
+			$ablocations = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'ADD',
+				'query'  => array(
+					'first_name' => isset($params->first_name) ? $params->first_name : null,
+					'address_1' => isset($params->address_1) ? $params->address_1: null,
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
+				)
+			));
 
 			return $ablocations;
 		}
         
-        public static function validateScheduleMode($scheduleMode)
-        {
-            $schedMmodes=array("daily","weekly","monthly","annually");
+		public static function validateScheduleMode($scheduleMode)
+		{
+			$schedMmodes=array("daily","weekly","monthly","annually");
             
-            if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
-        }
+			if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleEnable($scheduleEnabled)
-        {
-            $schedEnambles=array(TRUE,FALSE);
+		public static function validateScheduleEnable($scheduleEnabled)
+		{
+			$schedEnambles=array(TRUE,FALSE);
             
-            if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
-        }
+			if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleEvery($scheduleEvery)
-        {
-            if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
-        }
+		public static function validateScheduleEvery($scheduleEvery)
+		{
+			if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleWeekDays($scheduleWeekDays)
-        {
-            $weekdays = explode(',', $scheduleWeekDays);
+		public static function validateScheduleWeekDays($scheduleWeekDays)
+		{
+			$weekdays = explode(',', $scheduleWeekDays);
             
-            if (sizeof($weekdays)<1) return FALSE;
+			if (sizeof($weekdays)<1) return FALSE;
             
-            $isValid=TRUE;
+			$isValid=TRUE;
             
-            for ($i=0; $i < sizeof($weekdays); $i++) { 
-                if (is_numeric($weekdays[$i])) {
-                    $wday=intval($weekdays[$i]);
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
-                }
-                else $isValid=FALSE;
-            }
-            //echo $scheduleWeekDays.' --- '. $isValid."<br>";
-            return $isValid;
-        }
+			for ($i=0; $i < sizeof($weekdays); $i++) { 
+				if (is_numeric($weekdays[$i])) {
+					$wday=intval($weekdays[$i]);
+					if ($wday<1 || $wday>7) $isValid=FALSE;
+				}
+				else $isValid=FALSE;
+			}
+			//echo $scheduleWeekDays.' --- '. $isValid."<br>";
+			return $isValid;
+		}
         
-        public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
-        {
-            $schedMonthlyMmodes=array("dates","nth");
+		public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
+		{
+			$schedMonthlyMmodes=array("dates","nth");
             
-            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
-        }
+			if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
-        {
-            $monthlyDates = explode(',', $scheduleMonthlyDates);
+		public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
+		{
+			$monthlyDates = explode(',', $scheduleMonthlyDates);
             
-            if (sizeof($monthlyDates)<1) return FALSE;
+			if (sizeof($monthlyDates)<1) return FALSE;
             
-            $isValid=TRUE;
+			$isValid=TRUE;
             
-            for ($i=0; $i < sizeof($monthlyDates); $i++) { 
-                if (is_numeric($monthlyDates[$i])) {
-                    $mday=intval($monthlyDates[$i]);
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
-                }
-                else $isValid=FALSE;
-            }
-            //echo $scheduleMonthlyDates.' --- '. $isValid."<br>";
-            return $isValid;
-        }
+			for ($i=0; $i < sizeof($monthlyDates); $i++) { 
+				if (is_numeric($monthlyDates[$i])) {
+					$mday=intval($monthlyDates[$i]);
+					if ($mday<1 || $mday>31) $isValid=FALSE;
+				}
+				else $isValid=FALSE;
+			}
+			//echo $scheduleMonthlyDates.' --- '. $isValid."<br>";
+			return $isValid;
+		}
         
-        public static function validateScheduleNthN($scheduleNthN)
-        {
-            if (!is_numeric($scheduleNthN)) return FALSE;
+		public static function validateScheduleNthN($scheduleNthN)
+		{
+			if (!is_numeric($scheduleNthN)) return FALSE;
             
-            $schedNthNs=array(1,2,3,4,5,-1);
-            if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
-        }
+			$schedNthNs=array(1,2,3,4,5,-1);
+			if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
+		}
         
-        public static function validateScheduleNthWhat($scheduleNthWhat)
-        {
-            if (!is_numeric($scheduleNthWhat)) return FALSE;
+		public static function validateScheduleNthWhat($scheduleNthWhat)
+		{
+			if (!is_numeric($scheduleNthWhat)) return FALSE;
             
-            $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-            if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
-        }
+			$schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+			if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
+		}
 	}
 	
 ?>

Spacing +55 added lines, -55 removed lines

@@ -32,11 +32,11 @@ 
 		//public $offset;
 		//public $limit;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
 			$addressbooklocation = new AddressBookLocation();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($addressbooklocation, $key)) {
 	                $addressbooklocation->{$key} = $value;
 	            }
@@ -61,14 +61,14 @@ 
 		
 		public static function searchRoutedLocation($params)
 	    {
-	    	$result= Route4Me::makeRequst(array(
+	    	$result = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'display' => isset($params['display']) ? $params['display']: null,
-	                'query' => isset($params['query']) ? $params['query']: null,
-	                'fields' => isset($params['fields']) ? $params['fields']: null,
-	                'limit' => isset($params['limit']) ? $params['limit']: null,
+	                'display' => isset($params['display']) ? $params['display'] : null,
+	                'query' => isset($params['query']) ? $params['query'] : null,
+	                'fields' => isset($params['fields']) ? $params['fields'] : null,
+	                'limit' => isset($params['limit']) ? $params['limit'] : null,
 	                'offset' => isset($params['offset']) ? $params['offset'] : null,
 	            )
 	        ));
@@ -82,7 +82,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'limit' => isset($params->limit) ? $params->limit: null,
+	                'limit' => isset($params->limit) ? $params->limit : null,
 	                'offset' => isset($params->offset) ? $params->offset : null,
 	            )
 	        ));
@@ -109,42 +109,42 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-	            	'address_1' => 	isset($params->address_1) ? $params->address_1: null,
-	            	'address_2' =>    isset($params->address_2) ? $params->address_2: null,
-	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
+	            	'address_1' => 	isset($params->address_1) ? $params->address_1 : null,
+	            	'address_2' =>    isset($params->address_2) ? $params->address_2 : null,
+	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias : null,
 	                'first_name' => isset($params->first_name) ? $params->first_name : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
                     'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
-	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
-	                'address_group' =>    isset($params->address_group) ? $params->address_group: null,
-	                'first_name' =>    isset($params->first_name) ? $params->first_name: null,
-	                'last_name' =>    isset($params->last_name) ? $params->last_name: null,
-                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
-                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
-                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
-                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
-	                'address_email' =>    isset($params->address_email) ? $params->address_email: null,
-	                'address_city' =>    isset($params->address_city) ? $params->address_city: null,
-	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
-	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
-	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
-	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
-	                'schedule' =>    isset($params->schedule) ? $params->schedule: null,
-	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
-	                'service_time' =>    isset($params->service_time) ? $params->service_time: null,
-	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
-	                'color' =>    isset($params->color) ? $params->color: null,
-	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
-	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
-	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
-	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
-	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
-	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
-	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
-	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
-	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
+	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number : null,
+	                'address_group' =>    isset($params->address_group) ? $params->address_group : null,
+	                'first_name' =>    isset($params->first_name) ? $params->first_name : null,
+	                'last_name' =>    isset($params->last_name) ? $params->last_name : null,
+                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start : null,
+                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end : null,
+                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2 : null,
+                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2 : null,
+	                'address_email' =>    isset($params->address_email) ? $params->address_email : null,
+	                'address_city' =>    isset($params->address_city) ? $params->address_city : null,
+	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id : null,
+	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id : null,
+	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip : null,
+	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data : null,
+	                'schedule' =>    isset($params->schedule) ? $params->schedule : null,
+	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist : null,
+	                'service_time' =>    isset($params->service_time) ? $params->service_time : null,
+	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string : null,
+	                'color' =>    isset($params->color) ? $params->color : null,
+	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon : null,
+	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type : null,
+	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube : null,
+	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces : null,
+	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no : null,
+	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue : null,
+	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight : null,
+	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority : null,
+	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po : null,
 	            )
 	        ));
 
@@ -184,7 +184,7 @@ 
 	            'method' => 'ADD',
 	            'query'  => array(
 	                'first_name' => isset($params->first_name) ? $params->first_name : null,
-	                'address_1' => isset($params->address_1) ? $params->address_1: null,
+	                'address_1' => isset($params->address_1) ? $params->address_1 : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	            )
@@ -195,14 +195,14 @@ 
         
         public static function validateScheduleMode($scheduleMode)
         {
-            $schedMmodes=array("daily","weekly","monthly","annually");
+            $schedMmodes = array("daily", "weekly", "monthly", "annually");
             
             if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
         }
         
         public static function validateScheduleEnable($scheduleEnabled)
         {
-            $schedEnambles=array(TRUE,FALSE);
+            $schedEnambles = array(TRUE, FALSE);
             
             if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
         }
@@ -218,14 +218,14 @@ 
             
             if (sizeof($weekdays)<1) return FALSE;
             
-            $isValid=TRUE;
+            $isValid = TRUE;
             
-            for ($i=0; $i < sizeof($weekdays); $i++) { 
+            for ($i = 0; $i<sizeof($weekdays); $i++) { 
                 if (is_numeric($weekdays[$i])) {
-                    $wday=intval($weekdays[$i]);
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
+                    $wday = intval($weekdays[$i]);
+                    if ($wday<1 || $wday>7) $isValid = FALSE;
                 }
-                else $isValid=FALSE;
+                else $isValid = FALSE;
             }
             //echo $scheduleWeekDays.' --- '. $isValid."<br>";
             return $isValid;
@@ -233,7 +233,7 @@ 
         
         public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
         {
-            $schedMonthlyMmodes=array("dates","nth");
+            $schedMonthlyMmodes = array("dates", "nth");
             
             if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
         }
@@ -244,14 +244,14 @@ 
             
             if (sizeof($monthlyDates)<1) return FALSE;
             
-            $isValid=TRUE;
+            $isValid = TRUE;
             
-            for ($i=0; $i < sizeof($monthlyDates); $i++) { 
+            for ($i = 0; $i<sizeof($monthlyDates); $i++) { 
                 if (is_numeric($monthlyDates[$i])) {
-                    $mday=intval($monthlyDates[$i]);
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
+                    $mday = intval($monthlyDates[$i]);
+                    if ($mday<1 || $mday>31) $isValid = FALSE;
                 }
-                else $isValid=FALSE;
+                else $isValid = FALSE;
             }
             //echo $scheduleMonthlyDates.' --- '. $isValid."<br>";
             return $isValid;
@@ -261,7 +261,7 @@ 
         {
             if (!is_numeric($scheduleNthN)) return FALSE;
             
-            $schedNthNs=array(1,2,3,4,5,-1);
+            $schedNthNs = array(1, 2, 3, 4, 5, -1);
             if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
         }
         
@@ -269,7 +269,7 @@ 
         {
             if (!is_numeric($scheduleNthWhat)) return FALSE;
             
-            $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+            $schedNthWhats = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
             if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
         }
 	}

Braces +52 added lines, -14 removed lines

@@ -197,35 +197,52 @@ 
         {
             $schedMmodes=array("daily","weekly","monthly","annually");
             
-            if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
+            if (in_array($scheduleMode, $schedMmodes)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleEnable($scheduleEnabled)
         {
             $schedEnambles=array(TRUE,FALSE);
             
-            if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
+            if (in_array($scheduleEnabled, $schedEnambles)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleEvery($scheduleEvery)
         {
-            if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
+            if (is_numeric($scheduleEvery)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleWeekDays($scheduleWeekDays)
         {
             $weekdays = explode(',', $scheduleWeekDays);
             
-            if (sizeof($weekdays)<1) return FALSE;
+            if (sizeof($weekdays)<1) {
+            	return FALSE;
+            }
             
             $isValid=TRUE;
             
             for ($i=0; $i < sizeof($weekdays); $i++) { 
                 if (is_numeric($weekdays[$i])) {
                     $wday=intval($weekdays[$i]);
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
+                    if ($wday<1 || $wday>7) {
+                    	$isValid=FALSE;
+                    }
+                } else {
+                	$isValid=FALSE;
                 }
-                else $isValid=FALSE;
             }
             //echo $scheduleWeekDays.' --- '. $isValid."<br>";
             return $isValid;
@@ -235,23 +252,32 @@ 
         {
             $schedMonthlyMmodes=array("dates","nth");
             
-            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
+            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
         {
             $monthlyDates = explode(',', $scheduleMonthlyDates);
             
-            if (sizeof($monthlyDates)<1) return FALSE;
+            if (sizeof($monthlyDates)<1) {
+            	return FALSE;
+            }
             
             $isValid=TRUE;
             
             for ($i=0; $i < sizeof($monthlyDates); $i++) { 
                 if (is_numeric($monthlyDates[$i])) {
                     $mday=intval($monthlyDates[$i]);
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
+                    if ($mday<1 || $mday>31) {
+                    	$isValid=FALSE;
+                    }
+                } else {
+                	$isValid=FALSE;
                 }
-                else $isValid=FALSE;
             }
             //echo $scheduleMonthlyDates.' --- '. $isValid."<br>";
             return $isValid;
@@ -259,18 +285,30 @@ 
         
         public static function validateScheduleNthN($scheduleNthN)
         {
-            if (!is_numeric($scheduleNthN)) return FALSE;
+            if (!is_numeric($scheduleNthN)) {
+            	return FALSE;
+            }
             
             $schedNthNs=array(1,2,3,4,5,-1);
-            if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
+            if (in_array($scheduleNthN, $schedNthNs)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
         
         public static function validateScheduleNthWhat($scheduleNthWhat)
         {
-            if (!is_numeric($scheduleNthWhat)) return FALSE;
+            if (!is_numeric($scheduleNthWhat)) {
+            	return FALSE;
+            }
             
             $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-            if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
+            if (in_array($scheduleNthWhat, $schedNthWhats)) {
+            	return TRUE;
+            } else {
+            	return FALSE;
+            }
         }
 	}