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.
Passed
Push — master ( fbdbe5...f8b914 )
by Oleg
01:59
created
src/Route4Me/Route4Me.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -207,6 +207,7 @@  discard block
 block discarded – undo
207 207
 
208 208
     /**
209 209
      * @param $object: JSON object
210
+     * @param \SimpleXMLElement $object
210 211
      */
211 212
     public static function object2array($object)
212 213
     {
@@ -304,6 +305,7 @@  discard block
 block discarded – undo
304 305
      * Returns an array of the object properties
305 306
      * @param $object: An object.
306 307
      * @param $exclude: array of the object parameters to be excluded from the returned array.
308
+     * @param string[] $exclude
307 309
      */
308 310
     public static function getObjectProperties($object, $exclude)
309 311
     {
@@ -324,6 +326,7 @@  discard block
 block discarded – undo
324 326
      * Returns url path generated from the array of the fields and parameters.
325 327
      * @param $allFields; array of the paossible fields (parameter names).
326 328
      * @param $params: input parameters (array or object).
329
+     * @param string[] $allFields
327 330
      */
328 331
     public static function generateUrlPath($allFields, $params)
329 332
     {
Please login to merge, or discard this patch.
Indentation   +284 added lines, -284 removed lines patch added patch discarded remove patch
@@ -7,342 +7,342 @@
 block discarded – undo
7 7
 
8 8
 class Route4Me
9 9
 {
10
-    static public $apiKey;
11
-    static public $baseUrl = Endpoint::BASE_URL;
10
+	static public $apiKey;
11
+	static public $baseUrl = Endpoint::BASE_URL;
12 12
 
13
-    public static function setApiKey($apiKey)
14
-    {
15
-        self::$apiKey = $apiKey;
16
-    }
13
+	public static function setApiKey($apiKey)
14
+	{
15
+		self::$apiKey = $apiKey;
16
+	}
17 17
 
18
-    public static function getApiKey()
19
-    {
20
-        return self::$apiKey;
21
-    }
18
+	public static function getApiKey()
19
+	{
20
+		return self::$apiKey;
21
+	}
22 22
 
23
-    public static function setBaseUrl($baseUrl)
24
-    {
25
-        self::$baseUrl = $baseUrl;
26
-    }
23
+	public static function setBaseUrl($baseUrl)
24
+	{
25
+		self::$baseUrl = $baseUrl;
26
+	}
27 27
 
28
-    public static function getBaseUrl()
29
-    {
30
-        return self::$baseUrl;
31
-    }
28
+	public static function getBaseUrl()
29
+	{
30
+		return self::$baseUrl;
31
+	}
32 32
     
33
-    public static function fileUploadRequest($options) {
34
-        $query = isset($options['query']) ? array_filter($options['query']) : array();
33
+	public static function fileUploadRequest($options) {
34
+		$query = isset($options['query']) ? array_filter($options['query']) : array();
35 35
 
36
-        if (sizeof($query)==0) {
37
-            return null;
38
-        }
36
+		if (sizeof($query)==0) {
37
+			return null;
38
+		}
39 39
         
40
-        $body = isset($options['body']) ? array_filter($options['body']) : null;
40
+		$body = isset($options['body']) ? array_filter($options['body']) : null;
41 41
             
42
-        $fname = isset($body['strFilename']) ? $body['strFilename'] : '';
42
+		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
43 43
         
44
-        if ($fname=='') {
45
-            return null;  
46
-        } 
44
+		if ($fname=='') {
45
+			return null;  
46
+		} 
47 47
 
48
-        $rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fname)) : '@'.realpath($fname);
48
+		$rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fname)) : '@'.realpath($fname);
49 49
         
50
-        $url = self::$baseUrl.$options['url'].'?'.http_build_query(array_merge(array('api_key' => self::getApiKey()), $query));
50
+		$url = self::$baseUrl.$options['url'].'?'.http_build_query(array_merge(array('api_key' => self::getApiKey()), $query));
51 51
         
52
-        $ch = curl_init($url);
52
+		$ch = curl_init($url);
53 53
         
54
-        $curlOpts = array(
55
-            CURLOPT_POST => true,
56
-            CURLOPT_RETURNTRANSFER => false,
57
-            CURLOPT_TIMEOUT        => 60,
58
-            CURLOPT_FOLLOWLOCATION => true,
59
-            CURLOPT_SSL_VERIFYHOST => FALSE,
60
-            CURLOPT_SSL_VERIFYPEER => FALSE
61
-        );
54
+		$curlOpts = array(
55
+			CURLOPT_POST => true,
56
+			CURLOPT_RETURNTRANSFER => false,
57
+			CURLOPT_TIMEOUT        => 60,
58
+			CURLOPT_FOLLOWLOCATION => true,
59
+			CURLOPT_SSL_VERIFYHOST => FALSE,
60
+			CURLOPT_SSL_VERIFYPEER => FALSE
61
+		);
62 62
         
63
-        curl_setopt_array($ch, $curlOpts);
63
+		curl_setopt_array($ch, $curlOpts);
64 64
         
65
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
65
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
66 66
         
67
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array(
68
-            "Content-Type: multipart/form-data",
69
-            'Content-Disposition: form-data; name="strFilename"'
70
-        ));
67
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
68
+			"Content-Type: multipart/form-data",
69
+			'Content-Disposition: form-data; name="strFilename"'
70
+		));
71 71
         
72
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
73
-        curl_setopt($ch, CURLOPT_POSTFIELDS, array('strFilename' => $rpath)); 
72
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
73
+		curl_setopt($ch, CURLOPT_POSTFIELDS, array('strFilename' => $rpath)); 
74 74
         
75
-        $result = curl_exec($ch);
75
+		$result = curl_exec($ch);
76 76
 
77
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
78
-        curl_close($ch);
77
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
78
+		curl_close($ch);
79 79
 
80
-        $json = json_decode($result, true);
80
+		$json = json_decode($result, true);
81 81
         
82
-        if (200==$code) {
83
-            return $json;
84
-        } elseif (isset($json['errors'])) {
85
-            throw new ApiError(implode(', ', $json['errors']));
86
-        } else {
87
-            throw new ApiError('Something wrong');
88
-        }
89
-    }
82
+		if (200==$code) {
83
+			return $json;
84
+		} elseif (isset($json['errors'])) {
85
+			throw new ApiError(implode(', ', $json['errors']));
86
+		} else {
87
+			throw new ApiError('Something wrong');
88
+		}
89
+	}
90 90
 
