From d63744c32c09190ff0c27169dda97bb1356b2dff Mon Sep 17 00:00:00 2001 From: Ultra2D Date: Thu, 10 Mar 2016 08:17:09 +0100 Subject: [PATCH] Only use get_user if it exists --- html/includes/api_functions.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/html/includes/api_functions.inc.php b/html/includes/api_functions.inc.php index 5bc471304..d15ccb177 100644 --- a/html/includes/api_functions.inc.php +++ b/html/includes/api_functions.inc.php @@ -23,7 +23,12 @@ function authToken(\Slim\Route $route) { $app = \Slim\Slim::getInstance(); $token = $app->request->headers->get('X-Auth-Token'); if (isset($token) && !empty($token)) { - $username = get_user(dbFetchCell('SELECT `AT`.`user_id` FROM `api_tokens` AS AT WHERE `AT`.`token_hash`=?', array($token))); + if (!function_exists('get_user')) { + $username = dbFetchCell('SELECT `U`.`username` FROM `api_tokens` AS AT JOIN `users` AS U ON `AT`.`user_id`=`U`.`user_id` WHERE `AT`.`token_hash`=?', array($token)); + } + else { + $username = get_user(dbFetchCell('SELECT `AT`.`user_id` FROM `api_tokens` AS AT WHERE `AT`.`token_hash`=?', array($token))); + } if (!empty($username)) { $authenticated = true; }