From da17e6e676de53dd5dafcc2c2746aa7b136e1f36 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 10 Mar 2016 23:52:06 +0100
Subject: [PATCH 1/5] New add sync with api to create/update all rates

---
 htdocs/admin/multicurrency.php                | 103 ++++++++++++++++--
 .../class/multicurrency.class.php             |  11 ++
 2 files changed, 106 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index b1ad347d8b7..afb396a0217 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
+
 // Translations
 $langs->load("multicurrency");
 
@@ -41,10 +42,17 @@ if (! $user->admin) {
 
 // Parameters
 $action = GETPOST('action', 'alpha');
-
+$sync_response = GETPOST('sync_response');
 /*
  * Actions
  */
+if (!empty($sync_response))
+{
+	$sync_response = json_decode($sync_response);
+	MultiCurrency::syncRates($sync_response);
+	exit;
+}
+
 if (preg_match('/set_(.*)/',$action,$reg))
 {
 	$code=$reg[1];
@@ -64,7 +72,7 @@ if (preg_match('/del_(.*)/',$action,$reg))
 	$code=$reg[1];
 	if (dolibarr_del_const($db, $code, 0) > 0)
 	{
-		Header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
 	else
@@ -224,8 +232,8 @@ print '<td align="center" width="20">&nbsp;</td>';
 print '<td align="right" width="400">';
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_CURRENCY_APP_ID">';
-print '<input type="text" name="CURRENCY_APP_ID" value="'.$conf->global->MULTICURRENCY_APP_ID.'" size="28" />&nbsp;';
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_APP_ID">';
+print '<input type="text" name="MULTICURRENCY_APP_ID" value="'.$conf->global->MULTICURRENCY_APP_ID.'" size="28" />&nbsp;';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print '</form>';
 print '</td></tr>';
@@ -244,16 +252,95 @@ print '</form>';
 print '</td></tr>';
 
 print '</table>';
-
-print '</form>';
-
 print '<br />';
+
+print '<script type="text/javascript">
+
+	function getXMLHttpRequest() 
+	{
+	    var xhr = null;
+	    if (window.XMLHttpRequest || window.ActiveXObject) 
+	    {
+	        if (window.ActiveXObject) 
+	        {
+	            try 
+	            {
+	                xhr = new ActiveXObject("Msxml2.XMLHTTP");
+	            } 
+	            catch(e) 
+	            {
+	                xhr = new ActiveXObject("Microsoft.XMLHTTP");
+	            }
+	        } 
+	        else 
+	        {
+	            xhr = new XMLHttpRequest(); 
+	        }
+	    } 
+	    else 
+	    {
+	    	if (typeof $ !== "undefined") $.jnotify("'.$langs->transnoentitiesnoconv('multicurrency_error_browser_incompatible').'", "error");
+			else alert("'.$langs->transnoentitiesnoconv('multicurremulticurrency_error_browser_incompatiblency_syncronize_error').'");
+	       
+	        return null;
+	    }
+	    
+	    return xhr;
+	}
+
+	function request(url, callback) 
+	{
+	    var xhr = getXMLHttpRequest();
+	    xhr.onreadystatechange = function() 
+	    {
+	        if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) 
+	        {
+	            callback(xhr.responseText);
+	        }
+	
+	    };
+
+	    xhr.open("GET", url, true);
+	    xhr.send(null)
+	}
+
+	function syncronize_rates()
+	{
+		var url_sync = "http://apilayer.net/api/live?access_key='.$conf->global->MULTICURRENCY_APP_ID.'&format=1";
+		request(url_sync, update_rates);
+	}
+
+	function update_rates(responseText)
+	{
+		var response = JSON.parse(responseText);
+		if (response.success)
+		{
+			var url = "multicurrency.php?sync_response="+JSON.stringify(response);
+			request(url, reloadpage);
+		}
+		else
+		{
+			if (typeof $ !== "undefined") $.jnotify("'.$langs->transnoentitiesnoconv('multicurrency_syncronize_error').': "+response.error.info, "error");
+			else alert("'.$langs->transnoentitiesnoconv('multicurrency_syncronize_error').': "+response.error.info);
+		}
+	}
+	
+	function reloadpage(responseText)
+	{
+		var response = JSON.parse(responseText);
+		console.log(response);
+		
+	}
+	
+</script>';
+
+
 print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Currencies").'</td>'."\n";
 print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="center" width="100">'.$langs->trans("Rate").'</td>'."\n";
+print '<td align="right" width="100">'.$langs->trans("Rate").'&nbsp;<input type="button" class="button" onclick="javascript:syncronize_rates();" value="'.$langs->trans('Synchronize').'" /></td>'."\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'>';
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index fd6da3816ea..c78e7784ad1 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -520,6 +520,17 @@ class MultiCurrency extends CommonObject
 		 
 		 return false;
 	   }
+	   
+	/**
+	 *  Sync rates from api
+	 * 
+	 *  @param 	array 	$response 	array of reponse from api to sync dolibarr rates
+	 */
+	public static function syncRates($response)
+	{
+		$TRate = $response['quotes'];
+		$timestamp = $response['timestamp'];
+	}
 }
 
 /**

From 3134af5013984bb356716e9254891788f4312ef4 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Fri, 11 Mar 2016 23:42:02 +0100
Subject: [PATCH 2/5] Fix sync with currencylayer

---
 htdocs/admin/multicurrency.php                | 84 ++++++++++------
 .../class/multicurrency.class.php             | 95 +++++++++++++++++--
 2 files changed, 142 insertions(+), 37 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index afb396a0217..e4f4fc34301 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -225,32 +225,6 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print '</form>';
 print '</td></tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->transnoentitiesnoconv("multicurrency_appId").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="400">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_MULTICURRENCY_APP_ID">';
-print '<input type="text" name="MULTICURRENCY_APP_ID" value="'.$conf->global->MULTICURRENCY_APP_ID.'" size="28" />&nbsp;';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->transnoentitiesnoconv("multicurrency_currencyFromToRate").'</td>';
-print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="400">';
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_MULTICURRENCY_FROM_TO_RATE">';
-print '<input type="text" name="MULTICURRENCY_FROM_TO_RATE" value="'.$conf->global->MULTICURRENCY_FROM_TO_RATE.'" size="10" placeholder="USD-EUR-1" />&nbsp;'; // CURRENCY_BASE - CURRENCY_ENTITY - ID_ENTITY
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print '</td></tr>';
-
 print '</table>';
 print '<br />';
 
@@ -306,7 +280,8 @@ print '<script type="text/javascript">
 
 	function syncronize_rates()
 	{
-		var url_sync = "http://apilayer.net/api/live?access_key='.$conf->global->MULTICURRENCY_APP_ID.'&format=1";
+		document.getElementById("bt_sync").disabled = true;
+		var url_sync = "http://apilayer.net/api/live?access_key='.$conf->global->MULTICURRENCY_APP_ID.'&format=1'.(!empty($conf->global->MULTICURRENCY_APP_SOURCE) ? '&source='.$conf->global->MULTICURRENCY_APP_SOURCE : '').'";
 		request(url_sync, update_rates);
 	}
 
@@ -327,20 +302,67 @@ print '<script type="text/javascript">
 	
 	function reloadpage(responseText)
 	{
-		var response = JSON.parse(responseText);
-		console.log(response);
-		
+		document.getElementById("bt_sync").disabled = false;
+		window.location.href = window.location.pathname;
 	}
 	
 </script>';
 
+$var=false;
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("CurrencyLayerAccount").'</td>'."\n";
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="100">'.$langs->trans("Value").'&nbsp;<input type="button" id="bt_sync" class="button" onclick="javascript:syncronize_rates();" value="'.$langs->trans('Synchronize').'" /></td>'."\n";
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td><a target="_blank" href="https://currencylayer.com">'.$langs->transnoentitiesnoconv("multicurrency_appId").'</a></td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="400">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_APP_ID">';
+print '<input type="text" name="MULTICURRENCY_APP_ID" value="'.$conf->global->MULTICURRENCY_APP_ID.'" size="28" />&nbsp;';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->transnoentitiesnoconv("multicurrency_appCurrencySource").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="400">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_APP_SOURCE">';
+print '<input type="text" name="MULTICURRENCY_APP_SOURCE" value="'.$conf->global->MULTICURRENCY_APP_SOURCE.'" size="10" placeholder="USD" />&nbsp;'; // Default: USD
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->transnoentitiesnoconv("multicurrency_alternateCurrencySource").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="right" width="400">';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_MULTICURRENCY_ALTERNATE_SOURCE">';
+print '<input type="text" name="MULTICURRENCY_ALTERNATE_SOURCE" value="'.$conf->global->MULTICURRENCY_ALTERNATE_SOURCE.'" size="10" placeholder="EUR" />&nbsp;'; // Example: EUR
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print '</td></tr>';
+
+print '</table>';
+print '<br />';
 
 print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Currencies").'</td>'."\n";
 print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="100">'.$langs->trans("Rate").'&nbsp;<input type="button" class="button" onclick="javascript:syncronize_rates();" value="'.$langs->trans('Synchronize').'" /></td>'."\n";
+print '<td align="center" width="100">'.$langs->trans("Rate").'</td>'."\n";
 
 $var=!$var;
 print '<tr '.$bc[$var].'>';
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index c78e7784ad1..36c392b5930 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -208,7 +208,7 @@ class MultiCurrency extends CommonObject
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog('Currency::fetch ' . join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -383,7 +383,7 @@ class MultiCurrency extends CommonObject
 	 * 
 	 * @param double	$rate	rate value
 	 * 
-	 * @return bool false if KO, true if OK
+	 * @return int -1 if KO, 1 if OK
 	 */
 	 public function addRate($rate)
 	 {
@@ -402,6 +402,40 @@ class MultiCurrency extends CommonObject
 		}
 	 }
 	 
