[Mapbender-commits] r1968 - in branches/2.5: conf http/classes http/classes/phpmailer-1.72 http/classes/phpmailer-1.72/docs http/classes/phpmailer-1.72/test http/extensions http/frames http/include http/javascripts http/php http/print owsproxy/http

svn_mapbender at osgeo.org svn_mapbender at osgeo.org
Tue Jan 15 09:12:05 EST 2008


Author: christoph
Date: 2008-01-15 09:12:05 -0500 (Tue, 15 Jan 2008)
New Revision: 1968

Modified:
   branches/2.5/conf/mapbender.conf-dist
   branches/2.5/http/classes/class_administration.php
   branches/2.5/http/classes/class_gml2.php
   branches/2.5/http/classes/class_kml_parser_2.2.php
   branches/2.5/http/classes/class_wmc.php
   branches/2.5/http/classes/phpmailer-1.72/docs/extending.html
   branches/2.5/http/classes/phpmailer-1.72/mail.php
   branches/2.5/http/classes/phpmailer-1.72/test/phpmailer_test.php
   branches/2.5/http/extensions/ext_featureInfoTunnel.php
   branches/2.5/http/frames/cleanurl.php
   branches/2.5/http/include/dyn_css.php
   branches/2.5/http/javascripts/core.php
   branches/2.5/http/javascripts/map.php
   branches/2.5/http/javascripts/mod_digitize_tab.php
   branches/2.5/http/javascripts/mod_highlightPOI.php
   branches/2.5/http/javascripts/mod_initWmc.php
   branches/2.5/http/javascripts/mod_insertKmlIntoDb.php
   branches/2.5/http/javascripts/mod_loadwmc.php
   branches/2.5/http/javascripts/mod_measure4326.php
   branches/2.5/http/javascripts/mod_poi.php
   branches/2.5/http/javascripts/mod_resize_mapsize.php
   branches/2.5/http/javascripts/mod_saveLayerPreview.php
   branches/2.5/http/javascripts/mod_savewmc.php
   branches/2.5/http/javascripts/mod_setPOI2Scale.php
   branches/2.5/http/javascripts/mod_tab.php
   branches/2.5/http/javascripts/mod_wfs_SpatialRequest.php
   branches/2.5/http/javascripts/mod_wfs_gazetteer_client.php
   branches/2.5/http/javascripts/transform_coordinatesWGS84.php
   branches/2.5/http/javascripts/wfs.js
   branches/2.5/http/php/mb_listKMLs.php
   branches/2.5/http/php/mb_listWMCs.php
   branches/2.5/http/php/mod_changeEPSG.php
   branches/2.5/http/php/mod_displayKML.php
   branches/2.5/http/php/mod_featuretypeMetadata.php
   branches/2.5/http/php/mod_filteredWms_layer_topic.php
   branches/2.5/http/php/mod_filteredWms_topic.php
   branches/2.5/http/php/mod_gazetteerMetadata.php
   branches/2.5/http/php/mod_layerMetadata.php
   branches/2.5/http/php/mod_loadwms.php
   branches/2.5/http/php/mod_meetingPoint.php
   branches/2.5/http/php/mod_monitorCapabilities_main.php
   branches/2.5/http/php/mod_setLocale.php
   branches/2.5/http/php/mod_switchLocale.php
   branches/2.5/http/php/mod_switchLocale_noreload.php
   branches/2.5/http/php/mod_updateKmlInDb.php
   branches/2.5/http/php/mod_wfs_result.php
   branches/2.5/http/php/mod_wfs_server.php
   branches/2.5/http/php/mod_wfsrequest.php
   branches/2.5/http/print/mod_printPDF_pdf.php
   branches/2.5/owsproxy/http/index.php
Log:
bug fix 

http://trac.osgeo.org/mapbender/ticket/158

Modified: branches/2.5/conf/mapbender.conf-dist
===================================================================
--- branches/2.5/conf/mapbender.conf-dist	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/conf/mapbender.conf-dist	2008-01-15 14:12:05 UTC (rev 1968)
@@ -23,7 +23,7 @@
 	define("OWNER", "<owner>");
 	define("PW", "<password>");
 	
