From 0cb11a537d35a336956e94536f6d011f70512014 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 15 Jul 2014 23:27:11 +0200
Subject: [PATCH] Fix: IP address of user was lost into paypal confirm email

---
 htdocs/paybox/lib/paybox.lib.php | 23 -----------------------
 htdocs/paypal/lib/paypal.lib.php |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index f56367c9a36..09bacc3764f 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -183,27 +183,6 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
     // Formulaire pour module Paybox
     print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
 
-    // For Paybox V1 (IBS_xxx)
-    /*
-    print '<!-- Param for Paybox v1 -->'."\n";
-    print '<input type="hidden" name="IBS_MODE" value="'.$IBS_MODE.'">'."\n";
-    print '<input type="hidden" name="IBS_SITE" value="'.$IBS_SITE.'">'."\n";
-    print '<input type="hidden" name="IBS_RANG" value="'.$IBS_RANG.'">'."\n";
-    print '<input type="hidden" name="IBS_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
-    print '<input type="hidden" name="IBS_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
-    print '<input type="hidden" name="IBS_CMD" value="'.$IBS_CMD.'">'."\n";
-    print '<input type="hidden" name="IBS_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
-    print '<input type="hidden" name="IBS_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
-    print '<input type="hidden" name="IBS_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
-    print '<input type="hidden" name="IBS_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
-    print '<input type="hidden" name="IBS_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
-    print '<input type="hidden" name="IBS_TXT" value="'.$IBS_TXT.'">'."\n";
-    print '<input type="hidden" name="IBS_BKGD" value="'.$IBS_BKGD.'">'."\n";
-    print '<input type="hidden" name="IBS_WAIT" value="'.$IBS_WAIT.'">'."\n";
-    print '<input type="hidden" name="IBS_LANG" value="'.$IBS_LANG.'">'."\n";
-    print '<input type="hidden" name="IBS_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
-	*/
-
     // For Paybox V2 (PBX_xxx)
     print '<!-- Param for Paybox v2 -->'."\n";
     print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
@@ -228,8 +207,6 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
 
     print '</form>'."\n";
 
-    // Formulaire pour module Paybox v2 (PBX_xxx)
-
 
     print "\n";
     print '<script type="text/javascript" language="javascript">'."\n";
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 02a16c68b1f..cc678fce011 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -473,6 +473,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 	$_SESSION["Payment_Amount"] = $paymentAmount;
     $_SESSION["currencyCodeType"] = $currencyCodeType;
     $_SESSION["PaymentType"] = $paymentType;
+    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR '];  // Payer ip
 
     //'---------------------------------------------------------------------------------------------------------------
     //' Make the API call to PayPal
@@ -485,7 +486,6 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
     {
         $token = urldecode($resArray["TOKEN"]);
         $_SESSION['TOKEN']=$token;
-        $_SESSION['ipaddress']=$_SERVER['REMOTE_ADDR '];  // Payer ip
     }
 
     return $resArray;