Merge branch 'bruno' of http://192.168.115.233:3000/bruno/pabx-app into bruno

asterisk/var_lib_asterisk/agi-bin/verifica_rota.php

@@ -1,5 +1,6 @@
 #!/usr/bin/php -q
 <?php
+include('util/util.php');
 include('bd.php');
 
 ob_implicit_flush(true);
@@ -61,6 +62,7 @@ inner join pbx_rotas_saida c on a.id_rota = c.id
         and tipo_acesso <> '0'
         order by prioridade limit 1";
 
+WriteLog($query, '/var/log/asterisk/rotas_saida.log');
 
 $result = pg_query($conexao, $query);
 $row = pg_fetch_array($result);

asterisk/var_lib_asterisk/scripts/abandonadas/rtabd.service

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 [Unit]
 Description=Servico para retorno de chamadas abandonadas automaticamente.
 After=network.target
@@ -11,6 +12,8 @@ ExecStart=/var/lib/asterisk/scripts/abandonadas/retornoAbandonada.php
 
  
 =======
+=======
+>>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 #
 # ExecStartPre
 # If more than one command is specified, the
@@ -39,6 +42,9 @@ PIDFile=/var/lock/subsys/rtabd.pid
 Restart=always
 RestartSec=1
 
+<<<<<<< HEAD
 >>>>>>> 43c6181 (serviço rtabd para systemd - rtadb.service)
+=======
+>>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 [Install]
 WantedBy=multi-user.target

asterisk/var_lib_asterisk/scripts/cnvrtd/cnvrtd.service

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 [Unit]
 Description=Servico para conversao de arquivos e execucao em segundo plano.
 After=network.target
@@ -11,6 +12,8 @@ ExecStart=/var/lib/asterisk/scripts/cnvrtd/cnvrtd.php
 
  
 =======
+=======
+>>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 #
 # ExecStartPre
 # If more than one command is specified, the
@@ -39,6 +42,9 @@ PIDFile=/var/lock/subsys/cnvrtd.pid
 Restart=always
 RestartSec=1
 
+<<<<<<< HEAD
 >>>>>>> aadc23f (serviço cnvrtd para systemd - cnvrtd.service)
+=======
+>>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 [Install]
 WantedBy=multi-user.target

asterisk/var_lib_asterisk/scripts/supervisor/supervisor.service

@@ -10,6 +10,7 @@
 
 [Unit]
 <<<<<<< HEAD
+<<<<<<< HEAD
 Description=Service Supervisor Simples IP
 After=network.target
  
@@ -17,6 +18,10 @@ After=network.target
 Description=Supervisor - Simples IP
 
 >>>>>>> 0ffdd2d (serviço supervisor para systemd - supervisoe.service)
+=======
+Description=Supervisor - Simples IP
+
+>>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 [Service]
 Type=forking
 
@@ -35,7 +40,10 @@ RestartSec=3
 ExecStart=/var/lib/asterisk/scripts/supervisor/ssupervisor.php
 =======
 RestartSec=1
+<<<<<<< HEAD
 >>>>>>> 0ffdd2d (serviço supervisor para systemd - supervisoe.service)
+=======
+>>>>>>> ad564e39815b362816e2fbcbc8681338ece321df
 
 [Install]
 WantedBy=multi-user.target

nbproject/private/private.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="5"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group>
+            <file>file:/var/www/html/aplicativo/include/scriptdb/install/instalador_aplicativo/sip_install.sh</file>
+            <file>file:/var/www/html/aplicativo/admin/CadRotasSaida.php</file>
+            <file>file:/var/www/html/aplicativo/index.php</file>
+            <file>file:/var/www/html/aplicativo/admin/funcoes.php</file>
+            <file>file:/var/www/html/aplicativo/asterisk/var_lib_asterisk/agi-bin/verifica_rota.php</file>
+            <file>file:/var/www/html/aplicativo/include/scriptdb/install/instalador_asterisk/install.sh</file>
+            <file>file:/var/www/html/aplicativo/include/util/util.php</file>
+            <file>file:/var/www/html/aplicativo/include/util/funcoesApl.php</file>
+        </group>
+    </open-files>
+</project-private>