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

Merge pull request 'Correções e alterações no extension_padrao.' (#297) from matheorb/developer:dev-1.9 into 1.9 

Reviewed-on: SimplesIP/pabx-app#297
api_1.9_bilhetes
Matheo Bonucia 2 months ago
parent
0e9ebcbedd 6ac0af8921
commit
85b7a9b8d0
3 changed files with 28 additions and 27 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. 43
      admin/cadRamais.php
  2. 10
      agente/agentert.php
  3. 2
      asterisk/etc_asterisk/extensions_padrao.conf

43
admin/cadRamais.php
Unescape View File

@ -148,7 +148,7 @@ if ($_GET['ajax'] == 1) {
$qtde = $_POST["qtde"]; //quantidade de ramais que tentar<EFBFBD> criar
if (MaxRamaisPermite($dbcon, $qtde)) {
$z++;
$msg .= 'N<EFBFBD>o <EFBFBD> poss<EFBFBD>vel realizar a opera<EFBFBD><EFBFBD>o! O n<EFBFBD>mero m<EFBFBD>ximo de ramais permitidos j<EFBFBD> foi atingido!';
$msg .= 'Não foi possível realizar a operação! O número máximo de ramais permitidos já foi atingido!';
} else {
$senhaBranco = trim($secret) == '';
for ($i = 1; $i <= $qtde; $i++) {
@ -299,7 +299,7 @@ if ($_GET['ajax'] == 1) {
}
if ($passa && ($acao == "edita")) {
$numeroOld = $_POST['numero_old'];
ApagaUrl($dbcon, $numeroOld);
ApagaUrl($dbcon, $numeroOld, $_SESSION['SSEmpresaPadrao']);
$updPassRamal = $secret == MASCARA_PASSWORD ? '' : "secret='$secret',";
$updPassFacilidades = $senha_facilidade == MASCARA_PASSWORD ? '' : "senha_facilidade='$senha_facilidade',";
@ -391,27 +391,28 @@ if ($_GET['ajax'] == 1) {
$musicclass = 'default';
} //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'ESPERA', $nome, $espera); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SIGAME-INTERNO', $nome, $sigame_interno); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SIGAME-EXTERNO', $nome, $sigame_externo); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SIGAME-OCUPADO', $nome, $sigame_ocupado); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SIGAME-NAOATENDE', $nome, $sigame_nao_atende); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'GRAVACAO', $nome, $gravacao); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'GRAVACAO-OUT', $nome, $gravacao_saida); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'MUSICA', $nome, $musicclass); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'CADEADO', $nome, $cadeado); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'NAOPERTUBE', $nome, $pertube); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SENHA', $nome, $senha_facilidade); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'ESPERA',$org_id . $nome, $espera); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SIGAME-INTERNO', $org_id . $nome, $sigame_interno); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SIGAME-EXTERNO', $org_id . $nome, $sigame_externo); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SIGAME-OCUPADO', $org_id . $nome, $sigame_ocupado); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SIGAME-NAOATENDE', $org_id . $nome, $sigame_nao_atende); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'GRAVACAO', $org_id . $nome, $gravacao); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'GRAVACAO-OUT', $org_id . $nome, $gravacao_saida); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'MUSICA', $org_id . $nome, $musicclass); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'CADEADO', $org_id . $nome, $cadeado); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'NAOPERTUBE', $org_id . $nome, $pertube); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'SENHA', $org_id . $nome, $senha_facilidade); //executa insersao na base interna do asterisk
CommandAsterisk2($dbcon, 'ORG_RAMAL', $org_id . $nome2, $nome2);
if ($ispbx_tronco) {
CommandAsterisk2($dbcon, 'DISPOSITIVO', $nome, $ispbx_tronco . '/' . $nome);
CommandAsterisk2($dbcon, 'DISPOSITIVO', $org_id . $nome, $ispbx_tronco . '/' . $nome);
} else {
CommandAsterisk2($dbcon, 'DISPOSITIVO', $nome, $dispositivo);
CommandAsterisk2($dbcon, 'DISPOSITIVO', $org_id . $nome, $dispositivo);
}
CommandAsterisk2($dbcon, 'BINA-NOME', $nome, $callerid);
CommandAsterisk2($dbcon, 'BINA-EXTERNO', $nome, $callerid2);
CommandAsterisk2($dbcon, 'TIMEOUT-RAMAL', $nome, $timeout);
CommandAsterisk2($dbcon, 'TEMPO-RING-RAMAL', $nome, $ringTime);
CommandAsterisk2($dbcon, 'BINA-NOME', $org_id . $nome, $callerid);
CommandAsterisk2($dbcon, 'BINA-EXTERNO', $org_id . $nome, $callerid2);
CommandAsterisk2($dbcon, 'TIMEOUT-RAMAL', $org_id . $nome, $timeout);
CommandAsterisk2($dbcon, 'TEMPO-RING-RAMAL', $org_id . $nome, $ringTime);
} //gera arquivos e executa o reload dos dados no asterisk
if ($passa) {
@ -428,10 +429,10 @@ if ($_GET['ajax'] == 1) {
if ($acao == "edita") {
$id = $_GET["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);
} else {
$query = "SELECT * FROM pbx_sip_ramais where id is null";
$query = "SELECT * FROM pbx_sip_ramais where id is null and org_id = $org_id";
$allow = 'ulaw,alaw';
}
$result = pg_query($dbcon, $query);

10
agente/agentert.php
Unescape View File

@ -1503,7 +1503,7 @@ function ConnectaAgenteRt($db, $dac, $tpAtend, $org_id)
$verConexao = 0;
$i = 0;
while ($i++ < 10) {
$query = "select count(*) from pbx_supervisor_agentes where matricula = '$matricula' and upper(status) = 'PAUSA' ";
$query = "select count(*) from pbx_supervisor_agentes where matricula = '$matricula' and upper(status) = 'PAUSA' and org_id = $org_id ";
$result = pg_query($db, $query);
if (!$result) {
@ -1547,7 +1547,7 @@ function ConnectaAgenteRt($db, $dac, $tpAtend, $org_id)
*/
$query = "update pbx_supervisor_agentes
set ramal = '$ramal', nome = '$login', dac = '$dacDesc', modo_atendimento = '$moduAtendDesc', duracao = now(), chamada_classificado = '2'
where matricula = '$matricula'";
where matricula = '$matricula' and org_id = $org_id";
$result = pg_query($db, $query);
$result = $result && pg_affected_rows($result);
@ -1561,7 +1561,7 @@ function ConnectaAgenteRt($db, $dac, $tpAtend, $org_id)
* Registra o login do agente no sistema.
*
*/
$query = "insert into pbx_eventos_agentes(matricula,ramal,id_dac,\"login\", logoff, flag) values('$matricula', '$ramal',$dac, now(),now(),0)";
$query = "insert into pbx_eventos_agentes(matricula,ramal,id_dac,\"login\", logoff, flag, org_id) values('$matricula', '$ramal',$dac, now(),now(),0, $org_id)";
$result = pg_query($db, $query);
$result = $result && pg_affected_rows($result);
if (!$result) {
@ -1574,7 +1574,7 @@ function ConnectaAgenteRt($db, $dac, $tpAtend, $org_id)
*/
$idMotivoPausa = GetMotivoLogin($db);
$relEvt = '0';
$query = "insert into pbx_eventos_agentes(matricula,ramal,id_dac,id_motivo_pausa,entrada_pausa,flag,relaciona_eventos, reg_proc) values('$matricula', '$ramal',$dac,$idMotivoPausa,now(),0,$relEvt, $regProc)";
$query = "insert into pbx_eventos_agentes(matricula,ramal,id_dac,id_motivo_pausa,entrada_pausa,flag,relaciona_eventos, reg_proc, org_id) values('$matricula', '$ramal',$dac,$idMotivoPausa,now(),0,$relEvt, $regProc, $org_id)";
$result = pg_query($db, $query);
$result = $result && pg_affected_rows($result);
if (!$result) {
@ -2005,7 +2005,7 @@ function ClassificaChamada($db)
$query = sprintf($query, QuotedStr($matricula), $clas, $clasItem, QuotedStr($uniqueid), $idContrib, $dac, $munId);
} else {
$query .= ") values(%s,%s,%s,%s,%s,%s,%d)";
$query = sprintf($query, QuotedStr($matricula), $clas, $clasItem, QuotedStr($uniqueid), $dac, $munId);
$query = sprintf($query, QuotedStr($matricula), $clas, $clasItem, QuotedStr($uniqueid), $dac, $munId, $org_id);
}
$result = pg_query($db, $query);

2
asterisk/etc_asterisk/extensions_padrao.conf
Unescape View File

@ -1647,7 +1647,7 @@ exten => s,n,ExecIf($["X${BINA_TRONCO}" != "X"]?Set(CALLERID(num)=${BINA_TRONCO}
exten => s,n,Return()
exten => s,n(interno),GotoIf($["X${DB(BINA-NOME/${CHANNEL(peername)})}" = "X"]?fim)
exten => s,n,Set(CALLERID(name)=${DB(BINA-NOME/${CHANNEL(peername)})})
exten => s,n,Set(CALLERID(num)=${CALLERID(NUM)})
exten => s,n,Set(CALLERID(num)=${DB(ORG_RAMAL/${CHANNEL(peername)})})
exten => s,n(fim),Return()

Write Preview
Loading…
Cancel
Save