route4me / route4me-php-sdk

src/Route4Me/AddressBookLocation.php

Indentation +325 added lines, -325 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,415 +36,415 @@ 
 		
 		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,
-	                '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,
+					'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;
-            }
+			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;
+			}
 
-            return $isValid;
-        }
+			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;
+		}
         
-        /* Function adds the locations (with/without schedule) from the CSV file. 
+		/* Function adds the locations (with/without schedule) from the CSV file. 
          * $csvFileHandle - a file handler.
          * Returns array $results which contains two arrays: fail and succes.
          */
-        public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
-        {
-            $max_line_length = 512;
-            $delemietr=',';
+		public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
+		{
+			$max_line_length = 512;
+			$delemietr=',';
             
-            $results=array();
-            $results['fail']=array();
-            $results['success']=array();
+			$results=array();
+			$results['fail']=array();
+			$results['success']=array();
             
-            $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
-            if (!empty($columns)) {
-                array_push($results['fail'],'Empty CSV table');
-                return ($results);
-            }
+			$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
+			if (!empty($columns)) {
+				array_push($results['fail'],'Empty CSV table');
+				return ($results);
+			}
                      
-            $iRow=1;
+			$iRow=1;
             
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
-                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
-                    $curSchedule="";
-                    $mode="";
+			while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
+				if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
+					$curSchedule="";
+					$mode="";
                     
-                    if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
-                        if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
-                            $curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
-                            $mode=$rows[$locationsFieldsMapping['schedule_mode']];
-                        }
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
-                    }
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
+					if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
+						if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
+							$curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
+							$mode=$rows[$locationsFieldsMapping['schedule_mode']];
+						}
+						else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
+					}
+					else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
                     
-                    if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
-                        if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
-                            $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
-                        }
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
-                    }
+					if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
+						if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
+							$curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
+						}
+						else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
+					}
                     
-                    if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
-                        if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
-                            $curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
-                            if ($mode=='daily') {
-                                $curSchedule=trim($curSchedule,',');
-                                $curSchedule.='}';
-                            }
-                        }
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
-                    }
+					if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
+						if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
+							$curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
+							if ($mode=='daily') {
+								$curSchedule=trim($curSchedule,',');
+								$curSchedule.='}';
+							}
+						}
+						else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
+					}
                     
-                    if ($mode!='daily') {
-                        switch ($mode) {
-                            case 'weekly':
-                                if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                    if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                         $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
-                                break;
-                            case 'monthly':
-                                $monthlyMode="";
-                                if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                    if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                         $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
-                                         $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
+					if ($mode!='daily') {
+						switch ($mode) {
+							case 'weekly':
+								if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+									if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+										 $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
+									}
+									else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+								}
+								else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
+								break;
+							case 'monthly':
+								$monthlyMode="";
+								if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
+									if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
+										 $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
+										 $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
+									}
+									else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+								}
+								else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
                                 
-                                if ($monthlyMode!="") {
-                                    switch ($monthlyMode) {
-                                        case 'dates':
-                                            if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                     $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
-                                            }
-                                            break;
-                                        case 'nth':
-                                            if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                     $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
-                                            }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
+								if ($monthlyMode!="") {
+									switch ($monthlyMode) {
+										case 'dates':
+											if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
+												if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
+													 $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+												}
+												else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
+											}
+											break;
+										case 'nth':
+											if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+												if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+													 $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+												}
+												else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
+											}
+											else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
                                             
-                                            if ($curSchedule!="") {
-                                                if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                    if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                                    }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
-                                            }
+											if ($curSchedule!="") {
+												if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+													if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+														 $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+													}
+													else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
+												}
+												else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
+											}
                                             
-                                            break;
-                                    }
-                                }
-                                break;
-                            default:
-                                $curSchedule=="";
-                                break;
-                        }
+											break;
+									}
+								}
+								break;
+							default:
+								$curSchedule=="";
+								break;
+						}
                         
-                    }
+					}
 
-                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue;}
+					if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue;}
                     
-                    $curSchedule=strtolower($curSchedule);
+					$curSchedule=strtolower($curSchedule);
                     
