lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A better error message

Browse Source
This commit is contained in:
Laurent Destailleur 2015-09-21 15:38:17 +02:00
parent 2df47ff99c
commit c0ef8baa9d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,8 @@ class DolibarrApiAccess implements iAuthenticate
$userClass = Defaults::$userIdentifierClass; $userClass = Defaults::$userIdentifierClass;
if (isset($_GET['api_key'])) { if (isset($_GET['api_key']))
{
$sql = "SELECT u.login, u.datec, u.api_key, "; $sql = "SELECT u.login, u.datec, u.api_key, ";
$sql.= " u.tms as date_modification, u.entity"; $sql.= " u.tms as date_modification, u.entity";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
@ -100,7 +101,9 @@ class DolibarrApiAccess implements iAuthenticate
} }
else else
{ {
return false; throw new RestException(401, "Failed to login to API. No parameter 'api_key' provided");
//dol_syslog("Failed to login to API. No parameter key provided", LOG_DEBUG);
//return false;
} }
$userClass::setCacheIdentifier(static::$role); $userClass::setCacheIdentifier(static::$role);

5
htdocs/public/api/index.php
View File

@ -110,8 +110,11 @@ foreach ($modulesdir as $dir)
{ {
$classname=$reg[1]; $classname=$reg[1];
$classname = str_replace('Api_','',ucwords($reg[1])).'Api'; $classname = str_replace('Api_','',ucwords($reg[1])).'Api';
$classname = ucfirst($classname);
require_once $dir_part.$file_searched; require_once $dir_part.$file_searched;
if(class_exists($classname)) { if (class_exists($classname))
{
dol_syslog("Found API classname=".$classname);
$api->r->addAPIClass($classname,''); $api->r->addAPIClass($classname,'');
} }
} }