vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse source
This commit is contained in:
Laurent Destailleur 2026-07-13 11:48:52 +02:00
commit d1e679633f
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -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

11
htdocs/public/onlinesign/newonlinesign.php
View file

@ -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 '<tr><td class="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
if (!$found) {
print '<tr><td class="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($langs->transnoentitiesnoconv("ErrorBadParameters")).'</div></td></tr>'."\n";
}
print '</table>'."\n";