-                    $curSchedule='[{'.$curSchedule.'}]';
+					$curSchedule='[{'.$curSchedule.'}]';
 
-                    $oSchedule= json_decode($curSchedule,TRUE);
+					$oSchedule= json_decode($curSchedule,TRUE);
                     
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
-                        "cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
-                        "cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
-                        "curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
-                        "curbside_lng"     => isset($locationsFieldsMapping['curbside_lng']) ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
-                        "address_alias"     => isset($locationsFieldsMapping['address_alias']) ? $rows[$locationsFieldsMapping['address_alias']] : null,
-                        "address_1"     => $rows[$locationsFieldsMapping['address_1']],
-                        "address_2"     => isset($locationsFieldsMapping['address_2']) ? $rows[$locationsFieldsMapping['address_2']] : null,
-                        "address_city"     => isset($locationsFieldsMapping['address_city']) ? $rows[$locationsFieldsMapping['address_city']] : null,
-                        "address_state_id"     => isset($locationsFieldsMapping['address_state_id']) ? $rows[$locationsFieldsMapping['address_state_id']] : null,
-                        "address_zip"     => isset($locationsFieldsMapping['address_zip']) ? $rows[$locationsFieldsMapping['address_zip']] : null,
-                        "address_phone_number"  => isset($locationsFieldsMapping['address_phone_number']) ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
-                        "schedule" => isset($oSchedule) ? $oSchedule : null,
-                        "address_group"  => isset($locationsFieldsMapping['address_group']) ? $rows[$locationsFieldsMapping['address_group']] : null,
-                        "first_name"  => isset($locationsFieldsMapping['first_name']) ? $rows[$locationsFieldsMapping['first_name']] : null,
-                        "last_name"  => isset($locationsFieldsMapping['last_name']) ? $rows[$locationsFieldsMapping['last_name']] : null,
-                        "local_time_window_start"  => isset($locationsFieldsMapping['local_time_window_start']) ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
-                        "local_time_window_end"  => isset($locationsFieldsMapping['local_time_window_end']) ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
-                        "local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2']) ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
-                        "local_time_window_end_2"  => isset($locationsFieldsMapping['local_time_window_end_2']) ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
-                        "address_email"  => isset($locationsFieldsMapping['address_email']) ? $rows[$locationsFieldsMapping['address_email']] : null,
-                        "address_country_id"  => isset($locationsFieldsMapping['address_country_id']) ? $rows[$locationsFieldsMapping['address_country_id']] : null,
-                        "address_custom_data"  => isset($locationsFieldsMapping['address_custom_data']) ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
-                        "schedule_blacklist"  => isset($locationsFieldsMapping['schedule_blacklist']) ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
-                        "service_time"  => isset($locationsFieldsMapping['service_time']) ? $rows[$locationsFieldsMapping['service_time']] : null,
-                        "local_timezone_string"  => isset($locationsFieldsMapping['local_timezone_string']) ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
-                        "color"  => isset($locationsFieldsMapping['color']) ? $rows[$locationsFieldsMapping['color']] : null,
-                        "address_icon"  => isset($locationsFieldsMapping['address_icon']) ? $rows[$locationsFieldsMapping['address_icon']] : null,
-                        "address_stop_type"  => isset($locationsFieldsMapping['address_stop_type']) ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
-                        "address_cube"  => isset($locationsFieldsMapping['address_cube']) ? $rows[$locationsFieldsMapping['address_cube']] : null,
-                        "address_pieces"  => isset($locationsFieldsMapping['address_pieces']) ? $rows[$locationsFieldsMapping['address_pieces']] : null,
-                        "address_reference_no"  => isset($locationsFieldsMapping['address_reference_no']) ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
-                        "address_revenue"  => isset($locationsFieldsMapping['address_revenue']) ? $rows[$locationsFieldsMapping['address_revenue']] : null,
-                        "address_weight"  => isset($locationsFieldsMapping['address_weight']) ? $rows[$locationsFieldsMapping['address_weight']] : null,
-                        "address_priority"  => isset($locationsFieldsMapping['address_priority']) ? $rows[$locationsFieldsMapping['address_priority']] : null,
-                        "address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
-                    ));
+					$AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+						"cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
+						"cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
+						"curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
+						"curbside_lng"     => isset($locationsFieldsMapping['curbside_lng']) ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
+						"address_alias"     => isset($locationsFieldsMapping['address_alias']) ? $rows[$locationsFieldsMapping['address_alias']] : null,
+						"address_1"     => $rows[$locationsFieldsMapping['address_1']],
+						"address_2"     => isset($locationsFieldsMapping['address_2']) ? $rows[$locationsFieldsMapping['address_2']] : null,
+						"address_city"     => isset($locationsFieldsMapping['address_city']) ? $rows[$locationsFieldsMapping['address_city']] : null,
+						"address_state_id"     => isset($locationsFieldsMapping['address_state_id']) ? $rows[$locationsFieldsMapping['address_state_id']] : null,
+						"address_zip"     => isset($locationsFieldsMapping['address_zip']) ? $rows[$locationsFieldsMapping['address_zip']] : null,
+						"address_phone_number"  => isset($locationsFieldsMapping['address_phone_number']) ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
+						"schedule" => isset($oSchedule) ? $oSchedule : null,
+						"address_group"  => isset($locationsFieldsMapping['address_group']) ? $rows[$locationsFieldsMapping['address_group']] : null,
+						"first_name"  => isset($locationsFieldsMapping['first_name']) ? $rows[$locationsFieldsMapping['first_name']] : null,
+						"last_name"  => isset($locationsFieldsMapping['last_name']) ? $rows[$locationsFieldsMapping['last_name']] : null,
+						"local_time_window_start"  => isset($locationsFieldsMapping['local_time_window_start']) ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
+						"local_time_window_end"  => isset($locationsFieldsMapping['local_time_window_end']) ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
+						"local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2']) ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
+						"local_time_window_end_2"  => isset($locationsFieldsMapping['local_time_window_end_2']) ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
+						"address_email"  => isset($locationsFieldsMapping['address_email']) ? $rows[$locationsFieldsMapping['address_email']] : null,
+						"address_country_id"  => isset($locationsFieldsMapping['address_country_id']) ? $rows[$locationsFieldsMapping['address_country_id']] : null,
+						"address_custom_data"  => isset($locationsFieldsMapping['address_custom_data']) ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
+						"schedule_blacklist"  => isset($locationsFieldsMapping['schedule_blacklist']) ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
+						"service_time"  => isset($locationsFieldsMapping['service_time']) ? $rows[$locationsFieldsMapping['service_time']] : null,
+						"local_timezone_string"  => isset($locationsFieldsMapping['local_timezone_string']) ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
+						"color"  => isset($locationsFieldsMapping['color']) ? $rows[$locationsFieldsMapping['color']] : null,
+						"address_icon"  => isset($locationsFieldsMapping['address_icon']) ? $rows[$locationsFieldsMapping['address_icon']] : null,
+						"address_stop_type"  => isset($locationsFieldsMapping['address_stop_type']) ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
+						"address_cube"  => isset($locationsFieldsMapping['address_cube']) ? $rows[$locationsFieldsMapping['address_cube']] : null,
+						"address_pieces"  => isset($locationsFieldsMapping['address_pieces']) ? $rows[$locationsFieldsMapping['address_pieces']] : null,
+						"address_reference_no"  => isset($locationsFieldsMapping['address_reference_no']) ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
+						"address_revenue"  => isset($locationsFieldsMapping['address_revenue']) ? $rows[$locationsFieldsMapping['address_revenue']] : null,
+						"address_weight"  => isset($locationsFieldsMapping['address_weight']) ? $rows[$locationsFieldsMapping['address_weight']] : null,
+						"address_priority"  => isset($locationsFieldsMapping['address_priority']) ? $rows[$locationsFieldsMapping['address_priority']] : null,
+						"address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
+					));
                     
