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

Merge pull request #1244 from mafoo/BugFix_Provision

Browse Source 
BugFix + Optional Enable extensions appear in directory
This commit is contained in:
FusionPBX
2015-11-19 09:40:27 -08:00
parent 1484a78482 8505605202
commit 88d1c250b5
2 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/provision/app_defaults.php
View File

@@ -179,6 +179,13 @@
$array[$x]['default_setting_enabled'] = 'false';
$array[$x]['default_setting_description'] = '';
$x++;
$array[$x]['default_setting_category'] = 'provision';
$array[$x]['default_setting_subcategory'] = 'directory_extensions';
$array[$x]['default_setting_name'] = 'boolean';
$array[$x]['default_setting_value'] = 'true';
$array[$x]['default_setting_enabled'] = 'false';
$array[$x]['default_setting_description'] = 'allow extensions to be provisioned as contacts as $extensions in provision templates';
$x++;
$array[$x]['default_setting_category'] = 'ntp_server_primary';
$array[$x]['default_setting_subcategory'] = 'directory';
$array[$x]['default_setting_name'] = 'text';

41
app/provision/resources/classes/provision.php
View File

@@ -180,11 +180,17 @@ include "root.php";
if (strlen($device_template) == 0) {
$sql = "SELECT * FROM v_devices ";
$sql .= "WHERE device_mac_address=:mac ";
if($provision['http_domain_filter'] == "true") {
$sql .= "AND domain_uuid=:domain_uuid ";
}
//$sql .= "WHERE device_mac_address= '$mac' ";
$prep_statement_2 = $this->db->prepare(check_sql($sql));
if ($prep_statement_2) {
//use the prepared statement
$prep_statement_2->bindParam(':mac', $mac);
if($provision['http_domain_filter'] == "true") {
$prep_statement_2->bindParam(':domain_uuid', $domain_uuid);
}
$prep_statement_2->execute();
$row = $prep_statement_2->fetch();
//set the variables from values in the database
@@ -300,8 +306,14 @@ include "root.php";
if (strlen($device_uuid) > 0) {
$sql = "SELECT * FROM v_devices ";
$sql .= "WHERE device_uuid = '".$device_uuid."' ";
if($provision['http_domain_filter'] == "true") {
$sql .= "AND domain_uuid=:domain_uuid ";
}
$prep_statement_3 = $this->db->prepare(check_sql($sql));
if ($prep_statement_3) {
if($provision['http_domain_filter'] == "true") {
$prep_statement_3->bindParam(':domain_uuid', $domain_uuid);
}
$prep_statement_3->execute();
$row = $prep_statement_3->fetch();
$device_uuid_alternate = $row["device_uuid_alternate"];
@@ -311,8 +323,14 @@ include "root.php";
//get the new devices information
$sql = "SELECT * FROM v_devices ";
$sql .= "WHERE device_uuid = '".$device_uuid."' ";
if($provision['http_domain_filter'] == "true") {
$sql .= "AND domain_uuid=:domain_uuid ";
}
$prep_statement_4 = $this->db->prepare(check_sql($sql));
if ($prep_statement_4) {
if($provision['http_domain_filter'] == "true") {
$prep_statement_4->bindParam(':domain_uuid', $domain_uuid);
}
$prep_statement_4->execute();
$row = $prep_statement_4->fetch();
$device_label = $row["device_label"];
@@ -455,6 +473,29 @@ include "root.php";
unset ($prep_statement);
}
//get the extensions array and add to the template engine
if (strlen($device_uuid) > 0 and strlen($domain_uuid) > 0 and $_SESSION['provision']['directory_extensions']['boolean'] == "true") {
//get contacts from the database
$sql = "select c.contact_organization, c.contact_name_given, c.contact_name_family, e.extension ";
$sql .= "from v_contacts as c, v_extension_users as cte, v_extensions as e, v_users as u ";
$sql .= "where c.domain_uuid = '".$domain_uuid."' ";
$sql .= "and c.contact_uuid = u.contact_uuid ";
$sql .= "and u.user_uuid = cte.user_uuid ";
$sql .= "and cte.extension_uuid = e.extension_uuid ";
$sql .= "and e.directory_visible = 'true' ";
foreach ($lines as $line){
$sql .= "and e.extension != '" . $line['user_id']. "' ";
}
$sql .= "order by c.contact_organization desc, c.contact_name_given asc, c.contact_name_family asc ";
$prep_statement = $this->db->prepare(check_sql($sql));
$prep_statement->execute();
$extensions = $prep_statement->fetchAll(PDO::FETCH_NAMED);
unset ($prep_statement, $sql);
//assign the contacts array
$view->assign("extensions", $extensions);
}
//get the provisioning information from device keys
if (strlen($device_uuid) > 0) {
//get the device keys array