From 2a950ced3fa450dd1ea34dc2349e783a047e10af Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sat, 22 Sep 2012 10:31:54 +0200
Subject: [PATCH] 0001792: BLOOMBERG added to Exchange Rate Providers and
 config fix.

---
 config.default.php                            |  9 +++++
 gl/includes/db/gl_db_rates.inc                | 39 +++++++++++++++----
 gl/manage/exchange_rates.php                  |  6 +--
 .../LC_MESSAGES/empty.po                      |  2 +-
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/config.default.php b/config.default.php
index ae6668ef..17863660 100644
--- 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 5d98dcb7..35171403 100644
--- 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 90ab428f..49e924f6 100644
--- 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 8cd9e5d1..daf8c953 100644
--- 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
-- 
2.30.2