-	include_once("../../http/php/database-mysql.php"); 
+	include_once(dirname(__FILE__) . "/../http/php/database-mysql.php"); 
 	
 	# --------------------------------------------
 	# database with geos functions
@@ -43,7 +43,7 @@
 	define("OWNER", "<owner>");
 	define("PW", "<password>");
 	
-	include_once("../../http/php/database-pgsql.php"); 
+	include_once(dirname(__FILE__) . "/../http/php/database-pgsql.php"); 
 }
 
 # --------------------------------------------

Modified: branches/2.5/http/classes/class_administration.php
===================================================================
--- branches/2.5/http/classes/class_administration.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/classes/class_administration.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -21,7 +21,7 @@
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 
-require("phpmailer-1.72/class.phpmailer.php");
+require(dirname(__FILE__) . "/phpmailer-1.72/class.phpmailer.php");
 
 /**
  * class to wrap administration methods

Modified: branches/2.5/http/classes/class_gml2.php
===================================================================
--- branches/2.5/http/classes/class_gml2.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/classes/class_gml2.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -16,9 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once("class_mb_exception.php");
-require_once("class_connector.php");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/class_mb_exception.php");
+require_once(dirname(__FILE__) . "/class_connector.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 class gml2{
 	var $geomtype_point = 'Point';					
 	var $geomtype_polygon = 'Polygon';

Modified: branches/2.5/http/classes/class_kml_parser_2.2.php
===================================================================
--- branches/2.5/http/classes/class_kml_parser_2.2.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/classes/class_kml_parser_2.2.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,13 +17,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-require_once("../classes/class_mb_exception.php");
-require_once("../classes/class_kml_polygon.php");
-require_once("../classes/class_kml_linearring.php");
-require_once("../classes/class_kml_line.php");
-require_once("../classes/class_kml_point.php");
-require_once("../classes/class_kml_multigeometry.php");
-require_once("../classes/class_kml_placemark.php");
+require_once(dirname(__FILE__) . "/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_polygon.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_linearring.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_line.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_point.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_multigeometry.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_placemark.php");
 
 /**
  * not used in OGC KML Mapbender project, may be buggy

Modified: branches/2.5/http/classes/class_wmc.php
===================================================================
--- branches/2.5/http/classes/class_wmc.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/classes/class_wmc.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -16,12 +16,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_wms.php");
-require_once("../classes/class_mb_exception.php");
-require_once("../classes/class_layer_monitor.php");
-require_once("../classes/class_bbox.php");
-require_once("../extensions/JSON.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../classes/class_wms.php");
+require_once(dirname(__FILE__) . "/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__) . "/../classes/class_layer_monitor.php");
+require_once(dirname(__FILE__) . "/../classes/class_bbox.php");
+require_once(dirname(__FILE__) . "/../extensions/JSON.php");
 
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/classes/phpmailer-1.72/docs/extending.html
===================================================================
--- branches/2.5/http/classes/phpmailer-1.72/docs/extending.html	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/classes/phpmailer-1.72/docs/extending.html	2008-01-15 14:12:05 UTC (rev 1968)
@@ -16,7 +16,7 @@
 <tr>
 <td bgcolor="#CCCCCC">
 <pre>
-require("class.phpmailer.php");
+require(dirname(__FILE__) . "/class.phpmailer.php");
 
 $mail = new phpmailer();
 
@@ -27,8 +27,8 @@
 
 @MYSQL_CONNECT("localhost","root","password");
 @mysql_select_db("my_company");
-$query  = "SELECT full_name, email, photo FROM employee WHERE id=$id";
-$result = @MYSQL_QUERY($query);
+$query� =�"SELECT full_name, email,�photo�FROM employee�WHERE�id=$id";
+$result�=�@MYSQL_QUERY($query);
 
 while ($row = mysql_fetch_array ($result))
 {
@@ -83,7 +83,7 @@
 <tr>
 <td bgcolor="#CCCCCC">
 <pre>
-require("class.phpmailer.php");
+require(dirname(__FILE__) . "/class.phpmailer.php");
 
 class my_phpmailer extends phpmailer {
     // Set default variables for all new objects
@@ -120,7 +120,7 @@
 <tr>
 <td bgcolor="#CCCCCC">
 <pre>
-require("mail.inc.php");
+require(dirname(__FILE__) . "/mail.inc.php");
 
 // Instantiate your new class
 $mail = new my_phpmailer;

Modified: branches/2.5/http/classes/phpmailer-1.72/mail.php
===================================================================
--- branches/2.5/http/classes/phpmailer-1.72/mail.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/classes/phpmailer-1.72/mail.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -28,7 +28,7 @@
 programs are COM components only available on Windows.  They are also a
 little pricey for smaller projects.
 
-Since I do Linux development I’ve missed these tools for my PHP coding.
+Since I do Linux development I�ve missed these tools for my PHP coding.
 So I built a version myself that implements the same methods (object
 calls) that the Windows-based components do. It is open source and the
 LGPL license allows you to place the class in your proprietary PHP
@@ -58,7 +58,7 @@
 A Simple Example:
 
 <?php
-require("class.phpmailer.php");
+require(dirname(__FILE__) . "/class.phpmailer.php");
 
 $mail = new PHPMailer();
 

Modified: branches/2.5/http/classes/phpmailer-1.72/test/phpmailer_test.php
===================================================================
--- branches/2.5/http/classes/phpmailer-1.72/test/phpmailer_test.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/classes/phpmailer-1.72/test/phpmailer_test.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -6,7 +6,7 @@
 
 $INCLUDE_DIR = "";
 
-require("phpunit.php");
+require(dirname(__FILE__) . "/phpunit.php");
 require($INCLUDE_DIR . "class.phpmailer.php");
 error_reporting(E_ALL);
 

Modified: branches/2.5/http/extensions/ext_featureInfoTunnel.php
===================================================================
--- branches/2.5/http/extensions/ext_featureInfoTunnel.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/extensions/ext_featureInfoTunnel.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,8 +17,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once("../classes/class_stripRequest.php");
-require_once("../classes/class_connector.php");
+require_once(dirname(__FILE__) . "/../classes/class_stripRequest.php");
+require_once(dirname(__FILE__) . "/../classes/class_connector.php");
 $mr = new stripRequest(urldecode($_REQUEST["url"]));
 $nmr = $mr->encodeGET();
 $isOwsproxyRequest = (mb_strpos($nmr,OWSPROXY) === 0);

Modified: branches/2.5/http/frames/cleanurl.php
===================================================================
--- branches/2.5/http/frames/cleanurl.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/frames/cleanurl.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,8 +17,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ob_start(); 
-include_once("../../conf/mapbender.conf");
-include("../classes/class_administration.php");
+include_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+include(dirname(__FILE__) . "/../classes/class_administration.php");
 
 
 $adm = new administration();

Modified: branches/2.5/http/include/dyn_css.php
===================================================================
--- branches/2.5/http/include/dyn_css.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/include/dyn_css.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 

Modified: branches/2.5/http/javascripts/core.php
===================================================================
--- branches/2.5/http/javascripts/core.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/core.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -24,7 +24,7 @@
 	ob_start();
 #}
 header('Content-type: application/x-javascript');
-require_once("../javascripts/event.js");
-require_once("../javascripts/core.js");
+require_once(dirname(__FILE__) . "/../javascripts/event.js");
+require_once(dirname(__FILE__) . "/../javascripts/core.js");
 
 ?>
\ No newline at end of file

Modified: branches/2.5/http/javascripts/map.php
===================================================================
--- branches/2.5/http/javascripts/map.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/map.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -76,12 +76,12 @@
 //
 // Load JavaScript libraries
 //
-require_once("../javascripts/map.js");
-require_once("../javascripts/point.js");
-require_once("../javascripts/map_obj.js");
-require_once("../javascripts/wfs_obj.js");
-require_once("../extensions/jquery.js");
-require_once("../extensions/jqjson.js");
+require_once(dirname(__FILE__) . "/../javascripts/map.js");
+require_once(dirname(__FILE__) . "/../javascripts/point.js");
+require_once(dirname(__FILE__) . "/../javascripts/map_obj.js");
+require_once(dirname(__FILE__) . "/../javascripts/wfs_obj.js");
+require_once(dirname(__FILE__) . "/../extensions/jquery.js");
+require_once(dirname(__FILE__) . "/../extensions/jqjson.js");
 
 //
 // Load WMS
@@ -107,7 +107,7 @@
 $cnt = 0;
 while($row = db_fetch_array($res)){
 	if($row["e_mb_mod"] != ""){
-		require_once("../javascripts/" . trim($row["e_mb_mod"]));
+		require_once(dirname(__FILE__) . "/../javascripts/" . trim($row["e_mb_mod"]));
 	}
 	$cnt++;
 }

Modified: branches/2.5/http/javascripts/mod_digitize_tab.php
===================================================================
--- branches/2.5/http/javascripts/mod_digitize_tab.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_digitize_tab.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -19,8 +19,8 @@
 
 session_start();
 import_request_variables("PG");
-require_once("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 $gui_id = $_SESSION["mb_user_gui"];
@@ -58,7 +58,7 @@
 echo "<script language='JavaScript'>";
 echo "var mod_digitize_target = '".$e_target[0]."';";
 echo "var mod_digitize_frame = '".$e_target[1]."';";
-include("../../conf/" . $digitize_conf_filename);
+include(dirname(__FILE__) . "/../../conf/" . $digitize_conf_filename);
 ?>
 
 var wfsWindow;	

Modified: branches/2.5/http/javascripts/mod_highlightPOI.php
===================================================================
--- branches/2.5/http/javascripts/mod_highlightPOI.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_highlightPOI.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 $gui_id = $_REQUEST["gui_id"];
-include("../../conf/mapbender.conf");
+include(dirname(__FILE__) . "/../../conf/mapbender.conf");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/javascripts/mod_initWmc.php
===================================================================
--- branches/2.5/http/javascripts/mod_initWmc.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_initWmc.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -4,9 +4,9 @@
 $user = $_SESSION['mb_user_id'];
 $meetingPointId = $_SESSION['mb_myKml'];
 
-require_once("../classes/class_wmc.php");
-require_once("../classes/class_kml.php");
-require_once("../classes/class_administration.php");
+require_once(dirname(__FILE__) . "/../classes/class_wmc.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml.php");
+require_once(dirname(__FILE__) . "/../classes/class_administration.php");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/javascripts/mod_insertKmlIntoDb.php
===================================================================
--- branches/2.5/http/javascripts/mod_insertKmlIntoDb.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_insertKmlIntoDb.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,8 +17,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-include("../../conf/mapbender.conf");
-include("../classes/class_kml.php");
+include(dirname(__FILE__) . "/../../conf/mapbender.conf");
+include(dirname(__FILE__) . "/../classes/class_kml.php");
 session_start();
 $gui_id = $_REQUEST["gui_id"];
 ?>

Modified: branches/2.5/http/javascripts/mod_loadwmc.php
===================================================================
--- branches/2.5/http/javascripts/mod_loadwmc.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_loadwmc.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -38,14 +38,14 @@
 	echo "alert('loadwmc: ID not unique!');";
 }
 $e_id_css = "loadwmc";
-include("../include/dyn_js.php");
+include(dirname(__FILE__) . "/../include/dyn_js.php");
 
 echo "mod_loadwmc_target = '".$e_target."';";
 
 /*
 // this may be added at a later stage
 if ($new_wmc == 1) {
-	include("../generate_defaultWmc.php");
+	include(dirname(__FILE__) . "/../generate_defaultWmc.php");
 	$startup = true;
 	$e = new mb_notice("loadwmc: new wmc");
 }
@@ -56,11 +56,11 @@
 if ($gui_changed == 0) {
 	if ($_REQUEST['portal_services']) {
 		$e = new mb_notice("loadwmc: merging layers");
-		include("../merge_layers.php");
+		include(dirname(__FILE__) . "/../merge_layers.php");
 	}
 	if ($_SESSION['GML']) {
 		$e = new mb_notice("loadwmc: merging bbox");
-		include("../merge_bbox.php");
+		include(dirname(__FILE__) . "/../merge_bbox.php");
 	}
 }
 */

