diff --git a/admin/admin.db b/admin/admin.db
index 0b3c62e..5095925 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/php/login.php b/admin/php/login.php
index 0bbfd4d..28eab7b 100755
--- a/admin/php/login.php
+++ b/admin/php/login.php
@@ -259,7 +259,6 @@ function verificaPapelSessao($id_papel){
 //verifica se uma determinada operacao esta registrada na variavel SESSION
 //
 function verificaOperacaoSessao($operacao){
-
 	$resultado = false;
 	//a validacao consulta $_SESSION, que e definida no login
 	if(validaSessao()){
diff --git a/admin/php/preview.php b/admin/php/preview.php
index 6e6d989..d812620 100755
--- a/admin/php/preview.php
+++ b/admin/php/preview.php
@@ -8,6 +8,7 @@ include(dirname(__FILE__)."/login.php");
 if(verificaOperacaoSessao("admin/php/editortexto") == false){
 	//echo "Vc nao pode realizar essa operacao.";exit;
 }
+
 //
 //pega os endereços para compor a url de chamada do gerador de web services
 //ogc.php
@@ -45,14 +46,16 @@ foreach ($_GET as $k=>$v){
 		$tema = $v;
 	}
 }
+if(empty($tema)){
+	$tema = $_GET["tema"];
+}
 $req->setParameter("srsName",$req->getValueByName("SRS"));
 $listaepsg = $req->getValueByName("SRS")." EPSG:4618 EPSG:4291 EPSG:4326 EPSG:22521 EPSG:22522 EPSG:22523 EPSG:22524 EPSG:22525 EPSG:29101 EPSG:29119 EPSG:29120 EPSG:29121 EPSG:29122 EPSG:29177 EPSG:29178 EPSG:29179 EPSG:29180 EPSG:29181 EPSG:29182 EPSG:29183 EPSG:29184 EPSG:29185";
-if(isset($version) && !isset($VERSION)){
-	$VERSION = $version;
-}
-if(!isset($VERSION)){
-	$req->setParameter("VeRsIoN","1.0.0");
+if(isset($_GET["version"]) && !isset($VERSION)){
+	$_GET["VERSION"] = $_GET["version"];
 }
+$req->setParameter("VeRsIoN",$_GET["VERSION"]);
+
 //
 //compatibiliza chamadas fora do padrao
 //
@@ -77,10 +80,12 @@ $oMap->setmetadata("ows_onlineresource",$or);
 $oMap->setmetadata("wms_onlineresource",$or);
 $oMap->setmetadata("wms_attribution_onlineresource",$proto.$server.dirname($_SERVER['PHP_SELF']));
 $oMap->setmetadata("ows_enable_request","*");
+
 //parametro mandatario
 if($oMap->getmetadata("wms_srs") == ""){
 	$oMap->setmetadata("wms_srs","EPSG:4326");
 }
+
 $e = $oMap->extent;
 $extensaoMap = ($e->minx)." ".($e->miny)." ".($e->maxx)." ".($e->maxy);
 //gera o mapa
@@ -103,6 +108,7 @@ $extensao = $l->getmetadata("EXTENSAO");
 if($extensao == ""){
 	$extensao = $extensaoMap;
 }
+
 $l->setmetadata("wms_extent",$extensao);
 if (!empty($postgis_mapa)){
 	if ($l->connectiontype == MS_POSTGIS){
@@ -161,7 +167,7 @@ ms_ioinstallstdouttobuffer();
 $req->setParameter("format","image/png");
 $oMap->owsdispatch($req);
 $contenttype = ms_iostripstdoutbuffercontenttype();
-
+$oMap->save("/tmp/ms_tmp/teste.map");
 if(!isset($OUTPUTFORMAT)){
 	header("Content-type: $contenttype");
 }
diff --git a/admin1/catalogo/mapfile/editor/index.js b/admin1/catalogo/mapfile/editor/index.js
index 4054521..69adce3 100755
--- a/admin1/catalogo/mapfile/editor/index.js
+++ b/admin1/catalogo/mapfile/editor/index.js
@@ -24,7 +24,6 @@ Free Software Foundation, Inc., no endereço
  */
 i3GEOadmin.mapfile = {};
 i3GEOadmin.editor = {
-
 		init: function(onde,codigo,id_tema){
 
 		},
@@ -32,13 +31,18 @@ i3GEOadmin.editor = {
 			i3GEOadmin.core.iconeAguarde($("#titulo"));
 			$("form").submit();
 		},
-		testa: function(codigo){
+		testar: function(codigo){
 			i3GEOadmin.core.modalAguarde(true);
 			i3GEOadmin.teste.testaImg("../../../..",codigo,"","",$("#modalGeral .modal-body"))
 		},
 		testaTabela: function(codigo){
 			i3GEOadmin.core.modalAguarde(true);
 			i3GEOadmin.teste.testaTabela("../../../..",codigo,$("#modalGeral .modal-body"))
+		},
+		preview: function(codigo){
+			i3GEOadmin.core.modalAguarde(true);
+			var w = $("#modalGeral .modal-body").width() - 20;
+			var p = "<iframe style='width:" + w + "px;height:650px;border:0px solid white;' src='../../../../mashups/openlayers3.php?servidor=" + i3GEOadmin.editor.servidorPreview + "&fundo=e_wsm&nocache=sim&DESLIGACACHE=sim&controles=navigation,panzoombar,scaleline,mouseposition&botoes=identifica&largura=" + (w - 40) + "&altura=600&temas=" + codigo + "'>";
+			$("#modalGeral .modal-body").html(p);
 		}
-
 };
\ No newline at end of file
diff --git a/admin1/catalogo/mapfile/editor/index.php b/admin1/catalogo/mapfile/editor/index.php
index 79bb957..7a96d2e 100755
--- a/admin1/catalogo/mapfile/editor/index.php
+++ b/admin1/catalogo/mapfile/editor/index.php
@@ -1,6 +1,5 @@
 <?php
 //TODO botoes de copiar, colar, limpar
-//TODO preview com openlayers
 //TODO editor de cores
 //
 define ( ONDEI3GEO, "../../../.." );
@@ -49,8 +48,8 @@ $textoMapfile = textoMapfile ( $codigo );
 					<a href="http://mapserver.org/mapfile/index.html#mapfile" target="_new">Mapserver</a>
 				</blockquote>
 				<a onclick="i3GEOadmin.editor.salvar()" class="btn btn-primary" style="color: #008579;" href="#" role="button"> {{{salva}}} </a>
-				<a onclick="i3GEOadmin.editor.preview()" class="btn btn-primary" style="color: #008579;" href="#" role="button"> Preview </a>
-				<a onclick="i3GEOadmin.editor.testa('<?php echo $codigo;?>')" href="javascript:void(0)" class="btn btn-primary" style="color: #008579;" role="button"> {{{testaLayer}}} </a>
+				<a onclick="i3GEOadmin.editor.preview('<?php echo $codigo;?>')" class="btn btn-primary" style="color: #008579;" href="#" role="button"> Preview </a>
+				<a onclick="i3GEOadmin.editor.testar('<?php echo $codigo;?>')" href="javascript:void(0)" class="btn btn-primary" style="color: #008579;" role="button"> {{{testaLayer}}} </a>
 				<a onclick="window.open('../../../../ms_criamapa.php?temasa=<?php echo $codigo;?>&layers=<?php echo $codigo;?>')" class="btn btn-primary" style="color: #008579;" href="javascript:void(0)" role="button"> {{{testarI3geo}}} </a>
 				<a onclick="i3GEOadmin.editor.testaTabela('<?php echo $codigo;?>')" class="btn btn-primary" style="color: #008579;" href="javascript:void(0)" role="button"> {{{tabela}}} </a>
 			</div>
@@ -106,6 +105,14 @@ $(document).ready(function(){
 		$.material.init();
 		$("#editor").height(parseInt($("#editortemp").height()) + 50 + "px");
 		$("#editortemp").html("").hide();
+		//
+		//servidor utilizado no preview
+		//
+		var protocolo = window.location.href;
+		protocolo = protocolo.split(":")[0];
+
+		i3GEOadmin.editor.servidorPreview = protocolo + "://" + window.location.host + "/<?php echo basename($locaplic); ?>/admin1/catalogo/mapfile/preview/index.php";
+
 	});
 </script>
 </body>
diff --git a/admin1/catalogo/mapfile/preview/index.php b/admin1/catalogo/mapfile/preview/index.php
new file mode 100755
index 0000000..58dd096
--- /dev/null
+++ b/admin1/catalogo/mapfile/preview/index.php
@@ -0,0 +1,198 @@
+<?php
+error_reporting ( 0 );
+include_once (dirname ( __FILE__ ) . "/../../../../admin/php/login.php");
+if(verificaOperacaoSessao("admin/php/editortexto") == false){
+	echo "Vc nao pode realizar essa operacao.";exit;
+}
+
+
+//
+//pega os endere&ccedil;os para compor a url de chamada do gerador de web services
+//ogc.php
+//
+$protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
+$protocolo = $protocolo[0];
+$protocolo1 = strtolower($protocolo) . '://'.$_SERVER['SERVER_NAME'];
+$protocolo = strtolower($protocolo) . '://'.$_SERVER['SERVER_NAME'] .":". $_SERVER['SERVER_PORT'];
+$urli3geo = str_replace("/ogc.php","",$protocolo.$_SERVER["PHP_SELF"]);
+//
+//cria o web service
+//
+error_reporting(0);
+$versao = versao();
+$versao = $versao["principal"];
+
+
+if($_GET["SRS"] == "EPSG:900913"){
+	$_GET["SRS"] = "EPSG:3857";
+}
+if(isset($_GET["BBOX"])){
+	$_GET["BBOX"] = str_replace(" ",",",$_GET["BBOX"]);
+}
+$req = ms_newowsrequestobj();
+
+if(!isset($_GET["srs"]) && !isset($_GET["SRS"])){
+	$_GET["srs"] = "EPSG:4326";
+}
+foreach ($_GET as $k=>$v){
+	$req->setParameter(strtoupper($k), $v);
+	if(strtolower($k) == "layers" && empty($_GET["tema"])){
+		$tema = $v;
+	}
+	if(strtolower($k) == "layer" && empty($_GET["tema"])){
+		$tema = $v;
+	}
+}
+$tema = $locaplic . "/temas/" . $_GET["tema"] . ".map";
+if(!file_exists($tema)){
+	echo "Erro";
+	exit;
+}
+$req->setParameter("srsName",$req->getValueByName("SRS"));
+$listaepsg = $req->getValueByName("SRS")." EPSG:4618 EPSG:4291 EPSG:4326 EPSG:22521 EPSG:22522 EPSG:22523 EPSG:22524 EPSG:22525 EPSG:29101 EPSG:29119 EPSG:29120 EPSG:29121 EPSG:29122 EPSG:29177 EPSG:29178 EPSG:29179 EPSG:29180 EPSG:29181 EPSG:29182 EPSG:29183 EPSG:29184 EPSG:29185";
+if(isset($_GET["version"]) && !isset($VERSION)){
+	$_GET["VERSION"] = $_GET["version"];
+}
+$req->setParameter("VeRsIoN",$_GET["VERSION"]);
+
+//
+//compatibiliza chamadas fora do padrao
+//
+if(isset($_GET["outputFormat"]) && $_GET["outputFormat"] != ""){
+	$_GET["OUTPUTFORMAT"] = $_GET["outputFormat"];
+}
+//essa variavel e usada para definir se a imagem final gerada devera ser cortada ou nao
+$cortePixels = 0;
+
+if(empty($ogcwsmap)){
+	$oMap = ms_newMapobj($locaplic."/aplicmap/ogcwsv".$versao.".map");
+}
+else{
+	$oMap = ms_newMapobj($ogcwsmap);
+}
+
+$proto = "http" . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") ? "s" : "") . "://";
+$server = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];
+$or = $proto.$server.$_SERVER['PHP_SELF'];
+$or = $or."?tema=".$tema."&";
+$oMap->setmetadata("ows_onlineresource",$or);
+$oMap->setmetadata("wms_onlineresource",$or);
+$oMap->setmetadata("wms_attribution_onlineresource",$proto.$server.dirname($_SERVER['PHP_SELF']));
+$oMap->setmetadata("ows_enable_request","*");
+
+//parametro mandatario
+if($oMap->getmetadata("wms_srs") == ""){
+	$oMap->setmetadata("wms_srs","EPSG:4326");
+}
+
+$e = $oMap->extent;
+$extensaoMap = ($e->minx)." ".($e->miny)." ".($e->maxx)." ".($e->maxy);
+//gera o mapa
+
+$nmap = ms_newMapobj($tema);
+
+$nmap->setmetadata("ows_enable_request","*");
+$l = $nmap->getlayer(0);
+
+
+//$l->setmetadata("ows_title",pegaNome($l));
+$l->setmetadata("ows_srs",$listaepsg);
+$l->set("group","");
+$l->setmetadata("gml_include_items","all");
+$l->set("template","none.htm");
+$l->set("dump",MS_TRUE);
+$l->setmetadata("WMS_INCLUDE_ITEMS","all");
+$l->setmetadata("WFS_INCLUDE_ITEMS","all");
+//inclui extensao geografica
+$extensao = $l->getmetadata("EXTENSAO");
+if($extensao == ""){
+	$extensao = $extensaoMap;
+}
+
+$l->setmetadata("wms_extent",$extensao);
+if (!empty($postgis_mapa)){
+	if ($l->connectiontype == MS_POSTGIS){
+		$lcon = $l->connection;
+		if (($lcon == " ") || ($lcon == "") || (in_array($lcon,array_keys($postgis_mapa)))){
+			//
+			//o metadata CONEXAOORIGINAL guarda o valor original para posterior substitui&ccedil;&atilde;o
+			//
+			if(($lcon == " ") || ($lcon == "")){
+				$l->set("connection",$postgis_mapa);
+				$l->setmetadata("CONEXAOORIGINAL",$lcon);
+			}
+			else{
+				$l->set("connection",$postgis_mapa[$lcon]);
+				$l->setmetadata("CONEXAOORIGINAL",$lcon);
+			}
+		}
+	}
+}
+
+autoClasses($l,$oMap);
+if($versao > 5){
+	$pr = $l->getProcessing();
+	if(!in_array("LABEL_NO_CLIP=True",$pr)){
+		$l->setprocessing("LABEL_NO_CLIP=True");
+	}
+	if(!in_array("POLYLINE_NO_CLIP=True",$pr)){
+		$l->setprocessing("POLYLINE_NO_CLIP=True");
+	}
+}
+$l->set("status",MS_DEFAULT);
+
+ms_newLayerObj($oMap, $l);
+
+$oMap->setSymbolSet($locaplic."/symbols/".basename($oMap->symbolsetfilename));
+$oMap->setFontSet($locaplic."/symbols/".basename($oMap->fontsetfilename));
+
+if(ob_get_contents ()){
+	ob_end_clean();
+}
+cloneInlineSymbol($l,$nmap,$oMap);
+
+$l = $oMap->getlayer(0);
+$req->setParameter("LAYERS",$l->name);
+
+if(strtolower($req->getValueByName("REQUEST")) == "getfeatureinfo"){
+	$req->setParameter("LAYERS",$l->name);
+	$req->setParameter("QUERY_LAYERS",$l->name);
+	if(strtolower($req->getValueByName("SRS")) == "epsg:900913"){
+		$req->setParameter("SRS","EPSG:3857");
+		$_GET["SRS"] = "EPSG:3857";
+	}
+}
+
+ms_ioinstallstdouttobuffer();
+$req->setParameter("format","image/png");
+$oMap->owsdispatch($req);
+$contenttype = ms_iostripstdoutbuffercontenttype();
+$oMap->save("/tmp/ms_tmp/teste.map");
+if(!isset($OUTPUTFORMAT)){
+	header("Content-type: $contenttype");
+}
+
+$buffer = ms_iogetStdoutBufferBytes();
+ms_ioresethandlers();
+
+function texto2iso($texto){
+	if (function_exists("mb_convert_encoding")){
+		if (mb_detect_encoding($texto,"UTF-8",true)){
+			$texto = mb_convert_encoding($texto,"ISO-8859-1","UTF-8");
+		}
+	}
+	return $texto;
+}
+function nomeRand($n=10)
+{
+	$nomes = "";
+	$a = 'azertyuiopqsdfghjklmwxcvbnABCDEFGHIJKLMNOPQRSTUVWXYZ';
+	$max = 51;
+	for($i=0; $i < $n; ++$i)
+	{
+		$nomes .= $a{mt_rand(0, $max)};
+	}
+	return $nomes;
+}
+
+?>
--
libgit2 0.21.2