X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_rates.inc;h=b70822974f9bdc1d3d7124f15e118b2907477645;hb=d39276a5c8495014b0716c81c432fa9a86ffc138;hp=fc1060234cbfd758af3627154bdcc6e689701ac2;hpb=70840a5223cf5c9f31d360946225bbad6a2a1943;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index fc106023..b7082297 100644
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -133,6 +133,8 @@ 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')
 	{
@@ -148,40 +150,42 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	}
 	elseif ($provider == 'GOOGLE')
 	{
-		$filename = "/finance/converter?a=1&from={$curr_a}&to={$curr_b}";
+		$filename = "/bctzjpnsun/converter?a=1&from={$curr_a}&to={$curr_b}";;
 		$site = "finance.google.com";
 	}
 	elseif ($provider == 'BLOOMBERG')
 	{
 		$filename = "/quote/{$curr_b}{$curr_a}:CUR";
 		$site = "www.bloomberg.com";
-		$site_ip = "23.35.88.72";
+		$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.
-			if (isset($site_ip))
-		   		$site=$site_ip;
-	   } while( ($contents == '') && $retry--);
-	   
-	} else {
-		$contents = url_get_contents("http://".$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 ("<Cube currency='USD'", " <Cube currency='EUR' rate='1'/> <Cube currency='USD'", $contents);
@@ -204,7 +208,6 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	}
 	elseif ($provider == 'YAHOO')
 	{
-		$val = ''; 
 		$array = explode(',',$contents); // New operations for YAHOO. Safer.
 		$val = $array[1];
 		if ($val != 0)
@@ -212,27 +215,20 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
 	}
 	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)) 
-		{
-			$val = $matches[3];
-			$val = str_replace(',', '', $val);
+		$val = getInnerStr($contents, '<span class=bld>', ' ');
+		if (empty($val) || $val+0 <= 0.0001) {
+			// reverse lookup on could not convert for too small values 
+            $filename = "/bctzjpnsun/converter?a=1&from={$curr_b}&to={$curr_a}";
+            $contents = url_get_contents($proto.$site.$filename);
+            $val = getInnerStr($contents, '<span class=bld>', ' ');
+		} else {
 			if ($val != 0)
 				$val = 1 / $val;
 		}
     }    
 	elseif ($provider == 'BLOOMBERG')
 	{
-		$val = '';
-		$stmask = '<div class="price">';
-		$val = strstr($contents, $stmask);
-		$val = trim($val);
-		$val = substr($val, strlen($stmask));
-		$stmask = '</div>';
-		$val = strtok($val, $stmask); 
-		$val = trim($val);
+		$val = getInnerStr($contents, ',"price":', ',"');
     }    
 	return $val;
 }  /* end function get_extern_rate */
@@ -247,3 +243,15 @@ function get_sql_for_exchange_rates($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);
+}