Modified: branches/2.5/http/javascripts/mod_measure4326.php
===================================================================
--- branches/2.5/http/javascripts/mod_measure4326.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_measure4326.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 
 $gui_id = $_REQUEST["gui_id"];
 $con = db_connect($DBSERVER,$OWNER,$PW);
@@ -37,7 +37,7 @@
 }
 echo "var mod_measure_target = '".$e_target."';";
 
-require_once("../extensions/jquery.js");
+require_once(dirname(__FILE__) . "/../extensions/jquery.js");
 $e_id_css = "measure";
 include '../include/dyn_js.php';
 ?>

Modified: branches/2.5/http/javascripts/mod_poi.php
===================================================================
--- branches/2.5/http/javascripts/mod_poi.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_poi.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -1,5 +1,5 @@
 <?php
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 session_start();
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
@@ -19,7 +19,7 @@
 <?
 	$gui_id = $_SESSION["mb_user_gui"];
 	$e_id_css = 'poi';
-	include_once("../include/dyn_css.php");
+	include_once(dirname(__FILE__) . "/../include/dyn_css.php");
 ?>
 <style type="text/css">
 <!--
@@ -100,7 +100,7 @@
 
 $lingo = $_REQUEST["lingo"];
 $title = "layername_".$lingo;
-require_once("../../conf/".$_REQUEST["conf_file"]);
+require_once(dirname(__FILE__) . "/../../conf/".$_REQUEST["conf_file"]);
 
 echo "</script>"; 
 ?>

