GitHub Access Token became invalid

It seems like the GitHub access token used for retrieving details about this repository from GitHub became invalid. This might prevent certain types of inspections from being run (in particular, everything related to pull requests).
Please ask an admin of your repository to re-new the access token on this website.
Test Failed
Push — master ( 210e2d...dface1 )
by Oleg
05:06
created
src/Route4Me/AddressBookLocation.php 2 patches
Indentation   +325 added lines, -325 removed lines patch added patch discarded remove patch
@@ -23,11 +23,11 @@  discard block
 block discarded – undo
23 23
 		public $address_zip;
24 24
 		public $cached_lat;
25 25
 		public $cached_lng;
26
-        public $curbside_lat;
27
-        public $curbside_lng;
26
+		public $curbside_lat;
27
+		public $curbside_lng;
28 28
 		public $color;
29
-        public $address_custom_data;
30
-        public $schedule;
29
+		public $address_custom_data;
30
+		public $schedule;
31 31
 		
32 32
 		//public $offset;
33 33
 		//public $limit;
@@ -36,415 +36,415 @@  discard block
 block discarded – undo
36 36
 		
37 37
 		public static function fromArray(array $params) {
38 38
 			$addressbooklocation = new AddressBookLocation();
39
-	        foreach($params as $key => $value) {
40
-	            if (property_exists($addressbooklocation, $key)) {
41
-	                $addressbooklocation->{$key} = $value;
42
-	            }
39
+			foreach($params as $key => $value) {
40
+				if (property_exists($addressbooklocation, $key)) {
41
+					$addressbooklocation->{$key} = $value;
42
+				}
43 43
 			}
44 44
 			
45 45
 			return $addressbooklocation;
46 46
 		}
47 47
 		
48 48
 		public static function getAddressBookLocation($addressId)
49
-	    {
50
-	    	$ablocations = Route4Me::makeRequst(array(
51
-	            'url'    => self::$apiUrl,
52
-	            'method' => 'GET',
53
-	            'query'  => array(
54
-	                'query' => $addressId,
55
-	                'limit' => 30
56
-	            )
57
-	        ));
49
+		{
50
+			$ablocations = Route4Me::makeRequst(array(
51
+				'url'    => self::$apiUrl,
52
+				'method' => 'GET',
53
+				'query'  => array(
54
+					'query' => $addressId,
55
+					'limit' => 30
56
+				)
57
+			));
58 58
 
59 59
 			return $ablocations;
60 60
 		}
61 61
 		
62 62
 		public static function searchRoutedLocation($params)
63
-	    {
64
-	    	$result= Route4Me::makeRequst(array(
65
-	            'url'    => self::$apiUrl,
66
-	            'method' => 'GET',
67
-	            'query'  => array(
68
-	                'display' => isset($params['display']) ? $params['display']: null,
69
-	                'query' => isset($params['query']) ? $params['query']: null,
70
-	                'fields' => isset($params['fields']) ? $params['fields']: null,
71
-	                'limit' => isset($params['limit']) ? $params['limit']: null,
72
-	                'offset' => isset($params['offset']) ? $params['offset'] : null,
73
-	            )
74
-	        ));
63
+		{
64
+			$result= Route4Me::makeRequst(array(
65
+				'url'    => self::$apiUrl,
66
+				'method' => 'GET',
67
+				'query'  => array(
68
+					'display' => isset($params['display']) ? $params['display']: null,
69
+					'query' => isset($params['query']) ? $params['query']: null,
70
+					'fields' => isset($params['fields']) ? $params['fields']: null,
71
+					'limit' => isset($params['limit']) ? $params['limit']: null,
72
+					'offset' => isset($params['offset']) ? $params['offset'] : null,
73
+				)
74
+			));
75 75
 
76 76
 			return $result;
77 77
 		}
78 78
 		
79 79
 		public static function getAddressBookLocations($params)
80
-	    {
81
-	    	$ablocations = Route4Me::makeRequst(array(
82
-	            'url'    => self::$apiUrl,
83
-	            'method' => 'GET',
84
-	            'query'  => array(
85
-	                'limit' => isset($params->limit) ? $params->limit: null,
86
-	                'offset' => isset($params->offset) ? $params->offset : null,
87
-	            )
88
-	        ));
80
+		{
81
+			$ablocations = Route4Me::makeRequst(array(
82
+				'url'    => self::$apiUrl,
83
+				'method' => 'GET',
84
+				'query'  => array(
85
+					'limit' => isset($params->limit) ? $params->limit: null,
86
+					'offset' => isset($params->offset) ? $params->offset : null,
87
+				)
88
+			));
89 89
 
90 90
 			return $ablocations;
91 91
 		}
92 92
 		
93 93
 		public static function getAddressBookLocationsByIds($ids)
94
-	    {
95
-	    	$ablocations = Route4Me::makeRequst(array(
96
-	            'url'    => self::$apiUrl,
97
-	            'method' => 'GET',
98
-	            'query'  => array(
99
-	                'address_id' => $ids
100
-	            )
101
-	        ));
94
+		{
95
+			$ablocations = Route4Me::makeRequst(array(
96
+				'url'    => self::$apiUrl,
97
+				'method' => 'GET',
98
+				'query'  => array(
99
+					'address_id' => $ids
100
+				)
101
+			));
102 102
 
103 103
 			return $ablocations;
104 104
 		}
105 105
 		
106 106
 		public static function addAdressBookLocation($params)
107
-	    {
108
-	    	$ablocations = Route4Me::makeRequst(array(
109
-	            'url'    => self::$apiUrl,
110
-	            'method' => 'POST',
111
-	            'body'  => array(
112
-	            	'address_1' => 	isset($params->address_1) ? $params->address_1: null,
113
-	            	'address_2' =>    isset($params->address_2) ? $params->address_2: null,
114
-	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
115
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
116
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
117
-	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
118
-                    'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
119
-	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
120
-	                'address_group' =>    isset($params->address_group) ? $params->address_group: null,
121
-	                'first_name' =>    isset($params->first_name) ? $params->first_name: null,
122
-	                'last_name' =>    isset($params->last_name) ? $params->last_name: null,
123
-                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
124
-                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
125
-                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
126
-                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
127
-	                'address_email' =>    isset($params->address_email) ? $params->address_email: null,
128
-	                'address_city' =>    isset($params->address_city) ? $params->address_city: null,
129
-	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
130
-	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
131
-	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
132
-	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
133
-	                'schedule' =>    isset($params->schedule) ? $params->schedule: null,
134
-	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
135
-	                'service_time' =>    isset($params->service_time) ? $params->service_time: null,
136
-	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
137
-	                'color' =>    isset($params->color) ? $params->color: null,
138
-	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
139
-	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
140
-	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
141
-	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
142
-	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
143
-	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
144
-	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
145
-	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
146
-	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
147
-	            )
148
-	        ));
107
+		{
108
+			$ablocations = Route4Me::makeRequst(array(
109
+				'url'    => self::$apiUrl,
110
+				'method' => 'POST',
111
+				'body'  => array(
112
+					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
113
+					'address_2' =>    isset($params->address_2) ? $params->address_2: null,
114
+					'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
115
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
116
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
117
+					'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
118
+					'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
119
+					'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
120
+					'address_group' =>    isset($params->address_group) ? $params->address_group: null,
121
+					'first_name' =>    isset($params->first_name) ? $params->first_name: null,
122
+					'last_name' =>    isset($params->last_name) ? $params->last_name: null,
123
+					'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
124
+					'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
125
+					'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
126
+					'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
127
+					'address_email' =>    isset($params->address_email) ? $params->address_email: null,
128
+					'address_city' =>    isset($params->address_city) ? $params->address_city: null,
129
+					'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
130
+					'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
131
+					'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
132
+					'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
133
+					'schedule' =>    isset($params->schedule) ? $params->schedule: null,
134
+					'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
135
+					'service_time' =>    isset($params->service_time) ? $params->service_time: null,
136
+					'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
137
+					'color' =>    isset($params->color) ? $params->color: null,
138
+					'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
139
+					'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
140
+					'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
141
+					'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
142
+					'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
143
+					'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
144
+					'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
145
+					'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
146
+					'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
147
+				)
148
+			));
149 149
 
150 150
 			return $ablocations;
151 151
 		}
152 152
 		
153 153
 		public function deleteAdressBookLocation($address_ids)
154
-	    {
155
-	        $address = Route4Me::makeRequst(array(
156
-	            'url'    => self::$apiUrl,
157
-	            'method' => 'DELETEARRAY',
158
-	            'query'  => array(
159
-	                'address_ids'     => $address_ids
160
-	            )
161
-	        ));
154
+		{
155
+			$address = Route4Me::makeRequst(array(
156
+				'url'    => self::$apiUrl,
157
+				'method' => 'DELETEARRAY',
158
+				'query'  => array(
159
+					'address_ids'     => $address_ids
160
+				)
161
+			));
162 162
 	
163
-	        return $address;
164
-	    }
163
+			return $address;
164
+		}
165 165
 		
166 166
 		public function updateAdressBookLocation($params)
167
-	    {
168
-	    	//echo "address_id --> ".$params["address_id"]."<br";
169
-	        $address = Route4Me::makeRequst(array(
170
-	            'url'    => self::$apiUrl,
171
-	            'method' => 'PUT',
172
-	            'query'   => $params,
167
+		{
168
+			//echo "address_id --> ".$params["address_id"]."<br";
169
+			$address = Route4Me::makeRequst(array(
170
+				'url'    => self::$apiUrl,
171
+				'method' => 'PUT',
172
+				'query'   => $params,
173 173
 
174
-	        ));
174
+			));
175 175
 	
176
-	        return $address;
177
-	    }
176
+			return $address;
177
+		}
178 178
 			
179 179
 		public static function get($params)
180
-	    {
181
-	    	$ablocations = Route4Me::makeRequst(array(
182
-	            'url'    => self::$apiUrl,
183
-	            'method' => 'ADD',
184
-	            'query'  => array(
185
-	                'first_name' => isset($params->first_name) ? $params->first_name : null,
186
-	                'address_1' => isset($params->address_1) ? $params->address_1: null,
187
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
188
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
189
-	            )
190
-	        ));
180
+		{
181
+			$ablocations = Route4Me::makeRequst(array(
182
+				'url'    => self::$apiUrl,
183
+				'method' => 'ADD',
184
+				'query'  => array(
185
+					'first_name' => isset($params->first_name) ? $params->first_name : null,
186
+					'address_1' => isset($params->address_1) ? $params->address_1: null,
187
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
188
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
189
+				)
190
+			));
191 191
 
192 192
 			return $ablocations;
193 193
 		}
194 194
         
195
-        public static function validateScheduleMode($scheduleMode)
196
-        {
197
-            $schedMmodes=array("daily","weekly","monthly","annually");
195
+		public static function validateScheduleMode($scheduleMode)
196
+		{
197
+			$schedMmodes=array("daily","weekly","monthly","annually");
198 198
             
199
-            if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
200
-        }
199
+			if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
200
+		}
201 201
         
202
-        public static function validateScheduleEnable($scheduleEnabled)
203
-        {
204
-            $schedEnambles=array(TRUE,FALSE);
202
+		public static function validateScheduleEnable($scheduleEnabled)
203
+		{
204
+			$schedEnambles=array(TRUE,FALSE);
205 205
             
206
-            if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
207
-        }
206
+			if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
207
+		}
208 208
         
209
-        public static function validateScheduleEvery($scheduleEvery)
210
-        {
211
-            if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
212
-        }
209
+		public static function validateScheduleEvery($scheduleEvery)
210
+		{
211
+			if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
212
+		}
213 213
         
214
-        public static function validateScheduleWeekDays($scheduleWeekDays)
215
-        {
216
-            $weekdays = explode(',', $scheduleWeekDays);
214
+		public static function validateScheduleWeekDays($scheduleWeekDays)
215
+		{
216
+			$weekdays = explode(',', $scheduleWeekDays);
217 217
             
218
-            if (sizeof($weekdays)<1) return FALSE;
218
+			if (sizeof($weekdays)<1) return FALSE;
219 219
             
220
-            $isValid=TRUE;
220
+			$isValid=TRUE;
221 221
             
222
-            for ($i=0; $i < sizeof($weekdays); $i++) { 
223
-                if (is_numeric($weekdays[$i])) {
224
-                    $wday=intval($weekdays[$i]);
225
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
226
-                }
227
-                else $isValid=FALSE;
228
-            }
229
-            //echo $scheduleWeekDays.' --- '. $isValid."<br>";
230
-            return $isValid;
231
-        }
222
+			for ($i=0; $i < sizeof($weekdays); $i++) { 
223
+				if (is_numeric($weekdays[$i])) {
224
+					$wday=intval($weekdays[$i]);
225
+					if ($wday<1 || $wday>7) $isValid=FALSE;
226
+				}
227
+				else $isValid=FALSE;
228
+			}
229
+			//echo $scheduleWeekDays.' --- '. $isValid."<br>";
230
+			return $isValid;
231
+		}
232 232
         
233
-        public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
234
-        {
235
-            $schedMonthlyMmodes=array("dates","nth");
233
+		public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
234
+		{
235
+			$schedMonthlyMmodes=array("dates","nth");
236 236
             
237
-            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
238
-        }
237
+			if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
238
+		}
239 239
         
240
-        public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
241
-        {
242
-            $monthlyDates = explode(',', $scheduleMonthlyDates);
240
+		public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
241
+		{
242
+			$monthlyDates = explode(',', $scheduleMonthlyDates);
243 243
             
244
-            if (sizeof($monthlyDates)<1) return FALSE;
244
+			if (sizeof($monthlyDates)<1) return FALSE;
245 245
             
246
-            $isValid=TRUE;
246
+			$isValid=TRUE;
247 247
             
248
-            for ($i=0; $i < sizeof($monthlyDates); $i++) { 
249
-                if (is_numeric($monthlyDates[$i])) {
250
-                    $mday=intval($monthlyDates[$i]);
251
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
252
-                }
253
-                else $isValid=FALSE;
254
-            }
248
+			for ($i=0; $i < sizeof($monthlyDates); $i++) { 
249
+				if (is_numeric($monthlyDates[$i])) {
250
+					$mday=intval($monthlyDates[$i]);
251
+					if ($mday<1 || $mday>31) $isValid=FALSE;
252
+				}
253
+				else $isValid=FALSE;
254
+			}
255 255
 
256
-            return $isValid;
257
-        }
256
+			return $isValid;
257
+		}
258 258
         
259
-        public static function validateScheduleNthN($scheduleNthN)
260
-        {
261
-            if (!is_numeric($scheduleNthN)) return FALSE;
259
+		public static function validateScheduleNthN($scheduleNthN)
260
+		{
261
+			if (!is_numeric($scheduleNthN)) return FALSE;
262 262
             
263
-            $schedNthNs=array(1,2,3,4,5,-1);
264
-            if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
265
-        }
263
+			$schedNthNs=array(1,2,3,4,5,-1);
264
+			if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
265
+		}
266 266
         
267
-        public static function validateScheduleNthWhat($scheduleNthWhat)
268
-        {
269
-            if (!is_numeric($scheduleNthWhat)) return FALSE;
267
+		public static function validateScheduleNthWhat($scheduleNthWhat)
268
+		{
269
+			if (!is_numeric($scheduleNthWhat)) return FALSE;
270 270
             
271
-            $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
272
-            if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
273
-        }
271
+			$schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
272
+			if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
273
+		}
274 274
         
275
-        /* Function adds the locations (with/without schedule) from the CSV file. 
275
+		/* Function adds the locations (with/without schedule) from the CSV file. 
276 276
          * $csvFileHandle - a file handler.
277 277
          * Returns array $results which contains two arrays: fail and succes.
278 278
          */
279
-        public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
280
-        {
281
-            $max_line_length = 512;
282
-            $delemietr=',';
279
+		public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
280
+		{
281
+			$max_line_length = 512;
282
+			$delemietr=',';
283 283
             
284
-            $results=array();
285
-            $results['fail']=array();
286
-            $results['success']=array();
284
+			$results=array();
285
+			$results['fail']=array();
286
+			$results['success']=array();
287 287
             
288
-            $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
289
-            if (!empty($columns)) {
290
-                array_push($results['fail'],'Empty CSV table');
291
-                return ($results);
292
-            }
288
+			$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
289
+			if (!empty($columns)) {
290
+				array_push($results['fail'],'Empty CSV table');
291
+				return ($results);
292
+			}
293 293
                      
294
-            $iRow=1;
294
+			$iRow=1;
295 295
             
296
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
297
-                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
298
-                    $curSchedule="";
299
-                    $mode="";
296
+			while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
297
+				if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
298
+					$curSchedule="";
299
+					$mode="";
300 300
                     
301
-                    if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
302
-                        if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
303
-                            $curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
304
-                            $mode=$rows[$locationsFieldsMapping['schedule_mode']];
305
-                        }
306
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
307
-                    }
308
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
301
+					if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
302
+						if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
303
+							$curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
304
+							$mode=$rows[$locationsFieldsMapping['schedule_mode']];
305
+						}
306
+						else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
307
+					}
308
+					else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
309 309
                     
310
-                    if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
311
-                        if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
312
-                            $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
313
-                        }
314
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
315
-                    }
310
+					if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
311
+						if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
312
+							$curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
313
+						}
314
+						else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
315
+					}
316 316
                     
317
-                    if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
318
-                        if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
319
-                            $curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
320
-                            if ($mode=='daily') {
321
-                                $curSchedule=trim($curSchedule,',');
322
-                                $curSchedule.='}';
323
-                            }
324
-                        }
325
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
326
-                    }
317
+					if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
318
+						if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
319
+							$curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
320
+							if ($mode=='daily') {
321
+								$curSchedule=trim($curSchedule,',');
322
+								$curSchedule.='}';
323
+							}
324
+						}
325
+						else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
326
+					}
327 327
                     
