This commit is contained in:
Laurent Destailleur 2026-02-16 20:25:07 +01:00
parent d66612eb55
commit ecf01bacd7
7 changed files with 23 additions and 21 deletions

View file

@ -376,6 +376,7 @@ if ($action == 'export' && $user->hasRight('blockedlog', 'read')) { // read is
$concatenateddata = $block_static->buildKeyForSignature();
// Version line archive VE1=sha256
$signatureexport = '';
if ($formatexport == 'VE1') {
// Note: The signature on export line is not used. It has been replaced with a global signature on all file.
$signatureexport = dol_hash($previoushashexport.$concatenateddata, 'sha256');
@ -777,6 +778,7 @@ if ($action == 'check' || $action == 'checkconfirmed') {
$reg = array();
$period = '';
$regnumber = '';
$formatexport = '';
if (preg_match('/\speriod=([^\s]+)/', $line, $reg)) {
$period = $reg[1]; // Get period on first line
@ -884,24 +886,24 @@ if ($action == 'check' || $action == 'checkconfirmed') {
$lineanalyzed = 1;
$linetech = $line[0];
$block_static->id = $line[1];
$block_static->date_creation = $line[2];
$block_static->action = $lineactioncode = $line[3];
$block_static->module_source = $line[4];
$block_static->id = (int) $line[1];
$block_static->date_creation = (string) $line[2];
$block_static->action = $lineactioncode = (string) $line[3];
$block_static->module_source = (string) $line[4];
$block_static->amounts_taxexcl = $lineamountht = $line[5];
$block_static->amounts = $lineamountttc = $line[6];
$block_static->ref_object = $lineref = $line[7];
$block_static->date_object = $line[8];
$block_static->user_fullname = $line[9];
$block_static->linktoref = $line[10];
$block_static->linktype = $line[11];
$block_static->object_data = json_decode($line[12]);
$block_static->object_version = $line[13];
$block_static->object_format = $line[14];
$block_static->signature = $line[15];
$block_static->ref_object = $lineref = (string) $line[7];
$block_static->date_object = (string) $line[8];
$block_static->user_fullname = (string) $line[9];
$block_static->linktoref = (string) $line[10];
$block_static->linktype = (string) $line[11];
$block_static->object_data = json_decode((string) $line[12]);
$block_static->object_version = (string) $line[13];
$block_static->object_format = (string) $line[14];
$block_static->signature = (string) $line[15];
// Status from file: 'Valid' or 'KO'
$statusline = $line[16];
$statusline = (string) $line[16];
// Status revalidated from calculation using the HMAC secret key (possible only when we are on the same instance than
// the one hosting the initial database of the archive)

View file

@ -324,7 +324,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$param .= '&search_complete='.urlencode($search_complete);
}
if ($search_filtert != '') {
$param .= '&search_filtert='.urlencode($search_filtert);
$param .= '&search_filtert='.urlencode((string) $search_filtert);
}
if ($search_dateevent_start != '') {
$param .= '&dateevent_startyear='.GETPOSTINT('dateevent_startyear');

View file

@ -307,7 +307,7 @@ if ($object->id > 0) {
$param .= '&search_complete='.urlencode($search_complete);
}
if ($search_filtert != '') {
$param .= '&search_filtert='.urlencode($search_filtert);
$param .= '&search_filtert='.urlencode((string) $search_filtert);
}
if ($search_dateevent_start != '') {
$param .= '&dateevent_startyear='.GETPOSTINT('dateevent_startyear');

View file

@ -339,7 +339,7 @@ if ($object->id > 0) {
$param .= '&search_complete='.urlencode($search_complete);
}
if ($search_filtert != '') {
$param .= '&search_filtert='.urlencode($search_filtert);
$param .= '&search_filtert='.urlencode((string) $search_filtert);
}
if ($search_dateevent_start != '') {
$param .= '&dateevent_startyear='.GETPOSTINT('dateevent_startyear');

View file

@ -251,7 +251,7 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') ||
$param .= '&search_complete='.urlencode($search_complete);
}
if ($search_filtert != '') {
$param .= '&search_filtert='.urlencode($search_filtert);
$param .= '&search_filtert='.urlencode((string) $search_filtert);
}
if ($search_dateevent_start != '') {
$param .= '&dateevent_startyear='.GETPOSTINT('dateevent_startyear');

View file

@ -245,7 +245,7 @@ if (!empty($object->id)) {
$param .= '&search_complete='.urlencode($search_complete);
}
if ($search_filtert != '') {
$param .= '&search_filtert='.urlencode($search_filtert);
$param .= '&search_filtert='.urlencode((string) $search_filtert);
}
if ($search_dateevent_start != '') {
$param .= '&dateevent_startyear='.GETPOSTINT('dateevent_startyear');
@ -258,7 +258,7 @@ if (!empty($object->id)) {
$param .= '&dateevent_endday='.GETPOSTINT('dateevent_endday');
}
// Try to know count of actioncomm from cache
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
$cachekey = 'count_events_project_'.$object->id;
$nbEvent = dol_getcache($cachekey);

View file

@ -241,7 +241,7 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') ||
$param .= '&search_complete='.urlencode($search_complete);
}
if ($search_filtert != '') {
$param .= '&search_filtert='.urlencode($search_filtert);
$param .= '&search_filtert='.urlencode((string) $search_filtert);
}
if ($search_dateevent_start != '') {
$param .= '&dateevent_startyear='.GETPOSTINT('dateevent_startyear');