X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fincludes%2Fdb%2Fgl_db_rates.inc;h=5d98dcb7afd166084b4214e1901d771d1a1078a9;hb=5838404faacacbe4f77dd77bc1cd88fabc213a02;hp=a6dc58e7d59f5e4377e2705e7253e519be1c144b;hpb=0fd1eb74bd51889ce48a6ab5369e66a86cbe7da2;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index a6dc58e7..5d98dcb7 100644
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -76,7 +76,7 @@ function delete_exchange_rate($rate_id)
 //
 function retrieve_exrate($curr_b, $date)
 {
-	return $rate = hook_retrieve_exrate($curr_b, $date);
+	$rate = hook_retrieve_exrate($curr_b, $date);
 	if (is_numeric($rate))
 		return $rate;
 	return get_extern_rate($curr_b, 'ECB', $date);
@@ -112,7 +112,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);
@@ -125,7 +127,7 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 		$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')
 	{