nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1502 from moteus/provision_contact_category

Browse Source 
Fix. Export `contact_category` for provisioning template
This commit is contained in:
FusionPBX
2016-03-24 21:38:50 -06:00
parent eeae7f0cc8 2ab96611ef
commit 1807b37872
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -521,6 +521,7 @@ include "root.php";
//get the contacts assigned to the groups and add to the contacts array
if ($_SESSION['provision']['contact_groups']['boolean'] == "true") {
$sql = "select c.contact_uuid, c.contact_organization, c.contact_name_given, c.contact_name_family, ";
$sql .= "c.contact_type, c.contact_category, p.phone_label,";
$sql .= "p.phone_number, p.phone_extension ";
$sql .= "from v_contacts as c, v_contact_phones as p ";
$sql .= "where c.contact_uuid in ( ";
@@ -544,10 +545,12 @@ include "root.php";
if (!$this->contact_exists($contacts, $uuid)) {
$contacts[$uuid]['category'] = 'groups';
$contacts[$uuid]['contact_uuid'] = $row['contact_uuid'];
$contacts[$uuid]['contact_type'] = $row['contact_type'];
$contacts[$uuid]['contact_category'] = $row['contact_category'];
$contacts[$uuid]['contact_organization'] = $row['contact_organization'];
$contacts[$uuid]['contact_name_given'] = $row['contact_name_given'];
$contacts[$uuid]['contact_name_family'] = $row['contact_name_given'];
$contacts[$uuid]['phone_label'] = $row['phone_label'];
$contacts[$uuid]['phone_number'] = $row['phone_number'];
$contacts[$uuid]['phone_extension'] = $row['contact_name_given'];
}
@@ -557,6 +560,7 @@ include "root.php";
//get the contacts assigned to the user and add to the contacts array
if ($_SESSION['provision']['contact_users']['boolean'] == "true") {
$sql = "select c.contact_uuid, c.contact_organization, c.contact_name_given, c.contact_name_family, ";
$sql .= "c.contact_type, c.contact_category, p.phone_label,";
$sql .= "p.phone_number, p.phone_extension ";
$sql .= "from v_contacts as c, v_contact_phones as p ";
$sql .= "where c.contact_uuid in ( ";
@@ -579,10 +583,12 @@ include "root.php";
if (!$this->contact_exists($contacts, $uuid)) {
$contacts[$uuid]['category'] = 'users';
$contacts[$uuid]['contact_uuid'] = $row['contact_uuid'];
$contacts[$uuid]['contact_type'] = $row['contact_type'];
$contacts[$uuid]['contact_category'] = $row['contact_category'];
$contacts[$uuid]['contact_organization'] = $row['contact_organization'];
$contacts[$uuid]['contact_name_given'] = $row['contact_name_given'];
$contacts[$uuid]['contact_name_family'] = $row['contact_name_given'];
$contacts[$uuid]['phone_label'] = $row['phone_label'];
$contacts[$uuid]['phone_number'] = $row['phone_number'];
$contacts[$uuid]['phone_extension'] = $row['contact_name_given'];
}