X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_rates.inc;h=9d3c47ca0fd5978e6633aceb23a569ef1951d8f0;hb=76ecbabac8525f0d867c43859782e5ba4e6578b7;hp=0980cb363e6db29f43a6aa261dfac97d6a28fd50;hpb=f44132511cc91b83f20f91af0625d4b112b4c26e;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index 0980cb36..9d3c47ca 100644
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -62,12 +62,12 @@ function update_exchange_rate($curr_code, $date_, $buy_rate, $sell_rate)
 {
 	if (is_company_currency($curr_code))
 		display_db_error("Exchange rates cannot be set for company currency", "", true);
-
+			
 	$date = date2sql($date_);
-
+		
 	$sql = "UPDATE ".TB_PREF."exchange_rates SET rate_buy=$buy_rate, rate_sell=".db_escape($sell_rate)
 	." WHERE curr_code=".db_escape($curr_code)." AND date_='$date'";
-
+				
 	db_query($sql, "could not add exchange rate for $curr_code");
 }
 
@@ -79,7 +79,7 @@ function add_exchange_rate($curr_code, $date_, $buy_rate, $sell_rate)
 		display_db_error("Exchange rates cannot be set for company currency", "", true);
 
 	$date = date2sql($date_);
-
+		
 	$sql = "INSERT INTO ".TB_PREF."exchange_rates (curr_code, date_, rate_buy, rate_sell)
 		VALUES (".db_escape($curr_code).", '$date', ".db_escape($buy_rate)
 		.", ".db_escape($sell_rate).")";
@@ -138,13 +138,13 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	{
 		$filename = "/stats/eurofxref/eurofxref-daily.xml";
 		$site = "www.ecb.europa.eu";
+		$site_ip="172.230.157.137";
 	}
 	elseif ($provider == 'YAHOO')
 	{
 		$filename = "/d/quotes.csv?s={$curr_a}{$curr_b}=X&f=sl1d1t1ba&e=.csv"; // new URL's for YAHOO
 		$site = "download.finance.yahoo.com";
-        //$filename = "/q?s={$curr_a}{$curr_b}=X"; // Let old code be here for a while, Joe.
- 		//$site = "finance.yahoo.com";
+		$site_ip="203.84.220.151";
 	}
 	elseif ($provider == 'GOOGLE')
 	{
@@ -155,26 +155,28 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	{
 		$filename = "/quote/{$curr_b}{$curr_a}:CUR";
 		$site = "www.bloomberg.com";
+		$site_ip = "23.35.88.72";
 	}
 	$contents = '';
 	if (function_exists('curl_init'))
 	{	// first check with curl as we can set short timeout;
 		$retry = 1;
 	 	do {
-	       $ch = curl_init();
-    	   curl_setopt ($ch, CURLOPT_URL, 'http://'.$site.$filename);
-	       curl_setopt ($ch, CURLOPT_COOKIEJAR, "$path_to_root/tmp/cookie.txt");
-    	   curl_setopt ($ch, CURLOPT_HEADER, 0);
-	       curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
-	       // prevent warning while safe_mode/open_basedir on (redireciton doesn't occur at least on ECB page)
-		   if (!ini_get('safe_mode') && !ini_get('open_basedir'))
-    	   	curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 1);
-	       curl_setopt ($ch, CURLOPT_TIMEOUT, 3);
-    	   $contents = curl_exec ($ch);
-	       curl_close($ch);
+	       	$ch = curl_init();
+    	   	curl_setopt ($ch, CURLOPT_URL, 'http://'.$site.$filename);
+	       	curl_setopt ($ch, CURLOPT_COOKIEJAR, "$path_to_root/tmp/cookie.txt");
+    	   	curl_setopt ($ch, CURLOPT_HEADER, 0);
+	       	curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
+	       	// prevent warning while safe_mode/open_basedir on (redireciton doesn't occur at least on ECB page)
+		   	if (!ini_get('safe_mode') && !ini_get('open_basedir'))
+    	   		curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 1);
+	       	curl_setopt ($ch, CURLOPT_TIMEOUT, 3);
+    	   	$contents = curl_exec ($ch);
+	       	curl_close($ch);
 			// due to resolver bug in some curl versions (e.g. 7.15.5) 
 			// try again for constant IP.
-		   $site="172.230.157.137";
+			if (isset($site_ip))
+		   		$site=$site_ip;
 	   } while( ($contents == '') && $retry--);
 	   
 	} else {
@@ -207,14 +209,6 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 		$val = $array[1];
 		if ($val != 0)
 			$val = 1 / $val;
-		/* Let old code be here for a while, Joe.
-		//if (preg_match('/Last\sTrade:(.*?)Trade\sTime/s', $contents, $matches)) {
-			$val = strip_tags($matches[1]);
-			$val = str_replace(',', '', $val);
-			if ($val != 0)
-				$val = 1 / $val;
-		}
-		*/
 	}
 	elseif ($provider == 'GOOGLE')
 	{
@@ -232,11 +226,13 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	elseif ($provider == 'BLOOMBERG')
 	{
 		$val = '';
-		$stmask = '<span class=" price">';
-		$val = trim(strstr($contents, $stmask));
-		$stmask = chr(10);
-		$val = trim(strstr($val, $stmask));
-		$val = trim(strtok($val, $stmask)); 
+		$stmask = '<div class="price">';
+		$val = strstr($contents, $stmask);
+		$val = trim($val);
+		$val = substr($val, strlen($stmask));
+		$stmask = '</div>';
+		$val = strtok($val, $stmask); 
+		$val = trim($val);
     }    
 	return $val;
 }  /* end function get_extern_rate */
@@ -249,5 +245,5 @@ function get_sql_for_exchange_rates($curr)
 		FROM ".TB_PREF."exchange_rates "
 		."WHERE curr_code=".db_escape($curr)."
 		 ORDER BY date_ DESC";
-	return $sql;
+	return $sql;	 
 }