From 8c98db4c5358301efe2c9031fd13505b5b603306 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 23 Mar 2016 12:14:06 -0300
Subject: [PATCH] Conclusão da implantação do log de transações #62

---
 admin/php/arvore.php            |  2 +-
 admin/php/conexaopostgresql.php |  4 ++--
 admin/php/editormapfile.php     |  2 +-
 admin/php/logtransacoes.php     | 16 ++++++++++++++++
 admin/php/menutemas.php         |  5 ++---
 ms_configura.php                |  4 ++++
 6 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 admin/php/logtransacoes.php

diff --git a/admin/php/arvore.php b/admin/php/arvore.php
index e1c02d1..cb96bc2 100755
--- a/admin/php/arvore.php
+++ b/admin/php/arvore.php
@@ -530,7 +530,7 @@ switch (strtoupper($funcao))
 			}
 		}
 		retornaJSON(
-			exclui($tabela,$coluna,$id)
+			exclui($esquemaadmin.$tabela,$coluna,$id)
 		);
 		exit;
 	break;
diff --git a/admin/php/conexaopostgresql.php b/admin/php/conexaopostgresql.php
index 6961a07..a20fe57 100755
--- a/admin/php/conexaopostgresql.php
+++ b/admin/php/conexaopostgresql.php
@@ -3,8 +3,8 @@
 //$dbhw usuario com direito de escrita
 try
 {
-	$dbh = new PDO('pgsql:dbname=teste;user=postgres;password=postgres;host=localhost');
-	$dbhw = new PDO('pgsql:dbname=teste;user=postgres;password=postgres;host=localhost');
+	$dbh = new PDO('pgsql:dbname=geodados;user=postgres;password=postgres;host=localhost');
+	$dbhw = new PDO('pgsql:dbname=geodados;user=postgres;password=postgres;host=localhost');
 }
 catch (PDOException $e)
 {
diff --git a/admin/php/editormapfile.php b/admin/php/editormapfile.php
index 84e31d3..9f0425a 100755
--- a/admin/php/editormapfile.php
+++ b/admin/php/editormapfile.php
@@ -333,7 +333,7 @@ switch (strtoupper($funcao))
 			}
 			$tabela = "i3geoadmin_temas";
 			if($id){
-				exclui($tabela,$coluna,$id);
+				exclui($esquemaadmin.$tabela,$coluna,$id);
 			}
 			retornaJSON("ok");
 			exit;
diff --git a/admin/php/logtransacoes.php b/admin/php/logtransacoes.php
new file mode 100644
index 0000000..faa06bb
--- /dev/null
+++ b/admin/php/logtransacoes.php
@@ -0,0 +1,16 @@
+<?php
+//para rodar, comente a linha abaixo
+exit;
+include("admin.php");
+$dados = pegaDados("select * from ".$esquemaadmin."i3geoadmin_log");
+//["serializedata"]=> string(96) "a:5:{i:0;s:22:"administrador do i3geo";i:1;s:10:"admingeral";i:2;s:0:"";i:3;s:1:"1";i:4;s:0:"";}" ["usuario"]=> string(5) "admin" ["ip"]=> string(9) "127.0.0.1" ["timestamp"]=> string(43) "1458610085(Mon, 21 Mar 2016 22:28:05 -0300)" ["outros"]=> string(0) "" } } 
+foreach($dados as $d){
+	echo "<b>id_log:</b> ".$d["id_log"]."<br> \n";
+	echo "timestamp = ".$d["timestamp"] ."<br> \n";
+	echo "usuario = ".$d["usuario"] ."<br> \n";
+	echo "ip = ".$d["ip"] ."<br> \n";
+	echo "sql = ".$d["sql"] ."<br> \n";
+	echo "dados = '".implode("','",unserialize($d["serializedata"])) ."'<br> \n";
+	echo "outros = ".$d["outros"] ."<br><br> \n";
+}
+?>
\ No newline at end of file
diff --git a/admin/php/menutemas.php b/admin/php/menutemas.php
index f9be192..0b0d80c 100755
--- a/admin/php/menutemas.php
+++ b/admin/php/menutemas.php
@@ -598,13 +598,12 @@ switch (strtoupper($funcao))
 			$tabela = "i3geoadmin_menus";
 			$coluna = "id_menu";
 			$filhos = verificaFilhos();
-			if($filhos)
-			{
+			if($filhos){
 				retornaJSON("erro");
 				exit;
 			}
 		}
-		retornaJSON(exclui($tabela,$coluna,$id));
+		retornaJSON(exclui($esquemaadmin.$tabela,$coluna,$id));
 		exit;
 		break;
 
diff --git a/ms_configura.php b/ms_configura.php
index 8f746df..b9759b2 100755
--- a/ms_configura.php
+++ b/ms_configura.php
@@ -71,8 +71,12 @@ Para que isso funcione e necessario que exista a tabela que armazena o log.
 
 Se voce possui um banco de administracao anterior a versao 7, utilize o seguinte sql para criar a tabela
 
+- caso esteja utilizando SQLlite:
 CREATE TABLE i3geoadmin_log (id_log INTEGER PRIMARY KEY,sql TEXT,serializedata TEXT,usuario TEXT,ip TEXT,timestamp TEXT,outros TEXT)
 
+- caso esteja utilizando postgesql:
+CREATE TABLE i3geoadmin.i3geoadmin_log (id_log SERIAL PRIMARY KEY NOT NULL,sql TEXT,serializedata TEXT,usuario TEXT,ip TEXT,timestamp TEXT,outros TEXT);
+
 Tipo:
 {boolean}
 
--
libgit2 0.21.2