Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer

This commit is contained in:
Dorian Vabre 2021-04-13 12:10:15 +02:00
commit 0c6431efd5
2 changed files with 13 additions and 13 deletions

View File

@ -87,7 +87,7 @@ $securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_uni
// Securekey decomposition into pure securekey and id added at the end // Securekey decomposition into pure securekey and id added at the end
$securekey = substr($securekeyandid, 0, strlen($securekeyandid)-strlen($encodedid)); $securekey = substr($securekeyandid, 0, strlen($securekeyandid)-strlen($encodedid));
$idgotfromsecurekey = dol_decode(substr($securekeyandid, -strlen($encodedid), strlen($encodedid)),$dolibarr_main_instance_unique_id); $idgotfromsecurekey = dol_decode(substr($securekeyandid, -strlen($encodedid), strlen($encodedid)), $dolibarr_main_instance_unique_id);
// We check if the securekey collected is OK and if the id collected is the same than the id in the securekey // We check if the securekey collected is OK and if the id collected is the same than the id in the securekey
if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecurekey != $id) { if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecurekey != $id) {
@ -210,7 +210,7 @@ if (empty($reshook) && $action == 'add') {
if (!$error) { if (!$error) {
// Vérifier si client existe par l'email // Vérifier si client existe par l'email
$thirdparty = new Societe($db); $thirdparty = new Societe($db);
$resultfetchthirdparty = $thirdparty->fetch('','','','','','','','','','',$email); $resultfetchthirdparty = $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
if ($resultfetchthirdparty<0) { if ($resultfetchthirdparty<0) {
$error++; $error++;
@ -218,7 +218,7 @@ if (empty($reshook) && $action == 'add') {
$readythirdparty = -1; $readythirdparty = -1;
} elseif ($resultfetchthirdparty==0) { } elseif ($resultfetchthirdparty==0) {
// creation of a new thirdparty // creation of a new thirdparty
if(!empty(GETPOST("societe"))){ if (!empty(GETPOST("societe"))) {
$thirdparty->name = GETPOST("societe"); $thirdparty->name = GETPOST("societe");
} else { } else {
$thirdparty->name = $email; $thirdparty->name = $email;