-                    $abContacts=new AddressBookLocation();
+					$abContacts=new AddressBookLocation();
     
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
+					$abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
                     
-                    array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
+					array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
 
-                }
+				}
                 
-            }
+			}
 
-            return $results;
-        }
+			return $results;
+		}
 	
 	   
 	}

Switch Indentation +48 added lines, -48 removed lines

@@ -327,62 +327,62 @@
                     
                     if ($mode!='daily') {
                         switch ($mode) {
-                            case 'weekly':
-                                if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                    if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                         $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+                        case 'weekly':
+                            if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+                                if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+                                     $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
-                                break;
-                            case 'monthly':
-                                $monthlyMode="";
-                                if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                    if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                         $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
-                                         $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+                                else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+                            }
+                            else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
+                            break;
+                        case 'monthly':
+                            $monthlyMode="";
+                            if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
+                                if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
+                                     $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
+                                     $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
+                                else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+                            }
+                            else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
                                 
-                                if ($monthlyMode!="") {
-                                    switch ($monthlyMode) {
-                                        case 'dates':
-                                            if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                     $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
-                                            }
-                                            break;
-                                        case 'nth':
-                                            if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                     $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
-                                            }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
-                                            
-                                            if ($curSchedule!="") {
-                                                if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                    if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                                    }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
-                                            }
+                            if ($monthlyMode!="") {
+                                switch ($monthlyMode) {
+                                case 'dates':
+                                if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
+                                if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
+                                     $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+                                }
+                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
+                                }
+                                break;
+                                case 'nth':
+                                if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+                                if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+                                     $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+                                }
+                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
+                                }
+                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
                                             
