Index: branches/5.3.x/core/units/helpers/geocode_helper.php
===================================================================
diff -u -N -r15902 -r15974
--- branches/5.3.x/core/units/helpers/geocode_helper.php	(.../geocode_helper.php)	(revision 15902)
+++ branches/5.3.x/core/units/helpers/geocode_helper.php	(.../geocode_helper.php)	(revision 15974)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: geocode_helper.php 15902 2013-07-12 15:37:15Z alex $
+* @version	$Id: geocode_helper.php 15974 2013-10-03 12:12:52Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -81,22 +81,26 @@
 		// http://maps.google.com/maps/geo?
 		// ABQIAAAAzNbTbxHki-PAnXzsrA7z2hR0fs2_a3JecCfKmMFhGT8VtEjV7xRV8rMK1czaEH2ZG3eiYJMuej_vnQ
 
-		    $qaddress = $address.', '.$city.', '.$state;
-		    $request_url = $this->Application->ConfigValue('GoogleMapsURL').'output=xml&key='.
-		    	$this->Application->ConfigValue('GoogleMapsKey').'&q='.kUtil::escape($qaddress, kUtil::ESCAPE_URL);
+			$delay = 0;
+			$query_address = $address . ', ' . $city . ', ' . $state;
 
-		    $curl_helper = $this->Application->recallObject('CurlHelper');
+			$curl_helper = $this->Application->recallObject('CurlHelper');
 			/* @var $curl_helper kCurlHelper */
 
-		    $delay = 0;
-		    while (true)
-		    {
-			    $xml = $curl_helper->Send($request_url);
+			while ( true ) {
+				$curl_helper->SetRequestData(array(
+					'output' => 'xml',
+					'key' => $this->Application->ConfigValue('GoogleMapsKey'),
+					'q' => $query_address
+				));
 
-			    if (strpos($xml, '<code>620</code>')) {
-			    	$delay += 100000;
-			    } elseif (strpos($xml, '<code>200</code>')) {
-			    	// get latitude, longitude and zip  from xml-answer
+				$xml = $curl_helper->Send($this->Application->ConfigValue('GoogleMapsURL'));
+
+				if ( strpos($xml, '<code>620</code>') ) {
+					$delay += 100000;
+				}
+				elseif ( strpos($xml, '<code>200</code>') ) {
+					// get latitude, longitude and zip  from xml-answer
 					$a_coords = explode(',', $this->getTag('coordinates', $xml));
 					$lat = $a_coords[1];
 					$lon = abs($a_coords[0]); // set to positive, because required by SQL formula
@@ -105,20 +109,21 @@
 					$carrier = '';
 					$assoc_data = Array();
 					break;
-			    } else {
+				}
+				else {
 					$lon = '';
 					$lat = '';
 					$zip4 = '';
 					$dpbc = '';
 					$carrier = '';
 					$assoc_data = Array();
 					break;
-			    }
-		    	usleep($delay);
-		    }
+				}
 
-			return Array($lon, $lat, $zip4, $dpbc, $carrier, serialize($assoc_data));
+				usleep($delay);
+			}
 
+			return Array($lon, $lat, $zip4, $dpbc, $carrier, serialize($assoc_data));
 		}
 
 		/**