328
-                    if ($mode!='daily') {
329
-                        switch ($mode) {
330
-                            case 'weekly':
331
-                                if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
332
-                                    if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
333
-                                         $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
334
-                                    }
335
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
336
-                                }
337
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
338
-                                break;
339
-                            case 'monthly':
340
-                                $monthlyMode="";
341
-                                if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
342
-                                    if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
343
-                                         $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
344
-                                         $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
345
-                                    }
346
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
347
-                                }
348
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
328
+					if ($mode!='daily') {
329
+						switch ($mode) {
330
+							case 'weekly':
331
+								if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
332
+									if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
333
+										 $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
334
+									}
335
+									else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
336
+								}
337
+								else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
338
+								break;
339
+							case 'monthly':
340
+								$monthlyMode="";
341
+								if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
342
+									if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
343
+										 $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
344
+										 $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
345
+									}
346
+									else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
347
+								}
348
+								else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
349 349
                                 
350
-                                if ($monthlyMode!="") {
351
-                                    switch ($monthlyMode) {
352
-                                        case 'dates':
353
-                                            if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
354
-                                                if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
355
-                                                     $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
356
-                                                }
357
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
358
-                                            }
359
-                                            break;
360
-                                        case 'nth':
361
-                                            if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
362
-                                                if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
363
-                                                     $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
364
-                                                }
365
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
366
-                                            }
367
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
350
+								if ($monthlyMode!="") {
351
+									switch ($monthlyMode) {
352
+										case 'dates':
353
+											if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
354
+												if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
355
+													 $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
356
+												}
357
+												else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
358
+											}
359
+											break;
360
+										case 'nth':
361
+											if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
362
+												if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
363
+													 $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
364
+												}
365
+												else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
366
+											}
367
+											else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
368 368
                                             