Modified: branches/2.5/http/javascripts/mod_resize_mapsize.php
===================================================================
--- branches/2.5/http/javascripts/mod_resize_mapsize.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_resize_mapsize.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -1,5 +1,5 @@
 <?php
-# $Id$
+# $Id:mod_resize_mapsize.php 1964 2008-01-15 08:11:29Z christoph $
 # http://www.mapbender.org/index.php/ResizeMapsize
 # Created on 12.07.2006/07:32:08
 # Copyright (C) 2002 CCGIS 
@@ -26,7 +26,7 @@
 db_select_db(DB,$con);
 
 $e_id_css = "resizeMapsize";
-include("../include/dyn_js.php");
+include(dirname(__FILE__) . "/../include/dyn_js.php");
 
 $sqltarget = "SELECT e_target FROM gui_element WHERE e_id = 'resizeMapsize' AND fkey_gui_id = $1";
 $v = array($gui_id);

Modified: branches/2.5/http/javascripts/mod_saveLayerPreview.php
===================================================================
--- branches/2.5/http/javascripts/mod_saveLayerPreview.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_saveLayerPreview.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -19,7 +19,7 @@
 
 
 $gui_id = $_REQUEST["gui_id"];
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 $sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'savewmc' AND fkey_gui_id = $1";
@@ -37,7 +37,7 @@
 }
 
 $e_id_css = "saveLayerPreview";
