diff --git a/mashups/openlayers.php b/mashups/openlayers.php
index 1fd0f23..8ac6a8b 100644
--- a/mashups/openlayers.php
+++ b/mashups/openlayers.php
@@ -211,6 +211,10 @@ if($temas != ""){
 		$visiveis = explode(",",$visiveis);
 	}
 	$objOpenLayers = array();
+	if(!isset($servidor)){
+		$servidor = "../ogc.php";
+	}
+	/*
 	if(isset($servidor) && $servidor != "../ogc.php"){
 		$layers = $temas;
 		foreach($temas as $tema){
@@ -219,128 +223,127 @@ if($temas != ""){
 			$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tema.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{isBaseLayer:false})';
 		}
 	}
-	else{
-		foreach($temas as $tema){
-			if(file_exists($locaplic."/temas/".$tema.".gvp")){
-				include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php");
-				$gm = new gvsig2mapfile($locaplic."/temas/".$tema.".gvp");
-				$gvsigview = $gm->getViewsNames();
-				$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$gvsigview[0].'", "../ogc.php?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$tema.'",transparent: "true", format: "image/png"},{singleTile:false,visibility:true,isBaseLayer:false})';
+	*/
+	foreach($temas as $tema){
+		if(file_exists($locaplic."/temas/".$tema.".gvp")){
+			include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php");
+			$gm = new gvsig2mapfile($locaplic."/temas/".$tema.".gvp");
+			$gvsigview = $gm->getViewsNames();
+			$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$gvsigview[0].'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$tema.'",transparent: "true", format: "image/png"},{singleTile:false,visibility:true,isBaseLayer:false})';
+		}
+		else{
+			$nomeMap = "";
+			if(file_exists($locaplic."/temas/".$tema.".map")){
+				$nomeMap = $locaplic."/temas/".$tema.".map";
 			}
 			else{
-				$nomeMap = "";
-				if(file_exists($locaplic."/temas/".$tema.".map")){
-					$nomeMap = $locaplic."/temas/".$tema.".map";
+				if(file_exists($tema)){
+					$nomeMap = $tema;
 				}
 				else{
-					if(file_exists($tema)){
-						$nomeMap = $tema;
+					// acontece caso o mapfile tenha sido gerado na pasta
+					// temporaria por algum sistema
+					if(file_exists($dir_tmp."/".$tema.".map")){
+						$nomeMap = $dir_tmp."/".$tema.".map";
 					}
-					else{
-						// acontece caso o mapfile tenha sido gerado na pasta
-						// temporaria por algum sistema
-						if(file_exists($dir_tmp."/".$tema.".map")){
-							$nomeMap = $dir_tmp."/".$tema.".map";
+				}
+			}
+			if($nomeMap != ""){
+				$layersNomes = array();
+				$layers = array();
+				$maptemp = @ms_newMapObj($nomeMap);
+				if($maptemp){
+					$nlayers = $maptemp->numlayers;
+					for($i=0;$i<($nlayers);++$i)	{
+						$layern = $maptemp->getLayer($i);
+						if($layern->getmetadata("PLUGINI3GEO") != ""){
+							//obtem os dados necessarios para iniciar o plugin
+							$temasPluginI3Geo[] = array(
+									"name"=>$layern->name,
+									"tema"=>$layern->getmetadata("tema"),
+									"plugin"=>$layern->getmetadata("PLUGINI3GEO"),
+									"cache"=>strtoupper($layern->getmetadata("cache")),
+									"transitioneffect"=>strtoupper($layern->getmetadata("transitioneffect"))
+							);
+						}
+						else{
+							$layersNomes[] = $layern->name;
+							$layers[] = $layern;
 						}
 					}
-				}
-				if($nomeMap != ""){
-					$layersNomes = array();
-					$layers = array();
-					$maptemp = @ms_newMapObj($nomeMap);
-					if($maptemp){
-						$nlayers = $maptemp->numlayers;
-						for($i=0;$i<($nlayers);++$i)	{
-							$layern = $maptemp->getLayer($i);
-							if($layern->getmetadata("PLUGINI3GEO") != ""){
-								//obtem os dados necessarios para iniciar o plugin
-								$temasPluginI3Geo[] = array(
-										"name"=>$layern->name,
-										"tema"=>$layern->getmetadata("tema"),
-										"plugin"=>$layern->getmetadata("PLUGINI3GEO"),
-										"cache"=>strtoupper($layern->getmetadata("cache")),
-										"transitioneffect"=>strtoupper($layern->getmetadata("transitioneffect"))
-								);
-							}
-							else{
-								$layersNomes[] = $layern->name;
-								$layers[] = $layern;
-							}
+					$nomeLayer = implode(",",$layersNomes);
+					$tituloLayer = $layern->getmetadata("tema");
+					$ebase = "false";
+					if(isset($fundo) && $fundo != ""){
+						if(in_array($tema,$fundo)){
+							$ebase = "true";
 						}
-						$nomeLayer = implode(",",$layersNomes);
-						$tituloLayer = $layern->getmetadata("tema");
-						$ebase = "false";
-						if(isset($fundo) && $fundo != ""){
-							if(in_array($tema,$fundo)){
-								$ebase = "true";
-							}
+					}
+					$visivel = "false";
+					if(in_array($tema,$visiveis)){
+						$visivel = "true";
+					}
+					if($nlayers == 1 && strtoupper($layern->getmetadata("cache")) == "SIM" && $layern->getmetadata("PLUGINI3GEO") == ""){
+						if($layern->type != 2 && $layern->type != 3){
+							$opacidade = 1;
+						}
+						//
+						//verifica se deve aplicar filtro
+						//
+						$filtro = $_GET["map_layer_".$layern->name."_filter"];
+						if(!empty($filtro)){
+							$DESLIGACACHE = "sim";
+							$nocache = "map_layer_".$layern->name."_filter=".$filtro."&".$nocache;
 						}
-						$visivel = "false";
-						if(in_array($tema,$visiveis)){
-							$visivel = "true";
+						$teffect = 'transitionEffect: "resize",';
+						if(strtoupper($layern->getmetadata("transitioneffect")) == "NAO"){
+							$teffect = 'transitionEffect: null,';
 						}
-						if($nlayers == 1 && strtoupper($layern->getmetadata("cache")) == "SIM" && $layern->getmetadata("PLUGINI3GEO") == ""){
-							if($layern->type != 2 && $layern->type != 3){
+						// nesse caso o layer e adicionado como TMS
+						// tms leva os parametros do TMS
+						$objOpenLayers[] = 'new OpenLayers.Layer.TMS("'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'",{'.$teffect.' tileOrigin: new OpenLayers.LonLat(-180, -90),opacity:'.$opacidade.',serviceVersion:"&tms=",visibility:'.$visivel.',isBaseLayer:'.$ebase.',layername:"'.$nomeLayer.'",type:"png"})';
+						// cria um clone WMS para efeitos de getfeatureinfo
+						$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{cloneTMS:"'.$nomeLayer.'",layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{displayInLayerSwitcher:false,transitionEffect : null,singleTile:true,visibility:false,isBaseLayer:false})';
+					}
+					else{
+						foreach($layers as $l){
+							$singleTile = "false";
+							if(strtoupper($l->getmetadata("TILES")) == "NAO"){
+								$singleTile = "true";
+							}
+							$tituloLayer = $l->getmetadata("tema");
+							$nomeLayer = $l->name;
+							$visivel = "false";
+							if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){
+								$visivel = "true";
+							}
+							if($l->type != 2 && $l->type != 3){
 								$opacidade = 1;
 							}
 							//
 							//verifica se deve aplicar filtro
 							//
-							$filtro = $_GET["map_layer_".$layern->name."_filter"];
+							$filtro = $_GET["map_layer_".$l->name."_filter"];
 							if(!empty($filtro)){
 								$DESLIGACACHE = "sim";
-								$nocache = "map_layer_".$layern->name."_filter=".$filtro."&".$nocache;
+								$nocache = "map_layer_".$l->name."_filter=".$filtro."&".$nocache;
 							}
-							$teffect = 'transitionEffect: "resize",';
-							if(strtoupper($layern->getmetadata("transitioneffect")) == "NAO"){
-								$teffect = 'transitionEffect: null,';
+							$teffect = 'transitionEffect: "resize",';
+							if(strtoupper($l->getmetadata("transitioneffect")) == "NAO"){
+								$teffect = 'transitionEffect: null,';
 							}
-							// nesse caso o layer e adicionado como TMS
-							// tms leva os parametros do TMS
-							$objOpenLayers[] = 'new OpenLayers.Layer.TMS("'.$tituloLayer.'", "../ogc.php?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'",{'.$teffect.' tileOrigin: new OpenLayers.LonLat(-180, -90),opacity:'.$opacidade.',serviceVersion:"&tms=",visibility:'.$visivel.',isBaseLayer:'.$ebase.',layername:"'.$nomeLayer.'",type:"png"})';
-							// cria um clone WMS para efeitos de getfeatureinfo
-							$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{cloneTMS:"'.$nomeLayer.'",layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{displayInLayerSwitcher:false,transitionEffect : null,singleTile:true,visibility:false,isBaseLayer:false})';
-						}
-						else{
-							foreach($layers as $l){
-								$singleTile = "false";
-								if(strtoupper($l->getmetadata("TILES")) == "NAO"){
-									$singleTile = "true";
-								}
-								$tituloLayer = $l->getmetadata("tema");
-								$nomeLayer = $l->name;
-								$visivel = "false";
-								if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){
-									$visivel = "true";
-								}
-								if($l->type != 2 && $l->type != 3){
-									$opacidade = 1;
-								}
-								//
-								//verifica se deve aplicar filtro
-								//
-								$filtro = $_GET["map_layer_".$l->name."_filter"];
-								if(!empty($filtro)){
-									$DESLIGACACHE = "sim";
-									$nocache = "map_layer_".$l->name."_filter=".$filtro."&".$nocache;
-								}
-								$teffect = 'transitionEffect: "resize",';
-								if(strtoupper($l->getmetadata("transitioneffect")) == "NAO"){
-									$teffect = 'transitionEffect: null,';
-								}
-								if($tituloLayer != ""){
-									$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{opacity:'.$opacidade.',layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{'.$teffect.' singleTile:'.$singleTile.',visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
-								}
-								else{
-									$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{opacity:'.$opacidade.',layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{'.$teffect.' displayInLayerSwitcher:false,singleTile:'.$singleTile.',visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
-								}
+							if($tituloLayer != ""){
+								$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{opacity:'.$opacidade.',layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{'.$teffect.' singleTile:'.$singleTile.',visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
+							}
+							else{
+								$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{opacity:'.$opacidade.',layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{'.$teffect.' displayInLayerSwitcher:false,singleTile:'.$singleTile.',visibility:'.$visivel.',isBaseLayer:'.$ebase.'})';
 							}
 						}
 					}
 				}
-				else{
-					echo $tema." n&atilde;o foi encontrado.<br>";
-				}
+			}
+			else{
+				echo $tema." n&atilde;o foi encontrado.<br>";
 			}
 		}
 	}
--
libgit2 0.21.2