369
-                                            if ($curSchedule!="") {
370
-                                                if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
371
-                                                    if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
372
-                                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
373
-                                                    }
374
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
375
-                                                }
376
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
377
-                                            }
369
+											if ($curSchedule!="") {
370
+												if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
371
+													if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
372
+														 $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
373
+													}
374
+													else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
375
+												}
376
+												else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
377
+											}
378 378
                                             
379
-                                            break;
380
-                                    }
381
-                                }
382
-                                break;
383
-                            default:
384
-                                $curSchedule=="";
385
-                                break;
386
-                        }
379
+											break;
380
+									}
381
+								}
382
+								break;
383
+							default:
384
+								$curSchedule=="";
385
+								break;
386
+						}
387 387
                         
388
-                    }
388
+					}
389 389
 
390
-                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue;}
390
+					if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue;}
391 391
                     
392
-                    $curSchedule=strtolower($curSchedule);
392
+					$curSchedule=strtolower($curSchedule);
393 393
                     
394
-                    $curSchedule='[{'.$curSchedule.'}]';
394
+					$curSchedule='[{'.$curSchedule.'}]';
395 395
 
396
-                    $oSchedule= json_decode($curSchedule,TRUE);
396
+					$oSchedule= json_decode($curSchedule,TRUE);
397 397
                     