-include("../include/dyn_js.php");
+include(dirname(__FILE__) . "/../include/dyn_js.php");
 
 echo "mod_savewmc_target = '".$e_target."';";
 ?>

Modified: branches/2.5/http/javascripts/mod_savewmc.php
===================================================================
--- branches/2.5/http/javascripts/mod_savewmc.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_savewmc.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 $gui_id = $_REQUEST["gui_id"];
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 $sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'savewmc' AND fkey_gui_id = $1";
@@ -36,7 +36,7 @@
 }
 
 $e_id_css = "savewmc";
-include("../include/dyn_js.php");
+include(dirname(__FILE__) . "/../include/dyn_js.php");
 
 echo "mod_savewmc_target = '".$e_target."';";
 ?>

Modified: branches/2.5/http/javascripts/mod_setPOI2Scale.php
===================================================================
--- branches/2.5/http/javascripts/mod_setPOI2Scale.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_setPOI2Scale.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 $gui_id = $_REQUEST["gui_id"];
-include("../../conf/mapbender.conf");
+include(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 $sql = "SELECT e_target FROM gui_element WHERE e_id = 'setPOI2Scale' AND fkey_gui_id = '".$gui_id."'";
@@ -34,7 +34,7 @@
 }
 echo "var mod_setPOI2Scale_target = '".$e_target."';";
 $e_id_css = 'setPOI2Scale';
-include("../include/dyn_js.php");
+include(dirname(__FILE__) . "/../include/dyn_js.php");
 
 ?>
 

