[Mapbender-commits] r2140 - in branches/2.4.5: http/extensions http/include http/javascripts http/print resources/db/postgresql resources/db/update

Fri Feb 22 06:25:05 EST 2008

Author: christoph
Date: 2008-02-22 06:25:05 -0500 (Fri, 22 Feb 2008)
New Revision: 2140

Modified:
   branches/2.4.5/http/extensions/ext_featureInfoTunnel.php
   branches/2.4.5/http/extensions/ext_weldMaps.php
   branches/2.4.5/http/extensions/geom2wfst.php
   branches/2.4.5/http/extensions/markResult.php
   branches/2.4.5/http/include/dyn_css.php
   branches/2.4.5/http/include/dyn_js.php
   branches/2.4.5/http/include/dyn_php.php
   branches/2.4.5/http/javascripts/map.php
   branches/2.4.5/http/javascripts/mod_addWMS.php
   branches/2.4.5/http/javascripts/mod_addWMSfromList.php
   branches/2.4.5/http/javascripts/mod_addWMSfromfilteredList.php
   branches/2.4.5/http/javascripts/mod_addWMSfromfilteredListDB.php
   branches/2.4.5/http/javascripts/mod_addWMSfromfilteredList_ajax.php
   branches/2.4.5/http/javascripts/mod_add_vendorspecific.php
   branches/2.4.5/http/javascripts/mod_back.php
   branches/2.4.5/http/javascripts/mod_center1.php
   branches/2.4.5/http/javascripts/mod_coords.php
   branches/2.4.5/http/javascripts/mod_coords_div.php
   branches/2.4.5/http/javascripts/mod_copyright.php
   branches/2.4.5/http/javascripts/mod_dependentDiv.php
   branches/2.4.5/http/javascripts/mod_dependentIframe.php
   branches/2.4.5/http/javascripts/mod_digitize_tab.php
   branches/2.4.5/http/javascripts/mod_displayWmc.php
   branches/2.4.5/http/javascripts/mod_dragMapSize.php
   branches/2.4.5/http/javascripts/mod_dynamicOverview.php
   branches/2.4.5/http/javascripts/mod_embedded_legend.php
   branches/2.4.5/http/javascripts/mod_export_image.php
   branches/2.4.5/http/javascripts/mod_featureInfo.php
   branches/2.4.5/http/javascripts/mod_featureInfoRedirect.php
   branches/2.4.5/http/javascripts/mod_featureInfoTunnel.php
   branches/2.4.5/http/javascripts/mod_forward.php
   branches/2.4.5/http/javascripts/mod_gazetteerSQL_client.php
   branches/2.4.5/http/javascripts/mod_getArea.php
   branches/2.4.5/http/javascripts/mod_help.php
   branches/2.4.5/http/javascripts/mod_highlightPOI.php
   branches/2.4.5/http/javascripts/mod_home.php
   branches/2.4.5/http/javascripts/mod_initWmc.php
   branches/2.4.5/http/javascripts/mod_insertKmlIntoDb.php
   branches/2.4.5/http/javascripts/mod_insertLayerPreviewIntoDb.php
   branches/2.4.5/http/javascripts/mod_key.php
   branches/2.4.5/http/javascripts/mod_legend.php
   branches/2.4.5/http/javascripts/mod_loadwmc.php
   branches/2.4.5/http/javascripts/mod_measure.php
   branches/2.4.5/http/javascripts/mod_navFrame.php
   branches/2.4.5/http/javascripts/mod_owsproxy.php
   branches/2.4.5/http/javascripts/mod_pan.php
   branches/2.4.5/http/javascripts/mod_perimeter.php
   branches/2.4.5/http/javascripts/mod_poi.php
   branches/2.4.5/http/javascripts/mod_print1.php
   branches/2.4.5/http/javascripts/mod_repaint.php
   branches/2.4.5/http/javascripts/mod_resize_mapsize.php
   branches/2.4.5/http/javascripts/mod_sandclock.php
   branches/2.4.5/http/javascripts/mod_sandclock2.php
   branches/2.4.5/http/javascripts/mod_saveLayerPreview.php
   branches/2.4.5/http/javascripts/mod_saveWmcKml.php
   branches/2.4.5/http/javascripts/mod_savewmc.php
   branches/2.4.5/http/javascripts/mod_scaleHint.php
   branches/2.4.5/http/javascripts/mod_scaleSel.php
   branches/2.4.5/http/javascripts/mod_scaleText.php
   branches/2.4.5/http/javascripts/mod_scalebar.php
   branches/2.4.5/http/javascripts/mod_selArea.php
   branches/2.4.5/http/javascripts/mod_selArea1.php
   branches/2.4.5/http/javascripts/mod_selectMapsize.php
   branches/2.4.5/http/javascripts/mod_setBBOX1.php
   branches/2.4.5/http/javascripts/mod_setBackground.php
   branches/2.4.5/http/javascripts/mod_setBackground_all.php
   branches/2.4.5/http/javascripts/mod_setPOI2Scale.php
   branches/2.4.5/http/javascripts/mod_setTimeout.php
   branches/2.4.5/http/javascripts/mod_state.php
   branches/2.4.5/http/javascripts/mod_tab.php
   branches/2.4.5/http/javascripts/mod_toggleModule.php
   branches/2.4.5/http/javascripts/mod_usemap.php
   branches/2.4.5/http/javascripts/mod_wfs_SpatialRequest.php
   branches/2.4.5/http/javascripts/mod_wfs_gazetteer_client.php
   branches/2.4.5/http/javascripts/mod_zoomCoords.php
   branches/2.4.5/http/javascripts/mod_zoomFull.php
   branches/2.4.5/http/javascripts/mod_zoomIn1.php
   branches/2.4.5/http/javascripts/mod_zoomOut1.php
   branches/2.4.5/http/print/mod_printPDF.php
   branches/2.4.5/http/print/mod_printPDF_pdf.php
   branches/2.4.5/resources/db/postgresql/pgsql_schema.sql
   branches/2.4.5/resources/db/update/update_mysql_db.sql
   branches/2.4.5/resources/db/update/update_postgresql_db.sql
