X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_rates.inc;h=4118492ef7e7cdd7e56e4323954e2aa95942eab5;hb=f4161d2985268fc4333f968b215ed0c6a53b731c;hp=46e0aa0289f7d0d5aa9958462936354872da2e77;hpb=0a7206e29bd406cfa6b889cf641dabf48ad52ac9;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index 46e0aa02..4118492e 100644
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -137,11 +137,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 +152,9 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	}
 	elseif ($provider == 'GOOGLE')
 	{
-		$filename = "/finance/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 +163,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;
@@ -167,7 +177,7 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	 		do {
 	       		$ch = curl_init();
     	   		curl_setopt ($ch, CURLOPT_URL, $proto.$site.$filename);
-	       		curl_setopt ($ch, CURLOPT_COOKIEJAR, "$path_to_root/tmp/cookie.txt");
+	       		curl_setopt ($ch, CURLOPT_COOKIEJAR, VARLIB_PATH."/cookie.txt");
     	   		curl_setopt ($ch, CURLOPT_HEADER, 0);
 	       		curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
 	       		// prevent warning while safe_mode/open_basedir on (redirection doesn't occur at least on ECB page)
@@ -215,21 +225,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 = "/finance/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 */