91
-    public static function makeRequst($options) {
92
-        $errorHandler = new myErrorHandler();
91
+	public static function makeRequst($options) {
92
+		$errorHandler = new myErrorHandler();
93 93
 
94
-        $old_error_handler = set_error_handler(array($errorHandler, "proc_error"));
94
+		$old_error_handler = set_error_handler(array($errorHandler, "proc_error"));
95 95
 
96
-        $method = isset($options['method']) ? $options['method'] : 'GET';
97
-        $query = isset($options['query']) ? array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
96
+		$method = isset($options['method']) ? $options['method'] : 'GET';
97
+		$query = isset($options['query']) ? array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
98 98
 
99
-        $body = isset($options['body']) ? $options['body'] : null;
100
-        $file = isset($options['FILE']) ? $options['FILE'] : null;
101
-        $headers = array(
102
-            "User-Agent: Route4Me php-sdk"
103
-        );
99
+		$body = isset($options['body']) ? $options['body'] : null;
100
+		$file = isset($options['FILE']) ? $options['FILE'] : null;
101
+		$headers = array(
102
+			"User-Agent: Route4Me php-sdk"
103
+		);
104 104
 
105
-        if (isset($options['HTTPHEADER'])) {
106
-            $headers[] = $options['HTTPHEADER'];
107
-        }
105
+		if (isset($options['HTTPHEADER'])) {
106
+			$headers[] = $options['HTTPHEADER'];
107
+		}
108 108
 
109
-        if (isset($options['HTTPHEADERS'])) {
110
-            foreach ($options['HTTPHEADERS'] As $header) {
111
-                $headers[] = $header;
112
-            } 
113
-        }
109
+		if (isset($options['HTTPHEADERS'])) {
110
+			foreach ($options['HTTPHEADERS'] As $header) {
111
+				$headers[] = $header;
112
+			} 
113
+		}
114 114
 
115
-        $ch = curl_init();
115
+		$ch = curl_init();
116 116
 
117
-        $url = isset($options['url']) ? $options['url'].'?'.http_build_query(array_merge(
118
-            $query, array('api_key' => self::getApiKey())
119
-        )) : "";
117
+		$url = isset($options['url']) ? $options['url'].'?'.http_build_query(array_merge(
118
+			$query, array('api_key' => self::getApiKey())
119
+		)) : "";
120 120
 
121
-        $baseUrl = self::getBaseUrl();
121
+		$baseUrl = self::getBaseUrl();
122 122
  
123
-        $curlOpts = array(
124
-            CURLOPT_URL            => $baseUrl.$url,
125
-            CURLOPT_RETURNTRANSFER => true,
126
-            CURLOPT_TIMEOUT        => 80,
127
-            CURLOPT_FOLLOWLOCATION => true,
128
-            CURLOPT_SSL_VERIFYHOST => FALSE,
129
-            CURLOPT_SSL_VERIFYPEER => FALSE,
130
-            CURLOPT_HTTPHEADER     => $headers
131
-        );
123
+		$curlOpts = array(
124
+			CURLOPT_URL            => $baseUrl.$url,
125
+			CURLOPT_RETURNTRANSFER => true,
126
+			CURLOPT_TIMEOUT        => 80,
127
+			CURLOPT_FOLLOWLOCATION => true,
128
+			CURLOPT_SSL_VERIFYHOST => FALSE,
129
+			CURLOPT_SSL_VERIFYPEER => FALSE,
130
+			CURLOPT_HTTPHEADER     => $headers
131
+		);
132 132
         
133
-        curl_setopt_array($ch, $curlOpts);
133
+		curl_setopt_array($ch, $curlOpts);
134 134
         
135
-        if ($file!=null) {
136
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
137
-            $fp=fopen($file, 'r');
138
-            curl_setopt($ch, CURLOPT_INFILE, $fp);
139
-            curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
140
-        }
135
+		if ($file!=null) {
136
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
137
+			$fp=fopen($file, 'r');
138
+			curl_setopt($ch, CURLOPT_INFILE, $fp);
139
+			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
140
+		}
141 141
 
142
-        switch ($method) {
143
-        case 'DELETE':
144
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
145
-            break;
146
-        case 'DELETEARRAY':
147
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
148
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
149
-            break;
150
-        case 'PUT':
151
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
152
-            break;
153
-        case 'POST':
154
-           if (isset($body)) {
155
-                $bodyData = json_encode($body);
156
-               if (isset($options['HTTPHEADER'])) {
157
-                  if (strpos($options['HTTPHEADER'], "multipart/form-data")>0) {
158
-                      $bodyData = $body;
159
-                  }
160
-               }
142
+		switch ($method) {
143
+		case 'DELETE':
144
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
145
+			break;
146
+		case 'DELETEARRAY':
147
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
148
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
149
+			break;
150
+		case 'PUT':
151
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
152
+			break;
153
+		case 'POST':
154
+		   if (isset($body)) {
155
+				$bodyData = json_encode($body);
156
+			   if (isset($options['HTTPHEADER'])) {
157
+				  if (strpos($options['HTTPHEADER'], "multipart/form-data")>0) {
158
+					  $bodyData = $body;
159
+				  }
160
+			   }
161 161
                
162
-               curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData); 
163
-            } 
164
-            break;
165
-        case 'ADD':
166
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
167
-        }
162
+			   curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData); 
163
+			} 
164
+			break;
165
+		case 'ADD':
166
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
167
+		}
168 168
 
169
-        if (is_numeric(array_search($method, array('DELETE', 'PUT')))) {
170
-            if (isset($body)) {
171
-                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
172
-            } 
173
-        }
169
+		if (is_numeric(array_search($method, array('DELETE', 'PUT')))) {
170
+			if (isset($body)) {
171
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
172
+			} 
173
+		}
174 174
 
175
-        $result = curl_exec($ch);
175
+		$result = curl_exec($ch);
176 176
 
177
-        $isxml = FALSE;
178
-        $jxml = "";
179
-        if (strpos($result, '<?xml')>-1) {
180
-            $xml = simplexml_load_string($result);
181
-            //$jxml = json_encode($xml);
182
-            $jxml = self::object2array($xml);
183
-            $isxml = TRUE;
184
-        }
177
+		$isxml = FALSE;
178
+		$jxml = "";
179
+		if (strpos($result, '<?xml')>-1) {
180
+			$xml = simplexml_load_string($result);
181
+			//$jxml = json_encode($xml);
182
+			$jxml = self::object2array($xml);
183
+			$isxml = TRUE;
184
+		}
185 185
         
186
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
187
-        curl_close($ch);
186
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
187
+		curl_close($ch);
188 188
         
189
-        if (200==$code) {
190
-            if ($isxml) {
191
-                $json = $jxml;
192
-            } else {
193
-                $json = json_decode($result, true);
194
-            }
189
+		if (200==$code) {
190
+			if ($isxml) {
191
+				$json = $jxml;
192
+			} else {
193
+				$json = json_decode($result, true);
194
+			}
195 195
             
196
-            if (isset($json['errors'])) {
197
-                throw new ApiError(implode(', ', $json['errors']));
198
-            } else {
199
-                return $json;
200
-            }
201
-        } elseif (409==$code) {
202
-            throw new ApiError('Wrong API key');
203
-        } else {
204
-            throw new ApiError('Something wrong');
205
-        }
206
-    }
196
+			if (isset($json['errors'])) {
197
+				throw new ApiError(implode(', ', $json['errors']));
198
+			} else {
199
+				return $json;
200
+			}
201
+		} elseif (409==$code) {
202
+			throw new ApiError('Wrong API key');
203
+		} else {
204
+			throw new ApiError('Something wrong');
205
+		}
206
+	}
207 207
 
