Ligar org_id as querys funcoes.php

admin/funcoes.php

@@ -2511,8 +2511,8 @@ function gera_arquivos($dbcon, $tipo, $reload = 1, $reloadUra = 1) {
                 fwrite($escreve, 'exten => _' . $dados2['modelo'] . ',n,Gosub(rota-${ID_ROTA},${EXTEN},1)' . "\n");
 
                 $query3 = "select * 
-                          from (select id, tipo || '/' || username as nome_canal, nome, max_ligacoes from pbx_troncos) as troncos, pbx_rotas_saida_canais b
+                          from (select id, tipo || '/' || nome_asterisk as nome_canal, nome, nome_asterisk, max_ligacoes, org_id from pbx_troncos) as troncos, pbx_rotas_saida_canais b
-                         where troncos.nome = b.canal and b.id_rota=" . $dados['id'] . " order by b.id asc";
+                         where troncos.nome = b.canal and troncos.org_id = b.org_id and b.id_rota=" . $dados['id'] . " order by b.id asc";
                 $result3 = pg_query($dbcon, $query3);
 
                 fwrite($escreve, 'exten => _' . $dados2['modelo'] . ',n,Hangup()' . "\n");
@@ -2560,10 +2560,10 @@ function gera_arquivos($dbcon, $tipo, $reload = 1, $reloadUra = 1) {
                 }
 
                 $query3 = "select troncos.id_tronco, troncos.nome_canal, troncos.nome, troncos.max_ligacoes, troncos.callerid, troncos.tipo as tipo_tronco, b.id, b.id_rota, b.canal, 
-                              troncos.callerid_tronco, b.recorta, b.acrescenta
+                              troncos.callerid_tronco, b.recorta, b.acrescenta, troncos.org_id
-                         from (select id as id_tronco, tipo || '/' || username as nome_canal, nome, max_ligacoes, callerid, tipo, callerid_tronco from pbx_troncos) as troncos, 
+                         from (select id as id_tronco, tipo || '/' || nome_asterisk as nome_canal, nome, nome_asterisk, max_ligacoes, callerid, tipo, callerid_tronco, org_id from pbx_troncos) as troncos, 
                               pbx_rotas_saida_canais b
-                        where troncos.nome = b.canal and b.id_rota=" . $dados['id'] . " order by b.id asc";
+                        where troncos.nome = b.canal and troncos.org_id = b.org_id and b.id_rota=" . $dados['id'] . " order by b.id asc";
 
                 $result3 = pg_query($dbcon, $query3);
                 while ($dados3 = pg_fetch_array($result3)) {
@@ -3467,7 +3467,8 @@ function GeraDahdi($dbcon, $reload) {
                         a.cidsignalling,a.cidstart,a.echocanceller_canais,a.contrato,a.param_opc,a.tipo_cadastro,a.fxoks,a.sinalizacao_tipo,a.dispositivo 
                         from pbx_troncos_dahdi a, pbx_troncos_dahdi b  
                         where b.id = a.dispositivo
-                        and  a.tipo_cadastro = 'T' 
+                        and  a.tipo_cadastro = 'T'
+                        and a.org_id = b.org_id
                         order by a.channel_1, a.channel_2, interface";
 
     $result = pg_query($dbcon, $query);
@@ -4123,9 +4124,9 @@ function VerDependenciaTronco($id) {
 
 function GetDependenciaTronco($id) {
     try {
-        $query = "select 'Rota de Sa<EFBFBD>da' as dep, c.id, c.nome from pbx_rotas_saida_canais a, pbx_troncos b, pbx_rotas_saida c where a.canal =  b.nome and a.id_rota = c.id and b.id = '$id'
+        $query = "select 'Rota de Sa<EFBFBD>da' as dep, c.id, c.nome from pbx_rotas_saida_canais a, pbx_troncos b, pbx_rotas_saida c where a.canal =  b.nome and a.id_rota = c.id and a.org_id = c.org_id and b.id = '$id'
 union
-select  'Rota de Entrada' as dep, b.id, b.nome from pbx_rotas_entrada_troncos a, pbx_rotas_entrada b where b.id = a.id_rota and  a.id_tronco = '$id'
+select  'Rota de Entrada' as dep, b.id, b.nome from pbx_rotas_entrada_troncos a, pbx_rotas_entrada b where b.id = a.id_rota and b.org_id = a.org_id and a.id_tronco = '$id'
 union
 select  'Contextos' as dep, c.id, c.nome from pbx_contextos_canais a, pbx_troncos b, pbx_contextos c where a.canal =  b.nome and a.id_contexto = c.id  and b.id = '$id'";
         $result = pg_query($query);