398
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
399
-                        "cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
400
-                        "cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
401
-                        "curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
402
-                        "curbside_lng"     => isset($locationsFieldsMapping['curbside_lng']) ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
403
-                        "address_alias"     => isset($locationsFieldsMapping['address_alias']) ? $rows[$locationsFieldsMapping['address_alias']] : null,
404
-                        "address_1"     => $rows[$locationsFieldsMapping['address_1']],
405
-                        "address_2"     => isset($locationsFieldsMapping['address_2']) ? $rows[$locationsFieldsMapping['address_2']] : null,
406
-                        "address_city"     => isset($locationsFieldsMapping['address_city']) ? $rows[$locationsFieldsMapping['address_city']] : null,
407
-                        "address_state_id"     => isset($locationsFieldsMapping['address_state_id']) ? $rows[$locationsFieldsMapping['address_state_id']] : null,
408
-                        "address_zip"     => isset($locationsFieldsMapping['address_zip']) ? $rows[$locationsFieldsMapping['address_zip']] : null,
409
-                        "address_phone_number"  => isset($locationsFieldsMapping['address_phone_number']) ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
410
-                        "schedule" => isset($oSchedule) ? $oSchedule : null,
411
-                        "address_group"  => isset($locationsFieldsMapping['address_group']) ? $rows[$locationsFieldsMapping['address_group']] : null,
412
-                        "first_name"  => isset($locationsFieldsMapping['first_name']) ? $rows[$locationsFieldsMapping['first_name']] : null,
413
-                        "last_name"  => isset($locationsFieldsMapping['last_name']) ? $rows[$locationsFieldsMapping['last_name']] : null,
414
-                        "local_time_window_start"  => isset($locationsFieldsMapping['local_time_window_start']) ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
415
-                        "local_time_window_end"  => isset($locationsFieldsMapping['local_time_window_end']) ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
416
-                        "local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2']) ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
417
-                        "local_time_window_end_2"  => isset($locationsFieldsMapping['local_time_window_end_2']) ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
418
-                        "address_email"  => isset($locationsFieldsMapping['address_email']) ? $rows[$locationsFieldsMapping['address_email']] : null,
419
-                        "address_country_id"  => isset($locationsFieldsMapping['address_country_id']) ? $rows[$locationsFieldsMapping['address_country_id']] : null,
420
-                        "address_custom_data"  => isset($locationsFieldsMapping['address_custom_data']) ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
421
-                        "schedule_blacklist"  => isset($locationsFieldsMapping['schedule_blacklist']) ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
422
-                        "service_time"  => isset($locationsFieldsMapping['service_time']) ? $rows[$locationsFieldsMapping['service_time']] : null,
423
-                        "local_timezone_string"  => isset($locationsFieldsMapping['local_timezone_string']) ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
424
-                        "color"  => isset($locationsFieldsMapping['color']) ? $rows[$locationsFieldsMapping['color']] : null,
425
-                        "address_icon"  => isset($locationsFieldsMapping['address_icon']) ? $rows[$locationsFieldsMapping['address_icon']] : null,
426
-                        "address_stop_type"  => isset($locationsFieldsMapping['address_stop_type']) ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
427
-                        "address_cube"  => isset($locationsFieldsMapping['address_cube']) ? $rows[$locationsFieldsMapping['address_cube']] : null,
428
-                        "address_pieces"  => isset($locationsFieldsMapping['address_pieces']) ? $rows[$locationsFieldsMapping['address_pieces']] : null,
429
-                        "address_reference_no"  => isset($locationsFieldsMapping['address_reference_no']) ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
430
-                        "address_revenue"  => isset($locationsFieldsMapping['address_revenue']) ? $rows[$locationsFieldsMapping['address_revenue']] : null,
431
-                        "address_weight"  => isset($locationsFieldsMapping['address_weight']) ? $rows[$locationsFieldsMapping['address_weight']] : null,
432
-                        "address_priority"  => isset($locationsFieldsMapping['address_priority']) ? $rows[$locationsFieldsMapping['address_priority']] : null,
433
-                        "address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
434
-                    ));
398
+					$AdressBookLocationParameters=AddressBookLocation::fromArray(array(
399
+						"cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
400
+						"cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
401
+						"curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
402
+						"curbside_lng"     => isset($locationsFieldsMapping['curbside_lng']) ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
403
+						"address_alias"     => isset($locationsFieldsMapping['address_alias']) ? $rows[$locationsFieldsMapping['address_alias']] : null,
404
+						"address_1"     => $rows[$locationsFieldsMapping['address_1']],
405
+						"address_2"     => isset($locationsFieldsMapping['address_2']) ? $rows[$locationsFieldsMapping['address_2']] : null,
406
+						"address_city"     => isset($locationsFieldsMapping['address_city']) ? $rows[$locationsFieldsMapping['address_city']] : null,
407
+						"address_state_id"     => isset($locationsFieldsMapping['address_state_id']) ? $rows[$locationsFieldsMapping['address_state_id']] : null,
408
+						"address_zip"     => isset($locationsFieldsMapping['address_zip']) ? $rows[$locationsFieldsMapping['address_zip']] : null,
409
+						"address_phone_number"  => isset($locationsFieldsMapping['address_phone_number']) ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
410
+						"schedule" => isset($oSchedule) ? $oSchedule : null,
411
+						"address_group"  => isset($locationsFieldsMapping['address_group']) ? $rows[$locationsFieldsMapping['address_group']] : null,
412
+						"first_name"  => isset($locationsFieldsMapping['first_name']) ? $rows[$locationsFieldsMapping['first_name']] : null,
413
+						"last_name"  => isset($locationsFieldsMapping['last_name']) ? $rows[$locationsFieldsMapping['last_name']] : null,
414
+						"local_time_window_start"  => isset($locationsFieldsMapping['local_time_window_start']) ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
415
+						"local_time_window_end"  => isset($locationsFieldsMapping['local_time_window_end']) ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
416
+						"local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2']) ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
417
+						"local_time_window_end_2"  => isset($locationsFieldsMapping['local_time_window_end_2']) ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
418
+						"address_email"  => isset($locationsFieldsMapping['address_email']) ? $rows[$locationsFieldsMapping['address_email']] : null,
419
+						"address_country_id"  => isset($locationsFieldsMapping['address_country_id']) ? $rows[$locationsFieldsMapping['address_country_id']] : null,
420
+						"address_custom_data"  => isset($locationsFieldsMapping['address_custom_data']) ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
421
+						"schedule_blacklist"  => isset($locationsFieldsMapping['schedule_blacklist']) ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
422
+						"service_time"  => isset($locationsFieldsMapping['service_time']) ? $rows[$locationsFieldsMapping['service_time']] : null,
423
+						"local_timezone_string"  => isset($locationsFieldsMapping['local_timezone_string']) ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
424
+						"color"  => isset($locationsFieldsMapping['color']) ? $rows[$locationsFieldsMapping['color']] : null,
425
+						"address_icon"  => isset($locationsFieldsMapping['address_icon']) ? $rows[$locationsFieldsMapping['address_icon']] : null,
426
+						"address_stop_type"  => isset($locationsFieldsMapping['address_stop_type']) ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
427
+						"address_cube"  => isset($locationsFieldsMapping['address_cube']) ? $rows[$locationsFieldsMapping['address_cube']] : null,
428
+						"address_pieces"  => isset($locationsFieldsMapping['address_pieces']) ? $rows[$locationsFieldsMapping['address_pieces']] : null,
429
+						"address_reference_no"  => isset($locationsFieldsMapping['address_reference_no']) ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
430
+						"address_revenue"  => isset($locationsFieldsMapping['address_revenue']) ? $rows[$locationsFieldsMapping['address_revenue']] : null,
431
+						"address_weight"  => isset($locationsFieldsMapping['address_weight']) ? $rows[$locationsFieldsMapping['address_weight']] : null,
432
+						"address_priority"  => isset($locationsFieldsMapping['address_priority']) ? $rows[$locationsFieldsMapping['address_priority']] : null,
433
+						"address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
434
+					));
435 435
                     