208
-    /**
209
-     * @param $object: JSON object
210
-     */
211
-    public static function object2array($object)
212
-    {
213
-        return @json_decode(@json_encode($object), 1);
214
-    }
208
+	/**
209
+	 * @param $object: JSON object
210
+	 */
211
+	public static function object2array($object)
212
+	{
213
+		return @json_decode(@json_encode($object), 1);
214
+	}
215 215
 
216 216
     
217
-    /**
218
-     * Prints on the screen main keys and values of the array 
219
-     * @param $results: object to be printed on the screen.
220
-     * @param $deepPrinting: if true, object will be printed recursively.
221
-     */
222
-    public static function simplePrint($results, $deepPrinting = null)
223
-    {
224
-        if (isset($results)) {
225
-            if (is_array($results)) {
226
-                foreach ($results as $key=>$result) {
227
-                    if (is_array($result)) {
228
-                        foreach ($result as $key1=>$result1) {
229
-                            if (is_array($result1)) {
230
-                                  if ($deepPrinting) {
231
-                                      echo "<br>$key1 ------><br>";
232
-                                      Route4Me::simplePrint($result1, true);
233
-                                      echo "------<br>";
234
-                                  } else {
235
-                                      echo $key1." --> "."Array() <br>";
236
-                                  } 
237
-                            } else {
238
-                                if (is_object($result1)) {
239
-                                    if ($deepPrinting) {
240
-                                        echo "<br>$key1 ------><br>";
241
-                                        $oarray = (array)$result1;
242
-                                        Route4Me::simplePrint($oarray, true);
243
-                                        echo "------<br>";
244
-                                    } else {
245
-                                        echo $key1." --> "."Object <br>";
246
-                                    } 
247
-                                } else {
248
-                                    if (!is_null($result1)) {
249
-                                        echo $key1." --> ".$result1."<br>"; 
250
-                                    }   
251
-                                }
252
-                            }
253
-                        }
254
-                    } else {
255
-                        if (is_object($result)) {
256
-                            if ($deepPrinting) {
257
-                                echo "<br>$key ------><br>";
258
-                                $oarray = (array)$result;
259
-                                Route4Me::simplePrint($oarray, true);
260
-                                echo "------<br>";
261
-                            } else {
262
-                                echo $key." --> "."Object <br>";
263
-                            } 
264
-                        } else {
265
-                            if (!is_null($result)) {
266
-                                echo $key." --> ".$result."<br>";
267
-                            }
268
-                        }
217
+	/**
218
+	 * Prints on the screen main keys and values of the array 
219
+	 * @param $results: object to be printed on the screen.
220
+	 * @param $deepPrinting: if true, object will be printed recursively.
221
+	 */
222
+	public static function simplePrint($results, $deepPrinting = null)
223
+	{
224
+		if (isset($results)) {
225
+			if (is_array($results)) {
226
+				foreach ($results as $key=>$result) {
227
+					if (is_array($result)) {
228
+						foreach ($result as $key1=>$result1) {
229
+							if (is_array($result1)) {
230
+								  if ($deepPrinting) {
231
+									  echo "<br>$key1 ------><br>";
232
+									  Route4Me::simplePrint($result1, true);
233
+									  echo "------<br>";
234
+								  } else {
235
+									  echo $key1." --> "."Array() <br>";
236
+								  } 
237
+							} else {
238
+								if (is_object($result1)) {
239
+									if ($deepPrinting) {
240
+										echo "<br>$key1 ------><br>";
241
+										$oarray = (array)$result1;
242
+										Route4Me::simplePrint($oarray, true);
243
+										echo "------<br>";
244
+									} else {
245
+										echo $key1." --> "."Object <br>";
246
+									} 
247
+								} else {
248
+									if (!is_null($result1)) {
249
+										echo $key1." --> ".$result1."<br>"; 
250
+									}   
251
+								}
252
+							}
253
+						}
254
+					} else {
255
+						if (is_object($result)) {
256
+							if ($deepPrinting) {
257
+								echo "<br>$key ------><br>";
258
+								$oarray = (array)$result;
259
+								Route4Me::simplePrint($oarray, true);
260
+								echo "------<br>";
261
+							} else {
262
+								echo $key." --> "."Object <br>";
263
+							} 
264
+						} else {
265
+							if (!is_null($result)) {
266
+								echo $key." --> ".$result."<br>";
267
+							}
268
+						}
269 269
                         
270
-                    }
271
-                    //echo "<br>";
272
-                }
273
-            } 
274
-        }
275
-    }
270
+					}
271
+					//echo "<br>";
272
+				}
273
+			} 
274
+		}
275
+	}
276 276
 
277
-    /**
278
-     * Generates query or body parameters.
279
-     * @param $allFields: all known fields could be used for parameters generation.
280
-     * @param $params: input parameters (array or object)
281
-     */
282
-    public static function generateRequestParameters($allFields, $params)
283
-    {
284
-        $generatedParams = array();
277
+	/**
278
+	 * Generates query or body parameters.
279
+	 * @param $allFields: all known fields could be used for parameters generation.
280
+	 * @param $params: input parameters (array or object)
281
+	 */
282
+	public static function generateRequestParameters($allFields, $params)
283
+	{
284
+		$generatedParams = array();
285 285
         
286
-        if (is_array($params)) {
287
-            foreach ($allFields as $field) {
288
-                if (isset($params[$field])) {
289
-                    $generatedParams[$field] = $params[$field];
290
-                }
291
-            }
292
-        } elseif (is_object($params)) {
293
-            foreach ($allFields as $field) {
294
-                if (isset($params->{$field})) {
295
-                    $generatedParams[$field] = $params->{$field};
296
-                }
297
-            }
298
-        }
286
+		if (is_array($params)) {
287
+			foreach ($allFields as $field) {
288
+				if (isset($params[$field])) {
289
+					$generatedParams[$field] = $params[$field];
290
+				}
291
+			}
292
+		} elseif (is_object($params)) {
293
+			foreach ($allFields as $field) {
294
+				if (isset($params->{$field})) {
295
+					$generatedParams[$field] = $params->{$field};
296
+				}
297
+			}
298
+		}
299 299
 
300
-        return $generatedParams;
301
-    }
300
+		return $generatedParams;
301
+	}
302 302
     