-                                            break;
+                                if ($curSchedule!="") {
+                                if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+                                    if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
                                     }
+                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
+                                }
+                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
                                 }
+                                            
                                 break;
-                            default:
-                                $curSchedule=="";
+                                }
+                                }
                                 break;
+                        default:
+                            $curSchedule=="";
+                            break;
                         }
                         
                     }

Spacing +99 added lines, -99 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,41 +109,41 @@ 
 	            '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,
 	                '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,
 	            )
 	        ));
 
@@ -183,7 +183,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,
 	            )
@@ -194,14 +194,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;
         }
@@ -217,14 +217,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;
@@ -232,7 +232,7 @@ 
         
         public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
         {
-            $schedMonthlyMmodes=array("dates","nth");
+            $schedMonthlyMmodes = array("dates", "nth");
             
             if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
         }
@@ -243,14 +243,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;
             }
 
             return $isValid;
@@ -260,7 +260,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;
         }
         
@@ -268,7 +268,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;
         }
         
@@ -279,50 +279,50 @@ 
         public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
         {
             $max_line_length = 512;
-            $delemietr=',';
+            $delemietr = ',';
             
-            $results=array();
-            $results['fail']=array();
-            $results['success']=array();
+            $results = array();
+            $results['fail'] = array();
+            $results['success'] = array();
             
             $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
             if (!empty($columns)) {
-                array_push($results['fail'],'Empty CSV table');
+                array_push($results['fail'], 'Empty CSV table');
                 return ($results);
             }
                      
-            $iRow=1;
+            $iRow = 1;
             
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
-                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
-                    $curSchedule="";
-                    $mode="";
+            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
+                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null)!==$rows) {
+                    $curSchedule = "";
+                    $mode = "";
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
                         if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
-                            $curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
-                            $mode=$rows[$locationsFieldsMapping['schedule_mode']];
+                            $curSchedule = '"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
+                            $mode = $rows[$locationsFieldsMapping['schedule_mode']];
                         }
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
+                        else {array_push($results['fail'], "$iRow --> Wrong schedule mode parameter"); $curSchedule = ""; }
                     }
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
+                    else {array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); $curSchedule = ""; }
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
                         if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
-                            $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
+                            $curSchedule .= '"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
                         }
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
+                        else {array_push($results['fail'], "$iRow --> The schedule enabled parameter is not set "); $curSchedule = ""; }
                     }
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
                         if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
