dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove static and use this.

This commit is contained in:
FusionPBX 2023-05-11 19:58:09 -06:00 committed by GitHub
parent 40d9121c8f
commit 48fb933266
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,14 +409,14 @@ class authentication {
/** /**
* get_domain used to get the domain name from the URL or username and then sets both domain_name and domain_uuid * get_domain used to get the domain name from the URL or username and then sets both domain_name and domain_uuid
*/ */
public static function get_domain() { public function get_domain() {
//get the domain from the url //get the domain from the url
$domain_name = $_SERVER["HTTP_HOST"]; $this->domain_name = $_SERVER["HTTP_HOST"];
//get the domain name from the http value //get the domain name from the http value
if (!empty($_REQUEST["domain_name"])) { if (!empty($_REQUEST["domain_name"])) {
$domain_name = $_REQUEST["domain_name"]; $this->domain_name = $_REQUEST["domain_name"];
} }
//remote port number from the domain name //remote port number from the domain name
@ -442,11 +442,11 @@ class authentication {
//get the domain name //get the domain name
$domain_name = $username_array[count($username_array) -1]; $domain_name = $username_array[count($username_array) -1];
//check if the domain from the username exists then set the domain_uuid //check if the domain from the username exists
$domain_exists = false; $domain_exists = false;
foreach ($_SESSION['domains'] as $row) { foreach ($_SESSION['domains'] as $row) {
if (lower_case($row['domain_name']) == lower_case($domain_name)) { if (lower_case($row['domain_name']) == lower_case($domain_name)) {
$domain_uuid = $row['domain_uuid']; $this->domain_uuid = $row['domain_uuid'];
$domain_exists = true; $domain_exists = true;
break; break;
} }
@ -454,10 +454,11 @@ class authentication {
//if the domain exists then set domain_name and update the username //if the domain exists then set domain_name and update the username
if ($domain_exists) { if ($domain_exists) {
$username = substr($_SESSION['username'], 0, -(strlen($domain_name)+1)); $this->domain_name = $domain_name;
$_SESSION['domain_name'] = $domain_name; $this->username = substr($_SESSION['username'], 0, -(strlen($domain_name)+1));
$_SESSION['username'] = $username; //$_SESSION['domain_name'] = $domain_name;
$_SESSION['domain_uuid'] = $domain_uuid; $_SESSION['username'] = $this->username;
$_SESSION['domain_uuid'] = $this->domain_uuid;
} }
//unset the domain name variable //unset the domain name variable
@ -466,10 +467,10 @@ class authentication {
} }
//get the domain uuid and domain settings //get the domain uuid and domain settings
if (isset($domain_name) && !isset($domain_uuid)) { if (isset($this->domain_name) && !isset($this->domain_uuid)) {
foreach ($_SESSION['domains'] as $row) { foreach ($_SESSION['domains'] as $row) {
if (lower_case($row['domain_name']) == lower_case($domain_name)) { if (lower_case($row['domain_name']) == lower_case($this->domain_name)) {
$domain_uuid = $row['domain_uuid']; $this->domain_uuid = $row['domain_uuid'];
$_SESSION['domain_uuid'] = $row['domain_uuid']; $_SESSION['domain_uuid'] = $row['domain_uuid'];
break; break;
} }
@ -481,11 +482,11 @@ class authentication {
$obj->set(); $obj->set();
//set the domain settings //set the domain settings
$_SESSION['domain_name'] = $domain_name; $_SESSION['domain_name'] = $this->domain_name;
$_SESSION['domain_parent_uuid'] = $_SESSION["domain_uuid"]; $_SESSION['domain_parent_uuid'] = $_SESSION["domain_uuid"];
//set the domain name //set the domain name
return $domain_name; return $this->domain_name;
} }
} }