diff --git a/ChangeLog b/ChangeLog index 3a3987fc063..5428d157fde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -167,6 +167,7 @@ NEW: Add delivery date in supplier order linked object block (#38351) NEW: A lot of look and feel enhancement in the immutable log pages. NEW: Enhance the tools to check file integrity. NEW: The OAuth login with Google stay on the requested page after the redirect instead of reaching the home page. +FIX: Use generic online signature security token for unlisted source verifier. NEW: Add shipment online url to substitution array NEW: ModuleBuilder - selectable object tabs (+ fixes for multi-object generation) NEW: Add hook getTicketMessageEmailFrom to override sender in Ticket::sendTicketMessageByEmail diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index 750a3a949df..f615b08f33b 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -97,7 +97,6 @@ $ref = $REF = GETPOST("ref", 'alpha'); $urlok = ''; $urlko = ''; - if ($source == '') { $source = 'proposal'; } @@ -155,6 +154,8 @@ if ($source == 'proposal') { $securekeyseed = getDolGlobalString('FICHINTER_ONLINE_SIGNATURE_SECURITY_TOKEN', $defaultsalt); } elseif ($source == 'societe_rib') { $securekeyseed = getDolGlobalString('SOCIETE_RIB_ONLINE_SIGNATURE_SECURITY_TOKEN', $defaultsalt); +} else { + $securekeyseed = getDolGlobalString(dol_strtoupper((string) $source).'_ONLINE_SIGNATURE_SECURITY_TOKEN', $defaultsalt); } if (!dol_verifyHash($securekeyseed.$type.$ref.(isModEnabled('multicompany') ? $entity : ''), $SECUREKEY, 'hash')) { httponly_accessforbidden('Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref), 403, 1); @@ -686,12 +687,8 @@ if ($source == 'proposal') { $parameters = array('source' => $source); $reshook = $hookmanager->executeHooks('addFormSign', $parameters, $object, $action); // Note that $action and $object may have been modified by hook -if (!$found && !$mesg) { - $mesg = $langs->transnoentitiesnoconv("ErrorBadParameters"); -} - -if ($mesg) { - print '