diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 68759eeb5e3..cdcc0555db0 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -176,7 +176,7 @@ print "\n";
print '
';
print '| ';
print $langs->trans("PaypalLiveEnabled").' | ';
-if (empty($conf->global->PAYPAL_API_SANDBOX)) {
+if (!(getDolGlobalInt('PAYPAL_API_SANDBOX'))) {
print '';
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
@@ -187,27 +187,27 @@ print ' |
';
print '| ';
print $langs->trans("PAYPAL_API_USER").' | ';
-print '';
+print '';
print ' '.$langs->trans("Example").': admin-facilitator_api1.example.com, paypal_api1.mywebsite.com';
print ' |
';
print '| ';
print $langs->trans("PAYPAL_API_PASSWORD").' | ';
-print '';
+print '';
print ' |
';
print '| ';
print $langs->trans("PAYPAL_API_SIGNATURE").' | ';
-print '';
+print '';
print ' '.$langs->trans("Example").': ASsqXEmw4KzmX-CPChWSVDNCNfd.A3YNR7uz-VncXXAERFDFDFDF';
print ' |
';
print '| ';
print $langs->trans("PAYPAL_SSLVERSION").' | ';
-print $form->selectarray("PAYPAL_SSLVERSION", array('1'=> $langs->trans('TLSv1'), '6'=> $langs->trans('TLSv1.2')), $conf->global->PAYPAL_SSLVERSION);
+print $form->selectarray("PAYPAL_SSLVERSION", array('1'=> $langs->trans('TLSv1'), '6'=> $langs->trans('TLSv1.2')), getDolGlobalString('PAYPAL_SSLVERSION'));
print ' |
';
print '';
@@ -228,7 +228,7 @@ print "\n";
print '| ';
print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").' | ';
-print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY", array('integral'=> $langs->trans('PaypalModeIntegral'), 'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')), $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
+print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY", array('integral'=> $langs->trans('PaypalModeIntegral'), 'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')), getDolGlobalString('PAYPAL_API_INTEGRAL_OR_PAYPALONLY'));
print ' |
';
/*
@@ -241,7 +241,7 @@ print '';
print '| ';
print $langs->trans("PublicVendorName").' | ';
-print '';
+print '';
print ' '.$langs->trans("Example").': '.$mysoc->name.'';
print ' |
';
@@ -249,47 +249,47 @@ if (isModEnabled("banque")) {
print '| ';
print $langs->trans("BankAccount").' | ';
print img_picto('', 'bank_account').' ';
- $form->select_comptes($conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+ $form->select_comptes(getDolGlobalString('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS'), 'PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
print ' |
';
}
print '| ';
print $langs->trans("CSSUrlForPaymentForm").' | ';
-print '';
+print '';
print ' '.$langs->trans("Example").': http://mysite/mycss.css';
print ' |
';
print '| ';
print $langs->trans("PAYPAL_ADD_PAYMENT_URL").' | ';
-print $form->selectyesno("PAYPAL_ADD_PAYMENT_URL", $conf->global->PAYPAL_ADD_PAYMENT_URL, 1);
+print $form->selectyesno("PAYPAL_ADD_PAYMENT_URL", getDolGlobalString('PAYPAL_ADD_PAYMENT_URL'), 1);
print ' |
';
print '| ';
print $langs->trans("MessageForm").' | ';
-$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_FORM', $conf->global->ONLINE_PAYMENT_MESSAGE_FORM, '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_4, '90%');
+$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_FORM', getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM'), '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_4, '90%');
$doleditor->Create();
print ' |
';
print '| ';
print $langs->trans("MessageOK").' | ';
-$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_OK', $conf->global->ONLINE_PAYMENT_MESSAGE_OK, '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_4, '90%');
+$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_OK', getDolGlobalString('ONLINE_PAYMENT_MESSAGE_OK'), '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_4, '90%');
$doleditor->Create();
print ' |
';
print '| ';
print $langs->trans("MessageKO").' | ';
-$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_KO', $conf->global->ONLINE_PAYMENT_MESSAGE_KO, '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_4, '90%');
+$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_KO', getDolGlobalString('ONLINE_PAYMENT_MESSAGE_KO'), '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_4, '90%');
$doleditor->Create();
print ' |
';
print '| ';
print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").' | ';
-print '';
+print '';
print ' '.$langs->trans("Example").': myemail@myserver.com, Payment service <myemail2@myserver2.com>';
print ' |
';
@@ -309,11 +309,11 @@ print "\n";
// Payment token for URL
print '| ';
print $langs->trans("SecurityToken").' | ';
-print '';
+print '';
if (!empty($conf->use_javascript_ajax)) {
print ' '.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
}
-if (!empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
+if (getDolGlobalString('PAYMENT_SECURITY_ACCEPT_ANY_TOKEN')) {
$langs->load("errors");
print img_warning($langs->trans("WarningTheHiddenOptionIsOn", 'PAYMENT_SECURITY_ACCEPT_ANY_TOKEN'), '', 'pictowarning marginleftonly');
}
@@ -325,7 +325,7 @@ if ($conf->use_javascript_ajax) {
print ajax_constantonoff('PAYMENT_SECURITY_TOKEN_UNIQUE');
} else {
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("PAYMENT_SECURITY_TOKEN_UNIQUE", $arrval, $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE);
+ print $form->selectarray("PAYMENT_SECURITY_TOKEN_UNIQUE", $arrval, getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE'));
}
print ' |
';