303
-    /**
304
-     * Returns an array of the object properties
305
-     * @param $object: An object.
306
-     * @param $exclude: array of the object parameters to be excluded from the returned array.
307
-     */
308
-    public static function getObjectProperties($object, $exclude)
309
-    {
310
-        $objectParameters = array();
303
+	/**
304
+	 * Returns an array of the object properties
305
+	 * @param $object: An object.
306
+	 * @param $exclude: array of the object parameters to be excluded from the returned array.
307
+	 */
308
+	public static function getObjectProperties($object, $exclude)
309
+	{
310
+		$objectParameters = array();
311 311
         
312
-        foreach (get_object_vars($object) as $key => $value) {
313
-            if (property_exists($object, $key)) {
314
-                if (!is_numeric(array_search($key, $exclude))) {
315
-                    array_push($objectParameters, $key);
316
-                }
317
-            }
318
-        }
312
+		foreach (get_object_vars($object) as $key => $value) {
313
+			if (property_exists($object, $key)) {
314
+				if (!is_numeric(array_search($key, $exclude))) {
315
+					array_push($objectParameters, $key);
316
+				}
317
+			}
318
+		}
319 319
         
320
-        return $objectParameters;
321
-    }
320
+		return $objectParameters;
321
+	}
322 322
     
323
-    /**
324
-     * Returns url path generated from the array of the fields and parameters.
325
-     * @param $allFields; array of the paossible fields (parameter names).
326
-     * @param $params: input parameters (array or object).
327
-     */
328
-    public static function generateUrlPath($allFields, $params)
329
-    {
330
-        $generatedPath = "";
323
+	/**
324
+	 * Returns url path generated from the array of the fields and parameters.
325
+	 * @param $allFields; array of the paossible fields (parameter names).
326
+	 * @param $params: input parameters (array or object).
327
+	 */
328
+	public static function generateUrlPath($allFields, $params)
329
+	{
330
+		$generatedPath = "";
331 331
 
332
-        if (is_array($params)) {
333
-            foreach ($allFields as $field) {
334
-                if (isset($params[$field])) {
335
-                    $generatedPath .= $params[$field].'/';
336
-                }
337
-            }
338
-        } elseif (is_object($params)) {
339
-            foreach ($allFields as $field) {
340
-                if (isset($params->{$field})) {
341
-                    $generatedPath .= $params->{$field}.'/';
342
-                }
343
-            }
344
-        }
332
+		if (is_array($params)) {
333
+			foreach ($allFields as $field) {
334
+				if (isset($params[$field])) {
335
+					$generatedPath .= $params[$field].'/';
336
+				}
337
+			}
338
+		} elseif (is_object($params)) {
339
+			foreach ($allFields as $field) {
340
+				if (isset($params->{$field})) {
341
+					$generatedPath .= $params->{$field}.'/';
342
+				}
343
+			}
344
+		}
345 345
         
346
-        return $generatedPath;
347
-    }
346
+		return $generatedPath;
347
+	}
348 348
 }
Please login to merge, or discard this patch.
src/Route4Me/Geocoding.php 1 patch
Indentation   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -6,109 +6,109 @@
 block discarded – undo
6 6
 
7 7
 class Geocoding extends Common
8 8
 {
9
-    public $strExportFormat;
10
-    public $format;
11
-    public $addresses;
12
-    public $pk;
13
-    public $offset;
14
-    public $limit;
15
-    public $housenumber;
16
-    public $zipcode;
9
+	public $strExportFormat;
10
+	public $format;
11
+	public $addresses;
12
+	public $pk;
13
+	public $offset;
14
+	public $limit;
15
+	public $housenumber;
16
+	public $zipcode;
17 17
     
18
-    public static function fromArray(array $params) 
19
-    {
20
-        $geocoding = new Geocoding();
18
+	public static function fromArray(array $params) 
19
+	{
20
+		$geocoding = new Geocoding();
21 21
         
22
-        foreach($params as $key => $value) {
23
-            if (property_exists($geocoding, $key)) {
24
-                $geocoding->{$key} = $value;
25
-            }
26
-        }
22
+		foreach($params as $key => $value) {
23
+			if (property_exists($geocoding, $key)) {
24
+				$geocoding->{$key} = $value;
25
+			}
26
+		}
27 27
         
28
-        return $geocoding;
29
-    }
28
+		return $geocoding;
29
+	}
30 30
     
31
-    public static function forwardGeocoding($params)
32
-    {
33
-        $allBodyFields = array('strExportFormat', 'addresses');
31
+	public static function forwardGeocoding($params)
32
+	{
33
+		$allBodyFields = array('strExportFormat', 'addresses');
34 34
 
35
-        $fgCoding = Route4Me::makeRequst(array(
36
-            'url'    => Endpoint::GEOCODER,
37
-            'method' => 'POST',
38
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
39
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
40
-        ));
35
+		$fgCoding = Route4Me::makeRequst(array(
36
+			'url'    => Endpoint::GEOCODER,
37
+			'method' => 'POST',
38
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params),
39
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
40
+		));
41 41
         
42
-        return $fgCoding;
43
-    }
42
+		return $fgCoding;
43
+	}
44 44
     
45
-    public static function reverseGeocoding($params)
46
-    {
47
-        $allQueryFields = array('format', 'addresses', 'detailed');
45
+	public static function reverseGeocoding($params)
46
+	{
47
+		$allQueryFields = array('format', 'addresses', 'detailed');
48 48
 
49
-        $fgcoding = Route4Me::makeRequst(array(
50
-            'url'    => Endpoint::GEOCODER,
51
-            'method' => 'POST',
52
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
53
-        ));
49
+		$fgcoding = Route4Me::makeRequst(array(
50
+			'url'    => Endpoint::GEOCODER,
51
+			'method' => 'POST',
52
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
53
+		));
54 54
         
55
-        return $fgcoding;
56
-    }
55
+		return $fgcoding;
56
+	}
57 57
     
58
-    public static function getStreetData($params)
59
-    {
60
-        Route4Me::setBaseUrl(Endpoint::STREET_DATA);
58
+	public static function getStreetData($params)
59
+	{
60
+		Route4Me::setBaseUrl(Endpoint::STREET_DATA);
61 61
 
62
-        $allPathFields = array('pk', 'offset', 'limit');
62
+		$allPathFields = array('pk', 'offset', 'limit');
63 63
 
64
-        $url_query = Route4Me::generateUrlPath($allPathFields, $params);
64
+		$url_query = Route4Me::generateUrlPath($allPathFields, $params);
65 65
 
66
-        $query = array();
66
+		$query = array();
67 67
 
68
-        $response = Route4Me::makeRequst(array(
69
-            'url'    => $url_query,
70
-            'method' => 'GET',
71
-            'query'  => $query
72
-        ));
68
+		$response = Route4Me::makeRequst(array(
69
+			'url'    => $url_query,
70
+			'method' => 'GET',
71
+			'query'  => $query
72
+		));
73 73
 
74
-        return $response;
75
-    }
74
+		return $response;
75
+	}
76 76
     
