From 38a160873d2f28fa63a3ff9d333aae1e1390d23b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 6 Aug 2023 01:26:06 +0200 Subject: [PATCH] Standardize code --- htdocs/api/class/api.class.php | 1 - htdocs/api/class/api_access.class.php | 5 +++++ htdocs/api/class/api_documents.class.php | 1 - htdocs/api/class/api_login.class.php | 4 ++++ htdocs/api/class/api_status.class.php | 11 ++++++++++- htdocs/blockedlog/class/blockedlog.class.php | 5 +++++ 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php index 364d6415e83..672923eb20f 100644 --- a/htdocs/api/class/api.class.php +++ b/htdocs/api/class/api.class.php @@ -29,7 +29,6 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; */ class DolibarrApi { - /** * @var DoliDb $db Database object */ diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php index 3b8a740f177..48d57c67506 100644 --- a/htdocs/api/class/api_access.class.php +++ b/htdocs/api/class/api_access.class.php @@ -44,6 +44,11 @@ class DolibarrApiAccess implements iAuthenticate { const REALM = 'Restricted Dolibarr API'; + /** + * @var DoliDB Database handler + */ + public $db; + /** * @var array $requires role required by API method user / external / admin */ diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php index 66ab7201962..c064db3c487 100644 --- a/htdocs/api/class/api_documents.class.php +++ b/htdocs/api/class/api_documents.class.php @@ -32,7 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; */ class Documents extends DolibarrApi { - /** * @var array $DOCUMENT_FIELDS Mandatory fields, checked when create and update object */ diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php index 7cad862b3be..64c205ba6d8 100644 --- a/htdocs/api/class/api_login.class.php +++ b/htdocs/api/class/api_login.class.php @@ -26,6 +26,10 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; */ class Login { + /** + * @var DoliDB Database handler + */ + public $db; /** * Constructor of the class diff --git a/htdocs/api/class/api_status.class.php b/htdocs/api/class/api_status.class.php index 6c80e838f0a..fdde1c69788 100644 --- a/htdocs/api/class/api_status.class.php +++ b/htdocs/api/class/api_status.class.php @@ -24,8 +24,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; * @access protected * @class DolibarrApiAccess {@requires user,external} */ -class Status +class Status extends DolibarrApi { + /** + * Constructor of the class + */ + public function __construct() + { + global $db; + $this->db = $db; + } + /** * Get status (Dolibarr version) * diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 3b6905fcc25..be764fb2ebb 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -25,6 +25,11 @@ */ class BlockedLog { + /** + * @var DoliDB Database handler + */ + public $db; + /** * Id of the log * @var int