+	 /**
+	  * Try get label of code in llx_currency then add rate
+	  * 
+	  * @param	string	$code	currency code
+	  * @param	double	$rate	new rate
+	  * 
+	  * @return int -1 if KO, 1 if OK, 2 if label found and OK
+	  */
+	function addRateFromDolibarr($code, $rate)
+	{
+	 	global $db, $user;
+		
+		$currency = new MultiCurrency($db);
+		$currency->code = $code;
+		$currency->name = $code;
+		
+	 	$sql = 'SELECT label FROM '.MAIN_DB_PREFIX.'c_currencies WHERE code_iso = "'.$db->escape($code).'"';
+		$resql = $db->query($sql);
+		if ($resql && ($line = $db->fetch_object($resql)))
+		{
+			$currency->name = $line->label;
+		}
+		
+		if ($currency->create($user) > 0)
+		{
+			$currency->addRate($rate);
+			
+			if (!empty($line)) return 2;
+			else return 1;
+		}
+		
+		return -1;	
+	}
+	 
 	 /**
 	 * Update rate in database 
 	 * 
@@ -520,7 +554,37 @@ class MultiCurrency extends CommonObject
 		 
 		 return false;
 	   }
-	   
+
+	/**
+	 * With free account we can't set source then recalcul all rates to force another source
+	 * 
+	 * @param	stdClass	$TRate	Object containing all currencies rates	
+	 * @return	-1 if KO, 0 if nothing, 1 if OK
+	 */
+	public static function  recalculRates(&$TRate)
+	{
+		global $conf;
+		
+		if (!empty($conf->global->MULTICURRENCY_ALTERNATE_SOURCE))
+		{
+			$alternate_source = 'USD'.$conf->global->MULTICURRENCY_ALTERNATE_SOURCE;
+			if (!empty($TRate->{$alternate_source}))
+			{
+				$coef = $TRate->USDUSD / $TRate->{$alternate_source};
+				foreach ($TRate as $attr => &$rate)
+				{
+					$rate *= $coef;
+				}
+				
+				return 1;
+			}
+			
+			return -1; // Alternate souce not found
+		}
+		
+		return 0; // Nothing to do
+	}
+	
 	/**
 	 *  Sync rates from api
 	 * 
@@ -528,8 +592,27 @@ class MultiCurrency extends CommonObject
 	 */
 	public static function syncRates($response)
 	{
-		$TRate = $response['quotes'];
-		$timestamp = $response['timestamp'];
+		global $db,$conf;
+		
+		$TRate = $response->quotes;
+		$timestamp = $response->timestamp;
+		
+		if (self::recalculRates($TRate) >= 0) 
+		{
+			foreach ($TRate as $currency_code => $rate)
+			{
+				$code = substr($currency_code, 3, 3);
+				$obj = new MultiCurrency($db);
+				if ($obj->fetch(null, $code) > 0)
+				{
+					$obj->updateRate($rate);
+				}
+				else 
+				{
+					self::addRateFromDolibarr($code, $rate);
+				}
+			}	
+		}
 	}
 }
 
