From 06e939cf0478e4b8debf6bf0c7138278321fad8f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 16 Jun 2020 12:05:43 +0200 Subject: [PATCH] fix SeedDMS_Core_ApiKey::getUser() --- SeedDMS_Core/Core/inc.ClassUser.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php index b20e3de5a..efadb272d 100644 --- a/SeedDMS_Core/Core/inc.ClassUser.php +++ b/SeedDMS_Core/Core/inc.ClassUser.php @@ -286,6 +286,7 @@ class SeedDMS_Core_ApiKey { /* {{{ */ $this->_apikey = $apikey; $this->_disabled = $disabled; $this->_expires = $expires; + $this->_user = null; $this->_dms = null; } /* }}} */ @@ -400,15 +401,17 @@ class SeedDMS_Core_ApiKey { /* {{{ */ function getUser() { /* {{{ */ $db = $this->_dms->getDB(); - if (!isset($this->_user)) { - $queryStr = "SELECT `b`.* FROM `tblApiKeys`i `a` LEFT JOIN `tblUsers` `b` ON `a`.`user`=`b`.`id` WHERE `a`.`id`=".$this->_id; + if (!$this->_user) { + $queryStr = "SELECT `b`.* FROM `tblApiKeys` `a` LEFT JOIN `tblUsers` `b` ON `a`.`user`=`b`.`id` WHERE `a`.`id`=".$this->_id; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) return false; $this->_user = null; $row = $resArr[0]; + $classnamerole = $this->_dms->getClassname('role'); $classname = $this->_dms->getClassname('user'); + $role = $classnamerole::getInstance($row['role'], $this->_dms); $this->_user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $role, $row['hidden']); $this->_user->setDMS($this->_dms); }