From 8176684918f8095da6d7b5bd2b8409bd01a04ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 11 Jun 2026 22:57:54 +0200 Subject: [PATCH 1/3] fix missing include --- core/modules/modPrune.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/modules/modPrune.class.php b/core/modules/modPrune.class.php index fb5392f3..ae7afba1 100644 --- a/core/modules/modPrune.class.php +++ b/core/modules/modPrune.class.php @@ -249,6 +249,7 @@ public function remove($options = '') // remove vendor content $count = 0; + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_dir_recursive(dol_buildpath('/prune/vendor/', 0), 0, 0, 1, $count, 0, 1); return $this->_remove($sql, $options); From 04ddb151b6df851f0b9f99b2546a2ce210743f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 27 Jul 2026 11:07:02 +0200 Subject: [PATCH 2/3] fix retrieve token --- lib/prune.lib.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/prune.lib.php b/lib/prune.lib.php index 59aef8f9..58416203 100644 --- a/lib/prune.lib.php +++ b/lib/prune.lib.php @@ -152,7 +152,6 @@ function retrieveAccessToken($service, $userid, $email = null) // if we don't have a userid, we use the email field (if not null) if (!empty($email)) { $sql .= " AND email='" . $db->escape($email) . "'"; - $sql .= " AND entity IN (" . getEntity('user') . ")"; } $resql = $db->query($sql); @@ -185,7 +184,6 @@ function retrieveRefreshTokenBackup($service, $userid, $email = null) // if we don't have a userid, we use the email field (if not null) if (!empty($email)) { $sql .= " AND email='" . $db->escape($email) . "'"; - $sql .= " AND entity IN (" . getEntity('user') . ")"; } $resql = $db->query($sql); @@ -221,7 +219,6 @@ function storeAccessToken($service, $token, $refreshtoken, $userid, $email = nul $sql .= " AND fk_user=" . (int) $userid; if (!empty($email)) { $sql .= " AND email='" . $db->escape($email) . "'"; - $sql .= " AND entity IN (" . getEntity('user') . ")"; } $resql = $db->query($sql); if (!$resql) { @@ -270,7 +267,6 @@ function clearToken($service, $userid, $email = null) $sql .= " AND fk_user=" . (int) $userid; if (!empty($email)) { $sql .= " AND email='" . $db->escape($email) . "'"; - $sql .= " AND entity (" . getEntity('user') . ")"; } $resql = $db->query($sql); if (!$resql) { From 6101f0d59d4ef1e77b622a533b76d8097ad821f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 27 Jul 2026 11:14:07 +0200 Subject: [PATCH 3/3] fix retrieve token --- core/modules/modPrune.class.php | 2 +- lib/prune.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/modPrune.class.php b/core/modules/modPrune.class.php index ae7afba1..f4eab234 100644 --- a/core/modules/modPrune.class.php +++ b/core/modules/modPrune.class.php @@ -70,7 +70,7 @@ public function __construct($db) // Possible values for version are: 'development', 'experimental', 'dolibarr', // 'dolibarr_deprecated' or a version string like 'x.y.z' - $this->version = '1.2.0'; + $this->version = '1.2.1'; // Url to the file with your last numberversion of this module $url = 'https://wiki.netlogic.fr/versionmodule.php?module=' . strtolower($this->name) . '&number=' . $this->numero . '&version=' . $this->version . '&dolversion=' . DOL_VERSION; diff --git a/lib/prune.lib.php b/lib/prune.lib.php index 58416203..949e81f8 100644 --- a/lib/prune.lib.php +++ b/lib/prune.lib.php @@ -1,6 +1,6 @@ + * Copyright (C) 2015-2026 Frédéric France * * 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