@@ -724,7 +807,7 @@ class CurrencyRate extends CommonObjectLine
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 

From 0a533660b8834d83a5738e42c6da4e33c4bfdddb Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sat, 12 Mar 2016 21:17:09 +0100
Subject: [PATCH 3/5] Fix travis phpcs

---
 htdocs/compta/prelevement/create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 33d02bff05b..c2607d5b83d 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -65,7 +65,7 @@ if ($action == 'create')
     $result=$bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET);
     if ($result < 0)
     {
-    	setEventMessages($bprev->error , $bprev->errors, 'errors');
+    	setEventMessages($bprev->error, $bprev->errors, 'errors');
     }
     if ($result == 0)
     {

From 661ee72d55a377932068266d271a7e6c88f6ddea Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sun, 20 Mar 2016 15:17:30 +0100
Subject: [PATCH 4/5] UPDATE move ajax request in js file and call a new php
 file to update all rates

---
 htdocs/admin/multicurrency.php               | 91 +-----------------
 htdocs/multicurrency/ajax/updaterates.php    | 35 +++++++
 htdocs/multicurrency/js/currencylayer.js.php | 98 ++++++++++++++++++++
 3 files changed, 136 insertions(+), 88 deletions(-)
 create mode 100644 htdocs/multicurrency/ajax/updaterates.php
 create mode 100644 htdocs/multicurrency/js/currencylayer.js.php

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index e4f4fc34301..235b16ba100 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -42,16 +42,10 @@ if (! $user->admin) {
 
 // Parameters
 $action = GETPOST('action', 'alpha');
-$sync_response = GETPOST('sync_response');
 /*
  * Actions
  */
-if (!empty($sync_response))
-{
-	$sync_response = json_decode($sync_response);
-	MultiCurrency::syncRates($sync_response);
-	exit;
-}
+
 
 if (preg_match('/set_(.*)/',$action,$reg))
 {
@@ -145,8 +139,9 @@ if ($resql)
  */
 
 $page_name = "MultiCurrency";
+$morejs = array('/multicurrency/js/currencylayer.js.php');
 
-llxHeader('', $langs->trans($page_name));
+llxHeader('', $langs->trans($page_name), '', '', '', '', $morejs);
 
 // Subheader
 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
@@ -228,86 +223,6 @@ print '</td></tr>';
 print '</table>';
 print '<br />';
 
-print '<script type="text/javascript">
-
-	function getXMLHttpRequest() 
-	{
-	    var xhr = null;
-	    if (window.XMLHttpRequest || window.ActiveXObject) 
-	    {
-	        if (window.ActiveXObject) 
-	        {
-	            try 
-	            {
-	                xhr = new ActiveXObject("Msxml2.XMLHTTP");
-	            } 
-	            catch(e) 
-	            {
-	                xhr = new ActiveXObject("Microsoft.XMLHTTP");
-	            }
-	        } 
-	        else 
-	        {
-	            xhr = new XMLHttpRequest(); 
-	        }
-	    } 
-	    else 
-	    {
-	    	if (typeof $ !== "undefined") $.jnotify("'.$langs->transnoentitiesnoconv('multicurrency_error_browser_incompatible').'", "error");
-			else alert("'.$langs->transnoentitiesnoconv('multicurremulticurrency_error_browser_incompatiblency_syncronize_error').'");
-	       
-	        return null;
-	    }
-	    
-	    return xhr;
-	}
-
-	function request(url, callback) 
-	{
-	    var xhr = getXMLHttpRequest();
-	    xhr.onreadystatechange = function() 
-	    {
-	        if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) 
-	        {
-	            callback(xhr.responseText);
-	        }
-	
-	    };
-
-	    xhr.open("GET", url, true);
-	    xhr.send(null)
-	}
-
-	function syncronize_rates()
-	{
-		document.getElementById("bt_sync").disabled = true;
-		var url_sync = "http://apilayer.net/api/live?access_key='.$conf->global->MULTICURRENCY_APP_ID.'&format=1'.(!empty($conf->global->MULTICURRENCY_APP_SOURCE) ? '&source='.$conf->global->MULTICURRENCY_APP_SOURCE : '').'";
-		request(url_sync, update_rates);
-	}
-
-	function update_rates(responseText)
-	{
-		var response = JSON.parse(responseText);
-		if (response.success)
-		{
-			var url = "multicurrency.php?sync_response="+JSON.stringify(response);
-			request(url, reloadpage);
-		}
-		else
-		{
-			if (typeof $ !== "undefined") $.jnotify("'.$langs->transnoentitiesnoconv('multicurrency_syncronize_error').': "+response.error.info, "error");
-			else alert("'.$langs->transnoentitiesnoconv('multicurrency_syncronize_error').': "+response.error.info);
-		}
-	}
-	
-	function reloadpage(responseText)
-	{
-		document.getElementById("bt_sync").disabled = false;
-		window.location.href = window.location.pathname;
-	}
-	
-</script>';
-
 $var=false;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/multicurrency/ajax/updaterates.php b/htdocs/multicurrency/ajax/updaterates.php
new file mode 100644
index 00000000000..663e68a647c
--- /dev/null
+++ b/htdocs/multicurrency/ajax/updaterates.php
@@ -0,0 +1,35 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2016 Pierre-Henry Favre <phf@atm-consulting.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+
+$sync_response = GETPOST('sync_response');
+
+if (!empty($sync_response))
+{
+	$sync_response = json_decode($sync_response);
+	MultiCurrency::syncRates($sync_response);
+}
\ No newline at end of file
diff --git a/htdocs/multicurrency/js/currencylayer.js.php b/htdocs/multicurrency/js/currencylayer.js.php
new file mode 100644
index 00000000000..0b563aae266
--- /dev/null
+++ b/htdocs/multicurrency/js/currencylayer.js.php
@@ -0,0 +1,98 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2016 Pierre-Henry Favre <phf@atm-consulting.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+include '../../main.inc.php';
+$langs->load('errors');
+
+?>
+
+function getXMLHttpRequest() 
+{
+    var xhr = null;
+    if (window.XMLHttpRequest || window.ActiveXObject) 
+    {
+        if (window.ActiveXObject) 
+        {
+            try 
+            {
+                xhr = new ActiveXObject("Msxml2.XMLHTTP");
+            } 
+            catch(e) 
+            {
+                xhr = new ActiveXObject("Microsoft.XMLHTTP");
+            }
+        } 
+        else 
+        {
+            xhr = new XMLHttpRequest(); 
+        }
+    } 
+    else 
+    {
+    	if (typeof $ !== "undefined") $.jnotify("<?php echo $langs->transnoentitiesnoconv('multicurrency_error_browser_incompatible'); ?>", "error");
+		else alert("<?php echo $langs->transnoentitiesnoconv('multicurrency_error_browser_incompatible'); ?>");
+       
+        return null;
+    }
+    
+    return xhr;
+}
+
+function request(url, callback) 
+{
+    var xhr = getXMLHttpRequest();
+    xhr.onreadystatechange = function() 
+    {
+        if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) 
+        {
+            callback(xhr.responseText);
+        }
+
+    };
+
+    xhr.open("GET", url, true);
+    xhr.send(null);
+}
+
+function syncronize_rates()
+{
+	document.getElementById("bt_sync").disabled = true;
+	var url_sync = "http://apilayer.net/api/live?access_key=<?php echo $conf->global->MULTICURRENCY_APP_ID; ?>&format=1<?php if (!empty($conf->global->MULTICURRENCY_APP_SOURCE)) echo '&source='.$conf->global->MULTICURRENCY_APP_SOURCE; ?>";
+	request(url_sync, update_rates);
+}
+
+function update_rates(responseText)
+{
+	var response = JSON.parse(responseText);
+	if (response.success)
+	{
+		var url = "<?php echo DOL_URL_ROOT; ?>/multicurrency/ajax/updaterates.php?sync_response="+JSON.stringify(response);
+		request(url, reloadpage);
+	}
+	else
+	{
+		if (typeof $ !== "undefined") $.jnotify("<?php echo $langs->transnoentitiesnoconv('multicurrency_syncronize_error'); ?>: "+response.error.info, "error");
+		else alert("<?php echo $langs->transnoentitiesnoconv('multicurrency_syncronize_error'); ?>: "+response.error.info);
+	}
+}
+
+function reloadpage(responseText)
+{
+	document.getElementById("bt_sync").disabled = false;
+	window.location.href = window.location.pathname;
+}

From a33472942d22e7c6829cc8592fd86e9311192f9a Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Sat, 9 Apr 2016 22:12:33 +0200
Subject: [PATCH 5/5] Fix synchronize rates for multicurrency module

---
 htdocs/admin/multicurrency.php               | 48 +++++++++-
 htdocs/multicurrency/ajax/updaterates.php    | 35 -------
 htdocs/multicurrency/js/currencylayer.js.php | 98 --------------------
 3 files changed, 44 insertions(+), 137 deletions(-)
 delete mode 100644 htdocs/multicurrency/ajax/updaterates.php
 delete mode 100644 htdocs/multicurrency/js/currencylayer.js.php

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 235b16ba100..e09347099de 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -119,6 +119,21 @@ elseif ($action == 'update_currency')
 		}
 	}
 }
