From 2fbf010841445038b2cec6af6c378afa54e762f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 26 Mar 2025 16:06:51 +0100 Subject: [PATCH 1/6] fix typo --- htdocs/stripe/admin/stripe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index 3f1e6823a6d87..a4e06663d94e2 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -330,7 +330,7 @@ if (utf8_check(getDolGlobalString('STRIPE_TEST_SECRET_KEY'))) { try { \Stripe\Stripe::setApiKey(getDolGlobalString('STRIPE_LIVE_SECRET_KEY')); - $endpoint = \Stripe\WebhookEndpoint::retrieve(getDolglobalString('STRIPE_LIVE_WEBHOOK_ID')); + $endpoint = \Stripe\WebhookEndpoint::retrieve(getDolGlobalString('STRIPE_LIVE_WEBHOOK_ID')); $endpoint->enabled_events = $stripearrayofwebhookevents; if (GETPOST('webhook', 'alpha') == getDolGlobalString('STRIPE_LIVE_WEBHOOK_ID')) { if (empty(GETPOST('status', 'alpha'))) { From 1a4cc8060dd638f62086ee3ec7f9350dd2810cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 26 Mar 2025 16:20:07 +0100 Subject: [PATCH 2/6] Update card.php --- htdocs/salaries/card.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index bdf6c09673ea5..c974ca7ac1727 100644 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -129,6 +129,7 @@ $upload_dir = $conf->salaries->multidir_output[$conf->entity]; +$error = 0; /* * Actions From 4ec2535dede023f227cf40234d6525b67d795314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 26 Mar 2025 16:21:41 +0100 Subject: [PATCH 3/6] Update card.php --- htdocs/salaries/card.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index c974ca7ac1727..d1e905b0ef9c6 100644 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -1,14 +1,14 @@ * Copyright (C) 2014-2020 Laurent Destailleur - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2015 Charlie BENKE - * Copyright (C) 2018-2024 Frédéric France - * Copyright (C) 2021 Gauthier VERDOL - * Copyright (C) 2023 Maxime Nicolas - * Copyright (C) 2023 Benjamin GREMBI - * Copyright (C) 2024-2025 MDW - * Copyright (C) 2024-2025 Nick Fragoulis + * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2015 Charlie BENKE + * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2021 Gauthier VERDOL + * Copyright (C) 2023 Maxime Nicolas + * Copyright (C) 2023 Benjamin GREMBI + * Copyright (C) 2024-2025 MDW + * Copyright (C) 2024-2025 Nick Fragoulis * * 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 From 3cf5cc1e68e93e467c56daddeaf2dd6994674c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 26 Mar 2025 16:24:37 +0100 Subject: [PATCH 4/6] Update card.php --- htdocs/salaries/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index d1e905b0ef9c6..86cd73ea61086 100644 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -462,7 +462,7 @@ // Action to update one extrafield if ($action == 'update_extras' && $permissiontoeditextra) { - $object->oldcopy = dol_clone($object, 2); + $object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty $attribute = GETPOST('attribute', 'aZ09'); From ee3bf81ef96829e4d2f6065fb919a70095d8a0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 26 Mar 2025 16:32:49 +0100 Subject: [PATCH 5/6] Update interface_95_modWebhook_WebhookTriggers.class.php --- .../triggers/interface_95_modWebhook_WebhookTriggers.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php index 4d8d161ec663c..3274a0f6db74f 100644 --- a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php +++ b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php @@ -97,7 +97,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf $actionarraytmp = explode(",", $tmpobject->trigger_codes); $actionarray = array(); foreach ($actionarraytmp as $val) { - $actionarray = trim($val); + $actionarray[] = trim($val); } // Test on Target status From a8c845aa2c06a5baacfddc0e371cead98d9ff8a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 26 Mar 2025 16:47:37 +0100 Subject: [PATCH 6/6] Update interface_95_modWebhook_WebhookTriggers.class.php --- .../triggers/interface_95_modWebhook_WebhookTriggers.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php index 3274a0f6db74f..ab85678c9ec37 100644 --- a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php +++ b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php @@ -102,7 +102,7 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf // Test on Target status $testontargetstatus = ($tmpobject->status == Target::STATUS_AUTOMATIC_TRIGGER || ($tmpobject->status == Target::STATUS_MANUAL_TRIGGER && !empty($sendmanualtriggers))); - if (((!empty($object->context["actiontrigger"]) && in_array($object->context["actiontrigger"], array("sendtrigger", "testsend"))) || $testontargetstatus) && is_array($actionarray) && in_array($action, $actionarray)) { + if (((!empty($object->context["actiontrigger"]) && in_array($object->context["actiontrigger"], array("sendtrigger", "testsend"))) || $testontargetstatus) && in_array($action, $actionarray)) { // Build the answer object $resobject = new stdClass(); $resobject->triggercode = $action;