Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

User/rework

Browse Source
This commit is contained in:
Luca Haid
2025-03-17 08:56:54 +00:00
parent 720688e346
commit e28dddc2e2
14 changed files with 613 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
application/User/User.php
View File

@@ -24,26 +24,40 @@ class User extends mfBaseModel {
/**
* Loads currently logged in user
*/
public function loadMe() {
if(defined("INTERNAL_USER_ID") && is_numeric(INTERNAL_USER_ID)) {
$this->fetch(INTERNAL_USER_ID);
return true;
public function loadMe($ignoreImpersonate = false): bool
{
if (defined("INTERNAL_USER_ID") && is_numeric(INTERNAL_USER_ID)) {
return $this->fetch(INTERNAL_USER_ID);
}
$username = $_SESSION[MFAPPNAME.'_username'] ?? null;
if (!$username) {
return false;
}
$res = $this->db->select($this->table,"*","username='$username' and active=1 LIMIT 1");
$user = null;
if ($this->db->num_rows($res)) {
$user = $this->db->fetch_object($res);
// If Impersonating, load the user that is being impersonated
if (isset($_SESSION[MFAPPNAME.'_impersonate']) && !$ignoreImpersonate) {
$username = $_SESSION[MFAPPNAME.'_impersonate'];
$res = $this->db->select($this->table, "*", "username='$username' and active=1 LIMIT 1");
if ($this->db->num_rows($res)) {
$user = $this->db->fetch_object($res);
}
}
}
if (!$user) {
mfLoginController::staticLogout();
return false;
}
$this->load($user);
return true;
}
if(!isset($_SESSION) || !is_array($_SESSION) || !array_key_exists(MFAPPNAME.'_username', $_SESSION)) {
return false;
}
$username = $_SESSION[MFAPPNAME.'_username'];
$res = $this->db->select($this->table,"*","username='$username' LIMIT 1");
if($this->db->num_rows($res)) {
$data = $this->db->fetch_object($res);
$this->load($data);
return true;
}
return false;
}
public function loadByUsername($username) {
$username = $this->db->escape($username);
if(!$username) {