From ef50833aac9d633a59ca45f8d3bcf85142143478 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Thu, 16 Feb 2012 19:26:47 +0000
Subject: [PATCH] 

---
 classesphp/mapa_openlayers.php | 12 ++++++++++--
 interface/debug.htm            |  2 +-
 interface/googleearth.phtml    |  2 +-
 interface/googlemaps.phtml     |  2 +-
 interface/googlemaps1.phtml    |  2 +-
 interface/openlayers.htm       |  3 ++-
 interface/openlayersdebug.htm  |  2 +-
 7 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/classesphp/mapa_openlayers.php b/classesphp/mapa_openlayers.php
index c6634d6..1e0843c 100644
--- a/classesphp/mapa_openlayers.php
+++ b/classesphp/mapa_openlayers.php
@@ -271,7 +271,11 @@ else{
 	}
 	header('Content-Length: '.filesize($nomer));
 	header('Content-Type: image/png');
-	header('Cache-Control: max-age=3600, must-revalidate');
+	//header('Cache-Control: max-age=3600, must-revalidate');
+	header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT');
+	header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nomer)).' GMT', true, 200);
+	$etag = md5_file($nomer);
+	header('Etag: '.$etag);
 	fpassthru(fopen($nomer, 'rb'));
 	exit;
 }
@@ -330,7 +334,11 @@ function carregaCacheImagem($cachedir,$bbox,$layer,$map,$w,$h){
 */
 		header('Content-Length: '.filesize($nome));
 		header('Content-Type: image/png');
-		header('Cache-Control: max-age=3600, must-revalidate');
+		//header('Cache-Control: max-age=3600, must-revalidate');
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT');
+		header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nome)).' GMT', true, 200);
+		$etag = md5_file($nome);
+		header('Etag: '.$etag);
 		fpassthru(fopen($nome, 'rb'));
 		exit;
 	}
diff --git a/interface/debug.htm b/interface/debug.htm
index 1be6a53..40f8b50 100644
--- a/interface/debug.htm
+++ b/interface/debug.htm
@@ -68,7 +68,7 @@
 		<td><center><h1 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;"><div id=versaoi3geo ></div><h2 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">i3Geo - Software livre para criação de mapas interativos e geoprocessamento<h3 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro</h3></h2></h1></td>
 	</tr>
 	<tr>
-		<td style="padding:10px;"><center><img alt="" src='../imagens/logo_inicio.png' ></td>
+		<td style="padding:10px;"><center><img style="width:560px;height:81px" alt="" src='../imagens/logo_inicio.png' ></td>
 	</tr>
 	<tr>
 		<td><center>
diff --git a/interface/googleearth.phtml b/interface/googleearth.phtml
index 080b6ce..8848d64 100644
--- a/interface/googleearth.phtml
+++ b/interface/googleearth.phtml
@@ -97,7 +97,7 @@ include_once("../ms_configura.php");
 	<td><center><h1><div id=versaoi3geo ></div><h2>i3Geo - Software livre para criação de mapas interativos e geoprocessamento<h3>Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro</h3></h2></h1></td>
 </tr>
 <tr>
-	<td style="padding:10px;"><center><img alt="logomarca" src='../imagens/logo_inicio.png'></td>
+	<td style="padding:10px;"><center><img style="width:560px;height:81px" alt="logomarca" src='../imagens/logo_inicio.png'></td>
 </tr>
 <tr>
 	<td><center>
diff --git a/interface/googlemaps.phtml b/interface/googlemaps.phtml
index 328abdd..8b720a5 100644
--- a/interface/googlemaps.phtml
+++ b/interface/googlemaps.phtml
@@ -71,7 +71,7 @@ include_once("../ms_configura.php");
 		<td><center><h1 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;"><div id=versaoi3geo ></div><h2 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">i3Geo - Software livre para criação de mapas interativos e geoprocessamento<h3 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro</h3></h2></h1></td>
 	</tr>
 	<tr>
-		<td style="padding:10px;"><center><img alt="logomarca" src='../imagens/logo_inicio.png'></td>
+		<td style="padding:10px;"><center><img style="width:560px;height:81px" alt="logomarca" src='../imagens/logo_inicio.png'></td>
 	</tr>
 	<tr>
 		<td><center>
diff --git a/interface/googlemaps1.phtml b/interface/googlemaps1.phtml
index c71cd79..ccc232d 100644
--- a/interface/googlemaps1.phtml
+++ b/interface/googlemaps1.phtml
@@ -96,7 +96,7 @@ include_once("../ms_configura.php");
 	<td><center><h1><div id=versaoi3geo ></div><h2 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;" >i3Geo - Software livre para criação de mapas interativos e geoprocessamento<h3 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;" >Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro</h3></h2></h1></td>
 </tr>
 <tr>
-	<td style="padding:10px;"><center><img alt="logomarca" src='../imagens/logo_inicio.png'></td>
+	<td style="padding:10px;"><center><img style="width:560px;height:81px" alt="logomarca" src='../imagens/logo_inicio.png'></td>
 </tr>
 <tr>
 	<td><center>
diff --git a/interface/openlayers.htm b/interface/openlayers.htm
index 3ae6354..e55556d 100644
--- a/interface/openlayers.htm
+++ b/interface/openlayers.htm
@@ -3,6 +3,7 @@
 <head>
 <meta http-equiv="Category" content="i3Geo Mapa interativo MMA geoprocessamento sig mobile">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+
 <title>i3GEO - OpenLayers</title>
 
 </head>
@@ -68,7 +69,7 @@
 		<td><center><h1 style="font-weight:normal;font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;"><div id=versaoi3geo ></div><h2 style="font-weight:normal;font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">i3Geo - Software livre para criação de mapas interativos e geoprocessamento<h3 style="font-weight:normal;font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro</h3></h2></h1></td>
 	</tr>
 	<tr>
-		<td style="padding:10px;"><center><img alt="" src='../imagens/logo_inicio.png' ></td>
+		<td style="padding:10px;"><center><img alt="" style="width:560px;height:81px" src='../imagens/logo_inicio.png' ></td>
 	</tr>
 	<tr>
 		<td><center>
diff --git a/interface/openlayersdebug.htm b/interface/openlayersdebug.htm
index c2cd4a7..7ec40cc 100644
--- a/interface/openlayersdebug.htm
+++ b/interface/openlayersdebug.htm
@@ -68,7 +68,7 @@
 		<td><center><h1 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;"><div id=versaoi3geo ></div><h2 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">i3Geo - Software livre para criação de mapas interativos e geoprocessamento<h3 style="font-size:10px;font-family: Verdana, Arial, Helvetica, sans-serif;">Baseado no Mapserver, é licenciado sob GPL e integra o Portal do Software Público Brasileiro</h3></h2></h1></td>
 	</tr>
 	<tr>
-		<td style="padding:10px;"><center><img alt="" src='../imagens/logo_inicio.png' ></td>
+		<td style="padding:10px;"><center><img style="width:560px;height:81px" alt="" src='../imagens/logo_inicio.png' ></td>
 	</tr>
 	<tr>
 		<td><center>
--
libgit2 0.21.2