Log:
added session validating to php scripts

Modified: branches/2.4.5/http/extensions/ext_featureInfoTunnel.php
===================================================================

--- branches/2.4.5/http/extensions/ext_featureInfoTunnel.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/extensions/ext_featureInfoTunnel.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require_once("../classes/class_stripRequest.php");
 require_once("../classes/class_connector.php");
 $mr = new stripRequest(urldecode($_REQUEST["url"]));

Modified: branches/2.4.5/http/extensions/ext_weldMaps.php
===================================================================
--- branches/2.4.5/http/extensions/ext_weldMaps.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/extensions/ext_weldMaps.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -90,7 +90,7 @@
       $bgc = ImageColorAllocate ($im, 255, 255, 255);
       $tc  = ImageColorAllocate ($im, 0, 0, 0);
       ImageFilledRectangle ($im, 0, 0, $map_width, $map_height, $bgc); 
-      ImageString($im, 1, 5, 5, "Fehler beim Öffnen von: ", $tc);
+      ImageString($im, 1, 5, 5, "Fehler beim ï¿½ffnen von: ", $tc);
       $chunk = chunk_split(urldecode($imgname), 60, "###");
       $array_chunk = explode("###", $chunk);
       for($i=0; $i<count($array_chunk); $i++){
@@ -112,7 +112,7 @@
 		return $newResolution;
 	}	
 }
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $map_urls = explode("###",$_SESSION["mb_print_url"]);
 $output = new weldMaps($map_urls, $_SESSION["mb_print_resolution"]);
 ?>
\ No newline at end of file

Modified: branches/2.4.5/http/extensions/geom2wfst.php
===================================================================
--- branches/2.4.5/http/extensions/geom2wfst.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/extensions/geom2wfst.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
 
 

Modified: branches/2.4.5/http/extensions/markResult.php
===================================================================
--- branches/2.4.5/http/extensions/markResult.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/extensions/markResult.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -23,6 +23,8 @@
 * $color -> Color of the polygon/line, commasaparated RGB-values
 *
 */
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 import_request_variables("PG");
 $tmpx = array();
 $tmpy = array();

Modified: branches/2.4.5/http/include/dyn_css.php
===================================================================
--- branches/2.4.5/http/include/dyn_css.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/include/dyn_css.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 

