X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=gl%2Fincludes%2Fdb%2Fgl_db_rates.inc;h=351714036f251a456c62a7d6fc8c4d7c61669c98;hb=2a950ced3fa450dd1ea34dc2349e783a047e10af;hp=7189afa894dc131ba7af5cf258bb08e952cd0972;hpb=5040e3d0e0f8f5d6d08e0121f12308320abaa6c2;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index 7189afa8..35171403 100644
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -9,6 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+include_once($path_to_root . "/includes/remote_url.inc");
 //---------------------------------------------------------------------------------------------
 function get_exchange_rate($rate_id)
 {
@@ -75,12 +76,13 @@ function delete_exchange_rate($rate_id)
 //
 function retrieve_exrate($curr_b, $date)
 {
-	global $Hooks;
-
-	if (method_exists($Hooks, 'retrieve_exrate'))
-		return $Hooks->retrieve_exrate($curr_b, $date);
-	else
-		return get_extern_rate($curr_b, 'ECB', $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, $xchg_rate_provider, $date);
 }
 //-----------------------------------------------------------------------------
 
@@ -94,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;
@@ -113,7 +121,9 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	       curl_setopt ($ch, CURLOPT_COOKIEJAR, "cookie.txt");
     	   curl_setopt ($ch, CURLOPT_HEADER, 0);
 	       curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
-    	   curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 1);
+	       // prevent warning while save_mode/open_basedir on (redireciton doesn't occur at least on ECB page)
+		   if (!ini_get('save_mode') && !ini_get('open_basedir'))
+    	   	curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 1);
 	       curl_setopt ($ch, CURLOPT_TIMEOUT, 3);
     	   $contents = curl_exec ($ch);
 	       curl_close($ch);
@@ -123,21 +133,10 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	   } while( ($contents == '') && $retry--);
 	   
 	} else {
-		$handle = @fopen("http://".$site.$filename, 'rb');
-		if ($handle) {
-			do 
-			{
-				$data = @fread( $handle, 4096 );
-				if ( strlen ( $data ) == 0 ) 
-   					break;
-   				$contents .= $data; // with this syntax only text will be translated, whole text with htmlspecialchars($data)
-			} 
-			while (true);
-			@fclose( $handle );
-		} // end handle
+		$contents = url_get_contents("http://".$site.$filename);
 	}
 	if (!$contents) {
-		display_warning(_("Cannot retrieve currency rate from $provider page. Please set the rate manually."));
+		display_warning(sprintf(_("Cannot retrieve currency rate from %s page. Please set the rate manually."), $provider));
 	}
 	if ($provider == 'ECB')
 	{
@@ -161,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)) 
 		{
@@ -180,8 +186,27 @@ 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 */
 
+//-----------------------------------------------------------------------------
+
+function get_sql_for_exchange_rates()
+{
+	$sql = "SELECT date_, rate_buy, id FROM "
+		.TB_PREF."exchange_rates "
+		."WHERE curr_code=".db_escape($_POST['curr_abrev'])."
+		 ORDER BY date_ DESC";
+	return $sql;	 
+}
 ?>
\ No newline at end of file