Index: branches/5.2.x/core/units/helpers/geocode_helper.php
===================================================================
diff -u -N -r14244 -r14628
--- branches/5.2.x/core/units/helpers/geocode_helper.php	(.../geocode_helper.php)	(revision 14244)
+++ branches/5.2.x/core/units/helpers/geocode_helper.php	(.../geocode_helper.php)	(revision 14628)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: geocode_helper.php 14244 2011-03-16 20:53:41Z alex $
+* @version	$Id: geocode_helper.php 14628 2011-10-04 09:36:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -125,45 +125,48 @@
 		 * @param string $city
 		 * @param string $state
 		 * @param int $zip
-		 * @return Array (lon, lat)
+		 * @param bool $no_cache
+		 * @param bool $force_cache
+		 * @return Array|bool (lon, lat)
+		 * @access public
 		 */
-		function GetCoordinates($address, $city, $state, $zip, $no_cache = false, $force_cache = false)
+		public function GetCoordinates($address, $city, $state, $zip, $no_cache = false, $force_cache = false)
 		{
-			if (!$zip && !$state) {
+			if ( !$zip && !$state ) {
 				// if state or zip missing then do nothing
 				return false;
 			}
 
 			$zip_info = $no_cache ? false : $this->GetFromCache($address, $city, $state, $zip);
-//			$zip_info = $this->GetFromCache($address, $city, $state, $zip);
 
-			if (!$zip_info && !$force_cache) {
+			if ( !$zip_info && !$force_cache ) {
 				list($lon, $lat, $zip4, $dpbc, $carrier, $geocode_answer) = $this->QueryCoordinatesFromGoogle($address, $city, $state, $zip);
 
-				if ($lon != '' && $lat != '') {
+				if ( $lon != '' && $lat != '' ) {
 					// valid position returned by geocode => add to cache
 					$fields_hash = 	Array(
-											'zipcode'			=>	$zip4,
-											'address'			=>	$address,
-											'city'				=>	$city,
-											'state'				=>	$state,
-											'lat'				=>	$lat,
-											'lon'				=>	$lon,
-											'zip4'				=>	$zip4,
-											'dpbc'				=>	$dpbc,
-											'carrier'			=>	$carrier,
-											'geocode_answer'	=>	$geocode_answer,
-										);
-					$this->Conn->doInsert($fields_hash, TABLE_PREFIX.'ZipCodes');
-					return Array($lon, $lat, $zip4, $dpbc, $carrier);
+						'zipcode'			=>	$zip4,
+						'address'			=>	$address,
+						'city'				=>	$city,
+						'state'				=>	$state,
+						'lat'				=>	$lat,
+						'lon'				=>	$lon,
+						'zip4'				=>	$zip4,
+						'dpbc'				=>	$dpbc,
+						'carrier'			=>	$carrier,
+						'geocode_answer'	=>	$geocode_answer,
+					);
+
+					$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'ZipCodes');
+					return Array ($lon, $lat, $zip4, $dpbc, $carrier);
 				}
 				else {
 					// bad case, rie call failed => no data retrieved
 					return false;
 				}
 			}
 
-			return Array($zip_info['lon'], $zip_info['lat'], getArrayValue($zip_info, 'zip4'), getArrayValue($zip_info, 'dpbc'), getArrayValue($zip_info, 'carrier'));
+			return Array ($zip_info['lon'], $zip_info['lat'], getArrayValue($zip_info, 'zip4'), getArrayValue($zip_info, 'dpbc'), getArrayValue($zip_info, 'carrier'));
 		}
 
 		/**
@@ -173,14 +176,14 @@
 		 * @param string $city
 		 * @param string $state
 		 * @param int $zip
-		 * @return Array (lon, lat)
+		 * @return Array|bool (lon, lat)
 		 */
 		function GetFromCache($address, $city, $state, $zip)
 		{
 			$zip = substr($zip, 0, 5); // use only first 5 digits
 			$sql = 'SELECT lon, lat
-					FROM '.TABLE_PREFIX.'ZipCodes
-					WHERE zipcode = '.$this->Conn->qstr($zip);
+					FROM ' . TABLE_PREFIX . 'ZipCodes
+					WHERE zipcode = ' . $this->Conn->qstr($zip);
 			return $this->Conn->GetRow($sql);
 		}
 	}
\ No newline at end of file