436
-                    $abContacts=new AddressBookLocation();
436
+					$abContacts=new AddressBookLocation();
437 437
     
438
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
438
+					$abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
439 439
                     
440
-                    array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
440
+					array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
441 441
 
442
-                }
442
+				}
443 443
                 
444
-            }
444
+			}
445 445
 
446
-            return $results;
447
-        }
446
+			return $results;
447
+		}
448 448
 	
449 449
 	   
450 450
 	}
Please login to merge, or discard this patch.
Braces   +65 added lines, -40 removed lines patch added patch discarded remove patch
@@ -196,35 +196,52 @@  discard block
 block discarded – undo
196 196
         {
197 197
             $schedMmodes=array("daily","weekly","monthly","annually");
198 198
             
199
-            if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
199
+            if (in_array($scheduleMode, $schedMmodes)) {
200
+            	return TRUE;
201
+            } else {
202
+            	return FALSE;
203
+            }
200 204
         }
201 205
         
202 206
         public static function validateScheduleEnable($scheduleEnabled)
203 207
         {
204 208
             $schedEnambles=array(TRUE,FALSE);
205 209
             
206
-            if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
210
+            if (in_array($scheduleEnabled, $schedEnambles)) {
211
+            	return TRUE;
212
+            } else {
213
+            	return FALSE;
214
+            }
207 215
         }
