From 3607c02898a811f4873b142eaf89e8fc234d7830 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 24 Nov 2014 13:28:13 +0000
Subject: [PATCH] Inclusão de variavel para definicao de proxy no ms_configura.php e uso no plugin de acesso a dados kml

---
 admin/admin.db              | Bin 276480 -> 0 bytes
 classesjs/classe_eventos.js |  2 +-
 classesphp/proxy.php        |  8 +++++++-
 ms_configura.php            | 18 ++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index e705b15..572750c 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/classesjs/classe_eventos.js b/classesjs/classe_eventos.js
index 23c4004..fa7ff67 100644
--- a/classesjs/classe_eventos.js
+++ b/classesjs/classe_eventos.js
@@ -379,7 +379,7 @@ i3GEO.eventos = {
 		var teladd,teladms,
 			container = "",
 			targ = "",
-			pos,mousex,mousey,xfig,yfig,xreffig,yreffig,xtela,ytela,c,ex,r;
+			pos,mousex,mousey,xfig,yfig,xreffig,yreffig,xtela,ytela,c,ex;
 		if (!e){
 			e = window.event;
 		}
diff --git a/classesphp/proxy.php b/classesphp/proxy.php
index 32a5e9e..8461934 100644
--- a/classesphp/proxy.php
+++ b/classesphp/proxy.php
@@ -1,4 +1,7 @@
-<?php 
+<?php
+if(!isset($i3geo_proxy_server)){
+	include(dirname(__FILE__)."/../ms_configura.php");
+}
 $ch = curl_init();
 if(!$ch){
 	echo "erro curl_init";
@@ -7,6 +10,9 @@ if(!$ch){
 curl_setopt($ch, CURLOPT_URL, $_GET["url"]);
 curl_setopt($ch, CURLOPT_HEADER, 0);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+if(isset($i3geo_proxy_server) && $i3geo_proxy_server != ""){
+	curl_setopt($ch, CURLOPT_PROXY, $i3geo_proxy_server);
+}
 $resultado = curl_exec($ch);
 echo $resultado;
 ?>
\ No newline at end of file
diff --git a/ms_configura.php b/ms_configura.php
index 1d9a72a..9eae0b5 100644
--- a/ms_configura.php
+++ b/ms_configura.php
@@ -562,7 +562,25 @@ Tipo:
 {string}
 */
 $ogcwsmap = "";
+/*
+ Variable: $i3geo_proxy_server
+
+String com a definicao do servidor de proxy.
+
+O programa classesphp/proxy.php utiliza essa variavel para definir o proxy utilizado pela libcurl
+
+Como no caso: localhost/i3geo/classesphp/proxy.php?url=http://dev.openlayers.org/examples/kml/sundials.kml
+
+Exemplo:
+
+$i3geo_proxy_server = 'proxy:80';
+
+Tipo:
+{string}
+*/
+$i3geo_proxy_server = "";
 
+//valores de variaveis especificas para o sistema operacional em uso
 if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
 {
 	$navegadoresLocais = array(
--
libgit2 0.21.2