X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_rates.inc;h=924587d8ab9da210f814e004d718732e79837c50;hb=4deaa6ba6e084655989c30cfb7d9dd307408c7dc;hp=b70822974f9bdc1d3d7124f15e118b2907477645;hpb=d39276a5c8495014b0716c81c432fa9a86ffc138;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index b7082297..924587d8 100644
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -63,12 +63,16 @@ 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);
 			
+	begin_transaction(__FUNCTION__, func_get_args());
+
 	$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");
+
+	commit_transaction();
 }
 
 //---------------------------------------------------------------------------------------------
@@ -78,12 +82,14 @@ function add_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);
 
+	begin_transaction(__FUNCTION__, func_get_args());
 	$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).")";
 	db_query($sql, "could not add exchange rate for $curr_code");
+	commit_transaction();
 }
 
 //---------------------------------------------------------------------------------------------
@@ -101,8 +107,12 @@ function add_new_exchange_rate($curr_code, $date_, $ex_rate)
 
 function delete_exchange_rate($rate_id)
 {
+	begin_transaction(__FUNCTION__, func_get_args());
+
 	$sql = "DELETE FROM ".TB_PREF."exchange_rates WHERE id=".db_escape($rate_id);
 	db_query($sql, "could not delete exchange rate $rate_id");
+
+	commit_transaction();
 }
 
 //-----------------------------------------------------------------------------
@@ -137,11 +147,13 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	$proto = 'http://';
 	$curr_a = get_company_pref('curr_default');
 	if ($provider == 'ECB')
-	{
-		$filename = "/stats/eurofxref/eurofxref-daily.xml";
-		$site = "www.ecb.europa.eu";
-		$site_ip="172.230.157.137";
-	}
+    {
+        $filename = "/stats/eurofxref/eurofxref-daily.xml";
+        $site = "www.ecb.europa.eu";
+        $proto = 'https://';
+        $site_ip="172.230.157.137";
+        $contents=file_get_contents($proto.$site.$filename);
+    }
 	elseif ($provider == 'YAHOO')
 	{
 		$filename = "/d/quotes.csv?s={$curr_a}{$curr_b}=X&f=sl1d1t1ba&e=.csv"; // new URL's for YAHOO
@@ -150,8 +162,9 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	}
 	elseif ($provider == 'GOOGLE')
 	{
-		$filename = "/bctzjpnsun/converter?a=1&from={$curr_a}&to={$curr_b}";;
-		$site = "finance.google.com";
+		$filename = "/search?q={$curr_b}+to+{$curr_a}";
+		$site = "https://www.google.com";
+		$contents = file_get_contents($site.$filename);
 	}
 	elseif ($provider == 'BLOOMBERG')
 	{
@@ -160,6 +173,13 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 		$proto = 'https://';
 		$contents=file_get_contents($proto.$site.$filename);
 	}
+	elseif ($provider == 'EXCHANGE-RATES.ORG')
+	{
+		$filename = "/converter/{$curr_b}/{$curr_a}/1";
+		$site = "exchange-rates.org";
+		$proto = 'https://';
+		$contents=file_get_contents($proto.$site.$filename);
+	}
 	if (empty($contents)) {
 		if (function_exists('curl_init'))
 		{	// first check with curl as we can set short timeout;
@@ -215,21 +235,21 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	}
 	elseif ($provider == 'GOOGLE')
 	{
-		$val = getInnerStr($contents, '<span class=bld>', ' ');
-		if (empty($val) || $val+0 <= 0.0001) {
-			// reverse lookup on could not convert for too small values 
-            $filename = "/bctzjpnsun/converter?a=1&from={$curr_b}&to={$curr_a}";
-            $contents = url_get_contents($proto.$site.$filename);
-            $val = getInnerStr($contents, '<span class=bld>', ' ');
-		} else {
-			if ($val != 0)
-				$val = 1 / $val;
-		}
-    }    
+		$data = preg_split('/\D\s(.*?)\s=\s/', $contents);
+		$array = explode(" ", $data[1]);
+		$exRate = $array[0];
+
+		$val = str_replace (',', '', $exRate);
+    }
 	elseif ($provider == 'BLOOMBERG')
 	{
 		$val = getInnerStr($contents, ',"price":', ',"');
     }    
+    elseif ($provider == 'EXCHANGE-RATES.ORG')
+	{
+		$val = getInnerStr($contents, '<span id="ctl00_M_lblToAmount">', '<');
+		$val = str_replace (',', '', $val);
+    }
 	return $val;
 }  /* end function get_extern_rate */