77
-    public static function getZipCode($params)
78
-    {
79
-        Route4Me::setBaseUrl(Endpoint::STREET_DATA_ZIPCODE);
77
+	public static function getZipCode($params)
78
+	{
79
+		Route4Me::setBaseUrl(Endpoint::STREET_DATA_ZIPCODE);
80 80
 
81
-        $allPathFields = array('zipcode', 'offset', 'limit');
81
+		$allPathFields = array('zipcode', 'offset', 'limit');
82 82
 
83
-        $url_query = Route4Me::generateUrlPath($allPathFields, $params);
83
+		$url_query = Route4Me::generateUrlPath($allPathFields, $params);
84 84
 
85
-        $query = array();
85
+		$query = array();
86 86
 
87
-        $response = Route4Me::makeRequst(array(
88
-            'url'    => $url_query,
89
-            'method' => 'GET',
90
-            'query'  => $query
91
-        ));
87
+		$response = Route4Me::makeRequst(array(
88
+			'url'    => $url_query,
89
+			'method' => 'GET',
90
+			'query'  => $query
91
+		));
92 92
 
93
-        return $response;
94
-    }
93
+		return $response;
94
+	}
95 95
     
96
-    public static function getService($params)
97
-    {
98
-        Route4Me::setBaseUrl(Endpoint::STREET_DATA_SERVICE);
96
+	public static function getService($params)
97
+	{
98
+		Route4Me::setBaseUrl(Endpoint::STREET_DATA_SERVICE);
99 99
         
100
-        $allPathFields = array('zipcode', 'housenumber', 'offset', 'limit');
100
+		$allPathFields = array('zipcode', 'housenumber', 'offset', 'limit');
101 101
 
102
-        $url_query = Route4Me::generateUrlPath($allPathFields, $params);
102
+		$url_query = Route4Me::generateUrlPath($allPathFields, $params);
103 103
         
104
-        $query = array();
104
+		$query = array();
105 105
         
106
-        $response = Route4Me::makeRequst(array(
107
-            'url'    => $url_query,
108
-            'method' => 'GET',
109
-            'query'  => $query
110
-        ));
106
+		$response = Route4Me::makeRequst(array(
107
+			'url'    => $url_query,
108
+			'method' => 'GET',
109
+			'query'  => $query
110
+		));
111 111
         
112
-        return $response;
113
-    }
112
+		return $response;
113
+	}
114 114
 }
Please login to merge, or discard this patch.
src/Route4Me/AddressBookLocation.php 1 patch
Indentation   +371 added lines, -371 removed lines patch added patch discarded remove patch
@@ -6,452 +6,452 @@
 block discarded – undo
6 6
 
7 7
 class AddressBookLocation extends Common
8 8
 {
9
-    public $address_id;
10
-    public $address_group;
11
-    public $address_alias;
12
-    public $address_1;
13
-    public $address_2;
14
-    public $first_name;
15
-    public $last_name;
16
-    public $address_email;
17
-    public $address_phone_number;
18
-    public $address_city;
19
-    public $address_state_id;
20
-    public $address_country_id;
21
-    public $address_zip;
22
-    public $cached_lat;
23
-    public $cached_lng;
24
-    public $curbside_lat;
25
-    public $curbside_lng;
26
-    public $color;
27
-    public $address_custom_data;
28
-    public $schedule;
9
+	public $address_id;
10
+	public $address_group;
11
+	public $address_alias;
12
+	public $address_1;
13
+	public $address_2;
14
+	public $first_name;
15
+	public $last_name;
16
+	public $address_email;
17
+	public $address_phone_number;
18
+	public $address_city;
19
+	public $address_state_id;
20
+	public $address_country_id;
21
+	public $address_zip;
22
+	public $cached_lat;
23
+	public $cached_lng;
24
+	public $curbside_lat;
25
+	public $curbside_lng;
26
+	public $color;
27
+	public $address_custom_data;
28
+	public $schedule;
29 29
     
30
-    public $created_timestamp;
31
-    public $member_id;
32
-    public $schedule_blacklist;
33
-    public $in_route_count;
34
-    public $last_visited_timestamp;
35
-    public $last_routed_timestamp;
36
-    public $local_time_window_start;
37
-    public $local_time_window_end;
38
-    public $local_time_window_start_2;
39
-    public $local_time_window_end_2;
40
-    public $service_time;
41
-    public $local_timezone_string;
42
-    public $address_icon;
43
-    public $address_stop_type;
44
-    public $address_cube;
45
-    public $address_pieces;
46
-    public $address_reference_no;
47
-    public $address_revenue;
48
-    public $address_weight;
49
-    public $address_priority;
50
-    public $address_customer_po;
30
+	public $created_timestamp;
31
+	public $member_id;
32
+	public $schedule_blacklist;
33
+	public $in_route_count;
34
+	public $last_visited_timestamp;
35
+	public $last_routed_timestamp;
36
+	public $local_time_window_start;
37
+	public $local_time_window_end;
38
+	public $local_time_window_start_2;
39
+	public $local_time_window_end_2;
40
+	public $service_time;
41
+	public $local_timezone_string;
42
+	public $address_icon;
43
+	public $address_stop_type;
44
+	public $address_cube;
45
+	public $address_pieces;
46
+	public $address_reference_no;
47
+	public $address_revenue;
48
+	public $address_weight;
49
+	public $address_priority;
50
+	public $address_customer_po;
51 51
     
52
-    public static function fromArray(array $params)
53
-    {
54
-        $addressbooklocation = new AddressBookLocation();
52
+	public static function fromArray(array $params)
53
+	{
54
+		$addressbooklocation = new AddressBookLocation();
55 55
         
56
-        foreach ($params as $key => $value) {
57
-            if (property_exists($addressbooklocation, $key)) {
58
-                $addressbooklocation->{$key} = $value;
59
-            }
60
-        }
56
+		foreach ($params as $key => $value) {
57
+			if (property_exists($addressbooklocation, $key)) {
58
+				$addressbooklocation->{$key} = $value;
59
+			}
60
+		}
61 61
         
62
-        return $addressbooklocation;
63
-    }
62
+		return $addressbooklocation;
63
+	}
64 64
     
65 65
     
66 66
     
67
-    public static function getAddressBookLocation($addressId)
68
-    {
69
-        $ablocations = Route4Me::makeRequst(array(
70
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
71
-            'method' => 'GET',
72
-            'query'  => array(
73
-                'query' => $addressId,
74
-                'limit' => 30
75
-            )
76
-        ));
67
+	public static function getAddressBookLocation($addressId)
68
+	{
69
+		$ablocations = Route4Me::makeRequst(array(
70
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
71
+			'method' => 'GET',
72
+			'query'  => array(
73
+				'query' => $addressId,
74
+				'limit' => 30
75
+			)
76
+		));
77 77
 
78
-        return $ablocations;
79
-    }
78
+		return $ablocations;
79
+	}
80 80
     
81
-    public static function searchAddressBookLocations($params)
82
-    {
83
-        $allQueryFields = array('display', 'query', 'fields', 'limit', 'offset');
81
+	public static function searchAddressBookLocations($params)
82
+	{
83
+		$allQueryFields = array('display', 'query', 'fields', 'limit', 'offset');
84 84
         
85
-        $result = Route4Me::makeRequst(array(
86
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
87
-            'method' => 'GET',
88
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
89
-        ));
85
+		$result = Route4Me::makeRequst(array(
86
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
87
+			'method' => 'GET',
88
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
89
+		));
90 90
 
91
-        return $result;
92
-    }
91
+		return $result;
92
+	}
93 93
     
94
-    public static function getAddressBookLocations($params)
95
-    {
96
-        $allQueryFields = array('limit', 'offset', 'address_id');
94
+	public static function getAddressBookLocations($params)
95
+	{
96
+		$allQueryFields = array('limit', 'offset', 'address_id');
97 97
         
98
-        $ablocations = Route4Me::makeRequst(array(
99
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
100
-            'method' => 'GET',
101
-            'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
102
-        ));
98
+		$ablocations = Route4Me::makeRequst(array(
99
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
100
+			'method' => 'GET',
101
+			'query'  => Route4Me::generateRequestParameters($allQueryFields, $params)
102
+		));
103 103
 
104
-        return $ablocations;
105
-    }
104
+		return $ablocations;
105
+	}
106 106
     
107
-    public static function getRandomAddressBookLocation($params)
108
-    {
109
-        $ablocations = self::getAddressBookLocations($params);
107
+	public static function getRandomAddressBookLocation($params)
108
+	{
109
+		$ablocations = self::getAddressBookLocations($params);
110 110
         
111
-        if (isset($ablocations["results"])) {
112
-            $locationsSize = sizeof($ablocations["results"]);
111
+		if (isset($ablocations["results"])) {
112
+			$locationsSize = sizeof($ablocations["results"]);
113 113
             
114
-            if ($locationsSize>0) {
115
-                $randomLocationIndex = rand(0, $locationsSize - 1);
116
-                return $ablocations["results"][$randomLocationIndex];
117
-            } 
118
-        } 
114
+			if ($locationsSize>0) {
115
+				$randomLocationIndex = rand(0, $locationsSize - 1);
116
+				return $ablocations["results"][$randomLocationIndex];
117
+			} 
118
+		} 
119 119
 
120
-        return null;
121
-    }
120
+		return null;
121
+	}
122 122
     
123
-    /**
124
-     * @param AddressBookLocation $params
125
-    */
126
-    public static function addAdressBookLocation($params)
127
-    {
128
-        $allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
123
+	/**
124
+	 * @param AddressBookLocation $params
125
+	 */
126
+	public static function addAdressBookLocation($params)
127
+	{
128
+		$allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
129 129
         
130
-        $response = Route4Me::makeRequst(array(
131
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
132
-            'method' => 'POST',
133
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
134
-        ));
130
+		$response = Route4Me::makeRequst(array(
131
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
132
+			'method' => 'POST',
133
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
134
+		));
135 135
 
136
-        return $response;
137
-    }
136
+		return $response;
137
+	}
138 138
     
139
-    public function deleteAdressBookLocation($address_ids)
140
-    {
141
-        $result = Route4Me::makeRequst(array(
142
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
143
-            'method' => 'DELETEARRAY',
144
-            'query'  => array(
145
-                'address_ids' => $address_ids
146
-            )
147
-        ));
139
+	public function deleteAdressBookLocation($address_ids)
140
+	{
141
+		$result = Route4Me::makeRequst(array(
142
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
143
+			'method' => 'DELETEARRAY',
144
+			'query'  => array(
145
+				'address_ids' => $address_ids
146
+			)
147
+		));
148 148
 
149
-        return $result;
150
-    }
149
+		return $result;
150
+	}
151 151
     
152
-    public function updateAdressBookLocation($params)
153
-    {
154
-        $allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('in_route_count'));
152
+	public function updateAdressBookLocation($params)
153
+	{
154
+		$allBodyFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('in_route_count'));
155 155
 
156
-        $response = Route4Me::makeRequst(array(
157
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
158
-            'method' => 'PUT',
159
-            'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
160
-        ));
156
+		$response = Route4Me::makeRequst(array(
157
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
158
+			'method' => 'PUT',
159
+			'body'   => Route4Me::generateRequestParameters($allBodyFields, $params)
160
+		));
161 161
 
162
-        return $response;
163
-    }
162
+		return $response;
163
+	}
164 164
         
