Merge pull request 'mudança no método de implementação dos grupos de captura, agora será feito através de grupos nomeados, sem limitação de 64 grupos.' (#352) from matheorb/developer:dev-1.9 into 1.9
deny, permit, 'no' as requirecalltoken, inkeys, outkeys,callgroup,pickupgroup, case when(conta_senha = 'V')then 'yes' else 'no' end as qualify FROM pbx_iax_pbx order by id asc";
deny, permit, 'no' as requirecalltoken, inkeys, outkeys,namedcallgroup,namedpickupgroup, case when(conta_senha = 'V')then 'yes' else 'no' end as qualify FROM pbx_iax_pbx order by id asc";
$query = "SELECT registro,nome,type,secret,callerid,qualify,port,case when nat = 'yes' then 'force_rport,comedia' else nat end as nat,host,dtmfmode,context,canreinvite,disallow,allow,\"call-limit\",videosupport,
deny, permit, 'no' as requirecalltoken, inkeys, outkeys,callgroup,pickupgroup, case when(conta_senha = 'V')then 'yes' else 'no' end as qualify
deny, permit, 'no' as requirecalltoken, inkeys, outkeys,namedcallgroup,namedpickupgroup, case when(conta_senha = 'V')then 'yes' else 'no' end as qualify
FROM pbx_iax_pbx order by id asc";
$result = pg_query($dbcon, $query);
@ -3423,7 +3423,7 @@ function GeraDahdi($dbcon, $reload) {
$query = "select numero as callerid, contexto as context, dispositivo as channel, capturar as pickupgroup, grupo as callgroup from pbx_dahdi order by numero";
$query = "select numero as callerid, contexto as context, dispositivo as channel, capturar as namedpickupgroup, grupo as namedcallgroup from pbx_dahdi order by numero";
$result = pg_query($dbcon, $query);
$start = 0;
@ -3431,16 +3431,16 @@ function GeraDahdi($dbcon, $reload) {
@ -3787,7 +3787,7 @@ function GeraKhomp($dbcon, $reload) {
*/
GeraExtRamais($dbcon);
$query = "select numero as callerid, contexto as context, dispositivo as channel, capturar as pickupgroup, grupo as callgroup, numero_serie, numero_khomp, volume_input, volume_output, imediate from pbx_khomp where numero <> '0' order by numero_khomp::int";
$query = "select numero as callerid, contexto as context, dispositivo as channel, capturar as namedpickupgroup, grupo as namedcallgroup, numero_serie, numero_khomp, volume_input, volume_output, imediate from pbx_khomp where numero <> '0' order by numero_khomp::int";
$result = pg_query($dbcon, $query);
$start = 0;
$branches = array();
@ -3797,8 +3797,8 @@ function GeraKhomp($dbcon, $reload) {