Index: branches/5.2.x/units/shipping_quote_engines/usps.php
===================================================================
diff -u -N -r14258 -r14582
--- branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 14258)
+++ branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 14582)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: usps.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: usps.php 14582 2011-09-23 14:42:51Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -44,8 +44,6 @@
 define('MODULE_SHIPPING_USPS_INSURE', 'True');// 'Insure packages shipped by USPS?
 define('MODULE_SHIPPING_USPS_INSURE_TAX', 'True');// 'Insure tax on packages shipped by USPS?
 
-define('USPS_LOG_FILE', WRITEABLE .'/user_files/usps.log');
-
 class USPS extends ShippingQuoteEngine
 {
 	var $countries, $pounds, $ounces, $insurance_cost = 0, $shipping_origin_country, $store_first_name, $store_last_name, $company_name, $store_name, $store_address1, $store_address2, $store_city, $store_state, $store_zip5, $store_zip4, $store_phone, $usps_userid;
@@ -54,13 +52,22 @@
 	var $intl_types = Array();
 
 	/**
+	 * Path to a request log file
+	 *
+	 * @var string
+	 */
+	var $logFilePath = '';
+
+	/**
 	 * Creates USPS processing class
 	 *
 	 */
 	public function __construct()
 	{
 		parent::__construct();
 
+		$this->logFilePath = (defined('RESTRICTED') ? RESTRICTED : WRITEABLE . '/user_files') . '/usps.log';
+
         // EXPRESS, FIRST CLASS, PRIORITY, PARCEL, BMP, MEDIA
 		$this->types = Array(
 			'EXPRESS' => 'Express Mail',
@@ -1145,20 +1152,22 @@
 		$body = curl_exec($curl);
 		curl_close($curl);
 
-		if (defined('USPS_LOG_FILE')) {
-			$filename = USPS_LOG_FILE;
-	      	if ( !$fp = fopen($filename, "a") ) echo("Failed opening file $filename");
+		if ($this->logFilePath) {
+			$fp = fopen($this->logFilePath, 'a');
+
+			if ($fp) {
+				$request_url = sprintf("Date %s : IP %s\n\nPost\n\n%s\n\nReplay\n\n%s\n\n",
+			   		adodb_date('m/d/Y H:i:s'),
+			   		$_SERVER['REMOTE_ADDR'],
+			   		$usps_server . '/' . $api_dll . '?' . urldecode($request),
+			   		$body
+			   	);
+
+			   	fwrite($fp, $request_url);
+			   	fclose($fp);
+			}
 		}
-	   	$request_url = sprintf("Date %s : IP %s\n\nPost\n\n%s\n\nReplay\n\n%s\n\n",
-	   		date("m/d/Y H:i:s",time()),
-	   		$_SERVER['REMOTE_ADDR'],
-	   		$usps_server.'/'.$api_dll.'?'.urldecode($request),
-	   		$body
-	   	);
-		if (defined('USPS_LOG_FILE')) {
-	        if (!fwrite($fp, $request_url)) echo("Failed writing to file $filename");
-	        fclose($fp);
-		}
+
 		return $body;
 	}