165
-    public static function validateScheduleMode($scheduleMode)
166
-    {
167
-        $schedMmodes = array("daily", "weekly", "monthly", "annually");
165
+	public static function validateScheduleMode($scheduleMode)
166
+	{
167
+		$schedMmodes = array("daily", "weekly", "monthly", "annually");
168 168
         
169
-        if (in_array($scheduleMode, $schedMmodes)) {
170
-            return TRUE; 
171
-        } else {
172
-            return FALSE;
173
-        }
174
-    }
169
+		if (in_array($scheduleMode, $schedMmodes)) {
170
+			return TRUE; 
171
+		} else {
172
+			return FALSE;
173
+		}
174
+	}
175 175
     
176
-    public static function validateScheduleEnable($scheduleEnabled)
177
-    {
178
-        $schedEnables = array(TRUE, FALSE);
176
+	public static function validateScheduleEnable($scheduleEnabled)
177
+	{
178
+		$schedEnables = array(TRUE, FALSE);
179 179
         
180
-        if (in_array($scheduleEnabled, $schedEnables)) {
181
-            return TRUE;
182
-        } else {
183
-            return FALSE;
184
-        }
185
-    }
180
+		if (in_array($scheduleEnabled, $schedEnables)) {
181
+			return TRUE;
182
+		} else {
183
+			return FALSE;
184
+		}
185
+	}
186 186
     
187
-    public static function validateScheduleEvery($scheduleEvery)
188
-    {
189
-        if (is_numeric($scheduleEvery)) {
190
-            return TRUE;
191
-        } else {
192
-            return FALSE;
193
-        }
194
-    }
187
+	public static function validateScheduleEvery($scheduleEvery)
188
+	{
189
+		if (is_numeric($scheduleEvery)) {
190
+			return TRUE;
191
+		} else {
192
+			return FALSE;
193
+		}
194
+	}
195 195
     
196
-    public static function validateScheduleWeekDays($scheduleWeekDays)
197
-    {
198
-        $weekdays = explode(',', $scheduleWeekDays);
199
-        $weekdaysSize = sizeof($weekdays);
196
+	public static function validateScheduleWeekDays($scheduleWeekDays)
197
+	{
198
+		$weekdays = explode(',', $scheduleWeekDays);
199
+		$weekdaysSize = sizeof($weekdays);
200 200
         
201
-        if ($weekdaysSize<1) {
202
-            return FALSE;
203
-        }
201
+		if ($weekdaysSize<1) {
202
+			return FALSE;
203
+		}
204 204
         
205
-        $isValid = TRUE;
205
+		$isValid = TRUE;
206 206
         
207
-        for ($i = 0; $i<$weekdaysSize; $i++) { 
208
-            if (is_numeric($weekdays[$i])) {
209
-                $wday = intval($weekdays[$i]);
210
-                if ($wday<1 || $wday>7) {
211
-                    $isValid = FALSE;
212
-                }
213
-            } else {
214
-                $isValid = FALSE;
215
-            }
216
-        }
207
+		for ($i = 0; $i<$weekdaysSize; $i++) { 
208
+			if (is_numeric($weekdays[$i])) {
209
+				$wday = intval($weekdays[$i]);
210
+				if ($wday<1 || $wday>7) {
211
+					$isValid = FALSE;
212
+				}
213
+			} else {
214
+				$isValid = FALSE;
215
+			}
216
+		}
217 217
         
218
-        return $isValid;
219
-    }
218
+		return $isValid;
219
+	}
220 220
     