-                            $curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
+                            $curSchedule .= '"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
                             if ($mode=='daily') {
-                                $curSchedule=trim($curSchedule,',');
-                                $curSchedule.='}';
+                                $curSchedule = trim($curSchedule, ',');
+                                $curSchedule .= '}';
                             }
                         }
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
+                        else {array_push($results['fail'], "$iRow --> The parameter sched_every is not set"); $curSchedule = ""; }
                     }
                     
                     if ($mode!='daily') {
@@ -330,50 +330,50 @@ 
                             case 'weekly':
                                 if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                     if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                         $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
+                                         $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
                                     }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+                                    else {array_push($results['fail'], "$iRow --> Wrong weekdays"); $curSchedule = ""; }
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
+                                else {array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); $curSchedule = ""; }
                                 break;
                             case 'monthly':
-                                $monthlyMode="";
+                                $monthlyMode = "";
                                 if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
                                     if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                         $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
-                                         $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
+                                         $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
+                                         $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
                                     }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+                                    else {array_push($results['fail'], "$iRow --> Wrong monthly mode"); $curSchedule = ""; }
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
+                                else {array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule = ""; }
                                 
                                 if ($monthlyMode!="") {
                                     switch ($monthlyMode) {
                                         case 'dates':
                                             if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
                                                 if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                     $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+                                                     $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
                                                 }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
+                                                else {array_push($results['fail'], "$iRow --> Wrong monthly dates"); $curSchedule = ""; }
                                             }
                                             break;
                                         case 'nth':
                                             if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
                                                 if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                     $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+                                                     $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
                                                 }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
+                                                else {array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); $curSchedule = ""; }
                                             }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
+                                            else {array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); $curSchedule = ""; }
                                             
                                             if ($curSchedule!="") {
                                                 if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                     if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+                                                         $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
                                                     }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
+                                                    else {array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); $curSchedule = ""; }
                                                 }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
+                                                else {array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); $curSchedule = ""; }
                                             }
                                             
                                             break;
@@ -387,15 +387,15 @@ 
                         
                     }
 
-                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue;}
+                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue; }
                     
-                    $curSchedule=strtolower($curSchedule);
+                    $curSchedule = strtolower($curSchedule);
                     
-                    $curSchedule='[{'.$curSchedule.'}]';
+                    $curSchedule = '[{'.$curSchedule.'}]';
 
-                    $oSchedule= json_decode($curSchedule,TRUE);
+                    $oSchedule = json_decode($curSchedule, TRUE);
                     
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+                    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
                         "cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
                         "cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
                         "curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
@@ -433,11 +433,11 @@ 
                         "address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
                     ));
                     
-                    $abContacts=new AddressBookLocation();
+                    $abContacts = new AddressBookLocation();
     
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
+                    $abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
                     
-                    array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
+                    array_push($results['success'], "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
 
                 }
                 

Braces +65 added lines, -40 removed lines

@@ -196,35 +196,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;
@@ -234,23 +251,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;
             }
 
             return $isValid;
@@ -258,18 +284,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;
+            }
         }
         
         /* Function adds the locations (with/without schedule) from the CSV file. 
@@ -302,16 +340,13 @@ 
                         if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
                             $curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
                             $mode=$rows[$locationsFieldsMapping['schedule_mode']];
-                        }
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
-                    }
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
+                        } else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
+                    } else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
                         if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
                             $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
-                        }
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
+                        } else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
                     }
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
@@ -321,8 +356,7 @@ 
                                 $curSchedule=trim($curSchedule,',');
                                 $curSchedule.='}';
                             }
-                        }
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
+                        } else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
                     }
                     
                     if ($mode!='daily') {
@@ -331,10 +365,8 @@ 
                                 if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                     if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                          $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
+                                    } else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+                                } else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
                                 break;
                             case 'monthly':
                                 $monthlyMode="";
@@ -342,10 +374,8 @@ 
                                     if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
                                          $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
                                          $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
+                                    } else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+                                } else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
                                 
                                 if ($monthlyMode!="") {
                                     switch ($monthlyMode) {
@@ -353,27 +383,22 @@ 
                                             if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
                                                 if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
                                                      $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
+                                                } else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
                                             }
                                             break;
                                         case 'nth':
                                             if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
                                                 if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
                                                      $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
-                                            }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
+                                                } else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
+                                            } else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
                                             
                                             if ($curSchedule!="") {
                                                 if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                     if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                          $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                                    }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
+                                                    } else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
+                                                } else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
                                             }
                                             
                                             break;