From 33b60dd5966811f364654dc4165440982c41ed2e Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 14 Nov 2011 20:52:12 +0000
Subject: [PATCH] 

---
 admin/html/mapfiles.html |  2 ++
 admin/js/mapfiles.js     |  1 +
 admin/php/admin.php      | 40 ++++++++++++++++++++++++++++++++--------
 admin/php/mapfiles.php   | 19 +++++--------------
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/admin/html/mapfiles.html b/admin/html/mapfiles.html
index 0c4f137..3c45b0f 100644
--- a/admin/html/mapfiles.html
+++ b/admin/html/mapfiles.html
@@ -34,6 +34,8 @@
 </div>
 <br>
 <input id=botao2  type=button value="Testar a instalação" /><br><br>
+<p>Parâmetros obtidos do mapfile de inicialização:</p>
+<b><div id=mapfilebase style=color:navy ></div></b><br>
 <div id="tabela" style="left:-5px;"></div>
 <script>
 /*
diff --git a/admin/js/mapfiles.js b/admin/js/mapfiles.js
index 2119cf0..a7c7bdd 100644
--- a/admin/js/mapfiles.js
+++ b/admin/js/mapfiles.js
@@ -62,6 +62,7 @@ Pega os parâmetros do mapfiles.php
 */
 function pegaParametros(retorno)
 {
+	$i("mapfilebase").innerHTML = retorno.mapfile;
 	var ins = ""
 	for (i=0;i<$parametros.simples.length;i++)
 	{
diff --git a/admin/php/admin.php b/admin/php/admin.php
index 7903341..eddf743 100644
--- a/admin/php/admin.php
+++ b/admin/php/admin.php
@@ -59,14 +59,7 @@ error_reporting(0);
 include_once ($locaplic."/classesphp/carrega_ext.php");
 include_once ($locaplic."/classesphp/funcoes_gerais.php");
 
-//
-//verifica se o cliente pode editar
-//se funcao for verificaEditores vai para case específico
-//
-if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
-{$mapfile = "geral1windows";}
-else
-{$mapfile = "geral1";}
+$mapfile = mapfilebase($base,$locaplic);
 /*
 Function: retornaJSON
 
@@ -342,4 +335,35 @@ function resolveAcentos($palavra,$tipo)
 	$palavra = urldecode($palavra);
 	return $palavra;
 }
+function mapfilebase($base,$locaplic){
+	$versao = versao();
+	$versao = $versao["principal"];
+	if(isset($base) && $base != ""){
+		if(file_exists($base))
+		{$f = $base;}
+		else
+		{$f = $locaplic."/aplicmap/".$base.".map";}
+	}
+	else
+	{
+		$f = "";
+		if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
+		{$f = $locaplic."/aplicmap/geral1windowsv".$versao.".map";}
+		else
+		{
+			if($f == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){
+				$f = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map";
+			}
+			if($f == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
+				$f = "/var/www/html/i3geo/aplicmap/geral1fedorav".$versao.".map";
+			}
+			if($f == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
+				$f = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map";
+			}
+			if($f == "")
+			{$f = $locaplic."/aplicmap/geral1v".$versao.".map";}
+		}
+	}
+	return $f;
+}
 ?>
\ No newline at end of file
diff --git a/admin/php/mapfiles.php b/admin/php/mapfiles.php
index 47a029d..a4e148f 100644
--- a/admin/php/mapfiles.php
+++ b/admin/php/mapfiles.php
@@ -72,7 +72,7 @@ switch (strtoupper($funcao))
 		$par = array();
 		foreach ($vs as $v)
 		{
-			$handle = fopen ($locaplic."/aplicmap/".$mapfile.".map", "r");
+			$handle = fopen ($mapfile, "r");
 			while (!feof ($handle)) {
 				$buffer = fgets($handle);
 				if(!(stristr($buffer, $v) === FALSE))
@@ -88,19 +88,10 @@ switch (strtoupper($funcao))
 				}    		
 			}
 		}
+		$par["mapfile"] = $mapfile;
 		retornaJSON($par);
 		exit;
 	break;
-	//depreciado
-	case "RESTAURACONFIGURA":
-		if(verificaEditores($editores) == "nao")
-		{echo "Vc nao e um editor cadastrado. Apenas os editores definidos em i3geo/ms_configura.php podem acessar o sistema de administracao.";exit;}
-		$cp->register('restauraConfigura');
-		unlink($locaplic."/aplicmap/".$mapfile.".map");
-		copy ($locaplic."/aplicmap/".$mapfile.".default",$locaplic."/aplicmap/".$mapfile.".map");
-		$cp->set_data("ok");
-		$cp->return_data();
-	break;
 	/*
 	Valor: SALVACONFIGURA
 	
@@ -129,7 +120,7 @@ Salva um novo valor de uma variável no ms_configura.php
 */
 function salvaConfigura($variavel,$valor,$mapfile,$locaplic)
 {
-	$handle = fopen ($locaplic."/aplicmap/".$mapfile.".map", "r");
+	$handle = fopen ($mapfile, "r");
 	$linhas = array();
 	$valor = str_replace("\\\"",'"',$valor);
 	while (!feof ($handle)) {
@@ -151,8 +142,8 @@ function salvaConfigura($variavel,$valor,$mapfile,$locaplic)
 		$linhas[] = $buffer;
 	}
 	fclose ($handle);
-	unlink($locaplic."/aplicmap/".$mapfile.".map");
-	$handle = fopen ($locaplic."/aplicmap/".$mapfile.".map", "w");
+	unlink($mapfile);
+	$handle = fopen ($mapfile, "w");
 	foreach ($linhas as $linha)
 	{
 		fwrite($handle, $linha);
--
libgit2 0.21.2