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

Browse source 
develop
This commit is contained in:
Laurent Destailleur 2026-06-16 14:57:45 +02:00
commit f6f7a02189
9 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
htdocs/admin/ihm.php
View file

@ -381,12 +381,10 @@ $form = new Form($db);
$formother = new FormOther($db);
$formadmin = new FormAdmin($db);
print load_fiche_titre($langs->trans("GUISetup"), '', 'title_setup');
print load_fiche_titre($form->textwithpicto($langs->trans("GUISetup"), $langs->trans("DisplayDesc")), '', 'title_setup');
print '<div class="info nomargintop nomarginbottom">'.$langs->trans("DisplayDesc")."</div>\n";
print '<br>';
//WYSIWYG Editor
// WYSIWYG Editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
print '<form enctype="multipart/form-data" method="POST" action="'.dolBuildUrl($_SERVER["PHP_SELF"]).'">';

1
htdocs/admin/system/security.php
View file

@ -872,6 +872,7 @@ print '<input type="text" class="minwidth500 valignmiddle" name="exampletodecryp
print '<input type="submit" class="reposition button small smallpaddingimp valignmiddle" name="submit" value="'.$langs->transnoentitiesnoconv("Decrypt").'">';
if ($action == 'doldecrypt' && $user->admin && $exampletodecrypt) {
usleep(200);
$decryptedstring = $exampletodecrypt;
if (preg_match('/^dolobfuscationv1/', $exampletodecrypt)) {
require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
$b = new BlockedLog($db);

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

@ -342,6 +342,7 @@ if (GETPOST('forcegetkeyobfuscation')) {
print '<div class="error">'.$e->getMessage().'</div>';
}
$obfuscationkey = '';
try {
$obfuscationkey = $block_static->getObfuscationKey(); // Note: use the $mysoc->idprof1 and $registrationnumber. On network trouble, an Exception is thrown to the caller
print "\n<!-- API TO GET REMOTE OBFUSCATION KEY RETURNED result: ".$obfuscationkey." -->\n";

2
htdocs/blockedlog/admin/registration.php
View file

@ -532,7 +532,7 @@ if (empty($mode)) {
$state_id = $tmp[0];
}
$stateid = getDolGlobalInt('BLOCKEDLOG_REGISTRATION_STATE', (int) $state_id);
$item->fieldInputOverride = $formcompany->select_state($stateid, $country_code, "BLOCKEDLOG_REGISTRATION_STATE");
$item->fieldInputOverride = $formcompany->select_state($stateid, $mysoc->country_code, "BLOCKEDLOG_REGISTRATION_STATE");
//Company zip
$item = $formSetup->newItem('BLOCKEDLOG_REGISTRATION_ZIP');

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

@ -1604,6 +1604,7 @@ class BlockedLog
// Get the obfuscation key from ping.dolibarr.org (used just after to decode HMAC secret key)
$errormsg = '';
$obfuscationkey = '';
try {
$obfuscationkey = $this->getObfuscationKey(); // Get obfuscation key providing $mysoc->idprof1 and $registrationnumber. Note: On network trouble, an Exception is thrown to the caller
} catch (Exception $e) {
@ -1766,7 +1767,7 @@ class BlockedLog
}
}
return $obfuscationkey;
return (string) $obfuscationkey;
}
/**

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

@ -310,6 +310,7 @@ function pdfCertifMentionblockedLog(&$pdf, $outputlangs, $seller, $default_font_
if (in_array($seller->country_code, array('FR'))) {
$outputlangs->load("blockedlog");
$blockedlog_mention = '';
$isalne = isALNEQualifiedVersion(); // If necessary, we could replace with "if isALNERunningVersion()"
if ($isalne == 'CERTIF_LNE_IS_2') {
@ -397,7 +398,7 @@ function sumAmountsForUnalterableEvent($block, &$refinvoicefound, &$totalhtamoun
*
* @param string $idprof1 Counter ID/value of ne record
* @param string $registrationnumber Registration number
* @param string $force False. Use true for tests.
* @param boolean $force False. Use true for tests.
* @return string Obfuscationkey or 'ERROR ...' if error.
*/
function callApiToGetObfuscationKey($idprof1, $registrationnumber, $force = false)

4
htdocs/blockedlog/versionmod.inc.php
View file

@ -26,11 +26,11 @@ define('DOLCERT_VERSION', '3.0.0');
// 1 was used for beta version candidate for certification, or for stable version that has been certified.
// 2 to force LNE features for debug purposes(integrity of files will be broken). It just has one difference with 1: https is not required in this mode helping to work in development environment.
// 2 to force LNE features for debug purposes (integrity of files will be broken). It just has one difference with 1: https is not required in this mode helping to work in development environment.
// 0 was used for old version, for version not certified but compliant with the law by using an attestation of an IT provider that guarantee
// the the software is compliant. WARNING: In this case, you must find an IT company that give you the attestation of conformity.
if (!defined('CERTIF_LNE')) {
define('CERTIF_LNE', '1');
define('CERTIF_LNE', '2');
}

6
htdocs/core/class/extrafields.class.php
View file

@ -6,7 +6,7 @@
* Copyright (C) 2009-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013 Florian Henry <forian.henry@open-concept.pro>
* Copyright (C) 2015-2025 Charlene BENKE <charlene@patas-monkey.com>
* Copyright (C) 2015-2026 Charlene BENKE <charlene@patas-monkey.com>
* Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2017 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018-2026 Frédéric France <frederic.france@free.fr>
@ -1931,10 +1931,10 @@ class ExtraFields
}
}
$InfoFieldList[5] = (string) $InfoFieldList[5];
$filter_categorie = false;
if (count($InfoFieldList) > 5 && ($InfoFieldList[5] != '')) {
$InfoFieldList[5] = (string) $InfoFieldList[5];
if ($InfoFieldList[0] == 'categorie') {
$filter_categorie = true; // The combo list is a list of categories
} else {
@ -1994,7 +1994,7 @@ class ExtraFields
$sqlwhere .= ' WHERE 1=1';
}
if ($InfoFieldList[5] != '') {
if (count($InfoFieldList) > 5 && ($InfoFieldList[5] != '')) {
// We have a filter on category for another table
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$tmpcategory = new Categorie($this->db);

6
htdocs/core/lib/profid.lib.php
View file

@ -57,7 +57,7 @@ function isValidLuhn($str)
* @return boolean True if valid, False otherwise
* @since Dolibarr V20
*/
function isValidSiren($siren, $lengthonly = false)
function isValidSiren($siren, $lengthonly = 0)
{
$siren = trim($siren);
$siren = preg_replace('/(\s)/', '', $siren);
@ -78,7 +78,7 @@ function isValidSiren($siren, $lengthonly = false)
* @return boolean True if valid, False otherwise
* @since Dolibarr V20
*/
function isValidSiret($siret, $lengthonly = false)
function isValidSiret($siret, $lengthonly = 0)
{
$siret = trim($siret);
$siret = preg_replace('/(\s)/', '', $siret);
@ -258,7 +258,7 @@ function isValidTinForES($str)
* @param int $lenghtonly Make surface test only (length, ...)
* @return int Return integer <=0 if KO, >0 if OK
*/
function isValidProfIds($idprof, $thirdparty, $lenghtonly = false)
function isValidProfIds($idprof, $thirdparty, $lenghtonly = 0)
{
$ok = 1;