No exchange rate working in FA now (EXCHANGE-RATES.ORG). Fixed by @boxygen.

[fa-stable.git] / gl / includes / db / gl_db_rates.inc

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index b70822974f9bdc1d3d7124f15e118b2907477645..462e92cd164d00a325d09413c3d89b214b4f824e 100644 (file)
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -32,7 +32,7 @@ function get_date_exchange_rate($curr_code, $date_)
        if(db_num_rows($result) == 0) 
                return 0;
        $row = db_fetch($result);
-               return $row[0];
+       return $row[0];
 }
 
 /*
@@ -126,7 +126,7 @@ function retrieve_exrate($curr_b, $date)
 }
 //-----------------------------------------------------------------------------
 
-function get_extern_rate($curr_b, $provider = 'ECB', $date) 
+function get_extern_rate($curr_b, $provider, $date) 
 {
        global  $path_to_root;
 
@@ -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 = "/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 +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;
@@ -215,21 +225,20 @@ 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, "1 $curr_b = ",$curr_a);          
+    }
        return $val;
 }  /* end function get_extern_rate */