0001792: BLOOMBERG added to Exchange Rate Providers and config fix.

diff --git a/config.default.php b/config.default.php
index ae6668ef12399e099acac4a53d80146192f657de..178636607848694025f54866b5048c9941521b11 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -260,3 +260,12 @@ $text_company_selection  = false;
 */
 $login_delay = 30;
 $login_max_attempts = 10;
+
+/*
+       Choose Exchange Rate Provider
+       Default is ECB for backwards compatibility
+*/
+$xr_providers = array("ECB", "YAHOO", "GOOGLE", "BLOOMBERG");
+$dflt_xr_provider = 0;
+
+?>
\ No newline at end of file

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index 5d98dcb7afd166084b4214e1901d771d1a1078a9..351714036f251a456c62a7d6fc8c4d7c61669c98 100644 (file)
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -76,10 +76,13 @@ function delete_exchange_rate($rate_id)
 //
 function retrieve_exrate($curr_b, $date)
 {
+       global $xr_providers, $dflt_xr_provider;
+       $xchg_rate_provider = ((isset($xr_providers) && isset($dflt_xr_provider)) ? $xr_providers[$dflt_xr_provider] : 'ECB');
+       
        $rate = hook_retrieve_exrate($curr_b, $date);
        if (is_numeric($rate))
                return $rate;
-       return get_extern_rate($curr_b, 'ECB', $date);
+       return get_extern_rate($curr_b, $xchg_rate_provider, $date);
 }
 //-----------------------------------------------------------------------------
 
@@ -93,16 +96,22 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
        }
        elseif ($provider == 'YAHOO')
        {
-               $filename = "/q?s={$curr_a}{$curr_b}=X";
-               $site = "finance.yahoo.com";
+               $filename = "/d/quotes.csv?s={$curr_a}{$curr_b}=X&f=sl1d1t1ba&e=.csv"; // new URL's for YAHOO
+               $site = "download.finance.yahoo.com";
+        //$filename = "/q?s={$curr_a}{$curr_b}=X"; // Let old code be here for a while, Joe.
+               //$site = "finance.yahoo.com";
        }
        elseif ($provider == 'GOOGLE')
        {
                $filename = "/finance/converter?a=1&from={$curr_a}&to={$curr_b}";
-               $site = "finance.google.com";
+               $site = "www.google.com";
+       }
+       elseif ($provider == 'BLOOMBERG')
+       {
+               $filename = "/quote/{$curr_b}{$curr_a}:CUR";
+               $site = "www.bloomberg.com";
        }
        $contents = '';
-
        if (function_exists('curl_init'))
        {       // first check with curl as we can set short timeout;
                $retry = 1;
@@ -151,17 +160,24 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
        }
        elseif ($provider == 'YAHOO')
        {
-               $val = '';
-               if (preg_match('/Last\sTrade:(.*?)Trade\sTime/s', $contents, $matches)) {
+               $val = ''; 
+               $array = explode(',',$contents); // New operations for YAHOO. Safer.
+               $val = $array[1];
+               if ($val != 0)
+                       $val = 1 / $val;
+               /* Let old code be here for a while, Joe.
+               //if (preg_match('/Last\sTrade:(.*?)Trade\sTime/s', $contents, $matches)) {
                        $val = strip_tags($matches[1]);
                        $val = str_replace(',', '', $val);
                        if ($val != 0)
                                $val = 1 / $val;
                }
+               */
        }
        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)) 
                {
@@ -170,6 +186,15 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
                        if ($val != 0)
                                $val = 1 / $val;
                }
+    }    
+       elseif ($provider == 'BLOOMBERG')
+       {
+               $val = '';
+               $stmask = '<span class=" price">';
+               $val = trim(strstr($contents, $stmask));
+               $stmask = chr(10);
+               $val = trim(strstr($val, $stmask));
+               //$val = trim(strstr($val, $stmask, TRUE)); // Only works from PHP 5.3. Seems to work without it.
     }    
        return $val;
 }  /* end function get_extern_rate */

diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php
index 90ab428f37db35a37d4d6eb6403c8791804f975c..49e924f6b41d0841d0d30239a3c9a21aaa531ebe 100644 (file)
--- a/gl/manage/exchange_rates.php
+++ b/gl/manage/exchange_rates.php
@@ -108,8 +108,8 @@ function display_rates($curr_code)
 
 function display_rate_edit()
 {
-       global $selected_id, $Ajax;
-
+       global $selected_id, $Ajax, $xr_providers, $dflt_xr_provider;
+       $xchg_rate_provider = ((isset($xr_providers) && isset($dflt_xr_provider)) ? $xr_providers[$dflt_xr_provider] : 'ECB');
        start_table(TABLESTYLE2);
 
        if ($selected_id != "")
@@ -139,7 +139,7 @@ function display_rate_edit()
                $Ajax->activate('BuyRate');
        }
        amount_row(_("Exchange Rate:"), 'BuyRate', null, '',
-               submit('get_rate',_("Get"), false, _('Get current ECB rate') , true), 'max');
+               submit('get_rate',_("Get"), false, _('Get current rate from') . ' ' . $xchg_rate_provider , true), 'max');
 
        end_table(1);
 

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 8cd9e5d1b896da814ffc9811721d39ddb8437453..daf8c9538ac9f25f43118609c42cb330040566af 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -4518,7 +4518,7 @@ msgid "Exchange Rate:"
 msgstr ""
 
 #: gl/manage/exchange_rates.php:142
-msgid "Get current ECB rate"
+msgid "Get current rate from"
 msgstr ""
 
 #: gl/manage/exchange_rates.php:148