From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 21 Mar 2019 21:28:35 +0000 (+0100)
Subject: Removed CCA, (currencyconverterapi.com) is no longer working. Updated url from google... 
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=f4161d2985268fc4333f968b215ed0c6a53b731c

Removed CCA, (currencyconverterapi.com) is no longer working. Updated url from google api. @notrinos.
---

diff --git a/config.default.php b/config.default.php
index a1089866..acd3ddc6 100644
--- a/config.default.php
+++ b/config.default.php
@@ -178,7 +178,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 	Choose Exchange Rate Provider
 	Default is ECB for backwards compatibility
 */
-	$xr_providers = array("ECB", "EXCHANGE-RATES.ORG", "CCA", "YAHOO", "GOOGLE", "BLOOMBERG");
+	$xr_providers = array("ECB", "EXCHANGE-RATES.ORG", "GOOGLE", "YAHOO", "BLOOMBERG");
 	$dflt_xr_provider = 0;
 
 /*
diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index f067254c..4118492e 100644
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -152,8 +152,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')
 	{
@@ -169,13 +170,6 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 		$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;
@@ -231,17 +225,12 @@ 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":', ',"');
@@ -249,10 +238,7 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
     elseif ($provider == 'EXCHANGE-RATES.ORG')
 	{
 		$val = getInnerStr($contents, '<span id="ctl00_M_lblToAmount">', '<');
-    }
-    elseif ($provider == 'CCA')
-    {
-        $val = getInnerStr($contents, '"val":', '}');
+		$val = str_replace (',', '', $val);
     }
 	return $val;
 }  /* end function get_extern_rate */