208 216
         
209 217
         public static function validateScheduleEvery($scheduleEvery)
210 218
         {
211
-            if (is_numeric($scheduleEvery)) return TRUE; else return FALSE;
219
+            if (is_numeric($scheduleEvery)) {
220
+            	return TRUE;
221
+            } else {
222
+            	return FALSE;
223
+            }
212 224
         }
213 225
         
214 226
         public static function validateScheduleWeekDays($scheduleWeekDays)
215 227
         {
216 228
             $weekdays = explode(',', $scheduleWeekDays);
217 229
             
218
-            if (sizeof($weekdays)<1) return FALSE;
230
+            if (sizeof($weekdays)<1) {
231
+            	return FALSE;
232
+            }
219 233
             
220 234
             $isValid=TRUE;
221 235
             
222 236
             for ($i=0; $i < sizeof($weekdays); $i++) { 
223 237
                 if (is_numeric($weekdays[$i])) {
224 238
                     $wday=intval($weekdays[$i]);
225
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
239
+                    if ($wday<1 || $wday>7) {
240
+                    	$isValid=FALSE;
241
+                    }
242
+                } else {
243
+                	$isValid=FALSE;
226 244
                 }
227
-                else $isValid=FALSE;
228 245
             }
229 246
             //echo $scheduleWeekDays.' --- '. $isValid."<br>";
230 247
             return $isValid;
@@ -234,23 +251,32 @@  discard block
 block discarded – undo
234 251
         {
235 252
             $schedMonthlyMmodes=array("dates","nth");
236 253
             
237
-            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
254
+            if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) {
255
+            	return TRUE;
256
+            } else {
257
+            	return FALSE;
258
+            }
238 259
         }
