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

Update authentication, groups and permissions classes

Browse Source
This commit is contained in:
FusionPBX
2024-04-20 16:51:53 -06:00
committed by GitHub
parent 19e21d9997
commit 09719c7f36
3 changed files with 135 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/authentication/resources/classes/authentication.php
View File

@@ -35,7 +35,9 @@ class authentication {
/**
* Define variables and their scope
*/
private $database;
public $domain_uuid;
public $user_uuid;
public $domain_name;
public $username;
public $password;
@@ -44,7 +46,7 @@ class authentication {
* Called when the object is created
*/
public function __construct() {
$this->database = new database();
}
/**
@@ -111,6 +113,12 @@ class authentication {
$result['domain_uuid'] = $array["domain_uuid"];
$result['authorized'] = $array["authorized"];
//set the domain_uuid
$this->domain_uuid = $array["domain_uuid"];
//set the user_uuid
$this->user_uuid = $array["user_uuid"];
//save the result to the authentication plugin
$_SESSION['authentication']['plugin'][$name] = $result;
}
@@ -191,8 +199,7 @@ class authentication {
$sql .= "and user_setting_enabled = 'true' ";
$parameters['domain_uuid'] = $result["domain_uuid"];
$parameters['user_uuid'] = $result["user_uuid"];
$database = new database;
$user_settings = $database->select($sql, $parameters, 'all');
$user_settings = $this->database->select($sql, $parameters, 'all');
unset($sql, $parameters);
//build the user cidr array
@@ -228,7 +235,7 @@ class authentication {
//set the session variables
$_SESSION["domain_uuid"] = $result["domain_uuid"];
//$_SESSION["domain_name"] = $result["domain_name"];
$_SESSION["domain_name"] = $result["domain_name"];
$_SESSION["user_uuid"] = $result["user_uuid"];
$_SESSION["context"] = $result['domain_name'];
@@ -250,12 +257,14 @@ class authentication {
$_SESSION["user"]["contact_uuid"] = $result["contact_uuid"];
//get the groups assigned to the user
$group = new groups;
$group->session($result["domain_uuid"], $result["user_uuid"]);
$group = new groups($this->database, $result["domain_uuid"], $result["user_uuid"]);
$groups = $group->get_groups();
$group_level = $group->group_level;
$group->session();
//get the permissions assigned to the user through the assigned groups
$permission = new permissions;
$permission->session($result["domain_uuid"], $_SESSION["groups"]);
$permission = new permissions($this->database, $result["domain_uuid"], $result["user_uuid"]);
$permission->session();
//get the domains
if (file_exists($_SERVER["PROJECT_ROOT"]."/app/domains/app_config.php") && !is_cli()){
@@ -317,8 +326,7 @@ class authentication {
$sql .= "e.extension asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['user_uuid'] = $_SESSION['user_uuid'];
$database = new database;
$result = $database->select($sql, $parameters, 'all');
$result = $this->database->select($sql, $parameters, 'all');
if (is_array($result) && @sizeof($result) != 0) {
foreach($result as $x => $row) {
//set the destination