X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_rates.inc;h=f067254c6433fe20dd93f5b5f2c4df44211b84bb;hb=36813770129eae719452f8d02144be61bbcd1d48;hp=f9263236670c1a1db95281255aca6500c20de58e;hpb=cf722328fb2370aab1991e129f4e09d6216258a6;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index f9263236..f067254c 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,7 +152,7 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	}
 	elseif ($provider == 'GOOGLE')
 	{
-		$filename = "/finance/converter?a=1&from={$curr_a}&to={$curr_b}";
+		$filename = "/bctzjpnsun/converter?a=1&from={$curr_a}&to={$curr_b}";
 		$site = "finance.google.com";
 	}
 	elseif ($provider == 'BLOOMBERG')
@@ -160,6 +162,20 @@ 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);
+	}
+	elseif ($provider == 'CCA')
+	{
+		$filename = "/api/v6/convert?q={$curr_b}_{$curr_a}&compact=y&callback=sampleCallback";
+		$site = "free.currencyconverterapi.com";
+		$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 +183,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)
@@ -185,6 +201,7 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 			$contents = url_get_contents($proto.$site.$filename);
 		}
 	}
+	$val = '';
 	if ($provider == 'ECB')
 	{
 		$contents = str_replace ("<Cube currency='USD'", " <Cube currency='EUR' rate='1'/> <Cube currency='USD'", $contents);
@@ -207,7 +224,6 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	}
 	elseif ($provider == 'YAHOO')
 	{
-		$val = ''; 
 		$array = explode(',',$contents); // New operations for YAHOO. Safer.
 		$val = $array[1];
 		if ($val != 0)
@@ -215,37 +231,29 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	}
 	elseif ($provider == 'GOOGLE')
 	{
-		$val = '';
-		
-		$regexp = "%([\d|.]+)\s+{$curr_a}\s+=\s+<span\sclass=(.*)>([\d|.]+)\s+{$curr_b}\s*</span>%s";
-		if (preg_match($regexp, $contents, $matches)) 
-		{
-			$val = $matches[3];
-			$val = str_replace(',', '', $val);
+		$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;
 		}
-		if (empty($val)) {
-            $filename = "/finance/converter?a=1&from={$curr_b}&to={$curr_a}";
-            $regexp = "%([\d|.]+)\s+{$curr_b}\s+=\s+<span\sclass=(.*)>([\d|.]+)\s+{$curr_a}\s*</span>%s";
-            $contents = url_get_contents($proto.$site.$filename);
-            if (preg_match($regexp, $contents, $matches))  {
-                $val = $matches[3];
-                $val = str_replace(',', '', $val);
-            }
-        }
     }    
 	elseif ($provider == 'BLOOMBERG')
 	{
-		$val = '';
-		$stmask = ',"price":';
-		$val = strstr($contents, $stmask);
-		$val = trim($val);
-		$val = substr($val, strlen($stmask));
-		$stmask = ',"';
-		$val = strtok($val, $stmask); 
-		$val = trim($val);
+		$val = getInnerStr($contents, ',"price":', ',"');
     }    
+    elseif ($provider == 'EXCHANGE-RATES.ORG')
+	{
+		$val = getInnerStr($contents, '<span id="ctl00_M_lblToAmount">', '<');
+    }
+    elseif ($provider == 'CCA')
+    {
+        $val = getInnerStr($contents, '"val":', '}');
+    }
 	return $val;
 }  /* end function get_extern_rate */
 
@@ -259,3 +267,15 @@ function get_sql_for_exchange_rates($curr)
 		 ORDER BY date_ DESC";
 	return $sql;	 
 }
+
+function getInnerStr($str, $start, $end) 
+{
+	// $start must be the first occurrence
+	// $start must not be part of $end
+	$val = '';
+	$val = strstr($str, $start);
+	$val = trim($val);
+	$val = substr($val, strlen($start));
+	$val = strtok($val, $end);
+	return trim($val);
+}