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-02-20 11:37:28 +01:00
commit d6b780eab3
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
htdocs/blockedlog/admin/blockedlog.php
View file

@ -278,10 +278,10 @@ print '<!-- Link to pay -->';
print '<span class="fas fa-external-link-alt" style=""></span> <span class="opacitymedium">'.$langs->trans("DebugTools").'</span><br>';
print '<br>';
$urlforceregistration = DOL_MAIN_URL_ROOT.'/index.php?foreregistration=1';
$urlforceregistration = DOL_MAIN_URL_ROOT.'/index.php?forceregistration=1';
print $langs->trans("URLToForceRegistration").'<br>';
print '<div class="urllink"><input type="text" id="foreregistration" spellcheck="false" class="quatrevingtpercentminusx" value="'.$urlforceregistration.'"><a class="" href="'.$urlforceregistration.'" target="_blank" rel="noopener noreferrer"><span class="fas fa-external-link-alt paddingleft" style=""></span></a></div>';
print ajax_autoselect('foreregistration');
print '<div class="urllink"><input type="text" id="forceregistration" spellcheck="false" class="quatrevingtpercentminusx" value="'.$urlforceregistration.'"><a class="" href="'.$urlforceregistration.'" target="_blank" rel="noopener noreferrer"><span class="fas fa-external-link-alt paddingleft" style=""></span></a></div>';
print ajax_autoselect('forceregistration');
print '<br>';

3
htdocs/blockedlog/lib/blockedlog.lib.php
View file

@ -393,6 +393,9 @@ function callApiToPushCounter($id, $signature, $test, $previousid, $previoussign
$data .= '&datesys='.urlencode(dol_print_date(dol_now(), 'standard', 'gmt'));
$data .= '&version='.(float) DOL_VERSION;
$data .= '&version_full='.urlencode(DOL_VERSION);
$data .= '&versionblockedlog='.(float) getBlockedLogVersionToShow();
$data .= '&versionblockedlog_full='.urlencode(getBlockedLogVersionToShow());
$data .= '&entity='.(int) $conf->entity;
$data .= '&lastrowid='.(int) $id;

2
htdocs/core/lib/functions2.lib.php
View file

@ -3170,6 +3170,8 @@ function printCodeForPing($constanttosavelastko, $constanttosavefirstok, $arrayo
hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>',
version: '<?php echo (float) DOL_VERSION; ?>',
version_full: '<?php echo DOL_VERSION; ?>',
versionblockedlog: '<?php echo (float) getBlockedLogVersionToShow(); ?>',
versionblockedlog_full: '<?php echo getBlockedLogVersionToShow(); ?>',
entity: '<?php echo (int) $conf->entity; ?>',
dbtype: '<?php echo dol_escape_js($db->type); ?>',
php_version: '<?php echo dol_escape_js(phpversion()); ?>',