Index: branches/5.2.x/units/shipping_quote_engines/intershipper.php
===================================================================
diff -u -N -r15141 -r15854
--- branches/5.2.x/units/shipping_quote_engines/intershipper.php	(.../intershipper.php)	(revision 15141)
+++ branches/5.2.x/units/shipping_quote_engines/intershipper.php	(.../intershipper.php)	(revision 15854)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: intershipper.php 15141 2012-03-04 08:08:18Z alex $
+* @version	$Id: intershipper.php 15854 2013-07-02 14:55:29Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -56,8 +56,8 @@
 		foreach($params['carriers'] as $carrier)
 		{
 			$i++;
-			$uri .= '&CarrierCode'.$i.'='.	rawurlencode($carrier['name']).
-			'&CarrierAccount'.$i.'='.		rawurlencode($carrier['account']).
+			$uri .= '&CarrierCode'.$i.'='.	kUtil::escape($carrier['name'], kUtil::ESCAPE_URL).
+			'&CarrierAccount'.$i.'='.		kUtil::escape($carrier['account'], kUtil::ESCAPE_URL).
 			'&CarrierInvoiced'.$i.'='.		$carrier['invoiced'];
 		}
 
@@ -71,21 +71,21 @@
 		$uri .= '&DeliveryType='.	'COM'.
 			'&ShipMethod='.			$params['ShipMethod'].
 
-			'&OriginationName='.	rawurlencode( $params['orig_name'] ).
-			'&OriginationAddress1='.rawurlencode( $params['orig_addr1'] ).
-			'&OriginationAddress2='.rawurlencode( $params['orig_addr2'] ).
-			'&OriginationCity='.	rawurlencode( $params['orig_city'] ).
-			'&OriginationState='.	rawurlencode( $params['orig_state'] ).
-			'&OriginationPostal='.	rawurlencode( $params['orig_postal'] ).
-			'&OriginationCountry='.	rawurlencode( $params['orig_country'] ).
+			'&OriginationName='.	kUtil::escape( $params['orig_name'], kUtil::ESCAPE_URL ).
+			'&OriginationAddress1='.kUtil::escape( $params['orig_addr1'], kUtil::ESCAPE_URL ).
+			'&OriginationAddress2='.kUtil::escape( $params['orig_addr2'], kUtil::ESCAPE_URL ).
+			'&OriginationCity='.	kUtil::escape( $params['orig_city'], kUtil::ESCAPE_URL ).
+			'&OriginationState='.	kUtil::escape( $params['orig_state'], kUtil::ESCAPE_URL ).
+			'&OriginationPostal='.	kUtil::escape( $params['orig_postal'], kUtil::ESCAPE_URL ).
+			'&OriginationCountry='.	kUtil::escape( $params['orig_country'], kUtil::ESCAPE_URL ).
 
-			'&DestinationName='.	rawurlencode( $params['dest_name'] ).
-			'&DestinationAddress1='.rawurlencode( $params['dest_addr1'] ).
-			'&DestinationAddress2='.rawurlencode( $params['dest_addr2'] ).
-			'&DestinationCity='.	rawurlencode( $params['dest_city'] ).
-			'&DestinationState='.	rawurlencode( $params['dest_state'] ).
-			'&DestinationPostal='.	rawurlencode( $params['dest_postal'] ).
-			'&DestinationCountry='.	rawurlencode( $params['dest_country'] ).
+			'&DestinationName='.	kUtil::escape( $params['dest_name'], kUtil::ESCAPE_URL ).
+			'&DestinationAddress1='.kUtil::escape( $params['dest_addr1'], kUtil::ESCAPE_URL ).
+			'&DestinationAddress2='.kUtil::escape( $params['dest_addr2'], kUtil::ESCAPE_URL ).
+			'&DestinationCity='.	kUtil::escape( $params['dest_city'], kUtil::ESCAPE_URL ).
+			'&DestinationState='.	kUtil::escape( $params['dest_state'], kUtil::ESCAPE_URL ).
+			'&DestinationPostal='.	kUtil::escape( $params['dest_postal'], kUtil::ESCAPE_URL ).
+			'&DestinationCountry='.	kUtil::escape( $params['dest_country'], kUtil::ESCAPE_URL ).
 
 			'&Currency='.			'USD'.
 			'&TotalPackages='.		count($params['packages']);
@@ -94,7 +94,7 @@
 		foreach($params['packages'] as $package)
 		{
 			$i++;
-			$uri .=	'&BoxID'.$i.'='.	urlencode( $package['package_key'] ).
+			$uri .=	'&BoxID'.$i.'='.	kUtil::escape( $package['package_key'] , kUtil::ESCAPE_URL ).
 			'&Weight'.$i.'='.			$package['weight'].
 			'&WeightUnit'.$i.'='.		$package['weight_unit'].
 			'&Length'.$i.'='.			$package['length'].