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

Update provision.php

This commit is contained in:
FusionPBX 2019-06-09 18:44:33 -06:00 committed by GitHub
parent 0fcaec3f06
commit c75ee3cb5a
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,6 +304,7 @@ include "root.php";
$sql .= "WHERE g.group_name IN( ".$global_contact_groups['sql'].") "; $sql .= "WHERE g.group_name IN( ".$global_contact_groups['sql'].") ";
} }
$sql .= "ORDER BY group_description"; $sql .= "ORDER BY group_description";
//echo $sql."\n\n";
$prep_statement = $this->db->prepare(check_sql($sql)); $prep_statement = $this->db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$user_groups = $prep_statement->fetchAll(PDO::FETCH_NAMED); $user_groups = $prep_statement->fetchAll(PDO::FETCH_NAMED);
@ -341,6 +342,8 @@ include "root.php";
$sql .= " AND cu.domain_uuid = '$domain_uuid' "; $sql .= " AND cu.domain_uuid = '$domain_uuid' ";
$sql .= ")"; $sql .= ")";
$sql .= "ORDER BY contact_name_given, contact_name_family"; $sql .= "ORDER BY contact_name_given, contact_name_family";
//echo $sql."\n\n";
//exit;
$prep_statement = $this->db->prepare(check_sql($sql)); $prep_statement = $this->db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$user_contacts = $prep_statement->fetchAll(PDO::FETCH_NAMED); $user_contacts = $prep_statement->fetchAll(PDO::FETCH_NAMED);
@ -956,7 +959,8 @@ include "root.php";
if ($_SESSION['provision']['contact_users']['boolean'] == "true") { if ($_SESSION['provision']['contact_users']['boolean'] == "true") {
$this->contact_append($contacts, $line, $domain_uuid, $device_user_uuid, false); $this->contact_append($contacts, $line, $domain_uuid, $device_user_uuid, false);
} }
// Grandstream get the contacts assigned to the user and groups and add to the contacts array
//get the contacts assigned to the user and groups and add to the contacts array
if ($_SESSION['provision']['contact_grandstream']['boolean'] == "true") { if ($_SESSION['provision']['contact_grandstream']['boolean'] == "true") {
$this->contact_grandstream($contacts, $line, $domain_uuid, $device_user_uuid); $this->contact_grandstream($contacts, $line, $domain_uuid, $device_user_uuid);
} }