X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_rates.inc;h=4118492ef7e7cdd7e56e4323954e2aa95942eab5;hb=64f24ae3a63762d18b1ab6408263ec6ca1e14fb2;hp=0a1abf6251f2f371883060152574c916159dd7b0;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git
diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index 0a1abf62..4118492e 100644
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -14,7 +14,7 @@ include_once($path_to_root . "/includes/remote_url.inc");
function get_exchange_rate($rate_id)
{
$sql = "SELECT * FROM ".TB_PREF."exchange_rates WHERE id=".db_escape($rate_id);
- $result = db_query($sql, "could not get exchange rate for $rate_id");
+ $result = db_query($sql, "could not get exchange rate for $rate_id");
return db_fetch($result);
}
@@ -23,9 +23,11 @@ function get_exchange_rate($rate_id)
function get_date_exchange_rate($curr_code, $date_)
{
$date = date2sql($date_);
- $sql = "SELECT rate_buy FROM ".TB_PREF."exchange_rates WHERE curr_code=".db_escape($curr_code)
- ." AND date_='$date'";
- $result = db_query($sql, "could not get exchange rate for $curr_code - $date_");
+ $sql = "SELECT rate_buy
+ FROM ".TB_PREF."exchange_rates
+ WHERE curr_code=".db_escape($curr_code)
+ ." AND date_='$date'";
+ $result = db_query($sql, "could not get exchange rate for $curr_code - $date_");
if(db_num_rows($result) == 0)
return 0;
@@ -40,7 +42,9 @@ function get_last_exchange_rate($curr_code, $date_)
{
$date = date2sql($date_);
- $sql = "SELECT rate_buy, max(date_) as date_ FROM ".TB_PREF."exchange_rates WHERE curr_code = ".db_escape($curr_code)."
+ $sql = "SELECT rate_buy, max(date_) as date_
+ FROM ".TB_PREF."exchange_rates
+ WHERE curr_code = ".db_escape($curr_code)."
AND date_ <= '$date' GROUP BY rate_buy ORDER BY date_ Desc LIMIT 1";
$result = db_query($sql, "could not query exchange rates");
@@ -129,53 +133,69 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
if ($date != Today()) // no historical rates available
return 0;
+ $contents = '';
+ $proto = 'http://';
$curr_a = get_company_pref('curr_default');
if ($provider == 'ECB')
- {
- $filename = "/stats/eurofxref/eurofxref-daily.xml";
- $site = "www.ecb.europa.eu";
- }
+ {
+ $filename = "/stats/eurofxref/eurofxref-daily.xml";
+ $site = "www.ecb.europa.eu";
+ $proto = 'https://';
+ $site_ip="172.230.157.137";
+ $contents=file_get_contents($proto.$site.$filename);
+ }
elseif ($provider == 'YAHOO')
{
$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";
+ $site_ip="203.84.220.151";
}
elseif ($provider == 'GOOGLE')
{
- $filename = "/finance/converter?a=1&from={$curr_a}&to={$curr_b}";
- $site = "www.google.com";
+ $filename = "/search?q={$curr_b}+to+{$curr_a}";
+ $site = "https://www.google.com";
+ $contents = file_get_contents($site.$filename);
}
elseif ($provider == 'BLOOMBERG')
{
$filename = "/quote/{$curr_b}{$curr_a}:CUR";
$site = "www.bloomberg.com";
+ $proto = 'https://';
+ $contents=file_get_contents($proto.$site.$filename);
}
- $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, "$path_to_root/tmp/cookie.txt");
- curl_setopt ($ch, CURLOPT_HEADER, 0);
- curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 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="172.230.157.137";
- } while( ($contents == '') && $retry--);
-
- } else {
- $contents = url_get_contents("http://".$site.$filename);
+ elseif ($provider == 'EXCHANGE-RATES.ORG')
+ {
+ $filename = "/converter/{$curr_b}/{$curr_a}/1";
+ $site = "exchange-rates.org";
+ $proto = 'https://';
+ $contents=file_get_contents($proto.$site.$filename);
}
+ if (empty($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, $proto.$site.$filename);
+ curl_setopt ($ch, CURLOPT_COOKIEJAR, VARLIB_PATH."/cookie.txt");
+ curl_setopt ($ch, CURLOPT_HEADER, 0);
+ curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
+ // prevent warning while safe_mode/open_basedir on (redirection 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.
+ if (isset($site_ip))
+ $site=$site_ip;
+ } while( ($contents == '') && $retry--);
+ } else {
+ $contents = url_get_contents($proto.$site.$filename);
+ }
+ }
+ $val = '';
if ($provider == 'ECB')
{
$contents = str_replace (" ([\d|.]+)\s+{$curr_b}\s*%s";
- if (preg_match($regexp, $contents, $matches))
- {
- $val = $matches[3];
- $val = str_replace(',', '', $val);
- if ($val != 0)
- $val = 1 / $val;
- }
- }
+ $data = preg_split('/\D\s(.*?)\s=\s/', $contents);
+ $array = explode(" ", $data[1]);
+ $exRate = $array[0];
+
+ $val = str_replace (',', '', $exRate);
+ }
elseif ($provider == 'BLOOMBERG')
{
- $val = '';
- $stmask = '';
- $val = trim(strstr($contents, $stmask));
- $stmask = chr(10);
- $val = trim(strstr($val, $stmask));
- $val = trim(strtok($val, $stmask));
+ $val = getInnerStr($contents, ',"price":', ',"');
}
+ elseif ($provider == 'EXCHANGE-RATES.ORG')
+ {
+ $val = getInnerStr($contents, '', '<');
+ $val = str_replace (',', '', $val);
+ }
return $val;
} /* end function get_extern_rate */
@@ -241,9 +247,21 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
function get_sql_for_exchange_rates($curr)
{
- $sql = "SELECT date_, rate_buy, id FROM "
- .TB_PREF."exchange_rates "
+ $sql = "SELECT date_, rate_buy, id
+ FROM ".TB_PREF."exchange_rates "
."WHERE curr_code=".db_escape($curr)."
ORDER BY date_ DESC";
return $sql;
}
+
+function getInnerStr($str, $start, $end)
+{
+ // $start must be the first occurrence
+ // $start must not be part of $end
+ $val = '';
+ $val = strstr($str, $start);
+ $val = trim($val);
+ $val = substr($val, strlen($start));
+ $val = strtok($val, $end);
+ return trim($val);
+}