239 260
         
240 261
         public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
241 262
         {
242 263
             $monthlyDates = explode(',', $scheduleMonthlyDates);
243 264
             
244
-            if (sizeof($monthlyDates)<1) return FALSE;
265
+            if (sizeof($monthlyDates)<1) {
266
+            	return FALSE;
267
+            }
245 268
             
246 269
             $isValid=TRUE;
247 270
             
248 271
             for ($i=0; $i < sizeof($monthlyDates); $i++) { 
249 272
                 if (is_numeric($monthlyDates[$i])) {
250 273
                     $mday=intval($monthlyDates[$i]);
251
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
274
+                    if ($mday<1 || $mday>31) {
275
+                    	$isValid=FALSE;
276
+                    }
277
+                } else {
278
+                	$isValid=FALSE;
252 279
                 }
253
-                else $isValid=FALSE;
254 280
             }
255 281
 
256 282
             return $isValid;
@@ -258,18 +284,30 @@  discard block
 block discarded – undo
258 284
         
259 285
         public static function validateScheduleNthN($scheduleNthN)
260 286
         {
261
-            if (!is_numeric($scheduleNthN)) return FALSE;
287
+            if (!is_numeric($scheduleNthN)) {
288
+            	return FALSE;
289
+            }
262 290
             
263 291
             $schedNthNs=array(1,2,3,4,5,-1);
264
-            if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
292
+            if (in_array($scheduleNthN, $schedNthNs)) {
293
+            	return TRUE;
294
+            } else {
295
+            	return FALSE;
296
+            }
265 297
         }
266 298
         
267 299
         public static function validateScheduleNthWhat($scheduleNthWhat)
268 300
         {
269
-            if (!is_numeric($scheduleNthWhat)) return FALSE;
301
+            if (!is_numeric($scheduleNthWhat)) {
302
+            	return FALSE;
303
+            }
270 304
             
271 305
             $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
272
-            if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
306
+            if (in_array($scheduleNthWhat, $schedNthWhats)) {
307
+            	return TRUE;
308
+            } else {
309
+            	return FALSE;
310
+            }
273 311
         }
274 312
         
275 313
         /* Function adds the locations (with/without schedule) from the CSV file. 
@@ -302,16 +340,13 @@  discard block
 block discarded – undo
302 340
                         if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
303 341
                             $curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
304 342
                             $mode=$rows[$locationsFieldsMapping['schedule_mode']];
305
-                        }
306
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
307
-                    }
308
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
343
+                        } else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
344
+                    } else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
309 345
                     
310 346
                     if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
311 347
                         if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
312 348
                             $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
313
-                        }
314
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
349
+                        } else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
315 350
                     }
316 351
                     
317 352
                     if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
@@ -321,8 +356,7 @@  discard block
 block discarded – undo
321 356
                                 $curSchedule=trim($curSchedule,',');
322 357
                                 $curSchedule.='}';
323 358
                             }
324
-                        }
325
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
359
+                        } else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
326 360
                     }
327 361
                     
328 362
                     if ($mode!='daily') {
@@ -331,10 +365,8 @@  discard block
 block discarded – undo
331 365
                                 if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
332 366
                                     if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
333 367
                                          $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
334
-                                    }
335
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
336
-                                }
337
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
368
+                                    } else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
369
+                                } else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
338 370
                                 break;
339 371
                             case 'monthly':
340 372
                                 $monthlyMode="";
@@ -342,10 +374,8 @@  discard block
 block discarded – undo
342 374
                                     if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
343 375
                                          $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
344 376
                                          $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
345
-                                    }
346
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
347
-                                }
348
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
377
+                                    } else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
378
+                                } else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
349 379
                                 
350 380
                                 if ($monthlyMode!="") {
351 381
                                     switch ($monthlyMode) {
@@ -353,27 +383,22 @@  discard block
 block discarded – undo
353 383
                                             if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
354 384
                                                 if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
355 385
                                                      $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
356
-                                                }
357
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
386
+                                                } else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
358 387
                                             }
359 388
                                             break;
360 389
                                         case 'nth':
361 390
                                             if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
362 391
                                                 if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
363 392
                                                      $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
364
-                                                }
365
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
366
-                                            }
367
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
393
+                                                } else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
394
+                                            } else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
368 395
                                             
369 396
                                             if ($curSchedule!="") {
370 397
                                                 if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
371 398
                                                     if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
372 399
                                                          $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
373
-                                                    }
374
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
375
-                                                }
376
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
400
+                                                    } else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
401
+                                                } else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
377 402
                                             }
378 403
                                             
379 404
                                             break;
Please login to merge, or discard this patch.