From f1dfdf2c8a9933d03a2f06452ebe3872b33cabf6 Mon Sep 17 00:00:00 2001 From: Amarildo Pereira Date: Sun, 7 Apr 2024 16:45:47 -0400 Subject: [PATCH] =?UTF-8?q?O=20Script=20rgeneral.php=20nnao=20estava=20gra?= =?UTF-8?q?vando=20as=20redes=20devido=20a=20query=20na=20funcao=20gera=5F?= =?UTF-8?q?arquivos=20no=20arquivo=20funcoes.php=20selecionava=20sempre=20?= =?UTF-8?q?o=20primeiro=20registro=20usando=20um=20limit=201,=20foi=20nece?= =?UTF-8?q?ssario=20adicionar=20o=20id=20da=20organizacao=20master,=20pois?= =?UTF-8?q?=20as=20permissoes=20de=20rede=20gerais=20para=20os=20ramais=20?= =?UTF-8?q?sip=20hoje=20s=C3=A3o=20tratadas=20apenas=20neste=20perfil,=20t?= =?UTF-8?q?amb=C3=83em=20foi=20criada=20a=20funcao=20GetOraganizacaoMaster?= =?UTF-8?q?()=20no=20arquivo=20funcoesApl.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/funcoes.php | 4 ++-- include/util/funcoesApl.php | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/admin/funcoes.php b/admin/funcoes.php index 72b5f600..43addb51 100644 --- a/admin/funcoes.php +++ b/admin/funcoes.php @@ -1214,7 +1214,7 @@ function gera_arquivos($dbcon, $tipo, $reload = 1, $reloadUra = 1) $arq = $caminho_producao . "sip_general.conf"; $escreve = fopen($arq, 'w'); //externip='$externip', externhost='$externhost', localnet='$localnet', - $query = "SELECT nome, context, callerid, allowguest, allowoverlap, allowtransfer, + $query = sprintf("SELECT nome, context, callerid, allowguest, allowoverlap, allowtransfer, realm, bindport, bindaddr, srvlookup, pedantic, tos_sip, tos_audio, tos_video, maxexpiry, minexpiry, notifymimetype, buggymwi, vmexten, mohinterpret, mohsuggest, language, relaxdtmf, trustrpid, sendrpid, @@ -1226,7 +1226,7 @@ function gera_arquivos($dbcon, $tipo, $reload = 1, $reloadUra = 1) localnet, nat, canreinvite, directrtpsetup, rtcachefriends, rtsavesysname, rtupdate, rtautoclear, ignoreregexpire, domain, autodomain, allowexternaldomains, fromdomain, jbenable, jbforce, jbmaxsize, - jbresyncthreshold, jbimpl, jblog, auth FROM pbx_sip_general limit 1"; + jbresyncthreshold, jbimpl, jblog, auth FROM pbx_sip_general where org_id = (select id from pbx_organizacao where master = '%s')", GetOrganizacaoMaster()); $result = pg_query($dbcon, $query); while ($dados = pg_fetch_array($result)) { $x++; diff --git a/include/util/funcoesApl.php b/include/util/funcoesApl.php index 8c8b6acc..87f43909 100755 --- a/include/util/funcoesApl.php +++ b/include/util/funcoesApl.php @@ -1351,6 +1351,17 @@ function GetOrganizacao() return $_SESSION['SSEmpresaPadrao']; } +function GetOrganizacaoMaster(){ + global $dbcon; + if (empty($_SESSION['SSEmpresaMaster']) && IsUserConnect()) { + $query = "select id from pbx_organizacao where master = '1'"; + $result = pg_query($dbcon, $query); + $res = pg_fetch_assoc($result); + $_SESSION['SSEmpresaMaster'] = $res['id']; + } + return $_SESSION['SSEmpresaMaster']; +} + function GetAllOrganizacao() { global $dbcon;