From 56228768ea9f252defc00faefa967a1194ace13d Mon Sep 17 00:00:00 2001
From: edmarmoretti <edmar.moretti@gmail.com>
Date: Mon, 10 Jul 2017 22:05:42 -0300
Subject: [PATCH] Correção no uso da variável $conexaoadmin para ativar conexões com o sistema de administração diferentes do default

---
 admin1/index.php            | 5 +++++
 admin1/php/conexao.php      | 1 +
 admin1/php/funcoesAdmin.php | 4 ++--
 ms_configura.php            | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/admin1/index.php b/admin1/index.php
index 6079e07..f9117f3 100755
--- a/admin1/index.php
+++ b/admin1/index.php
@@ -31,6 +31,11 @@ if($esquemaadmin != ""){
 	$_SESSION["esquemaadmin"] = str_replace(".","",$esquemaadmin).".";
 }
 unset ($esquemaadmin);
+$_SESSION["conexaoadmin"] = "";
+if($conexaoadmin != ""){
+	$_SESSION["conexaoadmin"] = $conexaoadmin;
+}
+unset ($conexaoadmin);
 $_SESSION["postgis_mapa"] = $postgis_mapa;
 unset($postgis_mapa);
 $_SESSION["logTransacoes"] = $logTransacoes;
diff --git a/admin1/php/conexao.php b/admin1/php/conexao.php
index 55515a9..9e0dbc9 100755
--- a/admin1/php/conexao.php
+++ b/admin1/php/conexao.php
@@ -3,6 +3,7 @@ if(empty($_SESSION["locaplic"])){
 	echo "locaplic nao definido em conexao.php";
 	exit;
 }
+$conexaoadmin = $_SESSION["conexaoadmin"];
 if(!isset($conexaoadmin)){
 	$conexaoadmin = "";
 }
diff --git a/admin1/php/funcoesAdmin.php b/admin1/php/funcoesAdmin.php
index 78e7c92..7c069a8 100755
--- a/admin1/php/funcoesAdmin.php
+++ b/admin1/php/funcoesAdmin.php
@@ -180,12 +180,12 @@ Array originada de fetchAll
 */
 function pegaDados($sql,$dbh="",$close=true)
 {
+	//error_reporting (E_ALL);
 	$resultado = array();
 	//is_string para efeitos de compatibilidade
 	if($dbh == "" || is_string($dbh)){
 		include(dirname(__FILE__)."/conexao.php");
 	}
-	//error_reporting (E_ALL);
 	//$dbh deve ser definido com somente leitura, mas por prevencao:
 	$sql = str_ireplace(array("update","delete","insert","--","drop",";"),"",$sql);
 	$q = $dbh->query($sql,PDO::FETCH_ASSOC);
@@ -202,7 +202,7 @@ function pegaDados($sql,$dbh="",$close=true)
 			$dbh = null;
 			$dbhw = null;
 		}
-		throw new Exception(" erro admin.php funcao \admin\php\funcoesAdmin\pegaDados");
+		//throw new Exception(" erro admin.php funcao \admin\php\funcoesAdmin\pegaDados");
 	}
 }
 /**
diff --git a/ms_configura.php b/ms_configura.php
index 2dbebcf..f306d76 100755
--- a/ms_configura.php
+++ b/ms_configura.php
@@ -681,7 +681,7 @@ Tipo:
 {string}
 
 */
-$conexaoadmin = "";
+$conexaoadmin = "";//"/var/www/conexaoms.php";
 /*
 Variable: $esquemaadmin
 
--
libgit2 0.21.2