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

Correção nas funções e correção no AGI das abandonadas

1.9
Matheo Bonucia 2 weeks ago
parent
9617610950
commit
cafe4c301e
2 changed files with 10 additions and 14 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. 13
      admin/funcoes.php
  2. 11
      asterisk/var_lib_asterisk/scripts/integracao/abdAgi.php

13
admin/funcoes.php
Unescape View File

@ -442,7 +442,6 @@ function backup($conexao, $tabela, $tipo, $registro, $comando, $reload) {
//EM TODA GERA<EFBFBD><EFBFBD>O DE ARQUIVO, CASO O CAMPO DO BANCO ESTEJA EM BRANCO, O PARAMETRO NO ASTERISK IR<EFBFBD> SEM O "CAMPO = VALOR"
function gera_arquivos($dbcon, $tipo, $reload = 1, $reloadUra = 1) {
$org_id = GetOrganizacao();
$query = "SELECT * FROM pbx_conf_padrao";
$result = pg_query($dbcon, $query);
@ -837,11 +836,10 @@ function gera_arquivos($dbcon, $tipo, $reload = 1, $reloadUra = 1) {
while ($dados = pg_fetch_array($result)) {
$dados2[] = $dados;
//$numero = $org_id . $dados['numero'];
$numero = $dados['numero_asterisk'];
$x++;
fwrite($escreve, 'exten => _' . $numero . ',1,' . (($dados['m_espera'] == 'N') ? 'Ringing()' : 'Answer()') . "\n");
fwrite($escreve, 'exten => _' . $numero . ",n,Set(__ORG_ID={$org_id})\n");
fwrite($escreve, 'exten => _' . $numero . ",n,Set(__ORG_ID={$dados['org_id']})\n");
fwrite($escreve, 'exten => _' . $numero . ',n,ExecIf($["${ISNULL(${CDR(direcao)})}" = "1"]?Set(CDR(direcao)=I))' . "\n");
fwrite($escreve, 'exten => _' . $numero . ',n,ExecIf($["${CDR(direcao)}" != "E" && "${ISNULL(${CDR(ramal_origem)})}" = "1"]?Set(CDR(ramal_origem)=${CALLERID(num)}))' . "\n");
fwrite($escreve, 'exten => _' . $numero . ',n,Set(CHANNEL(accountcode)=${TRANSFER})' . "\n");
@ -1342,10 +1340,9 @@ function gera_arquivos($dbcon, $tipo, $reload = 1, $reloadUra = 1) {
if ($tipo == 'DISA') {
$arq = $caminho_producao . "extensions_disa.conf";
$escreve = fopen($arq, 'w');
fwrite($escreve, '[ext-disa]' . "\n");
fwrite($escreve, 'include => ext-disa-custom' . "\n");
$query = "SELECT * FROM pbx_disa";
$result = pg_query($dbcon, $query);
while ($dados = pg_fetch_array($result)) {
@ -1356,7 +1353,7 @@ function gera_arquivos($dbcon, $tipo, $reload = 1, $reloadUra = 1) {
fwrite($escreve, 'exten => _' . $dados['numero_asterisk'] . ',n,Set(CHANNEL(accountcode)=${TRANSFER})' . "\n");
fwrite($escreve, 'exten => _' . $dados['numero_asterisk'] . ',n,AGI(pbx_complemento.php,ext-disa)' . "\n");
$sql_conta = pg_query($dbcon, "SELECT * FROM pbx_disa_numeros where id_disa=" . $dados['id'] . "and org_id = $org_id order by id asc");
$sql_conta = pg_query($dbcon, "SELECT * FROM pbx_disa_numeros where id_disa=" . $dados['id'] . "and org_id = {$dados['org_id']} order by id asc");
$quantreg = pg_num_rows($sql_conta);
if ($quantreg > 0) {
fwrite($escreve, 'exten => _' . $dados['numero_asterisk'] . ',n,Agi(disa_agi.php,${CALLERID(NUM):-13})' . "\n");
@ -3171,8 +3168,8 @@ function GeraDisa($dbcon, $reload = true, $silent = 0) {
WriteFile($escreve, "exten => _" . $dados["numero_asterisk"] . ",1,Answer()\n", $silent);
WriteFile($escreve, "exten => _" . $dados["numero_asterisk"] . ",n,Set(CHANNEL(accountcode)=\${TRANSFER})\n", $silent);
WriteFile($escreve, "exten => _" . $dados["numero_asterisk"] . ",n,AGI(pbx_complemento.php,ext-disa)\n", $silent);
$sql_conta = pg_query("SELECT * FROM pbx_disa_numeros where id_disa=" . $dados["id"] . " order by id asc");
$query = "SELECT * FROM pbx_disa_numeros where id_disa=" . $dados["id"] . " order by id asc";
$sql_conta = pg_query($query);
$quantreg = pg_num_rows($sql_conta);
if ($quantreg > 0) {
WriteFile($escreve, "exten => _" . $dados["numero_asterisk"] . ",n,Agi(disa.php,\${CALLERID(NUM):-10})\n", $silent);

11
asterisk/var_lib_asterisk/scripts/integracao/abdAgi.php
Unescape View File

@ -331,16 +331,15 @@ try {
$query = "SELECT abdsr_uniqueid, abdsr_fila
FROM pbx_abandonadas_semretorno
WHERE abdsr_data_hora_retorno IS NULL
AND abdsr_numero = '$numero'
AND abdsr_numero = (SELECT nome FROM pbx_sip_ramais psr WHERE registro = '$numero')
AND abdsr_data >= (now()::date - $diasAbandon)
AND abdsr_data_hora_inicio =
(SELECT max(abdsr_data_hora_inicio)
AND abdsr_data_hora_inicio = (SELECT max(abdsr_data_hora_inicio)
FROM pbx_abandonadas_semretorno
WHERE abdsr_data >= (now()::date - $diasAbandon)
AND (abdsr_fila = '$dac'
OR (abdsr_fila = split_part('$dac', '@', 1)
AND org_id = split_part('$dac', '@', '2')::int))
AND abdsr_numero = '$numero'
AND org_id = split_part('$dac', '@', 2)::int))
AND abdsr_numero = (SELECT nome FROM pbx_sip_ramais psr WHERE registro = '$numero')
AND abdsr_data_hora_retorno IS NULL)";
$res = pg_query($conAbd, $query);
@ -387,7 +386,7 @@ try {
AND abdsr_data_hora_retorno is null
AND (abdsr_fila = '$filaAbandon'
OR (abdsr_fila = split_part('$filaAbandon', '@', 1)
AND org_id = split_part('$filaAbandon', '@', '2')::int))";
AND org_id = split_part('$filaAbandon', '@', 2)::int))";
$result = pg_query($conAbd, $query);
if (!$result) {

Write Preview
Loading…
Cancel
Save