Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-08 01:53:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new-api-rest-tokens

Browse Source
This commit is contained in:
Marc de Lima Lucio
2025-07-29 11:58:15 +02:00
parent bd89c1987f 6d791919ea
commit fda975970c
30 changed files with 385 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/api/class/api_access.class.php
View File

@@ -196,7 +196,7 @@ class DolibarrApiAccess implements iAuthenticate
}
// Check if user status is enabled
if ($fuser->statut != $fuser::STATUS_ENABLED) {
if ($fuser->status != $fuser::STATUS_ENABLED) {
// Status is disabled
dol_syslog("functions_isallowed::check_user_api_key Authentication KO for '".$login."': The user has been disabled", LOG_NOTICE);
sleep(1); // Anti brute force protection. Must be same delay when user and password are not valid.
@@ -219,6 +219,14 @@ class DolibarrApiAccess implements iAuthenticate
throw new RestException(401, $genericmessageerroruser);
}
// TODO
// Increase counter of API access
if (getDolGlobalString('API_COUNTER_ENABLED')) {
include DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
dolibarr_set_const($this->db, 'API_COUNTER_COUNT', getDolGlobalInt('API_COUNTER_COUNT') + 1);
//var_dump('eeee');exit;
}
// User seems valid
$fuser->loadRights('', 0, $stored_key);