221
-    public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
222
-    {
223
-        $schedMonthlyMmodes = array("dates", "nth");
221
+	public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
222
+	{
223
+		$schedMonthlyMmodes = array("dates", "nth");
224 224
         
225
-        if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) {
226
-            return TRUE;
227
-        } else {
228
-            return FALSE;
229
-        }
230
-    }
225
+		if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) {
226
+			return TRUE;
227
+		} else {
228
+			return FALSE;
229
+		}
230
+	}
231 231
     
232
-    public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
233
-    {
234
-        $monthlyDates = explode(',', $scheduleMonthlyDates);
235
-        $monthlyDatesSize = sizeof($monthlyDates);
232
+	public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
233
+	{
234
+		$monthlyDates = explode(',', $scheduleMonthlyDates);
235
+		$monthlyDatesSize = sizeof($monthlyDates);
236 236
         
237
-        if ($monthlyDatesSize<1) {
238
-            return FALSE;
239
-        }
237
+		if ($monthlyDatesSize<1) {
238
+			return FALSE;
239
+		}
240 240
         
241
-        $isValid = TRUE;
241
+		$isValid = TRUE;
242 242
         
243
-        for ($i = 0; $i<$monthlyDatesSize; $i++) { 
244
-            if (is_numeric($monthlyDates[$i])) {
245
-                $mday = intval($monthlyDates[$i]);
246
-                if ($mday<1 || $mday>31) {
247
-                    $isValid = FALSE;
248
-                }
249
-            } else {
250
-                $isValid = FALSE;
251
-            }
252
-        }
243
+		for ($i = 0; $i<$monthlyDatesSize; $i++) { 
244
+			if (is_numeric($monthlyDates[$i])) {
245
+				$mday = intval($monthlyDates[$i]);
246
+				if ($mday<1 || $mday>31) {
247
+					$isValid = FALSE;
248
+				}
249
+			} else {
250
+				$isValid = FALSE;
251
+			}
252
+		}
253 253
 
254
-        return $isValid;
255
-    }
254
+		return $isValid;
255
+	}
256 256
     
257
-    public static function validateScheduleNthN($scheduleNthN)
258
-    {
259
-        if (!is_numeric($scheduleNthN)) {
260
-            return FALSE;
261
-        }
257
+	public static function validateScheduleNthN($scheduleNthN)
258
+	{
259
+		if (!is_numeric($scheduleNthN)) {
260
+			return FALSE;
261
+		}
262 262
         
263
-        $schedNthNs = array(1, 2, 3, 4, 5, -1);
263
+		$schedNthNs = array(1, 2, 3, 4, 5, -1);
264 264
         
265
-        if (in_array($scheduleNthN, $schedNthNs)) {
266
-            return TRUE;
267
-        } else {
268
-            return FALSE;
269
-        }
270
-    }
265
+		if (in_array($scheduleNthN, $schedNthNs)) {
266
+			return TRUE;
267
+		} else {
268
+			return FALSE;
269
+		}
270
+	}
271 271
     
272
-    public static function validateScheduleNthWhat($scheduleNthWhat)
273
-    {
274
-        if (!is_numeric($scheduleNthWhat)) {
275
-            return FALSE;
276
-        }
272
+	public static function validateScheduleNthWhat($scheduleNthWhat)
273
+	{
274
+		if (!is_numeric($scheduleNthWhat)) {
275
+			return FALSE;
276
+		}
277 277
         
278
-        $schedNthWhats = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
278
+		$schedNthWhats = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
279 279
         
280
-        if (in_array($scheduleNthWhat, $schedNthWhats)) {
281
-            return TRUE;
282
-        } else {
283
-            return FALSE;
284
-        }
285
-    }
280
+		if (in_array($scheduleNthWhat, $schedNthWhats)) {
281
+			return TRUE;
282
+		} else {
283
+			return FALSE;
284
+		}
285
+	}
286 286
     
287
-    /** Function adds the locations (with/without schedule) from the CSV file. 
288
-     * $csvFileHandle - a file handler.
289
-     * Returns array $results which contains two arrays: fail and succes.
290
-     */
291
-    public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
292
-    {
293
-        $max_line_length = 512;
294
-        $delemietr = ',';
287
+	/** Function adds the locations (with/without schedule) from the CSV file. 
288
+	 * $csvFileHandle - a file handler.
289
+	 * Returns array $results which contains two arrays: fail and succes.
290
+	 */
291
+	public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
292
+	{
293
+		$max_line_length = 512;
294
+		$delemietr = ',';
295 295
         
296
-        $results = array();
297
-        $results['fail'] = array();
298
-        $results['success'] = array();
296
+		$results = array();
297
+		$results['fail'] = array();
298
+		$results['success'] = array();
299 299
         
300
-        $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
300
+		$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
301 301
         
302
-        $addressBookFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
302
+		$addressBookFields = Route4Me::getObjectProperties(new AddressBookLocation(), array('address_id', 'in_route_count'));
303 303
 
304
-        if (empty($columns)) {
305
-            array_push($results['fail'], 'Empty CSV table');
306
-            return ($results);
307
-        }
304
+		if (empty($columns)) {
305
+			array_push($results['fail'], 'Empty CSV table');
306
+			return ($results);
307
+		}
308 308
 
309
-        $iRow = 1;
309
+		$iRow = 1;
310 310
         
311
-        while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
312
-            if (!isset($rows[$locationsFieldsMapping['cached_lat']]) || !isset($rows[$locationsFieldsMapping['cached_lng']]) 
313
-                  || !isset($rows[$locationsFieldsMapping['address_1']]) || array(null)==$rows) {
314
-                continue;
315
-            }
311
+		while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
312
+			if (!isset($rows[$locationsFieldsMapping['cached_lat']]) || !isset($rows[$locationsFieldsMapping['cached_lng']]) 
313
+				  || !isset($rows[$locationsFieldsMapping['address_1']]) || array(null)==$rows) {
314
+				continue;
315
+			}
316 316
                       
317
-            $curSchedule = "";
318
-            $mode = "";
317
+			$curSchedule = "";
318
+			$mode = "";
319 319
             
320
-            $failCount = sizeof($results['fail']); 
320
+			$failCount = sizeof($results['fail']); 
321 321
             
322
-            if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
323
-                if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
324
-                    $curSchedule = '"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
325
-                    $mode = $rows[$locationsFieldsMapping['schedule_mode']];
326
-                } else {
327
-                    array_push($results['fail'], "$iRow --> Wrong schedule mode parameter"); 
328
-                }
329
-            } else {
330
-                array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); 
331
-            }
322
+			if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
323
+				if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
324
+					$curSchedule = '"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
325
+					$mode = $rows[$locationsFieldsMapping['schedule_mode']];
326
+				} else {
327
+					array_push($results['fail'], "$iRow --> Wrong schedule mode parameter"); 
328
+				}
329
+			} else {
330
+				array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); 
331
+			}
332 332
             
