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

Fix grandstream private (#3632) 

* Setup Grandstream GXP2100 Template and Phonebook for working provisioning

* Fix private function contact_grandstream so it can work until the code path is removed entirely
This commit is contained in:
Killsudo 2018-10-12 15:33:05 -05:00 committed by FusionPBX
parent 9a4e0fc873
commit 3366674868
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,10 +285,10 @@ include "root.php";
// Easier than assigning these common groups to every user.
// Check provision global_contact_groups and sanitize for sql.
$global_contact_groups['enabled']=false;
if ( preg_match('/[a-zA-Z0-9-_, ]/',$_SESSION['provision']['gs_global_contact_groups']['text'])){
if ( preg_match('/[a-zA-Z0-9-_, ]/',$_SESSION['provision']['grandstream_global_contact_groups']['text'])){
$global_contact_groups['enabled']=true;
$gp=array();
$groups=explode(',',$_SESSION['provision']['gs_global_contact_groups']['text']);
$groups=explode(',',$_SESSION['provision']['grandstream_global_contact_groups']['text']);
foreach ($groups as $group){
$gp[] = trim($group);
}
@ -945,7 +945,7 @@ include "root.php";
$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
if ($_SESSION['provision']['contact_grandstream']['text'] == "true") {
if ($_SESSION['provision']['contact_grandstream']['boolean'] == "true") {
$this->contact_grandstream($contacts, $line, $domain_uuid, $device_user_uuid);
}
}