';
@@ -374,17 +374,19 @@ print 'Your API authentication information can be found with following steps. We
print '';
if (!empty($conf->use_javascript_ajax)) {
- print "\n".'';
+ print '
+
+ ';
}
print '
';
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 15ed29f8d9f..cd942116585 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -1,7 +1,8 @@
- * Copyright (C) 2011-2012 Regis Houssin
- * Copyright (C) 2024 MDW
+/* Copyright (C) 2008-2012 Laurent Destailleur
+ * Copyright (C) 2011-2012 Regis Houssin
+ * Copyright (C) 2024 MDW
+ * Copyright (C) 2024 Frédéric France
*
* 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
@@ -467,22 +468,10 @@ function hash_call($methodName, $nvpStr)
}
// Clean parameters
- $PAYPAL_API_USER = "";
- if (getDolGlobalString('PAYPAL_API_USER')) {
- $PAYPAL_API_USER = getDolGlobalString('PAYPAL_API_USER');
- }
- $PAYPAL_API_PASSWORD = "";
- if (getDolGlobalString('PAYPAL_API_PASSWORD')) {
- $PAYPAL_API_PASSWORD = getDolGlobalString('PAYPAL_API_PASSWORD');
- }
- $PAYPAL_API_SIGNATURE = "";
- if (getDolGlobalString('PAYPAL_API_SIGNATURE')) {
- $PAYPAL_API_SIGNATURE = getDolGlobalString('PAYPAL_API_SIGNATURE');
- }
- $PAYPAL_API_SANDBOX = "";
- if (getDolGlobalString('PAYPAL_API_SANDBOX')) {
- $PAYPAL_API_SANDBOX = getDolGlobalString('PAYPAL_API_SANDBOX');
- }
+ $PAYPAL_API_USER = getDolGlobalString('PAYPAL_API_USER');
+ $PAYPAL_API_PASSWORD = getDolGlobalString('PAYPAL_API_PASSWORD');
+ $PAYPAL_API_SIGNATURE = getDolGlobalString('PAYPAL_API_SIGNATURE');
+ $PAYPAL_API_SANDBOX = getDolGlobalString('PAYPAL_API_SANDBOX');
// TODO END problem with triggers
dol_syslog("Paypal API endpoint ".$API_Endpoint);
@@ -514,8 +503,8 @@ function hash_call($methodName, $nvpStr)
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ($ssl_verifypeer ? true : false));
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, ($ssl_verifypeer ? true : false));
- curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, !getDolGlobalString('MAIN_USE_CONNECT_TIMEOUT') ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
- curl_setopt($ch, CURLOPT_TIMEOUT, !getDolGlobalString('MAIN_USE_RESPONSE_TIMEOUT') ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, getDolGlobalInt('MAIN_USE_CONNECT_TIMEOUT', 5));
+ curl_setopt($ch, CURLOPT_TIMEOUT, getDolGlobalInt('MAIN_USE_RESPONSE_TIMEOUT', 30));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_POST, 1);
diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
index b3a714489a2..eba524caab4 100644
--- a/htdocs/paypal/lib/paypalfunctions.lib.php
+++ b/htdocs/paypal/lib/paypalfunctions.lib.php
@@ -1,7 +1,8 @@
- * Copyright (C) 2011 Regis Houssin
- * Copyright (C) 2024 MDW
+/* Copyright (C) 2010-2011 Laurent Destailleur
+ * Copyright (C) 2011 Regis Houssin
+ * Copyright (C) 2024 MDW
+ * Copyright (C) 2024 Frédéric France
*
* 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
@@ -57,22 +58,10 @@ if (getDolGlobalString('PAYPAL_API_SANDBOX') || GETPOST('forcesandbox', 'alpha')
}
// Clean parameters
-$PAYPAL_API_USER = "";
-if (getDolGlobalString('PAYPAL_API_USER')) {
- $PAYPAL_API_USER = getDolGlobalString('PAYPAL_API_USER');
-}
-$PAYPAL_API_PASSWORD = "";
-if (getDolGlobalString('PAYPAL_API_PASSWORD')) {
- $PAYPAL_API_PASSWORD = getDolGlobalString('PAYPAL_API_PASSWORD');
-}
-$PAYPAL_API_SIGNATURE = "";
-if (getDolGlobalString('PAYPAL_API_SIGNATURE')) {
- $PAYPAL_API_SIGNATURE = getDolGlobalString('PAYPAL_API_SIGNATURE');
-}
-$PAYPAL_API_SANDBOX = "";
-if (getDolGlobalString('PAYPAL_API_SANDBOX')) {
- $PAYPAL_API_SANDBOX = getDolGlobalString('PAYPAL_API_SANDBOX');
-}
+$PAYPAL_API_USER = getDolGlobalString('PAYPAL_API_USER');
+$PAYPAL_API_PASSWORD = getDolGlobalString('PAYPAL_API_PASSWORD');
+$PAYPAL_API_SIGNATURE = getDolGlobalString('PAYPAL_API_SIGNATURE');
+$PAYPAL_API_SANDBOX = getDolGlobalString('PAYPAL_API_SANDBOX');
// Proxy
$PROXY_HOST = getDolGlobalString('MAIN_PROXY_HOST');
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 54af1723370..3ad6cbb59fa 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -231,6 +231,12 @@ $ref = $REF = GETPOST('ref', 'alpha');
$TAG = GETPOST("tag", 'alpha');
$FULLTAG = GETPOST("fulltag", 'alpha'); // fulltag is tag with more information
$SECUREKEY = GETPOST("securekey"); // Secure key
+$PAYPAL_API_OK = "";
+$PAYPAL_API_KO = "";
+$PAYPAL_API_SANDBOX = "";
+$PAYPAL_API_USER = "";
+$PAYPAL_API_PASSWORD = "";
+$PAYPAL_API_SIGNATURE = "";
if ($paymentmethod && !preg_match('/'.preg_quote('PM='.$paymentmethod, '/').'/', $FULLTAG)) {
$FULLTAG .= ($FULLTAG ? '.' : '').'PM='.$paymentmethod;
@@ -286,6 +292,7 @@ $urlko = preg_replace('/&$/', '', $urlko); // Remove last &
';
if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal')) {
+ global $PAYPAL_API_SANDBOX, $PAYPAL_API_OK, $PAYPAL_API_KO, $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index f99deda6845..a8ae18fb64d 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -71,7 +71,8 @@ if (isModEnabled('paypal')) {
*/
$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
-
+$PAYPALTOKEN = "";
+$PAYPALPAYERID = "";
if (isModEnabled('paypal')) {
$PAYPALTOKEN = GETPOST('TOKEN');
if (empty($PAYPALTOKEN)) {
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 8fa92e88b89..2abb3b01311 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -77,23 +77,17 @@ $hookmanager->initHooks(array('newpayment'));
$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
// Clean parameters
+$PAYPAL_API_USER = "";
+$PAYPAL_API_PASSWORD = "";
+$PAYPAL_API_SIGNATURE = "";
+$PAYPAL_API_SANDBOX = "";
+$PAYPALTOKEN = "";
+$PAYPALPAYERID = "";
if (isModEnabled('paypal')) {
- $PAYPAL_API_USER = "";
- if (getDolGlobalString('PAYPAL_API_USER')) {
- $PAYPAL_API_USER = getDolGlobalString('PAYPAL_API_USER');
- }
- $PAYPAL_API_PASSWORD = "";
- if (getDolGlobalString('PAYPAL_API_PASSWORD')) {
- $PAYPAL_API_PASSWORD = getDolGlobalString('PAYPAL_API_PASSWORD');
- }
- $PAYPAL_API_SIGNATURE = "";
- if (getDolGlobalString('PAYPAL_API_SIGNATURE')) {
- $PAYPAL_API_SIGNATURE = getDolGlobalString('PAYPAL_API_SIGNATURE');
- }
- $PAYPAL_API_SANDBOX = "";
- if (getDolGlobalString('PAYPAL_API_SANDBOX')) {
- $PAYPAL_API_SANDBOX = getDolGlobalString('PAYPAL_API_SANDBOX');
- }
+ $PAYPAL_API_USER = getDolGlobalString('PAYPAL_API_USER');
+ $PAYPAL_API_PASSWORD = getDolGlobalString('PAYPAL_API_PASSWORD');
+ $PAYPAL_API_SIGNATURE = getDolGlobalString('PAYPAL_API_SIGNATURE');
+ $PAYPAL_API_SANDBOX = getDolGlobalString('PAYPAL_API_SANDBOX');
/*$PAYPAL_API_OK = "";
if ($urlok) {
$PAYPAL_API_OK = $urlok;