333
-            if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
334
-                if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
335
-                    $curSchedule .= '"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
336
-                } else {
337
-                    array_push($results['fail'], "$iRow --> The schedule enabled parameter is not set ");  
338
-                }
339
-            }
333
+			if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
334
+				if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
335
+					$curSchedule .= '"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
336
+				} else {
337
+					array_push($results['fail'], "$iRow --> The schedule enabled parameter is not set ");  
338
+				}
339
+			}
340 340
             
341
-            if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
342
-                if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
343
-                    $curSchedule .= '"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
344
-                    if ($mode=='daily') {
345
-                        $curSchedule = trim($curSchedule, ',');
346
-                        $curSchedule .= '}';
347
-                    }
348
-                } else {
349
-                    array_push($results['fail'], "$iRow --> The parameter sched_every is not set"); 
350
-                }
351
-            }
341
+			if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
342
+				if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
343
+					$curSchedule .= '"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
344
+					if ($mode=='daily') {
345
+						$curSchedule = trim($curSchedule, ',');
346
+						$curSchedule .= '}';
347
+					}
348
+				} else {
349
+					array_push($results['fail'], "$iRow --> The parameter sched_every is not set"); 
350
+				}
351
+			}
352 352
             
353
-            if ($mode!='daily') {
354
-                switch ($mode) {
355
-                    case 'weekly':
356
-                        if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
357
-                            if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
358
-                                 $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
359
-                            } else {
360
-                                array_push($results['fail'], "$iRow --> Wrong weekdays"); 
361
-                            }
362
-                        } else {
363
-                            array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
364
-                        }
365
-                        break;
366
-                    case 'monthly':
367
-                        $monthlyMode = "";
368
-                        if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
369
-                            if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
370
-                                 $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
371
-                                 $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
372
-                            } else {
373
-                                array_push($results['fail'], "$iRow --> Wrong monthly mode"); 
374
-                            }
375
-                        } else {
376
-                            array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
377
-                        }
353
+			if ($mode!='daily') {
354
+				switch ($mode) {
355
+					case 'weekly':
356
+						if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
357
+							if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
358
+								 $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
359
+							} else {
360
+								array_push($results['fail'], "$iRow --> Wrong weekdays"); 
361
+							}
362
+						} else {
363
+							array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
364
+						}
365
+						break;
366
+					case 'monthly':
367
+						$monthlyMode = "";
368
+						if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
369
+							if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
370
+								 $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
371
+								 $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
372
+							} else {
373
+								array_push($results['fail'], "$iRow --> Wrong monthly mode"); 
374
+							}
375
+						} else {
376
+							array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
377
+						}
378 378
                         
379
-                        if ($monthlyMode!="") {
380
-                            switch ($monthlyMode) {
381
-                                case 'dates':
382
-                                    if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
383
-                                        if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
384
-                                             $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
385
-                                        } else {
386
-                                            array_push($results['fail'], "$iRow --> Wrong monthly dates"); 
387
-                                        }
388
-                                    }
389
-                                    break;
390
-                                case 'nth':
391
-                                    if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
392
-                                        if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
393
-                                             $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
394
-                                        } else {
395
-                                            array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); 
396
-                                        }
397
-                                    } else {
398
-                                        array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
399
-                                    }
379
+						if ($monthlyMode!="") {
380
+							switch ($monthlyMode) {
381
+								case 'dates':
382
+									if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
383
+										if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
384
+											 $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
385
+										} else {
386
+											array_push($results['fail'], "$iRow --> Wrong monthly dates"); 
387
+										}
388
+									}
389
+									break;
390
+								case 'nth':
391
+									if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
392
+										if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
393
+											 $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
394
+										} else {
395
+											array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); 
396
+										}
397
+									} else {
398
+										array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
399
+									}
400 400
                                     
401
-                                    if ($curSchedule!="") {
402
-                                        if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
403
-                                            if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
404
-                                                 $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
405
-                                            } else {
406
-                                                array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
407
-                                            }
408
-                                        } else {
409
-                                            array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
410
-                                        }
411
-                                    }
412
-                                    break;
413
-                            }
414
-                        }
415
-                        break;
416
-                    default:
417
-                        $curSchedule = "";
418
-                        break;
419
-                }
420
-            }
401
+									if ($curSchedule!="") {
402
+										if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
403
+											if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
404
+												 $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
405
+											} else {
406
+												array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
407
+											}
408
+										} else {
409
+											array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
410
+										}
411
+									}
412
+									break;
413
+							}
414
+						}
415
+						break;
416
+					default:
417
+						$curSchedule = "";
418
+						break;
419
+				}
420
+			}
421 421
 
422
-            if (sizeof($results['fail'])>$failCount) {
423
-                $curSchedule = "";
424
-            }
422
+			if (sizeof($results['fail'])>$failCount) {
423
+				$curSchedule = "";
424
+			}
425 425
 
426
-            if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {
427
-                $iRow++; 
428
-                continue;
429
-            }
426
+			if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {
427
+				$iRow++; 
428
+				continue;
429
+			}
430 430
             
431
-            $curSchedule = strtolower($curSchedule);
431
+			$curSchedule = strtolower($curSchedule);
432 432
             
433
-            $curSchedule = '[{'.$curSchedule.'}]';
433
+			$curSchedule = '[{'.$curSchedule.'}]';
434 434
 
435
-            $oSchedule = json_decode($curSchedule, TRUE);
435
+			$oSchedule = json_decode($curSchedule, TRUE);
436 436
             
437
-            $parametersArray = array();
437
+			$parametersArray = array();
438 438
             
439
-            foreach ($addressBookFields as $addressBookField) {
440
-                if (isset($locationsFieldsMapping[$addressBookField])) {
441
-                    $parametersArray[$addressBookField] = $rows[$locationsFieldsMapping[$addressBookField]];
442
-                }
443
-            }
439
+			foreach ($addressBookFields as $addressBookField) {
440
+				if (isset($locationsFieldsMapping[$addressBookField])) {
441
+					$parametersArray[$addressBookField] = $rows[$locationsFieldsMapping[$addressBookField]];
442
+				}
443
+			}
444 444
             
445
-            $AdressBookLocationParameters = AddressBookLocation::fromArray($parametersArray);
445
+			$AdressBookLocationParameters = AddressBookLocation::fromArray($parametersArray);
446 446
             
447
-            $abContacts = new AddressBookLocation();
447
+			$abContacts = new AddressBookLocation();
448 448
 
449
-            $abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
449
+			$abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
450 450
             
451
-            array_push($results['success'], "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
452
-        }
451
+			array_push($results['success'], "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
452
+		}
453 453
 
454
-        return $results;
455
-    }
454
+		return $results;
455
+	}
456 456
  }
457 457
  
458 458
\ No newline at end of file
Please login to merge, or discard this patch.