Fixed ECB URLs moved permanently.

[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 f3237d55e575f9d78eea50daaa3ebb99ee0f03d2..70ab230a630b3e2758ed64080b3fe675ca8cb8f8 100644 (file)
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -45,7 +45,7 @@ function update_exchange_rate($curr_code, $date_, $buy_rate, $sell_rate)
        $sql = "UPDATE ".TB_PREF."exchange_rates SET rate_buy=$buy_rate, rate_sell=".db_escape($sell_rate)
        ." WHERE curr_code=".db_escape($curr_code)." AND date_='$date'";
                                
-       db_query($sql, "could not add exchange rate for $curr_code");                           
+       db_query($sql, "could not add exchange rate for $curr_code");
 }
 
 //---------------------------------------------------------------------------------------------
@@ -60,7 +60,18 @@ function add_exchange_rate($curr_code, $date_, $buy_rate, $sell_rate)
        $sql = "INSERT INTO ".TB_PREF."exchange_rates (curr_code, date_, rate_buy, rate_sell)
                VALUES (".db_escape($curr_code).", '$date', ".db_escape($buy_rate)
                .", ".db_escape($sell_rate).")";
-       db_query($sql, "could not add exchange rate for $curr_code");                           
+       db_query($sql, "could not add exchange rate for $curr_code");
+}
+
+//---------------------------------------------------------------------------------------------
+
+function add_new_exchange_rate($curr_code, $date_, $ex_rate)
+{
+       if (is_company_currency($curr_code) || !$ex_rate)
+               return;
+
+       if (!get_date_exchange_rate($curr_code, $date_))
+               add_exchange_rate($curr_code, $date_, $ex_rate, $ex_rate);
 }
 
 //---------------------------------------------------------------------------------------------
@@ -68,12 +79,16 @@ function add_exchange_rate($curr_code, $date_, $buy_rate, $sell_rate)
 function delete_exchange_rate($rate_id)
 {
        $sql = "DELETE FROM ".TB_PREF."exchange_rates WHERE id=".db_escape($rate_id);
-       db_query($sql, "could not delete exchange rate $rate_id");              
+       db_query($sql, "could not delete exchange rate $rate_id");
 }
 
 //-----------------------------------------------------------------------------
 //     Retrieve exchange rate as of date $date from external source (usually inet)
 //
+//     Exchange rate for currency revaluation purposes is defined in FA as home_currency/curr_b ratio i.e.
+//
+//     amount [home] = amount [curr] * ex_rate
+//
 function retrieve_exrate($curr_b, $date)
 {
        global $xr_providers, $dflt_xr_provider;
@@ -90,11 +105,14 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 {
        global  $path_to_root;
 
+       if ($date != Today())   // no historical rates available
+               return 0;
+
        $curr_a = get_company_pref('curr_default');
        if ($provider == 'ECB')
        {
                $filename = "/stats/eurofxref/eurofxref-daily.xml";
-               $site = "www.ecb.int";
+               $site = "www.ecb.europa.eu";
        }
        elseif ($provider == 'YAHOO')
        {
@@ -123,23 +141,20 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
               curl_setopt ($ch, CURLOPT_COOKIEJAR, "$path_to_root/tmp/cookie.txt");
           curl_setopt ($ch, CURLOPT_HEADER, 0);
               curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 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'))
+              // prevent warning while safe_mode/open_basedir on (redireciton doesn't occur at least on ECB page)
+                  if (!ini_get('safe_mode') && !ini_get('open_basedir'))
                curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 1);
               curl_setopt ($ch, CURLOPT_TIMEOUT, 3);
           $contents = curl_exec ($ch);
               curl_close($ch);
                        // due to resolver bug in some curl versions (e.g. 7.15.5) 
                        // try again for constant IP.
-                  $site="195.128.2.97";
+                  $site="172.230.157.137";
           } while( ($contents == '') && $retry--);
           
        } else {
                $contents = url_get_contents("http://".$site.$filename);
        }
-       if (!$contents) {
-               display_warning(sprintf(_("Cannot retrieve currency rate from %s page. Please set the rate manually."), $provider));
-       }
        if ($provider == 'ECB')
        {
                $contents = str_replace ("<Cube currency='USD'", " <Cube currency='EUR' rate='1'/> <Cube currency='USD'", $contents);