eduardo_pereira
/
pabx-app
forked from SimplesIP/pabx-app
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

colocar org_id nas querys e retirar do sqlite ramais desativados

1.9
bruno 2 months ago
parent
cba1b5f810
commit
d3734aa095
2 changed files with 31 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      admin/funcoes.php
  2. 29
      admin/ramais.php

36
admin/funcoes.php
Unescape View File

@ -40,7 +40,7 @@ function Ajusta_ramais($nome, $conexao, $reload = false, $reloadUra = false) {
return false;
}
ApagaUrl($conexao, $nome);
ApagaUrl($conexao, $nome, $org_id);
return true;
}
@ -2945,23 +2945,23 @@ function GetMascara() {
<option value="00XXXXXXXXXX.">INTERNACIONAL</option>';
}
function ApagaUrl($dbcon, $ramal) {
CommandAsterisk2($dbcon, 'DEL ESPERA', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SIGAME-INTERNO', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SIGAME-EXTERNO', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SIGAME-OCUPADO', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SIGAME-NAOATENDE', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL GRAVACAO', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL GRAVACAO-OUT', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL MUSICA', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL CADEADO', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL NAOPERTUBE', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SENHA', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL DISPOSITIVO', $ramal, ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL VOICE2', $ramal, '');
CommandAsterisk2($dbcon, 'DEL BINA-NOME', $ramal, '');
CommandAsterisk2($dbcon, 'DEL BINA-EXTERNO', $ramal, '');
CommandAsterisk2($dbcon, 'DEL TEMPO-RING-RAMAL', $ramal, '');
function ApagaUrl($dbcon, $ramal, $org_id) {
CommandAsterisk2($dbcon, 'DEL ESPERA', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SIGAME-INTERNO', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SIGAME-EXTERNO', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SIGAME-OCUPADO', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SIGAME-NAOATENDE', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL GRAVACAO', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL GRAVACAO-OUT', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL MUSICA', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL CADEADO', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL NAOPERTUBE', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL SENHA', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL DISPOSITIVO', "$org_id$ramal", ''); //executa inser<EFBFBD><EFBFBD>o na base interna do asterisk
CommandAsterisk2($dbcon, 'DEL VOICE2', "$org_id$ramal", '');
CommandAsterisk2($dbcon, 'DEL BINA-NOME', "$org_id$ramal", '');
CommandAsterisk2($dbcon, 'DEL BINA-EXTERNO', "$org_id$ramal", '');
CommandAsterisk2($dbcon, 'DEL TEMPO-RING-RAMAL', "$org_id$ramal", '');
}
function GetIdGrupoUser($dbcon, $idUser) {

29
admin/ramais.php
Unescape View File

@ -81,8 +81,7 @@ function GetRamalFiltro( $idProg, $filtro ){
$query .= " limit $regPagina offset $offSet";
$result = pg_query($dbcon, $query);
return $result;
return array("ramais_db" => $result, "ramais_rodape" => $links);
}
/* Buscar todos os ramais da página */
@ -97,10 +96,7 @@ function GetALLRamal($idProg, $filtro = null ){
$query .= " limit $regPagina offset $offSet";
$result = pg_query($dbcon, $query);
return $result ;
return array("ramais_db" => $result, "ramais_rodape" => $links);
}
$acao = isset($_GET['acao']) ? trim($_GET['acao']) : 'select';
@ -111,37 +107,38 @@ $recontaPag = ($acao == 'inseri') || ($acao == "deleta") || isset($_GET['pesquis
$janW = '700';
$janH = '400';
$verificaMaster = IsOrganizacaoMaster();
$org_id = $_SESSION['SSEmpresaPadrao'];
if ($acao == "deleta") {
$id = $_GET["id"] ?? "0";
$query = "SELECT * FROM pbx_sip_ramais where id=$id";
$query = "SELECT * FROM pbx_sip_ramais where id=$id and org_id = $org_id";
$result = pg_query($dbcon, $query);
$dados = pg_fetch_array($result);
$ramal = $dados['nome'];
//Apaga a relacao entre rotas e ramais
$query = "delete from pbx_rotas_saida_ramais where ramal = '$ramal'";
$query = "delete from pbx_rotas_saida_ramais where ramal = '$ramal' and org_id = $org_id";
pg_query($dbcon, $query);
//Apaga ch secretaria
$query = "delete from pbx_chefe_secretaria where numero = '$ramal'";
$query = "delete from pbx_chefe_secretaria where numero = '$ramal' and org_id = $org_id";
pg_query($dbcon, $query);
//Relação de restrição a audios cadastrada na interface de grupo de usuarios
$query = "delete from pbx_grupo_audio_ramal where nome = '$ramal' ";
$query = "delete from pbx_grupo_audio_ramal where nome = '$ramal' and org_id = $org_id";
pg_query($dbcon, $query);
//Remove ramais da agenda
$query = "delete from rma_depto_ramais where nome = '$ramal' ";
$query = "delete from rma_depto_ramais where nome = '$ramal' and org_id = $org_id";
pg_query($dbcon, $query);
$query = "delete from pbx_sip_ramais where id='$id'";
$query = "delete from pbx_sip_ramais where id='$id' and org_id = $org_id";
pg_query($dbcon, $query);
GrvAudita($dbcon, $idProg, 'pbx_sip_ramais', 'DEL', array(), array('id' => $id), array('id' => 'ID'), array('id'), true);
$query = "delete from pbx_voicemail_usuarios where numero_ramal ='$ramal'";
$query = "delete from pbx_voicemail_usuarios where numero_ramal ='$ramal' and org_id = $org_id";
pg_query($dbcon, $query);
Ajusta_ramais($ramal, $dbcon, false, false);
@ -150,7 +147,7 @@ if ($acao == "deleta") {
if(empty($filtro)){
$result = GetALLRamal( $idProg, $filtro );
$ramais = GetALLRamal( $idProg, $filtro );
}
else {
$result = GetRamalFiltro($idProg, $filtro);
@ -191,7 +188,7 @@ else {
<?php
$z = 0;
while ($dados = pg_fetch_array($result)) {
while ($dados = pg_fetch_array($ramais["ramais_db"])) {
$totaldep = GetTotalDependencias('ramal', $dados['nome']);
$opcao = 'ramal';
$acao = $dados['nome'];
@ -260,7 +257,7 @@ else {
<th align="center" colspan="9">
<table width="100%" class="grid" border="0" cellspacing="0" cellpadding="2">
<tr>
<th align="center" style="width: 90%; border:0;"><?= $links; ?></th>
<th align="center" style="width: 90%; border:0;"><?= $ramais["ramais_rodape"]; ?></th>
<th align="right" style="width: 10%; border:0;"><?= sprintf("%s/%s", $pagMostra, $totalReg); ?></th>
</tr>
</table>

Write Preview
Loading…
Cancel
Save