*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -219,7 +219,7 @@ if (empty($reshook)) {
// Transport mode
if ($action == 'settransportmode' && $user->hasRight('societe', 'creer')) {
$object->fetch($id);
- $result = $object->setTransportMode(GETPOST('transport_mode_id', 'alpha'));
+ $result = $object->setTransportMode(GETPOSTINT('transport_mode_id'));
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
}
@@ -304,7 +304,7 @@ if (empty($reshook)) {
if ($action == 'update_extras' && $user->hasRight('societe', 'creer')) {
$object->fetch($id);
- $object->oldcopy = dol_clone($object, 2);
+ $object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
// Fill array 'array_options' with data from update form
$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
@@ -470,9 +470,9 @@ if ($object->id > 0) {
print '';
print '';
if ($action == 'editconditions') {
- $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1, '', 1, $object->deposit_percent);
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->cond_reglement_id, 'cond_reglement_id', 1, '', 1, $object->deposit_percent);
} else {
- $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none', 0, '', 1, $object->deposit_percent);
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->cond_reglement_id, 'none', 0, '', 1, $object->deposit_percent);
}
print " ";
print '';
@@ -488,9 +488,9 @@ if ($object->id > 0) {
print '';
print '';
if ($action == 'editmode') {
- $form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
} else {
- $form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->mode_reglement_id, 'none');
}
print " ";
print '';
@@ -507,9 +507,9 @@ if ($object->id > 0) {
print '';
print '';
if ($action == 'editbankaccount') {
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'fk_account', 1);
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->fk_account, 'fk_account', 1);
} else {
- $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'none');
+ $form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->fk_account, 'none');
}
print " ";
print '';
@@ -634,9 +634,9 @@ if ($object->id > 0) {
print '';
print '';
if ($action == 'editshipping') {
- $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+ $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->shipping_method_id, 'shipping_method_id', 1);
} else {
- $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
+ $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->shipping_method_id, 'none');
}
print " ";
print '';
@@ -717,7 +717,7 @@ if ($object->id > 0) {
print '';
print '';
if ($action == 'editlevel') {
- $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
+ $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, (int) $object->fk_prospectlevel, 'prospect_level_id', 1);
} else {
print $object->getLibProspLevel();
}
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 0920ddae516..72e5b54d99a 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -3,7 +3,7 @@
* Copyright (C) 2005-2019 Laurent Destailleur
* Copyright (C) 2005-2016 Regis Houssin
* Copyright (C) 2021 Waël Almoman
- * Copyright (C) 2024 MDW
+ * Copyright (C) 2024-2025 MDW
* Copyright (C) 2024 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -153,7 +153,7 @@ if (empty($reshook)) {
if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha')) {
setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
} else {
- $result = $object->createFromClone($user, $object->id, GETPOST("clone_content", 'alpha'), GETPOST("clone_receivers", 'alpha'));
+ $result = $object->createFromClone($user, $object->id, GETPOSTINT("clone_content"), GETPOSTINT("clone_receivers"));
if ($result > 0) {
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
exit;
@@ -452,14 +452,14 @@ if (empty($reshook)) {
// Loop finished, set global statut of mail
if ($nbko > 0) {
$statut = 2; // Status 'sent partially' (because at least one error)
- setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+ setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", (string) $nbok), null, 'mesgs');
} else {
if ($nbok >= $num) {
$statut = 3; // Send to everybody
} else {
$statut = 2; // Status 'sent partially' (because not send to everybody)
}
- setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+ setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", (string) $nbok), null, 'mesgs');
}
$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".((int) $statut)." WHERE rowid = ".((int) $object->id);
@@ -640,18 +640,18 @@ if (empty($reshook)) {
}
// Action of file remove
- if (GETPOST("removedfile") && $permissiontocreate) {
+ if (GETPOSTINT("removedfile") && $permissiontocreate) {
$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- dol_remove_file_process(GETPOST('removedfile'), 0, 0); // We really delete file linked to mailing
+ dol_remove_file_process(GETPOSTINT('removedfile'), 0, 0); // We really delete file linked to mailing
$action = "edit";
}
// Action of emailing update
- if ($action == 'update' && !GETPOST("removedfile") && !$cancel && $permissiontocreate) {
+ if ($action == 'update' && !GETPOSTINT("removedfile") && !$cancel && $permissiontocreate) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$isupload = 0;
@@ -1030,7 +1030,7 @@ if ($action == 'create') { // aaa
// From
print '';
- print $form->editfieldkey("MailFrom", 'email_from', $object->email_from, $object, $user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY, 'string');
+ print $form->editfieldkey("MailFrom", 'email_from', $object->email_from, $object, (int) ($user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY), 'string');
print ' ';
print $form->editfieldval("MailFrom", 'email_from', $object->email_from, $object, $user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY, 'string');
$email = CMailFile::getValidAddress($object->email_from, 2);
@@ -1047,13 +1047,13 @@ if ($action == 'create') { // aaa
// Errors to
if ($object->messtype != 'sms') {
print ' ';
- print $form->editfieldkey("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY, 'string');
+ print $form->editfieldkey("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, (int) ($user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY), 'string');
print ' ';
print $form->editfieldval("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY, 'string');
$emailarray = CMailFile::getArrayAddress($object->email_errorsto);
foreach ($emailarray as $email => $name) {
if ($name != $email) {
- print dol_escape_htmltag($name).' <'.$email;
+ print dol_escape_htmltag((string) $name).' <'.$email;
print '>';
if ($email && !isValidEmail($email)) {
$langs->load("errors");
@@ -1072,7 +1072,7 @@ if ($action == 'create') { // aaa
// Reply to
if ($object->messtype != 'sms') {
print ' ';
- print $form->editfieldkey("MailReply", 'email_replyto', $object->email_replyto, $object, $user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY, 'string');
+ print $form->editfieldkey("MailReply", 'email_replyto', $object->email_replyto, $object, (int) ($user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY), 'string');
print ' ';
print $form->editfieldval("MailReply", 'email_replyto', $object->email_replyto, $object, $user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY, 'string');
$email = CMailFile::getValidAddress($object->email_replyto, 2);
@@ -1102,19 +1102,19 @@ if ($action == 'create') { // aaa
print ' ';
$nbemail = ($object->nbemail ? $object->nbemail : 0);
if (is_numeric($nbemail)) {
- $text = '';
+ $htmltooltip = '';
if ((getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && getDolGlobalInt('MAILING_LIMIT_SENDBYWEB') < $nbemail) && ($object->status == 1 || ($object->status == 2 && $nbtry < $nbemail))) {
if (getDolGlobalInt('MAILING_LIMIT_SENDBYWEB') > 0) {
- $text .= $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
+ $htmltooltip .= $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
} else {
- $text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
+ $htmltooltip .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
}
}
if (empty($nbemail)) {
$nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
}
- if ($text) {
- print $form->textwithpicto($nbemail, $text, 1, 'warning');
+ if ($htmltooltip) {
+ print $form->textwithpicto($nbemail, $htmltooltip, 1, 'warning');
} else {
print $nbemail;
}
@@ -1410,19 +1410,19 @@ if ($action == 'create') { // aaa
print ' ';
$nbemail = ($object->nbemail ? $object->nbemail : 0);
if (is_numeric($nbemail)) {
- $text = '';
+ $htmltooltip = '';
if ((getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->status == 1 || $object->status == 2)) {
if (getDolGlobalInt('MAILING_LIMIT_SENDBYWEB') > 0) {
- $text .= $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
+ $htmltooltip .= $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
} else {
- $text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
+ $htmltooltip .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
}
}
if (empty($nbemail)) {
$nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
}
- if ($text) {
- print $form->textwithpicto($nbemail, $text, 1, 'warning');
+ if ($htmltooltip) {
+ print $form->textwithpicto($nbemail, $htmltooltip, 1, 'warning');
} else {
print $nbemail;
}
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index cc3e8e07d70..f64332ba50a 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -3,7 +3,7 @@
* Copyright (C) 2005-2024 Laurent Destailleur
* Copyright (C) 2005-2010 Regis Houssin
* Copyright (C) 2014 Florian Henry
- * Copyright (C) 2024 MDW
+ * Copyright (C) 2024-2025 MDW
* Copyright (C) 2024 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -393,7 +393,7 @@ if ($object->fetch($id) >= 0) {
$emailarray = CMailFile::getArrayAddress($object->email_errorsto);
foreach ($emailarray as $email => $name) {
if ($name != $email) {
- print dol_escape_htmltag($name).' <'.$email;
+ print dol_escape_htmltag((string) $name).' <'.$email;
print '>';
if ($email && !isValidEmail($email)) {
$langs->load("errors");
@@ -412,7 +412,7 @@ if ($object->fetch($id) >= 0) {
// Reply to
if ($object->messtype != 'sms') {
print '';
- print $form->editfieldkey("MailReply", 'email_replyto', $object->email_replyto, $object, $user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY, 'string');
+ print $form->editfieldkey("MailReply", 'email_replyto', $object->email_replyto, $object, (int) ($user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY), 'string');
print ' ';
print $form->editfieldval("MailReply", 'email_replyto', $object->email_replyto, $object, $user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY, 'string');
$email = CMailFile::getValidAddress($object->email_replyto, 2);
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 0fd4ea09ccd..14da007e650 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -2,7 +2,7 @@
/* Advance Targeting Emailing for mass emailing module
* Copyright (C) 2013 Florian Henry
* Copyright (C) 2024 Frédéric France
- * Copyright (C) 2024 MDW
+ * Copyright (C) 2024-2025 MDW
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -186,7 +186,7 @@ class AdvanceTargetingMailing extends CommonObject
$sql .= ") VALUES (";
$sql .= " ".(!isset($this->name) ? 'NULL' : "'".$this->db->escape($this->name)."'").",";
$sql .= " ".((int) $conf->entity).",";
- $sql .= " ".(!isset($this->fk_element) ? 'NULL' : "'".$this->db->escape($this->fk_element)."'").",";
+ $sql .= " ".(!isset($this->fk_element) ? 'NULL' : "'".$this->db->escape((string) $this->fk_element)."'").",";
$sql .= " ".(!isset($this->type_element) ? 'NULL' : "'".$this->db->escape($this->type_element)."'").",";
$sql .= " ".(!isset($this->filtervalue) ? 'NULL' : "'".$this->db->escape($this->filtervalue)."'").",";
$sql .= " ".((int) $user->id).",";
@@ -734,7 +734,7 @@ class AdvanceTargetingMailing extends CommonObject
if (!empty($arrayquery['contact_no_email'])) {
$tmpwhere .= "(t.email IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
} else {
- $tmpwhere .= "(t.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
+ $tmpwhere .= "(t.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape((string) $arrayquery['contact_no_email'])."'))";
}
$sqlwhere[] = $tmpwhere;
}
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index bf469345b8f..cdf5ae854bc 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -3,6 +3,7 @@
* Copyright (C) 2004-2012 Laurent Destailleur
* Copyright (C) 2006 Andre Cianfarani
* Copyright (C) 2024 Frédéric France
+ * Copyright (C) 2025 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -68,7 +69,7 @@ $result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid
if ($action == 'setpricelevel' && $user->hasRight('societe', 'creer')) {
$soc = new Societe($db);
$soc->fetch($id);
- $soc->setPriceLevel(GETPOST("price_level"), $user);
+ $soc->setPriceLevel(GETPOSTINT("price_level"), $user);
header("Location: multiprix.php?id=".$id);
exit;
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 3bbd792aea0..0cef5254d90 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2001-2004 Rodolphe Quiedeville
* Copyright (C) 2004-2021 Laurent Destailleur
* Copyright (C) 2024 Frédéric France
+ * Copyright (C) 2025 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -78,9 +79,9 @@ if ($action == 'setremise' && $user->hasRight('societe', 'lire')) {
$discount_type = GETPOSTINT('discount_type');
if (!empty($discount_type)) {
- $result = $object->set_remise_supplier(price2num(GETPOST("remise")), GETPOST("note", "alphanohtml"), $user);
+ $result = $object->set_remise_supplier((float) price2num(GETPOST("remise")), GETPOST("note", "alphanohtml"), $user);
} else {
- $result = $object->set_remise_client(price2num(GETPOST("remise")), GETPOST("note", "alphanohtml"), $user);
+ $result = $object->set_remise_client((float) price2num(GETPOST("remise")), GETPOST("note", "alphanohtml"), $user);
}
if ($result > 0) {
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index aee066eca43..24f2baf1c8a 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2019 Laurent Destailleur
* Copyright (C) 2008 Raphael Bertrand (Resultic)
* Copyright (C) 2019-2024 Frédéric France
- * Copyright (C) 2024 MDW
+ * Copyright (C) 2024-2025 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -187,7 +187,7 @@ if ($action == 'setremise' && $permissiontocreate) {
if (!$error) {
$soc = new Societe($db);
$soc->fetch($id);
- $discountid = $soc->set_remise_except($amount, $user, $desc, $tva_tx, $discount_type, $price_base_type);
+ $discountid = $soc->set_remise_except((float) $amount, $user, $desc, $tva_tx, $discount_type, $price_base_type);
if ($discountid > 0) {
if (!empty($backtopage)) {
@@ -388,7 +388,7 @@ if ($socid > 0) {
// VAT
print ''.$langs->trans("VAT").' ';
print '';
- print $form->load_tva('tva_tx', (GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS', 0)), $mysoc, $object, 0, 0, '', 0, 1);
+ print $form->load_tva('tva_tx', (GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS', 0)), $mysoc, $object, 0, 0, '', false, 1);
print ' ';
print ''.$langs->trans("NoteReason").' ';
print ' ';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7f2c8de8bcd..c4ce6e4aab7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -10664,7 +10664,7 @@ class Form
/**
* Return select list of user groups
*
- * @param int|object|object[] $selected Id group or group(s) preselected
+ * @param int|object|array $selected Id group or group(s) preselected
* @param string $htmlname Field name in form
* @param int<0,1> $show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue
* @param string|int[] $exclude Array list of groups id to exclude
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index cf42ba4b738..6993b15a465 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -142,7 +142,7 @@ class FormCompany extends Form
/**
* Affiche formulaire de selection des modes de reglement
*
- * @param int $page Page
+ * @param string $page Page
* @param int $selected Id or code preselected
* @param string $htmlname Nom du formulaire select
* @param int $empty Add empty value in list
@@ -194,7 +194,7 @@ class FormCompany extends Form
/**
* Affiche formulaire de selection des niveau de prospection pour les contacts
*
- * @param int $page Page
+ * @param string $page Page
* @param int $selected Id or code preselected
* @param string $htmlname Nom du formulaire select
* @param int $empty Add empty value in list
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 05c759dfc26..2b769b19461 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -2351,7 +2351,7 @@ class FormFile
/**
* Show detail icon with link for preview
*
- * @param array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string} $file Array with data of file. Example: array('name'=>...)
+ * @param array{name:string,path?:string,level1name?:string,relativename?:string,fullname:string,date?:string,size?:int,perm?:int,type?:string} $file Array with data of file. Example: array('name'=>...)
* @param string $modulepart propal, facture, facture_fourn, ...
* @param string $relativepath Relative path of docs
* @param int $ruleforpicto Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file). Use a negative value to show a generic picto even if preview not available.
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 6185b847d1d..045810ef8e7 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -44,8 +44,8 @@
* @param string $action Action string
* @param array|int<-1,-1> $showextcals Array with list of external calendars (used to show links to select calendar), or -1 to show no legend
* @param string|string[] $actioncode Preselected value(s) of actioncode for filter on event type
- * @param int $usergroupid Id of group to filter on users
- * @param string $excludetype A type to exclude ('systemauto', 'system', '')
+ * @param int|int[] $usergroupid Id of group to filter on users
+ * @param ''|'systemauto'|'system' $excludetype A type to exclude ('systemauto', 'system', '')
* @param int $resourceid Preselected value of resource for filter on resource
* @param int $search_categ_cus Tag id
* @return void