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

removido funcoes inuteis e inserido org_id para seperar organizacoes

1.9
Matheo Bonucia 2 months ago
parent
fa59579ec9
commit
1e223c46dd
3 changed files with 45 additions and 33 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. 1
      agente/funcoesAgente.php
  2. 71
      include/util/funcoesApl.php
  3. 6
      include/util/util.php

1
agente/funcoesAgente.php
Unescape View File

@ -926,6 +926,7 @@ function GetStatusDiscador($value, $cmpId = 0)
AND a.ctst_status = 1
AND a.org_id = $org_id
ORDER BY ctst_nome;";
$result = pg_query($query);
$sel = $value ? " selected" : "";

71
include/util/funcoesApl.php
Unescape View File

@ -2082,7 +2082,6 @@ function GetEncType($upload) {
if ($upload == 2)
return "enctype=\"application/x-www-form-urlencoded\"";
return "";
return "enctype=\"text/plain\"";
}
function InsereRotasRamais($dbcon, $rotas, $ramal) {
@ -2150,14 +2149,15 @@ function GetObsProdAgente($db = null, $dac = 0) {
*/
function InsereRamaisChf($conn, $ramal) {
$org_id = $_SESSION['SSEmpresaPadrao'];
$excecoes = $_POST['ramalSecExcecoesInc'];
$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($conn, $query);
foreach ($excecoes as $exc) {
global $idProg;
$query = "insert into pbx_chefe_secretaria(numero, excecao)values('$ramal', '$exc');";
$query = "insert into pbx_chefe_secretaria(numero, excecao, org_id)values('$ramal', '$exc', $org_id);";
pg_query($conn, $query);
$novo = array('numero' => $ramal, 'excecao' => $exc);
GrvAudita($conn, $idProg, 'pbx_chefe_secretaria', 'INS', array(), $novo, array('numero', 'excecao'), array('numero'), true);
@ -2188,10 +2188,20 @@ function GetClienteClassifica($db, $fone) {
}
function GetClienteIntegra($db, $uniqueid) {
$query = "select distinct a.int_dados
from pbx_integracao_dados a, pbx_integracao_reg b
where a.int_id = b.reg_retorno
and b.reg_uniqueid = '$uniqueid' limit 1";
$org_id = $_SESSION['SSEmpresaPadrao'];
$query = "
SELECT
DISTINCT a.int_dados
FROM
pbx_integracao_dados a,
pbx_integracao_reg b
WHERE
a.int_id = b.reg_retorno
AND b.reg_uniqueid = '$uniqueid'
AND a.org_id = b.org_id
AND a.org_id = $org_id
LIMIT 1;
";
$result = pg_query($db, $query);
if (!$result | (pg_num_rows($result) == 0))
@ -2216,7 +2226,7 @@ function dropTemporaryTable($db, $nomeTable) {
}
function InsertDb($db, $nomeTable, $content, $getSequencia = false) {
$org_id = $_SESSION['SSEmpresaPadrao'];
$fields = "";
$values = "";
foreach ($content as $key => $value) {
@ -2224,7 +2234,7 @@ function InsertDb($db, $nomeTable, $content, $getSequencia = false) {
$values .= !$values ? sprintf("%s", NullDb($value)) : sprintf(", %s", NullDb($value));
}
$query = sprintf("insert into %s(%s)values(%s)", $nomeTable, $fields, $values);
$query = sprintf("insert into %s(%s)values(%s, %d)", $nomeTable, $fields, $values, $org_id);
$result = pg_query($db, $query);
if ($result && $getSequencia) {
return GetSequenciaDb($db, $getSequencia);
@ -2233,13 +2243,14 @@ function InsertDb($db, $nomeTable, $content, $getSequencia = false) {
}
function UpdateDb($db, $nomeTable, $content, $where) {
$org_id = $_SESSION['SSEmpresaPadrao'];
$query = "";
$values = "";
foreach ($content as $key => $value) {
$values .= !$values ? sprintf("%s = %s", $key, NullDb($value)) : sprintf(",%s = %s", $key, NullDb($value));
}
$query .= sprintf("update %s set %s where %s", $nomeTable, $values, $where);
$query .= sprintf("update %s set %s where %s and org_id = %d", $nomeTable, $values, $where, $org_id);
$result = pg_query($db, $query);
//echo $query;
return $result;
@ -2739,7 +2750,7 @@ function PbxContratos($id) {
$sel = "selected";
}
$item = "<option value=\"0\" $sel>------------</option>";
$query = "SELECT contr_id, contr_descricao FROM pbx_tarif_contrato WHERE contr_id <> 0 AND org_id = {$org_id} ORDER BY 2";
$query = "SELECT contr_id, contr_descricao FROM pbx_tarif_contrato WHERE contr_id <> 0 AND org_id IN ($org_id, 0) ORDER BY 2";
$result = pg_query($db, $query);
while ($row = pg_fetch_array($result)) {
@ -2915,7 +2926,8 @@ function VerificaDefaults($db) {
/*
* Insere contrato padrao
*/
$query = "select count(*) from pbx_tarif_contrato where contr_id = 0";
$org_id = $_SESSION['SSEmpresaPadrao'];
$query = "select count(*) from pbx_tarif_contrato where contr_id = 0 and org_id in ($org_id, 0)";
$result = pg_query($db, $query);
$row = pg_fetch_row($result);
@ -2923,11 +2935,11 @@ function VerificaDefaults($db) {
$query = "insert into pbx_operadoras values(0, 'Simples IP', 0, '-', 0)";
pg_query($db, $query);
$query = "insert into pbx_tarif_contrato(contr_id, oper_id, empresa, contr_numero, contr_descricao, contr_dia_fechamento, contr_tipo, contr_tipo_franquia) values( 0, '0', '1', '0', 'sem trarifa', '1', 'fixo', '0')";
$query = "insert into pbx_tarif_contrato(contr_id, oper_id, empresa, contr_numero, contr_descricao, contr_dia_fechamento, contr_tipo, contr_tipo_franquia, org_id) values( 0, '0', '1', '0', 'sem trarifa', '1', 'fixo', '0', $org_id)";
pg_query($db, $query);
$query = "insert into pbx_tarif_contrato_preco (prc_id,contr_id, prc_vigencia, prc_tipo_opera, prc_tipo, prc_franquia, prc_franquia_movel, prc_franquia_preco, prc_preco_vc1, prc_preco_vc2, prc_preco_vc3, prc_preco_vc4, prc_preco_vc1_cad, prc_preco_vc2_cad, prc_preco_vc3_cad, prc_preco_vc4_cad, prc_preco_vc1_ext, prc_preco_vc2_ext, prc_preco_vc3_ext, prc_preco_vc4_ext)
values('0','0','2013-10-17','0','1','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0')";
$query = "insert into pbx_tarif_contrato_preco (prc_id,contr_id, prc_vigencia, prc_tipo_opera, prc_tipo, prc_franquia, prc_franquia_movel, prc_franquia_preco, prc_preco_vc1, prc_preco_vc2, prc_preco_vc3, prc_preco_vc4, prc_preco_vc1_cad, prc_preco_vc2_cad, prc_preco_vc3_cad, prc_preco_vc4_cad, prc_preco_vc1_ext, prc_preco_vc2_ext, prc_preco_vc3_ext, prc_preco_vc4_ext, org_id)
values('0','0','2013-10-17','0','1','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0', $org_id)";
pg_query($db, $query);
}
@ -3044,14 +3056,16 @@ function ExisteRegistro($db, $table, $where, $id, $queryParam = null) {
}
function GetDacFromCampanha($db, $id) {
$query = "select id_dac from pbx_campanha where cmp_id = '$id'";
$org_id = $_SESSION['SSEmpresaPadrao'];
$query = "select id_dac from pbx_campanha where cmp_id = '$id' and org_id = $org_id ";
$result = pg_query($db, $query);
$dados = pg_fetch_row($result);
return $dados[0];
}
function GetIdCampanhaFromNome($db, $nomeCampanha) {
$query = "select cmp_id from pbx_campanha where cmp_descricao = '$nomeCampanha'";
$org_id = $_SESSION['SSEmpresaPadrao'];
$query = "select cmp_id from pbx_campanha where cmp_descricao = '$nomeCampanha' and org_id = $org_id";
$result = pg_query($db, $query);
$dados = pg_fetch_row($result);
return $dados[0];
@ -3360,6 +3374,7 @@ function GetIpUsuario() {
function RegistraAcesso($login, $id) {
try {
$org_id = $_SESSION['SSEmpresaPadrao'];
$infoDispositivo = new Browser();
$logAcess = "Browser:%s|Platform:%s|Version:%s|Agent:%s|Mobile:%s|Robot:%s";
$logAcess = sprintf(
@ -3372,12 +3387,12 @@ function RegistraAcesso($login, $id) {
$infoDispositivo->isRobot() ? '1' : '0'
);
$query = "update pbx_controle_acesso set acs_data_fim = coalesce(acs_data_ultacess, now()) where acs_login = %s and acs_data_fim is null;";
$query = sprintf($query, QuotedStr($login));
$query = "update pbx_controle_acesso set acs_data_fim = coalesce(acs_data_ultacess, now()) where acs_login = %s and org_id IN (%d, 0) and acs_data_fim is null;";
$query = sprintf($query, QuotedStr($login), $org_id);
pg_query($query);
$query = "insert into pbx_controle_acesso(acs_ip, acs_sessao, acs_login, acs_user_id, acs_log ) values(%s,%s,%s,%s,%s)";
$query = sprintf($query, QuotedStr(GetIpUsuario()), QuotedStr(session_id()), QuotedStr($login), QuotedStr($id), QuotedStr($logAcess));
$query = "insert into pbx_controle_acesso(acs_ip, acs_sessao, acs_login, acs_user_id, acs_log, org_id ) values(%s,%s,%s,%s,%s, %d)";
$query = sprintf($query, QuotedStr(GetIpUsuario()), QuotedStr(session_id()), QuotedStr($login), QuotedStr($id), QuotedStr($logAcess), $org_id);
$result = pg_query($query);
if (!$result) {
throw new Exception("Erro ao registrar acesso ao sistema!");
@ -3392,6 +3407,7 @@ function RegistraAcesso($login, $id) {
function RegistraAcessoItem($idProg) {
try {
$org_id = $_SESSION['SSEmpresaPadrao'];
if (IsAjax()) {
return true;
}
@ -3400,15 +3416,15 @@ function RegistraAcessoItem($idProg) {
throw new Exception("Registro de acesso Não iniciado!");
}
$query = "insert into pbx_controle_acesso_item(acs_id, acsi_prog)values(%s,%s)";
$query = sprintf($query, QuotedStr($_SESSION["SSRegAcessoId"]), QuotedStr($idProg));
$query = "insert into pbx_controle_acesso_item(acs_id, acsi_prog, org_id)values(%s,%s,%d)";
$query = sprintf($query, QuotedStr($_SESSION["SSRegAcessoId"]), QuotedStr($idProg), $org_id);
$result = pg_query($query);
if (!$result) {
throw new Exception("Erro ao registrar acesso ao sistema!");
}
$query = "update pbx_controle_acesso set acs_data_ultacess = now(), acs_prog_ultacess = %s where acs_id = %s";
$query = sprintf($query, QuotedStr($idProg), QuotedStr($_SESSION["SSRegAcessoId"]));
$query = "update pbx_controle_acesso set acs_data_ultacess = now(), acs_prog_ultacess = %s where acs_id = %s and org_id in (%d, 0)";
$query = sprintf($query, QuotedStr($idProg), QuotedStr($_SESSION["SSRegAcessoId"]), $org_id);
$result = pg_query($query);
if (!$result) {
throw new Exception("Erro ao atualizar acesso ao sistema!");
@ -3423,6 +3439,7 @@ function RegistraAcessoItem($idProg) {
function RegistraErroAcesso($login, $senha) {
try {
$org_id = $_SESSION['SSEmpresaPadrao'];
$infoDispositivo = new Browser();
$logAcess = "Login:%s|Senha:%s|Browser:%s|Platform:%s|Version:%s|Agent:%s|Mobile:%s|Robot:%s";
$logAcess = sprintf(
@ -3440,8 +3457,8 @@ function RegistraErroAcesso($login, $senha) {
$id = '-1';
$login = substr($login, 0, 32);
$query = "insert into pbx_controle_acesso(acs_ip, acs_sessao, acs_login, acs_user_id, acs_log, acs_erro ) values(%s,%s,%s,%s,%s, '1')";
$query = sprintf($query, QuotedStr(GetIpUsuario()), QuotedStr(session_id()), QuotedStr($login), QuotedStr($id), QuotedStr($logAcess));
$query = "insert into pbx_controle_acesso(acs_ip, acs_sessao, acs_login, acs_user_id, acs_log, acs_erro, org_id) values(%s, %s, %s, %s, %s, '1', %d)";
$query = sprintf($query, QuotedStr(GetIpUsuario()), QuotedStr(session_id()), QuotedStr($login), QuotedStr($id), QuotedStr($logAcess), $org_id);
$result = pg_query($query);
if (!$result) {
throw new Exception("Erro ao registrar acesso ao sistema!");

6
include/util/util.php
Unescape View File

@ -2001,12 +2001,6 @@ function GeraProtocolo($db, $uniqueid)
return $proto;
}
function IsPhp6()
{
$versao = (int) soNumero(PHP_VERSION);
return $versao >= 560;
}
function EchoLog($log)
{
global $debugLocal;

Write Preview
Loading…
Cancel
Save