diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php index e218cf63425..7b7324acabd 100644 --- a/htdocs/webhook/target_card.php +++ b/htdocs/webhook/target_card.php @@ -87,17 +87,17 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'inclu // Set $enablepermissioncheck to 1 to enable a minimum low level of checks $enablepermissioncheck = 0; if ($enablepermissioncheck) { - $permissiontoread = $user->hasRight('webhook', 'target', 'read'); - $permissiontoadd = $user->hasRight('webhook', 'target', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php - $permissiontodelete = $user->hasRight('webhook', 'target', 'delete') || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); - $permissionnote = $user->hasRight('webhook', 'target', 'write'); // Used by the include of actions_setnotes.inc.php - $permissiondellink = $user->hasRight('webhook', 'target', 'write'); // Used by the include of actions_dellink.inc.php + $permissiontoread = (bool) $user->hasRight('webhook', 'target', 'read'); + $permissiontoadd = (bool) $user->hasRight('webhook', 'target', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php + $permissiontodelete = (bool) $user->hasRight('webhook', 'target', 'delete') || ((bool) $permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); + $permissionnote = (bool) $user->hasRight('webhook', 'target', 'write'); // Used by the include of actions_setnotes.inc.php + $permissiondellink = (bool) $user->hasRight('webhook', 'target', 'write'); // Used by the include of actions_dellink.inc.php } else { - $permissiontoread = 1; - $permissiontoadd = 1; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php - $permissiontodelete = 1; - $permissionnote = 1; - $permissiondellink = 1; + $permissiontoread = true; + $permissiontoadd = true; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php + $permissiontodelete = true; + $permissionnote = true; + $permissiondellink = true; } $upload_dir = $conf->webhook->multidir_output[isset($object->entity) ? $object->entity : 1].'/target'; @@ -163,10 +163,10 @@ if (empty($reshook)) { if ($action == 'classin' && $permissiontoadd) { $object->setProject(GETPOSTINT('projectid')); } - if ($action == 'confirm_statusmanual' && $confirm == "yes" &&$permissiontoadd) { + if ($action == 'confirm_statusmanual' && $confirm == "yes" && $permissiontoadd) { $object->setStatusCommon($user, $object::STATUS_MANUAL_TRIGGER, 0, 'TARGET_REOPEN'); } - if ($action == 'confirm_statusautomatic' && $confirm == "yes" &&$permissiontoadd) { + if ($action == 'confirm_statusautomatic' && $confirm == "yes" && $permissiontoadd) { $object->setStatusCommon($user, $object::STATUS_AUTOMATIC_TRIGGER, 0, 'TARGET_REOPEN'); } if ($action == 'testsendtourl' && $permissiontoadd) {