Modified: branches/2.4.5/http/include/dyn_js.php
===================================================================
--- branches/2.4.5/http/include/dyn_js.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/include/dyn_js.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,6 +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(dirname(__FILE__)."/../php/mb_validateSession.php");
 if(isset($gui_id))
 {
 	$sql = "SELECT * FROM gui_element_vars WHERE fkey_e_id = $1 AND fkey_gui_id = $2 and var_type='var'";

Modified: branches/2.4.5/http/include/dyn_php.php
===================================================================
--- branches/2.4.5/http/include/dyn_php.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/include/dyn_php.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,6 +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__)."/../php/mb_validateSession.php");
+
 if(isset($gui_id))
 {
 	$sql = "SELECT * FROM gui_element_vars WHERE fkey_gui_id = $1 and var_type='php_var'";

Modified: branches/2.4.5/http/javascripts/map.php
===================================================================
--- branches/2.4.5/http/javascripts/map.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/map.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 ob_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 
 // see http://trac.osgeo.org/mapbender/ticket/79
 ini_set('session.bug_compat_42',0); 

Modified: branches/2.4.5/http/javascripts/mod_addWMS.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_addWMS.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_addWMS.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,10 +17,10 @@
 # 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__)."/../php/mb_validateSession.php");
+
 $gui_id = $_REQUEST["gui_id"];
 
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 

Modified: branches/2.4.5/http/javascripts/mod_addWMSfromList.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_addWMSfromList.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_addWMSfromList.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,7 +17,6 @@
 # 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(dirname(__FILE__)."/../php/mb_validateSession.php");
 import_request_variables("PG");
 

Modified: branches/2.4.5/http/javascripts/mod_addWMSfromfilteredList.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_addWMSfromfilteredList.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_addWMSfromfilteredList.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,7 +17,6 @@
 # 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(dirname(__FILE__)."/../php/mb_validateSession.php");
 import_request_variables("PG");
 ?>

Modified: branches/2.4.5/http/javascripts/mod_addWMSfromfilteredListDB.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_addWMSfromfilteredListDB.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_addWMSfromfilteredListDB.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,7 +17,6 @@
 # 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(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

Modified: branches/2.4.5/http/javascripts/mod_addWMSfromfilteredList_ajax.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_addWMSfromfilteredList_ajax.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_addWMSfromfilteredList_ajax.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
 
 ?>

Modified: branches/2.4.5/http/javascripts/mod_add_vendorspecific.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_add_vendorspecific.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_add_vendorspecific.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -18,6 +18,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__)."/../php/mb_validateSession.php");
+
 ?>
 mb_registerVendorSpecific("mod_vs_init()");
 function mod_vs_init(){   

Modified: branches/2.4.5/http/javascripts/mod_back.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_back.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_back.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'back' AND fkey_gui_id = $1 ";

Modified: branches/2.4.5/http/javascripts/mod_center1.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_center1.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_center1.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 

Modified: branches/2.4.5/http/javascripts/mod_coords.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_coords.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_coords.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 $con = db_connect($DBSERVER,$OWNER,$PW);

Modified: branches/2.4.5/http/javascripts/mod_coords_div.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_coords_div.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_coords_div.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 $con = db_connect($DBSERVER,$OWNER,$PW);

Modified: branches/2.4.5/http/javascripts/mod_copyright.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_copyright.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_copyright.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,7 +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(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 $e_id_css = 'copyright';
 $gui_id = $_REQUEST["gui_id"];
 include '../include/dyn_js.php';

Modified: branches/2.4.5/http/javascripts/mod_dependentDiv.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_dependentDiv.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_dependentDiv.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 

Modified: branches/2.4.5/http/javascripts/mod_dependentIframe.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_dependentIframe.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_dependentIframe.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,8 +17,9 @@
 # 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__)."/../php/mb_validateSession.php");
+
 $gui_id = $_REQUEST["gui_id"];
-require_once(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 = 'dependentIframe' AND fkey_gui_id = $1 ";

Modified: branches/2.4.5/http/javascripts/mod_digitize_tab.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_digitize_tab.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_digitize_tab.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,10 +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.
 
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 import_request_variables("PG");
-require_once("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 $gui_id = $_SESSION["mb_user_gui"];

Modified: branches/2.4.5/http/javascripts/mod_displayWmc.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_displayWmc.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_displayWmc.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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.
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 	
 	$wmc_id = $_GET["wmc_id"];

Modified: branches/2.4.5/http/javascripts/mod_dragMapSize.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_dragMapSize.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_dragMapSize.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +17,9 @@
 # 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__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
-require_once(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 = 'dragMapSize' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_dynamicOverview.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_dynamicOverview.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_dynamicOverview.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -18,7 +18,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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $e_id_css = 'dynamicOverview';
 $gui_id = $_REQUEST["gui_id"];
 include '../include/dyn_js.php';

Modified: branches/2.4.5/http/javascripts/mod_embedded_legend.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_embedded_legend.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_embedded_legend.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -16,8 +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.
-session_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>

Modified: branches/2.4.5/http/javascripts/mod_export_image.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_export_image.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_export_image.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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.
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
-session_start();
 
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -192,7 +192,7 @@
 	//disablePrinting();
 	//}
 	//else{
-	//   alert("Das Format ist noch nicht ausgewählt.");
+	//   alert("Das Format ist noch nicht ausgewï¿½hlt.");
 	//}   
 	// window.opener.mod_back_set();
 }
@@ -210,7 +210,7 @@
 	<table border='0'>
 	<tr>   
 	<td  class="text">
-		Vergrößerungsfaktor
+		Vergrï¿½ï¿½erungsfaktor
 	</td>
 	</tr>
 	<tr>

Modified: branches/2.4.5/http/javascripts/mod_featureInfo.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_featureInfo.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_featureInfo.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 

Modified: branches/2.4.5/http/javascripts/mod_featureInfoRedirect.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_featureInfoRedirect.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_featureInfoRedirect.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -16,6 +16,8 @@
 # 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(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 
 /*

Modified: branches/2.4.5/http/javascripts/mod_featureInfoTunnel.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_featureInfoTunnel.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_featureInfoTunnel.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
 
 $con = db_connect($DBSERVER,$OWNER,$PW);

Modified: branches/2.4.5/http/javascripts/mod_forward.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_forward.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_forward.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 

Modified: branches/2.4.5/http/javascripts/mod_gazetteerSQL_client.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_gazetteerSQL_client.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_gazetteerSQL_client.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -1,7 +1,5 @@
 <?php
-session_start();
 require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 
 $e_id = $_REQUEST["elementID"];
 $e_target = explode(",", $_REQUEST["e_target"]);

Modified: branches/2.4.5/http/javascripts/mod_getArea.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_getArea.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_getArea.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 

Modified: branches/2.4.5/http/javascripts/mod_help.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_help.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_help.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,7 +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(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 $gui_id = $_REQUEST["gui_id"];

Modified: branches/2.4.5/http/javascripts/mod_highlightPOI.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_highlightPOI.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_highlightPOI.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-include("../../conf/mapbender.conf");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.4.5/http/javascripts/mod_home.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_home.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_home.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -15,10 +15,11 @@
 # 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(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 function mod_home_init(){
 <?php
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
 echo "var url = '".LOGIN."';";
 echo "var name = '".urlencode($_SESSION["mb_user_name"])."';";
 echo "var pw = '".$_SESSION["mb_user_password"]."';";

Modified: branches/2.4.5/http/javascripts/mod_initWmc.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_initWmc.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_initWmc.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -1,5 +1,6 @@
 <?php
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 if ($_SESSION['mb_myWmc'] && $_SESSION['mb_myWmc_action'] && in_array($_SESSION['mb_myWmc_action'], array("load", "merge", "append"))) {
 	$action = $_SESSION['mb_myWmc_action'];
 	$wmc_id = $_SESSION['mb_myWmc'];

Modified: branches/2.4.5/http/javascripts/mod_insertKmlIntoDb.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_insertKmlIntoDb.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_insertKmlIntoDb.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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.
 
-include("../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 include("../classes/class_kml.php");
 session_start();
 $gui_id = $_REQUEST["gui_id"];

Modified: branches/2.4.5/http/javascripts/mod_insertLayerPreviewIntoDb.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_insertLayerPreviewIntoDb.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_insertLayerPreviewIntoDb.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,8 +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.
 
-session_start();
-include("../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 $gui_id = $_REQUEST["gui_id"];
 

Modified: branches/2.4.5/http/javascripts/mod_key.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_key.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_key.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.4.5/http/javascripts/mod_legend.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_legend.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_legend.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -16,8 +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(dirname(__FILE__)."/../../conf/mapbender.conf");
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 $gui_id = $_SESSION["mb_user_gui"];

Modified: branches/2.4.5/http/javascripts/mod_loadwmc.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_loadwmc.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_loadwmc.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../classes/class_wmc.php");
 
 $gui_id = $_REQUEST["gui_id"];

Modified: branches/2.4.5/http/javascripts/mod_measure.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_measure.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_measure.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 $con = db_connect($DBSERVER,$OWNER,$PW);

Modified: branches/2.4.5/http/javascripts/mod_navFrame.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_navFrame.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_navFrame.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +17,9 @@
 # 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__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 include '../include/dyn_js.php';
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.4.5/http/javascripts/mod_owsproxy.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_owsproxy.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_owsproxy.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -16,8 +16,6 @@
 # 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.
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
-session_start();
 
 include(dirname(__FILE__)."/../php/mb_validateSession.php");
 include(dirname(__FILE__)."/../classes/class_administration.php");

Modified: branches/2.4.5/http/javascripts/mod_pan.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_pan.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_pan.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'pan1' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_perimeter.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_perimeter.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_perimeter.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 

Modified: branches/2.4.5/http/javascripts/mod_poi.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_poi.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_poi.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -1,6 +1,6 @@
 <?php
-require_once("../../conf/mapbender.conf");
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 
@@ -110,7 +110,7 @@
 function validate(){
 
    if(document.form1.search.value.length < 1){
-      alert("Bitte vervollständigen Sie die Angaben!");
+      alert("Bitte vervollstï¿½ndigen Sie die Angaben!");
       document.form1.search.focus();
       return false;
    }
@@ -219,7 +219,7 @@
 		$md_fileidentifier[$cnt] = pg_result($res,$cnt,"md_fileidentifier"); # Layername
 		$layername[$cnt] = pg_result($res,$cnt,"md_fileidentifier"); # Layername in der Mapdatei
 		$result_title[$cnt] = pg_result($res,$cnt,"\"".$title."\""); # layer_deutsch Ergebnisname
-		$search_columns[$cnt] = pg_result($res,$cnt,"search_columns"); # Suchspalten, Trennung über ,
+		$search_columns[$cnt] = pg_result($res,$cnt,"search_columns"); # Suchspalten, Trennung ï¿½ber ,
 		$search_result[$cnt] = pg_result($res,$cnt,"search_result"); # Ergebnisspalte
 		$search_keywords[$cnt] = pg_result($res,$cnt,"search_keywords"); # Ergebnisspalte
 		$wms_title[$cnt] = pg_result($res,$cnt,"wms_title"); # WMS tile

Modified: branches/2.4.5/http/javascripts/mod_print1.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_print1.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_print1.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +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.
 
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 include(dirname(__FILE__)."/../../conf/print.conf");
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -193,7 +192,7 @@
 		disablePrinting();
 	}
 	else{
-		alert("Das Format ist noch nicht ausgewählt.");
+		alert("Das Format ist noch nicht ausgewï¿½hlt.");
 	}   
 		window.opener.mod_back_set();
 }

Modified: branches/2.4.5/http/javascripts/mod_repaint.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_repaint.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_repaint.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'repaint' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_resize_mapsize.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_resize_mapsize.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_resize_mapsize.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -20,7 +20,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(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.4.5/http/javascripts/mod_sandclock.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_sandclock.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_sandclock.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +17,9 @@
 # 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__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
-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 = 'sandclock' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_sandclock2.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_sandclock2.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_sandclock2.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +17,9 @@
 # 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__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
-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 = 'sandclock2' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_saveLayerPreview.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_saveLayerPreview.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_saveLayerPreview.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-require_once("../../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";

Modified: branches/2.4.5/http/javascripts/mod_saveWmcKml.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_saveWmcKml.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_saveWmcKml.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +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.
 
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/mod_savewmc.php");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.4.5/http/javascripts/mod_savewmc.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_savewmc.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_savewmc.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
 

Modified: branches/2.4.5/http/javascripts/mod_scaleHint.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_scaleHint.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_scaleHint.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +17,9 @@
 # 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__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
-require_once(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 = 'setScaleHint' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_scaleSel.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_scaleSel.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_scaleSel.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'scaleSelect' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_scaleText.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_scaleText.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_scaleText.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'scaleText' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_scalebar.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_scalebar.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_scalebar.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'scalebar' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_selArea.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_selArea.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_selArea.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'selArea1' AND fkey_gui_id = '".$gui_id."'";

Modified: branches/2.4.5/http/javascripts/mod_selArea1.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_selArea1.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_selArea1.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +17,9 @@
 # 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__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
-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 = 'selArea1' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_selectMapsize.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_selectMapsize.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_selectMapsize.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,8 +17,9 @@
 # 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__)."/../php/mb_validateSession.php");
+
 $gui_id = $_REQUEST["gui_id"];
-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 = 'selectMapsize' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_setBBOX1.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_setBBOX1.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_setBBOX1.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'setBBOX' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_setBackground.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_setBackground.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_setBackground.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'setBackground' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_setBackground_all.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_setBackground_all.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_setBackground_all.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -18,9 +18,9 @@
 # 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__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
-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 = 'setBackground_all' AND fkey_gui_id = $1 ";

Modified: branches/2.4.5/http/javascripts/mod_setPOI2Scale.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_setPOI2Scale.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_setPOI2Scale.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-include("../../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 = $1";

Modified: branches/2.4.5/http/javascripts/mod_setTimeout.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_setTimeout.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_setTimeout.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -18,8 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-session_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $e_id_css = 'timeout';
 $gui_id = $_REQUEST["gui_id"];
 include '../include/dyn_js.php';

Modified: branches/2.4.5/http/javascripts/mod_state.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_state.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_state.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +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(dirname(__FILE__)."/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $gui_id = $_SESSION["mb_user_gui"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 ?>

Modified: branches/2.4.5/http/javascripts/mod_tab.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_tab.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_tab.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -19,6 +19,7 @@
 
 /********** Configuration*************************************************/
 
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
 $e_id_css = 'tabs';
 include(dirname(__FILE__).'/../include/dyn_js.php');

Modified: branches/2.4.5/http/javascripts/mod_toggleModule.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_toggleModule.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_toggleModule.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +17,9 @@
 # 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__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
-require_once(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 = 'toggleModule' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_usemap.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_usemap.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_usemap.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -16,6 +16,8 @@
 # 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(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 var mod_usemap_target = 'mapframe1';
 var mod_usemap_wfs = "<url>";

Modified: branches/2.4.5/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_wfs_SpatialRequest.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_wfs_SpatialRequest.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,10 +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.
 
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 import_request_variables("PG");
-require_once("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
 require_once("../../conf/wfs_default.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.4.5/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_wfs_gazetteer_client.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_wfs_gazetteer_client.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -18,13 +18,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $gui_id = $_SESSION["mb_user_gui"];
 
 $target = $_REQUEST["target"];
 $e_id_css = $_REQUEST["e_id_css"];
 
-require_once("../../conf/mapbender.conf");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db($DB,$con);

Modified: branches/2.4.5/http/javascripts/mod_zoomCoords.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_zoomCoords.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_zoomCoords.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -1,10 +1,8 @@
 <?php
 #$Id$
 #$Header: /cvsroot/mapbender/mapbender/http/javascripts/mod_zoomCoords.php,v 1.10 2006/03/09 08:57:13 uli_rothstein Exp $
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-session_start();
-import_request_variables("PG");
 require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+import_request_variables("PG");
 
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

Modified: branches/2.4.5/http/javascripts/mod_zoomFull.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_zoomFull.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_zoomFull.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -1,8 +1,8 @@
 <?php
 #$Id$
 #$Header: /cvsroot/mapbender/mapbender/http/javascripts/mod_zoomFull.php,v 1.8 2005/09/13 18:16:42 bjoern_heuser Exp $
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'zoomFull' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_zoomIn1.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_zoomIn1.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_zoomIn1.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -17,9 +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__)."/../php/mb_validateSession.php");
 $gui_id = $_REQUEST["gui_id"];
-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 = 'zoomIn1' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/javascripts/mod_zoomOut1.php
===================================================================
--- branches/2.4.5/http/javascripts/mod_zoomOut1.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/javascripts/mod_zoomOut1.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -1,9 +1,9 @@
 <?php
 #$Id$
 #$Header: /cvsroot/mapbender/mapbender/http/javascripts/mod_zoomOut1.php,v 1.8 2005/09/13 18:16:42 bjoern_heuser Exp $
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $gui_id = $_REQUEST["gui_id"];
-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 = 'zoomOut1' AND fkey_gui_id = $1";

Modified: branches/2.4.5/http/print/mod_printPDF.php
===================================================================
--- branches/2.4.5/http/print/mod_printPDF.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/print/mod_printPDF.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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.
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 
 ?>
@@ -261,7 +261,7 @@
 		//overview_url
 		var ind_overview = pt.getMapObjIndexByName('overview');
 
-		//alert ("länge: " + length+ " - " + ind_overview + name + pt.mb_mapObj[ind_overview].wms.length);
+		//alert ("lï¿½nge: " + length+ " - " + ind_overview + name + pt.mb_mapObj[ind_overview].wms.length);
 		if(pt.mb_mapObj[ind_overview].mapURL != false ){
 			document.forms[0].overview_url.value = pt.mb_mapObj[ind_overview].mapURL;
 		}
@@ -324,7 +324,7 @@
 		document.form1.submit();
 	}
 	else{
-		alert("Das Format ist noch nicht ausgewählt.");
+		alert("Das Format ist noch nicht ausgewï¿½hlt.");
 	}
 }
 function valCom(obj){

Modified: branches/2.4.5/http/print/mod_printPDF_pdf.php
===================================================================
--- branches/2.4.5/http/print/mod_printPDF_pdf.php	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/http/print/mod_printPDF_pdf.php	2008-02-22 11:25:05 UTC (rev 2140)
@@ -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.4.5/resources/db/postgresql/pgsql_schema.sql
===================================================================
--- branches/2.4.5/resources/db/postgresql/pgsql_schema.sql	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/resources/db/postgresql/pgsql_schema.sql	2008-02-22 11:25:05 UTC (rev 2140)
@@ -24,7 +24,6 @@
     e_pos integer,
     e_public integer,
     e_comment text,
-    e_title character varying(255),    
     e_element character varying(255) DEFAULT ''::character varying NOT NULL,
     e_src character varying(255),
     e_attributes text,
@@ -40,7 +39,8 @@
     e_mb_mod character varying(50),
     e_target character varying(50),
     e_requires character varying(50),
-    e_url character varying(255)
+    e_url character varying(255),
+    e_title character varying(255)
 );
 
 

Modified: branches/2.4.5/resources/db/update/update_mysql_db.sql
===================================================================
--- branches/2.4.5/resources/db/update/update_mysql_db.sql	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/resources/db/update/update_mysql_db.sql	2008-02-22 11:25:05 UTC (rev 2140)
@@ -1,9 +1,8 @@
 --
--- database changes in version 2.4.3
+-- database changes in version 2.4.5
 --
 
 --
--- table wms_format: http://trac.osgeo.org/mapbender/ticket/53 
+-- table gui_element: new column for translation
 --
-ALTER TABLE wms_format CHANGE data_format data_format VARCHAR(100);
-
+ALTER TABLE gui_element ADD COLUMN e_title VARCHAR(255);

Modified: branches/2.4.5/resources/db/update/update_postgresql_db.sql
===================================================================
--- branches/2.4.5/resources/db/update/update_postgresql_db.sql	2008-02-21 17:13:37 UTC (rev 2139)
+++ branches/2.4.5/resources/db/update/update_postgresql_db.sql	2008-02-22 11:25:05 UTC (rev 2140)
@@ -1,9 +1,9 @@
 --
--- database changes in version 2.4.3
+-- database changes in version 2.4.5
 --
 
 --
--- table wms_format: http://trac.osgeo.org/mapbender/ticket/53 
+-- table gui_element: new column for translation
 --
-ALTER TABLE wms_format ALTER COLUMN data_format TYPE varchar(100);
+ALTER TABLE gui_element ADD COLUMN e_title VARCHAR(255);
 

