X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_rates.inc;h=70ab230a630b3e2758ed64080b3fe675ca8cb8f8;hb=d970dc2362314b8c4787da86d3d7b8a8f40162f7;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..70ab230a 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 . ***********************************************************************/ +include_once($path_to_root . "/includes/remote_url.inc"); //--------------------------------------------------------------------------------------------- function get_exchange_rate($rate_id) { @@ -44,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"); } //--------------------------------------------------------------------------------------------- @@ -59,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); } //--------------------------------------------------------------------------------------------- @@ -67,77 +79,81 @@ 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 $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); } //----------------------------------------------------------------------------- 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') { - $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; do { $ch = curl_init(); curl_setopt ($ch, CURLOPT_URL, 'http://'.$site.$filename); - curl_setopt ($ch, CURLOPT_COOKIEJAR, "cookie.txt"); + curl_setopt ($ch, CURLOPT_COOKIEJAR, "$path_to_root/tmp/cookie.txt"); curl_setopt ($ch, CURLOPT_HEADER, 0); curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 1); + // 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 { - $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 - } - if (!$contents) { - display_warning(_("Cannot retrieve currency rate from $provider page. Please set the rate manually.")); + $contents = url_get_contents("http://".$site.$filename); } if ($provider == 'ECB') { @@ -161,17 +177,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+([\d|.]+)\s+{$curr_b}\s*%s"; if (preg_match($regexp, $contents, $matches)) { @@ -180,8 +203,27 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date) if ($val != 0) $val = 1 / $val; } + } + elseif ($provider == 'BLOOMBERG') + { + $val = ''; + $stmask = ''; + $val = trim(strstr($contents, $stmask)); + $stmask = chr(10); + $val = trim(strstr($val, $stmask)); + $val = trim(strtok($val, $stmask)); } 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