+elseif ($action == 'synchronize') 
+{
+	$response = GETPOST('response');
+	$response = json_decode($response);
+	
+	if ($response->success)
+	{
+		MultiCurrency::syncRates($response);	
+	}
+	else
+	{
+		setEventMessages($langs->trans('multicurrency_syncronize_error', $reponse->error->info), null, 'errors');
+	}
+}
+
 
 $TCurrency = array();
 $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity;
@@ -139,9 +154,7 @@ if ($resql)
  */
 
 $page_name = "MultiCurrency";
-$morejs = array('/multicurrency/js/currencylayer.js.php');
-
-llxHeader('', $langs->trans($page_name), '', '', '', '', $morejs);
+llxHeader('', $langs->trans($page_name));
 
 // Subheader
 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
@@ -228,7 +241,14 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("CurrencyLayerAccount").'</td>'."\n";
 print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="right" width="100">'.$langs->trans("Value").'&nbsp;<input type="button" id="bt_sync" class="button" onclick="javascript:syncronize_rates();" value="'.$langs->trans('Synchronize').'" /></td>'."\n";
+print '<td align="right" width="100">';
+print '<form id="form_sync" action="" method="POST">';
+print '<input type="hidden" name="action" value="synchronize" />';
+print '<textarea id="response" class="hideobject" name="response"></textarea>';
+print $langs->trans("Value").'&nbsp;<input type="button" id="bt_sync" class="button" onclick="javascript:getRates();" value="'.$langs->trans('Synchronize').'" />';
+print '</form>';
+print '</td></tr>';
+
 
 $var=!$var;
 print '<tr '.$bc[$var].'>';
