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

Update destinations.php

Browse Source
This commit is contained in:
FusionPBX
2020-03-08 00:29:31 -07:00
committed by GitHub
parent 479888cad4
commit 7bcf522385
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/destinations/resources/classes/destinations.php
+31 -20
View File
@@ -37,11 +37,12 @@ if (!class_exists('destinations')) {
* destinations array * destinations array
*/ */
public $destinations; public $destinations;
public $db; public $domain_uuid;
/** /**
* declare private variables * declare private variables
*/ */
private $domain_name;
private $app_name; private $app_name;
private $app_uuid; private $app_uuid;
private $permission_prefix; private $permission_prefix;
@@ -53,12 +54,9 @@ if (!class_exists('destinations')) {
* Called when the object is created * Called when the object is created
*/ */
public function __construct() { public function __construct() {
//connect to the database if not connected //set the domain details
if (!$this->db) { if (is_null($this->domain_uuid)) {
require_once "resources/classes/database.php"; $this->domain_uuid = $_SESSION['domain_uuid'];
$database = new database;
$database->connect();
$this->db = $database->db;
} }
//assign private variables //assign private variables
@@ -91,6 +89,13 @@ if (!class_exists('destinations')) {
//set the global variables //set the global variables
global $db_type; global $db_type;
//get the domain_name
$sql = "select domain_name from v_domains ";
$sql .= "where domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $this->domain_uuid;
$database = new database;
$this->domain_name = $database->select($sql, $parameters, 'column');
//get the destinations //get the destinations
if (!is_array($this->destinations)) { if (!is_array($this->destinations)) {
@@ -148,7 +153,7 @@ if (!class_exists('destinations')) {
$sql .= trim($row['where'])." "; $sql .= trim($row['where'])." ";
} }
$sql .= "order by ".trim($row['order_by']); $sql .= "order by ".trim($row['order_by']);
$sql = str_replace("\${domain_uuid}", $_SESSION['domain_uuid'], $sql); $sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql);
$database = new database; $database = new database;
$result = $database->select($sql, null, 'all'); $result = $database->select($sql, null, 'all');
@@ -284,7 +289,6 @@ if (!class_exists('destinations')) {
} }
} }
} }
} }
else { else {
$select_value = str_replace("\${".$key."}", $data[$key], $select_value); $select_value = str_replace("\${".$key."}", $data[$key], $select_value);
@@ -303,10 +307,10 @@ if (!class_exists('destinations')) {
} }
} }
$select_value = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_value); $select_value = str_replace("\${domain_name}", $this->domain_name, $select_value);
$select_value = str_replace("\${context}", $_SESSION['domain_name'], $select_value); $select_value = str_replace("\${context}", $this->domain_name, $select_value);
$select_label = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_label); $select_label = str_replace("\${domain_name}", $this->domain_name, $select_label);
$select_label = str_replace("\${context}", $_SESSION['domain_name'], $select_label); $select_label = str_replace("\${context}", $this->domain_name, $select_label);
$select_label = str_replace("&#9993", 'email-icon', $select_label); $select_label = str_replace("&#9993", 'email-icon', $select_label);
$select_label = escape(trim($select_label)); $select_label = escape(trim($select_label));
$select_label = str_replace('email-icon', '&#9993', $select_label); $select_label = str_replace('email-icon', '&#9993', $select_label);
@@ -322,7 +326,7 @@ if (!class_exists('destinations')) {
$destination_label = str_replace(":", " ", $destination_value); $destination_label = str_replace(":", " ", $destination_value);
$destination_label = str_replace("menu-exec-app", "", $destination_label); $destination_label = str_replace("menu-exec-app", "", $destination_label);
$destination_label = str_replace("transfer", "", $destination_label); $destination_label = str_replace("transfer", "", $destination_label);
$destination_label = str_replace("XML ".$_SESSION['domain_name'], "", $destination_label); $destination_label = str_replace("XML ".$this->domain_name, "", $destination_label);
if ($destination_value != '' || $destination_label != '') { if ($destination_value != '' || $destination_label != '') {
$response .= " <option value='".escape($destination_value)."' selected='selected'>".trim($destination_label)."</option>\n"; $response .= " <option value='".escape($destination_value)."' selected='selected'>".trim($destination_label)."</option>\n";
} }
@@ -345,6 +349,13 @@ if (!class_exists('destinations')) {
//set the global variables //set the global variables
global $db_type; global $db_type;
//get the domain_name
$sql = "select domain_name from v_domains ";
$sql .= "where domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $this->domain_uuid;
$database = new database;
$this->domain_name = $database->select($sql, $parameters, 'column');
//get the destinations //get the destinations
if (!is_array($this->destinations)) { if (!is_array($this->destinations)) {
@@ -401,7 +412,7 @@ if (!class_exists('destinations')) {
$sql .= trim($row['where'])." "; $sql .= trim($row['where'])." ";
} }
$sql .= "order by ".trim($row['order_by']); $sql .= "order by ".trim($row['order_by']);
$sql = str_replace("\${domain_uuid}", $_SESSION['domain_uuid'], $sql); $sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql);
$database = new database; $database = new database;
$result = $database->select($sql, null, 'all'); $result = $database->select($sql, null, 'all');
@@ -503,10 +514,10 @@ if (!class_exists('destinations')) {
} }
} }
$select_value = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_value); $select_value = str_replace("\${domain_name}", $this->domain_name, $select_value);
$select_value = str_replace("\${context}", $_SESSION['domain_name'], $select_value); $select_value = str_replace("\${context}", $this->domain_name, $select_value);
$select_label = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_label); $select_label = str_replace("\${domain_name}", $this->domain_name, $select_label);
$select_label = str_replace("\${context}", $_SESSION['domain_name'], $select_label); $select_label = str_replace("\${context}", $this->domain_name, $select_label);
$select_label = str_replace("&#9993", 'email-icon', $select_label); $select_label = str_replace("&#9993", 'email-icon', $select_label);
$select_label = escape(trim($select_label)); $select_label = escape(trim($select_label));
$select_label = str_replace('email-icon', '&#9993', $select_label); $select_label = str_replace('email-icon', '&#9993', $select_label);
@@ -521,7 +532,7 @@ if (!class_exists('destinations')) {
$destination_label = str_replace(":", " ", $destination_value); $destination_label = str_replace(":", " ", $destination_value);
$destination_label = str_replace("menu-exec-app", "", $destination_label); $destination_label = str_replace("menu-exec-app", "", $destination_label);
$destination_label = str_replace("transfer", "", $destination_label); $destination_label = str_replace("transfer", "", $destination_label);
$destination_label = str_replace("XML ".$_SESSION['domain_name'], "", $destination_label); $destination_label = str_replace("XML ".$this->domain_name, "", $destination_label);
$array[$label][$destination_label] = $destination_value; $array[$label][$destination_label] = $destination_value;
} }