Modified: branches/2.5/http/javascripts/mod_tab.php
===================================================================
--- branches/2.5/http/javascripts/mod_tab.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_tab.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -46,5 +46,5 @@
 echo "var tab_ids = " . $output . ";";	
 
 include(dirname(__FILE__)."/../javascripts/style.js");
-include("mod_tab.js");
+include(dirname(__FILE__) . "/mod_tab.js");
 ?>
\ No newline at end of file

Modified: branches/2.5/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- branches/2.5/http/javascripts/mod_wfs_SpatialRequest.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_wfs_SpatialRequest.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -19,8 +19,8 @@
 
 session_start();
 import_request_variables("PG");
-require_once("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 
@@ -29,7 +29,7 @@
 
 $wfs_conf_filename = "wfs_default.conf";
 include '../include/dyn_php.php';
-include("../../conf/" . $wfs_conf_filename);
+include(dirname(__FILE__) . "/../../conf/" . $wfs_conf_filename);
 
 include '../include/dyn_js.php';
 $sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'setSpatialRequest' AND fkey_gui_id = '".$gui_id."'";

Modified: branches/2.5/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- branches/2.5/http/javascripts/mod_wfs_gazetteer_client.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/mod_wfs_gazetteer_client.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -24,7 +24,7 @@
 $target = $_REQUEST["e_target"];
 $e_id_css = $_REQUEST["e_id_css"];
 
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db($DB,$con);

Modified: branches/2.5/http/javascripts/transform_coordinatesWGS84.php
===================================================================
--- branches/2.5/http/javascripts/transform_coordinatesWGS84.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/transform_coordinatesWGS84.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 
 $DBSERVER = '192.168.0.100';
 $OWNER = "admin";

Modified: branches/2.5/http/javascripts/wfs.js
===================================================================
--- branches/2.5/http/javascripts/wfs.js	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/javascripts/wfs.js	2008-01-15 14:12:05 UTC (rev 1968)
@@ -19,15 +19,15 @@
 
 session_start();
 import_request_variables("PG");
-require_once("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 
 $gui_id = $_REQUEST["gui_id"];
 $e_id_css = "wfs";
 include '../include/dyn_js.php';
-require_once("wfs_usemap.js");
+require_once(dirname(__FILE__) . "/wfs_usemap.js");
 ?>
 var highlight_tag_id = "wfs_highlight_tag";
 var mb_wfs_fetched = [];

Modified: branches/2.5/http/php/mb_listKMLs.php
===================================================================
--- branches/2.5/http/php/mb_listKMLs.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mb_listKMLs.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -18,11 +18,11 @@
 
 session_start();
 
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_administration.php");
-require_once("../classes/class_mb_exception.php");
-require_once("../classes/class_connector.php");
-require_once("../classes/class_kml_ows.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../classes/class_administration.php");
+require_once(dirname(__FILE__) . "/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__) . "/../classes/class_connector.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
 
 $gui_id = $_SESSION["mb_user_gui"];
 $user_id = $_SESSION["mb_user_id"];

Modified: branches/2.5/http/php/mb_listWMCs.php
===================================================================
--- branches/2.5/http/php/mb_listWMCs.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mb_listWMCs.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -28,10 +28,10 @@
 
 $form_target = $_SERVER["PHP_SELF"] . "?" . SID;
 
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_administration.php");
-require_once("../classes/class_mb_exception.php");
-require_once("../classes/class_wmc.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../classes/class_administration.php");
+require_once(dirname(__FILE__) . "/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__) . "/../classes/class_wmc.php");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_changeEPSG.php
===================================================================
--- branches/2.5/http/php/mod_changeEPSG.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_changeEPSG.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -53,7 +53,7 @@
 
 # transform coordinates
 if(isset($_REQUEST["srs"])){
-	require_once("../../conf/mapbender.conf");
+	require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 	$arraymapObj = mb_split("###", $_REQUEST["srs"]);
 	echo "<script type='text/javascript'>";
 	echo "var newExtent = new Array();";

Modified: branches/2.5/http/php/mod_displayKML.php
===================================================================
--- branches/2.5/http/php/mod_displayKML.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_displayKML.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -20,8 +20,8 @@
 session_start();
 mb_internal_encoding("UTF-8");
 
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_kml_ows.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
 
 $kmlId = $_GET["kmlId"];
 

Modified: branches/2.5/http/php/mod_featuretypeMetadata.php
===================================================================
--- branches/2.5/http/php/mod_featuretypeMetadata.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_featuretypeMetadata.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,8 +17,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-require_once("../../conf/mapbender.conf");
-require_once("../../conf/geoportal.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/geoportal.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 

Modified: branches/2.5/http/php/mod_filteredWms_layer_topic.php
===================================================================
--- branches/2.5/http/php/mod_filteredWms_layer_topic.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_filteredWms_layer_topic.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -19,7 +19,7 @@
 
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/mb_validatePermission.php");
-require_once("../classes/class_administration.php");
+require_once(dirname(__FILE__) . "/../classes/class_administration.php");
 
 $logged_user_name = $_SESSION["mb_user_name"];
 $logged_user_id = $_SESSION["mb_user_id"];

Modified: branches/2.5/http/php/mod_filteredWms_topic.php
===================================================================
--- branches/2.5/http/php/mod_filteredWms_topic.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_filteredWms_topic.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -18,10 +18,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import_request_variables("PG");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
-require_once("../php/mb_validatePermission.php");
+require_once(dirname(__FILE__) . "/../php/mb_validatePermission.php");
 $self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -63,7 +63,7 @@
 <body>
 <?php
 
-require_once("../classes/class_administration.php");
+require_once(dirname(__FILE__) . "/../classes/class_administration.php");
 
 $fieldHeight = 20;
 

Modified: branches/2.5/http/php/mod_gazetteerMetadata.php
===================================================================
--- branches/2.5/http/php/mod_gazetteerMetadata.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_gazetteerMetadata.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -39,7 +39,7 @@
 <title>Metadata search</title>
 <?
 $e_id_css = 'poi';
-include_once("../include/dyn_css.php");
+include_once(dirname(__FILE__) . "/../include/dyn_css.php");
 ?>
 <style type="text/css">
 <!--

Modified: branches/2.5/http/php/mod_layerMetadata.php
===================================================================
--- branches/2.5/http/php/mod_layerMetadata.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_layerMetadata.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 

Modified: branches/2.5/http/php/mod_loadwms.php
===================================================================
--- branches/2.5/http/php/mod_loadwms.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_loadwms.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -18,11 +18,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 session_start();
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
-require_once("mb_validatePermission.php");
-require_once("../classes/class_wms.php"); 
+require_once(dirname(__FILE__) . "/mb_validatePermission.php");
+require_once(dirname(__FILE__) . "/../classes/class_wms.php"); 
 
 
 echo "file: ".$_REQUEST["xml_file"];

Modified: branches/2.5/http/php/mod_meetingPoint.php
===================================================================
--- branches/2.5/http/php/mod_meetingPoint.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_meetingPoint.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -19,8 +19,8 @@
 
 session_start();
 
-require("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
+require(dirname(__FILE__) . "/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_monitorCapabilities_main.php
===================================================================
--- branches/2.5/http/php/mod_monitorCapabilities_main.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_monitorCapabilities_main.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//require_once("../php/mb_validateSession.php");
+//require_once(dirname(__FILE__) . "/../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 //session_start();
 //import_request_variables("PG");

Modified: branches/2.5/http/php/mod_setLocale.php
===================================================================
--- branches/2.5/http/php/mod_setLocale.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_setLocale.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -18,8 +18,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 session_start();
-require_once("../classes/class_locale.php");
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../classes/class_locale.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $_SESSION["mb_lang"] = $_REQUEST["lang"];
 $localeObj = new Mb_locale($_SESSION["mb_lang"]);
 session_write_close();

Modified: branches/2.5/http/php/mod_switchLocale.php
===================================================================
--- branches/2.5/http/php/mod_switchLocale.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_switchLocale.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -38,7 +38,7 @@
 <meta name="DC.Rights" content="WhereGroup GmbH & Co.KG, Bonn">
 <title>Metadata search</title>
 <?
-include_once("../include/dyn_css.php");
+include_once(dirname(__FILE__) . "/../include/dyn_css.php");
 ?>
 <script type="text/javascript">
 <!--

Modified: branches/2.5/http/php/mod_switchLocale_noreload.php
===================================================================
--- branches/2.5/http/php/mod_switchLocale_noreload.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_switchLocale_noreload.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -38,7 +38,7 @@
 <meta name="DC.Rights" content="WhereGroup GmbH & Co.KG, Bonn">
 <title>Metadata search</title>
 <?
-include_once("../include/dyn_css.php");
+include_once(dirname(__FILE__) . "/../include/dyn_css.php");
 ?>
 <script type="text/javascript">
 <!--

Modified: branches/2.5/http/php/mod_updateKmlInDb.php
===================================================================
--- branches/2.5/http/php/mod_updateKmlInDb.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_updateKmlInDb.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -20,9 +20,9 @@
 session_start();
 mb_internal_encoding("UTF-8");
 
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_mb_exception.php");
-require_once("../classes/class_kml_ows.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
 
 $kmlId = $_POST["kmlId"];
 $placemarkId = $_POST["placemarkId"];

Modified: branches/2.5/http/php/mod_wfs_result.php
===================================================================
--- branches/2.5/http/php/mod_wfs_result.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_wfs_result.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -24,9 +24,9 @@
 $typename = $_REQUEST["typename"];
 
 session_start();
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_stripRequest.php");
-require_once("../classes/class_connector.php");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../classes/class_stripRequest.php");
+require_once(dirname(__FILE__) . "/../classes/class_connector.php");
 
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_wfs_server.php
===================================================================
--- branches/2.5/http/php/mod_wfs_server.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_wfs_server.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -4,7 +4,7 @@
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
 require_once(dirname(__FILE__)."/../classes/class_wfs.php");
-include_once("../extensions/JSON.php");
+include_once(dirname(__FILE__) . "/../extensions/JSON.php");
 
 //db connection
 $con = db_connect(DBSERVER,OWNER,PW);

Modified: branches/2.5/http/php/mod_wfsrequest.php
===================================================================
--- branches/2.5/http/php/mod_wfsrequest.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/php/mod_wfsrequest.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -27,7 +27,7 @@
 		die('Unzulässige Eingabe');
 	}
 }
-require_once("../../conf/mapbender.conf");
+require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db($DB,$con);
 if(isset($_REQUEST["backlink"]) && $_REQUEST["backlink"] == 'parent'){
@@ -100,7 +100,7 @@
 }
 else{
 	echo "<html><head><style type='text/css'>".$g_res_style."</style></head><body>";
-	include("../classes/class_gml2.php");
+	include(dirname(__FILE__) . "/../classes/class_gml2.php");
         $mygml = new gml2();
         $mygml->parsegml($req);
         $c = $mygml->getMemberCount();

Modified: branches/2.5/http/print/mod_printPDF_pdf.php
===================================================================
--- branches/2.5/http/print/mod_printPDF_pdf.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/http/print/mod_printPDF_pdf.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#require_once("../php/mb_validateSession.php");
+#require_once(dirname(__FILE__) . "/../php/mb_validateSession.php");
 ob_start();
 session_start();
 ini_set('error_reporting', 'E_ALL & ~ E_NOTICE');

Modified: branches/2.5/owsproxy/http/index.php
===================================================================
--- branches/2.5/owsproxy/http/index.php	2008-01-15 08:33:09 UTC (rev 1967)
+++ branches/2.5/owsproxy/http/index.php	2008-01-15 14:12:05 UTC (rev 1968)
@@ -18,11 +18,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-require("../../conf/mapbender.conf");
-require("../../http/classes/class_administration.php");
-require("../../http/classes/class_connector.php");
-require_once("../../http/classes/class_mb_exception.php");
-require("./classes/class_QueryHandler.php");
+require(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require(dirname(__FILE__) . "/../../http/classes/class_administration.php");
+require(dirname(__FILE__) . "/../../http/classes/class_connector.php");
+require_once(dirname(__FILE__) . "/../../http/classes/class_mb_exception.php");
+require(dirname(__FILE__) . "/./classes/class_QueryHandler.php");
 
 /***** conf *****/
 $imageformats = array("image/png","image/gif","image/jpeg", "image/jpg");



More information about the Mapbender_commits mailing list