@@ -311,6 +331,26 @@ foreach ($TCurrency as &$currency)
 
 print '</table>';
 
+
+
+print '
+	<script type="text/javascript">
+ 		function getRates()
+		{
+			$("#bt_sync").attr("disabled", true);
+			var url_sync = "http://apilayer.net/api/live?access_key='.$conf->global->MULTICURRENCY_APP_ID.'&format=1'.(!empty($conf->global->MULTICURRENCY_APP_SOURCE) ? '&source='.$conf->global->MULTICURRENCY_APP_SOURCE : '').'";
+			
+			$.ajax({
+				url: url_sync,
+				dataType: "jsonp"
+			}).done(function(response) {
+				$("#response").val(JSON.stringify(response));
+				$("#form_sync").submit();
+			});
+		}
+	</script>
+';
+
 llxFooter();
 
 $db->close();
\ No newline at end of file
diff --git a/htdocs/multicurrency/ajax/updaterates.php b/htdocs/multicurrency/ajax/updaterates.php
deleted file mode 100644
index 663e68a647c..00000000000
--- a/htdocs/multicurrency/ajax/updaterates.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) 2016 Pierre-Henry Favre <phf@atm-consulting.fr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
-
-$sync_response = GETPOST('sync_response');
-
-if (!empty($sync_response))
-{
-	$sync_response = json_decode($sync_response);
-	MultiCurrency::syncRates($sync_response);
-}
\ No newline at end of file
diff --git a/htdocs/multicurrency/js/currencylayer.js.php b/htdocs/multicurrency/js/currencylayer.js.php
deleted file mode 100644
index 0b563aae266..00000000000
--- a/htdocs/multicurrency/js/currencylayer.js.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* <one line to give the program's name and a brief idea of what it does.>
- * Copyright (C) 2016 Pierre-Henry Favre <phf@atm-consulting.fr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-include '../../main.inc.php';
-$langs->load('errors');
-
-?>
-
-function getXMLHttpRequest() 
-{
-    var xhr = null;
-    if (window.XMLHttpRequest || window.ActiveXObject) 
-    {
-        if (window.ActiveXObject) 
-        {
-            try 
-            {
-                xhr = new ActiveXObject("Msxml2.XMLHTTP");
-            } 
-            catch(e) 
-            {
-                xhr = new ActiveXObject("Microsoft.XMLHTTP");
-            }
-        } 
-        else 
-        {
-            xhr = new XMLHttpRequest(); 
-        }
-    } 
-    else 
-    {
-    	if (typeof $ !== "undefined") $.jnotify("<?php echo $langs->transnoentitiesnoconv('multicurrency_error_browser_incompatible'); ?>", "error");
-		else alert("<?php echo $langs->transnoentitiesnoconv('multicurrency_error_browser_incompatible'); ?>");
-       
-        return null;
-    }
-    
-    return xhr;
-}
-
-function request(url, callback) 
-{
-    var xhr = getXMLHttpRequest();
-    xhr.onreadystatechange = function() 
-    {
-        if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) 
-        {
-            callback(xhr.responseText);
-        }
-
-    };
-
-    xhr.open("GET", url, true);
-    xhr.send(null);
-}
-
-function syncronize_rates()
-{
-	document.getElementById("bt_sync").disabled = true;
-	var url_sync = "http://apilayer.net/api/live?access_key=<?php echo $conf->global->MULTICURRENCY_APP_ID; ?>&format=1<?php if (!empty($conf->global->MULTICURRENCY_APP_SOURCE)) echo '&source='.$conf->global->MULTICURRENCY_APP_SOURCE; ?>";
-	request(url_sync, update_rates);
-}
-
-function update_rates(responseText)
-{
-	var response = JSON.parse(responseText);
-	if (response.success)
-	{
-		var url = "<?php echo DOL_URL_ROOT; ?>/multicurrency/ajax/updaterates.php?sync_response="+JSON.stringify(response);
-		request(url, reloadpage);
-	}
-	else
-	{
-		if (typeof $ !== "undefined") $.jnotify("<?php echo $langs->transnoentitiesnoconv('multicurrency_syncronize_error'); ?>: "+response.error.info, "error");
-		else alert("<?php echo $langs->transnoentitiesnoconv('multicurrency_syncronize_error'); ?>: "+response.error.info);
-	}
-}
-
-function reloadpage(responseText)
-{
-	document.getElementById("bt_sync").disabled = false;
-	window.location.href = window.location.pathname;
-}