nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the user_uuid using database::new()

Browse Source
This commit is contained in:
FusionPBX
2025-07-03 08:17:46 -06:00
committed by GitHub
parent 2253983dc4
commit 4079b0a690
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/classes/database.php
View File

@@ -324,12 +324,13 @@
$this->domain_uuid = $params['domain_uuid'];
}
//allow passed user_uuid in the constructor to override the session user_uuid
//set the user_uuid
if (isset($params['user_uuid'])) {
//allow passed user_uuid in the constructor to override the session user_uuid
$this->user_uuid = $params['user_uuid'];
} else {
} elseif (!empty($_SESSION['user_uuid'])) {
//try to determine the current user_uuid using the session
$this->user_uuid = (!empty($_SESSION['user_uuid']) ? $_SESSION['user_uuid'] : null);
$this->user_uuid = $_SESSION['user_uuid'];
}
}
@@ -3198,12 +3199,23 @@
* @see database::connect()
*/
public static function new(array $params = []) {
//re-use the database connection
if (self::$database === null) {
self::$database = new database($params);
if (!self::$database->is_connected()) {
self::$database->connect();
}
}
//set the user_uuid
if (isset($params['user_uuid'])) {
//allow passed user_uuid in the constructor to override the session user_uuid
self::$database->user_uuid = $params['user_uuid'];
} elseif (!empty($_SESSION['user_uuid'])) {
//try to determine the current user_uuid using the session
self::$database->user_uuid = $_SESSION['user_uuid'];
}
return self::$database;
}