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

Correção da mensagem de erro ao inserir ramais mesmo com a operacao ok e inclusao das variaveis RAMAL_REGISTRO e CALLERID REGISTRO, feito pelo arquivox funcoes.php na gravação do arquivo sip_ramais.conf

1.9
AMARILDO PEREIRA 6 months ago
parent
f1dfdf2c8a
commit
9cbe3fc117
2 changed files with 1291 additions and 1290 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      admin/cadRamais.php
  2. 2
      admin/funcoes.php

19
admin/cadRamais.php
Unescape View File

@ -347,10 +347,7 @@ if ($_GET['ajax'] == 1) {
$z++; $z++;
$msg .= 'Erro ao incluir ramal ' . $nome2 . '!' . '\n'; $msg .= 'Erro ao incluir ramal ' . $nome2 . '!' . '\n';
} else { } else {
if (!pg_affected_rows($result)) {
$z++;
$msg .= 'Erro ao incluir ramal ' . $nome2 . '!' . '\n';
} else {
$query = "SELECT max(id) AS id FROM pbx_sip_ramais"; $query = "SELECT max(id) AS id FROM pbx_sip_ramais";
$result = pg_query($dbcon, $query); $result = pg_query($dbcon, $query);
$id_ult = pg_fetch_row($result); $id_ult = pg_fetch_row($result);
@ -421,7 +418,6 @@ if ($_GET['ajax'] == 1) {
} }
} }
} }
}
if ($z >= 1) { if ($z >= 1) {
echo "<script>javascript:alert('$msg');</script>"; echo "<script>javascript:alert('$msg');</script>";
echo "<script>javascript:history.back();</script>"; echo "<script>javascript:history.back();</script>";
@ -754,7 +750,8 @@ if ($_GET['ajax'] == 1) {
$query2 = "SELECT id, username, nome, tipo FROM pbx_troncos WHERE org_id = {$org_id} ORDER BY nome;"; $query2 = "SELECT id, username, nome, tipo FROM pbx_troncos WHERE org_id = {$org_id} ORDER BY nome;";
$result2 = pg_query($dbcon, $query2); $result2 = pg_query($dbcon, $query2);
$troncos = pg_fetch_all($result2); $troncos = pg_fetch_all($result2);
foreach ($troncos as $v) { ?> foreach ($troncos as $v) {
?>
<?php $selected = ""; ?> <?php $selected = ""; ?>
<?php $dispPbx = $v['tipo'] . '/' . $v['username']; ?> <?php $dispPbx = $v['tipo'] . '/' . $v['username']; ?>
<?php ($dispPbx == $ispbx_tronco) ? $selected = "selected" : null; ?> <?php ($dispPbx == $ispbx_tronco) ? $selected = "selected" : null; ?>
@ -870,7 +867,8 @@ if ($_GET['ajax'] == 1) {
<?php <?php
$query2 = "SELECT * FROM pbx_musichold_grupos WHERE org_id = {$org_id} AND nome <> 'agentes' order by nome asc"; $query2 = "SELECT * FROM pbx_musichold_grupos WHERE org_id = {$org_id} AND nome <> 'agentes' order by nome asc";
$result2 = pg_query($dbcon, $query2); $result2 = pg_query($dbcon, $query2);
while ($dados2 = pg_fetch_array($result2)) { ?> while ($dados2 = pg_fetch_array($result2)) {
?>
<option value="<?= $dados2['nome']; ?>" <?= ($acao == 'edita') && ($musica_espera == $dados2['nome']) ? "selected" : null; ?>><?= $dados2['nome']; ?></option> <option value="<?= $dados2['nome']; ?>" <?= ($acao == 'edita') && ($musica_espera == $dados2['nome']) ? "selected" : null; ?>><?= $dados2['nome']; ?></option>
<?php } ?> <?php } ?>
</select> </select>
@ -942,7 +940,8 @@ if ($_GET['ajax'] == 1) {
<?php <?php
$query2 = "SELECT * FROM pbx_contextos WHERE org_id = {$org_id} ORDER BY id ASC"; $query2 = "SELECT * FROM pbx_contextos WHERE org_id = {$org_id} ORDER BY id ASC";
$result2 = pg_query($dbcon, $query2); $result2 = pg_query($dbcon, $query2);
while ($dados2 = pg_fetch_array($result2)) { ?> while ($dados2 = pg_fetch_array($result2)) {
?>
<option value="<?= $dados2['nome']; ?>" <?= ($acao == 'edita') && ($context == $dados2['nome']) ? "selected" : null; ?>><?= $dados2['nome']; ?></option> <option value="<?= $dados2['nome']; ?>" <?= ($acao == 'edita') && ($context == $dados2['nome']) ? "selected" : null; ?>><?= $dados2['nome']; ?></option>
<?php } ?> <?php } ?>
</select> </select>
@ -1526,8 +1525,7 @@ if ($_GET['ajax'] == 1) {
</html> </html>
<?php <?php
function GetDefaultRedesPermitidas() function GetDefaultRedesPermitidas() {
{
global $dbcon; global $dbcon;
$query = "select extranet from pbx_sip_general"; $query = "select extranet from pbx_sip_general";
$result = pg_query($dbcon, $query); $result = pg_query($dbcon, $query);
@ -1537,3 +1535,4 @@ function GetDefaultRedesPermitidas()
$row = pg_fetch_array($result); $row = pg_fetch_array($result);
return $row['extranet']; return $row['extranet'];
} }

2
admin/funcoes.php
Unescape View File

@ -922,6 +922,8 @@ function gera_arquivos($dbcon, $tipo, $reload = 1, $reloadUra = 1)
} }
} }
} }
fwrite($escreve, sprintf("setvar=RAMAL_REGISTRO=%s", $dados["nome"]));
fwrite($escreve, sprintf("setvar=CALLERID_REGISTRO=%s", $dados["callerid"]));
fwrite($escreve, chr(13) . chr(10)); fwrite($escreve, chr(13) . chr(10));
} }

Write Preview
Loading…
Cancel
Save