[Mapbender-commits] r2111 - in branches/2.5/http: javascripts php print sld

svn_mapbender at osgeo.org svn_mapbender at osgeo.org
Wed Feb 20 04:27:40 EST 2008 

Author: christoph
Date: 2008-02-20 04:27:39 -0500 (Wed, 20 Feb 2008)
New Revision: 2111

Modified:
   branches/2.5/http/javascripts/core.js
   branches/2.5/http/php/mod_SelectKeyword.php
   branches/2.5/http/php/mod_WMSpreferences.php
   branches/2.5/http/php/mod_button_tooltips.php
   branches/2.5/http/php/mod_createJSLayerObjFromXML.php
   branches/2.5/http/php/mod_createJSObjFromDB.php
   branches/2.5/http/php/mod_createJSObjFromDBByWMS.php
   branches/2.5/http/php/mod_createJSObjFromXML.php
   branches/2.5/http/php/mod_createUser.php
   branches/2.5/http/php/mod_deleteGUI.php
   branches/2.5/http/php/mod_deleteWFS.php
   branches/2.5/http/php/mod_deleteWMS.php
   branches/2.5/http/php/mod_digitize_messages.php
   branches/2.5/http/php/mod_displayKML.php
   branches/2.5/http/php/mod_editFilteredGroup.php
   branches/2.5/http/php/mod_editFilteredUser.php
   branches/2.5/http/php/mod_evalArea.php
   branches/2.5/http/php/mod_exportElement.php
   branches/2.5/http/php/mod_export_image.php
   branches/2.5/http/php/mod_featuretypeMetadata.php
   branches/2.5/http/php/mod_forgottenPassword.php
   branches/2.5/http/php/mod_gazLayerObj_conf.php
   branches/2.5/http/php/mod_gazLayerObj_edit.php
   branches/2.5/http/php/mod_gazetteerMetadata.php
   branches/2.5/http/php/mod_gazetteerMetadata_search.php
   branches/2.5/http/php/mod_gazetteer_conf.php
   branches/2.5/http/php/mod_gazetteer_edit.php
   branches/2.5/http/php/mod_help.php
   branches/2.5/http/php/mod_insertWmcIntoDb.php
   branches/2.5/http/php/mod_layerMetadata.php
   branches/2.5/http/php/mod_loadCapabilitiesList.php
   branches/2.5/http/php/mod_loadWFSCapabilities.php
   branches/2.5/http/php/mod_loadwfs.php
   branches/2.5/http/php/mod_loadwms_temp.php
   branches/2.5/http/php/mod_log.php
   branches/2.5/http/php/mod_logout.php
   branches/2.5/http/php/mod_map1.php
   branches/2.5/http/php/mod_mapOV.php
   branches/2.5/http/php/mod_owsproxy_conf.php
   branches/2.5/http/php/mod_printView1.php
   branches/2.5/http/php/mod_saveWKT.php
   branches/2.5/http/php/mod_setLocale.php
   branches/2.5/http/php/mod_simpleWMSpreferences.php
   branches/2.5/http/php/mod_switchLocale.php
   branches/2.5/http/php/mod_switchLocale_noreload.php
   branches/2.5/http/php/mod_treefolderAdmin.php
   branches/2.5/http/php/mod_treefolderClient.php
   branches/2.5/http/php/mod_updateKmlInDb.php
   branches/2.5/http/php/mod_usemap.php
   branches/2.5/http/php/mod_wfs.php
   branches/2.5/http/php/mod_wfsLayerObj_conf.php
   branches/2.5/http/php/mod_wfsSpatialRequest_messages.php
   branches/2.5/http/php/mod_wfs_conf.php
   branches/2.5/http/php/mod_wfs_edit.php
   branches/2.5/http/php/mod_wfs_gazetteer_server.php
   branches/2.5/http/php/mod_wfs_result.php
   branches/2.5/http/php/mod_wfs_save.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.php
   branches/2.5/http/print/mod_printPDF_pdf.php
   branches/2.5/http/sld/sld_filter_parse.php
   branches/2.5/http/sld/sld_parse.php
   branches/2.5/http/sld/sld_pick_color.php
Log:
added validateSession and validatePermission scripts

fixed some minor JS issues

Modified: branches/2.5/http/javascripts/core.js
===================================================================
--- branches/2.5/http/javascripts/core.js	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/javascripts/core.js	2008-02-20 09:27:39 UTC (rev 2111)
@@ -144,10 +144,10 @@
  * @deprecated
  */
 function writeTag(frameName, elName, tagSource) {
-  if(frameName && frameName != ""){
+  if(frameName && frameName !== ""){
      window.frames[frameName].document.getElementById(elName).innerHTML = tagSource;
   }
-  else if(!frameName || frameName == ""){
+  else if(!frameName || frameName === ""){
        document.getElementById(elName).innerHTML = tagSource;
   }
 }
\ No newline at end of file

Modified: branches/2.5/http/php/mod_SelectKeyword.php
===================================================================
--- branches/2.5/http/php/mod_SelectKeyword.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_SelectKeyword.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +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");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 

Modified: branches/2.5/http/php/mod_WMSpreferences.php
===================================================================
--- branches/2.5/http/php/mod_WMSpreferences.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_WMSpreferences.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +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");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
 session_start();

Modified: branches/2.5/http/php/mod_button_tooltips.php
===================================================================
--- branches/2.5/http/php/mod_button_tooltips.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_button_tooltips.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -20,6 +20,7 @@
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../extensions/JSON.php");
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 session_start();
 $con = db_connect(DBSERVER,OWNER,PW);

Modified: branches/2.5/http/php/mod_createJSLayerObjFromXML.php
===================================================================
--- branches/2.5/http/php/mod_createJSLayerObjFromXML.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_createJSLayerObjFromXML.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +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");
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>

Modified: branches/2.5/http/php/mod_createJSObjFromDB.php
===================================================================
--- branches/2.5/http/php/mod_createJSObjFromDB.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_createJSObjFromDB.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,7 @@
 
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_wms.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_createJSObjFromDBByWMS.php
===================================================================
--- branches/2.5/http/php/mod_createJSObjFromDBByWMS.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_createJSObjFromDBByWMS.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -23,6 +23,7 @@
 require_once(dirname(__FILE__)."/../classes/class_wms.php");
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $wms_id = $_GET["wms_id"];
 $gui_id = $_GET["gui_id"];

Modified: branches/2.5/http/php/mod_createJSObjFromXML.php
===================================================================
--- branches/2.5/http/php/mod_createJSObjFromXML.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_createJSObjFromXML.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,7 @@
 
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_wms.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $capabilitiesURL = html_entity_decode($_REQUEST['caps']);
 ?>

Modified: branches/2.5/http/php/mod_createUser.php
===================================================================
--- branches/2.5/http/php/mod_createUser.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_createUser.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -24,6 +24,8 @@
 	echo "This module is disabled. Please check your mapbender.conf.";
 	die;	
 }
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 require_once(dirname(__FILE__)."/../classes/class_gui.php");

Modified: branches/2.5/http/php/mod_deleteGUI.php
===================================================================
--- branches/2.5/http/php/mod_deleteGUI.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_deleteGUI.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,7 +19,7 @@
 
 session_start();
 import_request_variables("PG");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
@@ -48,7 +48,7 @@
 	var ind = document.form1.guiList.selectedIndex;
 	if(ind > -1){
 		var permission =  confirm("delete: " + document.form1.guiList.options[ind].text + " ?");
-		if(permission == true){
+		if(permission === true){
 			document.form1.del.value = 1;
 			document.form1.submit();
 		}

Modified: branches/2.5/http/php/mod_deleteWFS.php
===================================================================
--- branches/2.5/http/php/mod_deleteWFS.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_deleteWFS.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,7 +19,7 @@
 
 session_start();
 import_request_variables("PG");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);
@@ -48,7 +48,7 @@
 	var ind = document.form1.wfsList.selectedIndex;
 	if(ind > -1){
 		var permission =  confirm("delete: "  + document.form1.wfsList.options[ind].text + " ?");
-		if(permission == true){
+		if(permission === true){
 			document.form1.del.value = 1;
 			document.form1.submit();
 		}

Modified: branches/2.5/http/php/mod_deleteWMS.php
===================================================================
--- branches/2.5/http/php/mod_deleteWMS.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_deleteWMS.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -47,7 +47,7 @@
    var ind = document.form1.wmsList.selectedIndex;
    if(ind > -1) {
      var permission =  confirm("delete: " + document.form1.wmsList.options[ind].text + " ?");
-     if(permission == true) {
+     if(permission === true) {
         document.form1.del.value = 1;
         document.form1.submit();
      }
@@ -60,7 +60,7 @@
    if(ind > -1)
 	 {
      var permission =  confirm("A mail will be sent to the owners of '" + document.form1.wmsList.options[ind].text + "', suggesting its deletion.");
-     if(permission == true) {
+     if(permission === true) {
         document.form2.suggest.value = 1;
         document.form2.wms_name.value = document.form1.wmsList.options[ind].text;
         document.form2.owners.value = email_str;

Modified: branches/2.5/http/php/mod_digitize_messages.php
===================================================================
--- branches/2.5/http/php/mod_digitize_messages.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_digitize_messages.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -22,6 +22,7 @@
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../extensions/JSON.php");
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $e = new mb_notice("locale: " . $_SESSION["mb_locale"] . "; lang: " . $_SESSION["mb_lang"]);
 $e = new mb_notice(setlocale(LC_ALL, $_SESSION["mb_locale"]));

Modified: branches/2.5/http/php/mod_displayKML.php
===================================================================
--- branches/2.5/http/php/mod_displayKML.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_displayKML.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -22,6 +22,7 @@
 
 require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $kmlId = $_GET["kmlId"];
 

Modified: branches/2.5/http/php/mod_editFilteredGroup.php
===================================================================
--- branches/2.5/http/php/mod_editFilteredGroup.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_editFilteredGroup.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -50,7 +50,7 @@
      if(val == 'delete'){
         permission = confirm("Delete Group?");
      }
-     if(permission == true){
+     if(permission === true){
         document.forms[0].action.value = val;
         document.forms[0].submit();
      }
@@ -58,7 +58,7 @@
 }
 function validateInput(){
   var str_alert = "Input incorrect !";
-  if(document.forms[0].name.value == ''){
+  if(document.forms[0].name.value === ''){
       alert(str_alert);
       document.forms[0].name.focus();
       return 'false';

Modified: branches/2.5/http/php/mod_editFilteredUser.php
===================================================================
--- branches/2.5/http/php/mod_editFilteredUser.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_editFilteredUser.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -53,7 +53,7 @@
      if(val == 'delete'){
         permission = confirm("Delete User?");
      }
-     if(permission == true){
+     if(permission === true){
         if(document.forms[0].password.value == myPW){
             document.forms[0].password.value = '';
         }
@@ -64,27 +64,27 @@
 }
 function validateInput(){
   var str_alert = "Input incorrect !";
-  if(document.forms[0].name.value == ''){
+  if(document.forms[0].name.value === ''){
       alert(str_alert);
       document.forms[0].name.focus();
       return 'false';
   }
-  if(document.forms[0].password.value == ''){
+  if(document.forms[0].password.value === ''){
       alert(str_alert);
       document.forms[0].password.focus();
       return 'false';
   }
-  if((document.forms[0].password.value != myPW || document.forms[0].v_password.value != '' )&& document.forms[0].password.value != document.forms[0].v_password.value){
+  if((document.forms[0].password.value != myPW || document.forms[0].v_password.value !== '' )&& document.forms[0].password.value != document.forms[0].v_password.value){
       alert("Password verification failed. You have to enter the same password twice!");
       document.forms[0].password.value = myPW;
       document.forms[0].password.focus();
       return 'false';
   }
-  if(document.forms[0].resolution.value == ''){
+  if(document.forms[0].resolution.value === ''){
       document.forms[0].resolution.value = 72;
       return 'true';
   }
-  if(document.forms[0].login_count.value == ''){
+  if(document.forms[0].login_count.value === ''){
       document.forms[0].login_count.value = 0;
       return 'true';
   }
@@ -98,23 +98,25 @@
 	var selection=[];
 	var i,j,selected;
 	for(i=0;i<list.options.length;i++){
-		if(list.options[i].selected)
-			selection[selection.length]=list.options[i].value;
+		if (list.options[i].selected) {
+			selection[selection.length] = list.options[i].value;
+		}
 	}
 	
 	list.options.length = 1;
 	for(i=0; i<all.length; i++){
-		if(all[i]['name'].toLowerCase().indexOf(str)==-1)
+		if (all[i].name.toLowerCase().indexOf(str) == -1) {
 			continue;
+		}
 		selected=false;
 		for(j=0;j<selection.length;j++){
-			if(selection[j]==all[i]['id']){
+			if(selection[j]==all[i].id){
 				selected=true;
 				break;
 			}
 		}
-		var newOption = new Option(all[i]['name'],all[i]['id'],false,selected);
-		newOption.setAttribute("title", all[i]['email']);
+		var newOption = new Option(all[i].name, all[i].id,false,selected);
+		newOption.setAttribute("title", all[i].email);
 		list.options[list.options.length] = newOption;
 	}	
 }

Modified: branches/2.5/http/php/mod_evalArea.php
===================================================================
--- branches/2.5/http/php/mod_evalArea.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_evalArea.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -20,6 +20,7 @@
 include '../include/dyn_css.php';
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -78,7 +79,7 @@
 	   echo "Fl&auml;che: 0 m<sup>2</sup>";
 	}
 }else{
-	#echo "Flächenberechnung für MySQL liegt derzeit nicht vor<br></sup>";
+	#echo "Fl�chenberechnung f�r MySQL liegt derzeit nicht vor<br></sup>";
 	#$con = db_connect($GEOS_DBSERVER,$GEOS_PORT,$GEOS_OWNER,$GEOS_PW);
 	#db_select_db($GEOS_DBSERVER,$con);
 	$con_string = "host=$GEOS_DBSERVER port=$GEOS_PORT dbname=$GEOS_DB user=$GEOS_OWNER password=$GEOS_PW";

Modified: branches/2.5/http/php/mod_exportElement.php
===================================================================
--- branches/2.5/http/php/mod_exportElement.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_exportElement.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +18,8 @@
 # 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">
 <html>

Modified: branches/2.5/http/php/mod_export_image.php
===================================================================
--- branches/2.5/http/php/mod_export_image.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_export_image.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -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.
 session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 import_request_variables("PG");
 $_SESSION["mb_print_url"] = $map_url;
 $_SESSION["mb_print_resolution"] = $quality;

Modified: branches/2.5/http/php/mod_featuretypeMetadata.php
===================================================================
--- branches/2.5/http/php/mod_featuretypeMetadata.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_featuretypeMetadata.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +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");
 
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_forgottenPassword.php
===================================================================
--- branches/2.5/http/php/mod_forgottenPassword.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_forgottenPassword.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,7 @@
 
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+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.5/http/php/mod_gazLayerObj_conf.php
===================================================================
--- branches/2.5/http/php/mod_gazLayerObj_conf.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_gazLayerObj_conf.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,8 @@
 
 require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
 require(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 ?>
 <html>
 <head>

Modified: branches/2.5/http/php/mod_gazLayerObj_edit.php
===================================================================
--- branches/2.5/http/php/mod_gazLayerObj_edit.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_gazLayerObj_edit.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +18,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 require(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 ?>
 <html>
 <head>

Modified: branches/2.5/http/php/mod_gazetteerMetadata.php
===================================================================
--- branches/2.5/http/php/mod_gazetteerMetadata.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_gazetteerMetadata.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -23,6 +23,7 @@
 
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_gazetteerMetadata_search.php
===================================================================
--- branches/2.5/http/php/mod_gazetteerMetadata_search.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_gazetteerMetadata_search.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -7,6 +7,7 @@
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 require_once(dirname(__FILE__)."/../extensions/JSON.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $n = new administration();
 $myguis = $n->getGuisByPermission($user_id, true);

Modified: branches/2.5/http/php/mod_gazetteer_conf.php
===================================================================
--- branches/2.5/http/php/mod_gazetteer_conf.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_gazetteer_conf.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,7 @@
 
 require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
 require(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 <html>
 <head>

Modified: branches/2.5/http/php/mod_gazetteer_edit.php
===================================================================
--- branches/2.5/http/php/mod_gazetteer_edit.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_gazetteer_edit.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 require(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 <html>
 <head>

Modified: branches/2.5/http/php/mod_help.php
===================================================================
--- branches/2.5/http/php/mod_help.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_help.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +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");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 

Modified: branches/2.5/http/php/mod_insertWmcIntoDb.php
===================================================================
--- branches/2.5/http/php/mod_insertWmcIntoDb.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_insertWmcIntoDb.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -22,6 +22,7 @@
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 require_once(dirname(__FILE__)."/../classes/class_wmc.php");
 require_once(dirname(__FILE__)."/../extensions/JSON.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 session_start();
 $con = db_connect($DBSERVER,$OWNER,$PW);

Modified: branches/2.5/http/php/mod_layerMetadata.php
===================================================================
--- branches/2.5/http/php/mod_layerMetadata.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_layerMetadata.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +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");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 

Modified: branches/2.5/http/php/mod_loadCapabilitiesList.php
===================================================================
--- branches/2.5/http/php/mod_loadCapabilitiesList.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_loadCapabilitiesList.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -22,7 +22,7 @@
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 
-include(dirname(__FILE__)."/../php/mb_validateSession.php");
+include(dirname(__FILE__)."/../php/mb_validatePermission.php");
 import_request_variables("PG");
 ?>
 

Modified: branches/2.5/http/php/mod_loadWFSCapabilities.php
===================================================================
--- branches/2.5/http/php/mod_loadWFSCapabilities.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_loadWFSCapabilities.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,7 +19,7 @@
 
 session_start();
 
-include(dirname(__FILE__)."/../php/mb_validateSession.php");
+include(dirname(__FILE__)."/../php/mb_validatePermission.php");
 include(dirname(__FILE__)."/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_loadwfs.php
===================================================================
--- branches/2.5/http/php/mod_loadwfs.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_loadwfs.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -20,6 +20,7 @@
 session_start();
 
 require_once(dirname(__FILE__)."/mb_validateInput.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_wfs.php"); 
 echo "file: ".$_REQUEST["xml_file"];

Modified: branches/2.5/http/php/mod_loadwms_temp.php
===================================================================
--- branches/2.5/http/php/mod_loadwms_temp.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_loadwms_temp.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -21,6 +21,7 @@
 require_once(dirname(__FILE__)."/mb_validateInput.php");
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_wms.php"); 
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 
 #echo "file: ".$_REQUEST["xml_file"];

Modified: branches/2.5/http/php/mod_log.php
===================================================================
--- branches/2.5/http/php/mod_log.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_log.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -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.
 include_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.5/http/php/mod_logout.php
===================================================================
--- branches/2.5/http/php/mod_logout.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_logout.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +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");
 
 session_start();
 $con = db_connect($DBSERVER,$OWNER,$PW);

Modified: branches/2.5/http/php/mod_map1.php
===================================================================
--- branches/2.5/http/php/mod_map1.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_map1.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,7 @@
 
 session_start();
 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 = $_SESSION["mb_user_gui"];

Modified: branches/2.5/http/php/mod_mapOV.php
===================================================================
--- branches/2.5/http/php/mod_mapOV.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_mapOV.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,7 @@
 
 session_start();
 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);
 

Modified: branches/2.5/http/php/mod_owsproxy_conf.php
===================================================================
--- branches/2.5/http/php/mod_owsproxy_conf.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_owsproxy_conf.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -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(dirname(__FILE__)."/../php/mb_validateSession.php");
+include(dirname(__FILE__)."/../php/mb_validatePermission.php");
 include(dirname(__FILE__)."/../classes/class_administration.php");
 $admin = new administration();
 $ownwms = $admin->getWmsByOwner($_SESSION["mb_user_id"]);

Modified: branches/2.5/http/php/mod_printView1.php
===================================================================
--- branches/2.5/http/php/mod_printView1.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_printView1.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -23,6 +23,7 @@
 $_SESSION["mb_print_url"] = $map_url;
 $_SESSION["mb_print_resolution"] = $quality;
 include(dirname(__FILE__)."/../../conf/print.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
@@ -77,7 +78,7 @@
 echo "<div  style='position: absolute; top:".($printOffset_top+1)."px;left:".($printOffset_left+1)."px; z-index:1;width:".($map_width/2-1)."px; height:".($header_height -2)."px;'>";
 echo "<div style='position:relative;left:5px; font-weight:bold; font-size:20px;z-index:3;'>".$printTitle . "</div>";
 echo "<div style='position:relative;left:5px;z-index:3;'>Datum: ".$date . "</div>";
-echo "<div style='position:relative;left:5px;z-index:3;'>Maßstab: 1:".$map_scale . "</div>";
+echo "<div style='position:relative;left:5px;z-index:3;'>Ma�stab: 1:".$map_scale . "</div>";
 echo"</div>"; 
 
 echo "<img class='bg_header' style='position: absolute; top:".($printOffset_top+1)."px;left:".($printOffset_left + $map_width/2+2)."px; z-index:1;width:".($map_width/2-1)."px; height:".($header_height -2)."px;' src='../img/white.gif'>";

Modified: branches/2.5/http/php/mod_saveWKT.php
===================================================================
--- branches/2.5/http/php/mod_saveWKT.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_saveWKT.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,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");
 ?>
 <html>
 <head>
@@ -68,12 +69,12 @@
 </script>
 </head>
 <!-- <body onload='checkGeom()'>  
-//NEW!!! Bei Erstaufruf ist die ausgewählte Tabelle (und deren Geometrie) noch nicht bekannt! 
+//NEW!!! Bei Erstaufruf ist die ausgew�hlte Tabelle (und deren Geometrie) noch nicht bekannt! 
 Deshalb zuvor eine Fehlermeldung.  Jetzt als PHP-Code, siehe if($save)   -->
 <body> 
 <?php 
 /*****************************************************************************
-personal postgresql parameters - persönliche Postgresql-Einstellungen    */
+personal postgresql parameters - pers�nliche Postgresql-Einstellungen    */
 $host = "localhost";
 $port = "5432";
 define("DBname", "databasename");
@@ -162,12 +163,12 @@
  //NEW!!! in Tabellen vom GEOMETRY-Typ lassen sich (datensatzweise) verschiedene Geometrien abspeichern
  if ($geometryType != $geoType && $geometryType != 'GEOMETRY') { 
 	echo "<br>";
-	echo "Geometrie (".$geoType.") stimmt nicht mit der der Tabelle (".$geometryType.") überein!";
+	echo "Geometrie (".$geoType.") stimmt nicht mit der der Tabelle (".$geometryType.") �berein!";
 	die;
  }
 
  if(count(myX) != count(myY)){
-   echo "Geometrie verschlüsselt.....................";
+   echo "Geometrie verschl�sselt.....................";
    die;
  }
  $sql = "INSERT INTO ".$tablenames."(";
@@ -185,7 +186,7 @@
    } 
 
    if($myColumns[$i] == $myGeometry){
-		//NEW!!  $geoType anstelle von $geometryType, um a) auch in Tabellen mit Geometrietyp 'Geometry' abspeichern zu können
+		//NEW!!  $geoType anstelle von $geometryType, um a) auch in Tabellen mit Geometrietyp 'Geometry' abspeichern zu k�nnen
 		if ($geoType == "POINT") { 
 			$sql .= "transform(GeometryFromText('".$geoType."("; //$geoType anstelle von $geometryType s. o.
 		} elseif ($geoType == "LINESTRING") { 
@@ -215,7 +216,7 @@
 //			$sql .= ")))))',".$src_epsg."),".$epsg.")";  // 0.9
 			$sql .= ")))',".$src_epsg."),".$epsg.")"; // postgis 1.0.0
 		} 
-/* Linestrings lassen sich in MULTILINESTRING, Polygone in MULTIPOLYGON-Tabellen abspeichern, wenn gegen $geoType geprüft wird, ergibt sich kein Problem
+/* Linestrings lassen sich in MULTILINESTRING, Polygone in MULTIPOLYGON-Tabellen abspeichern, wenn gegen $geoType gepr�ft wird, ergibt sich kein Problem
 // da sich aber MULTI... nicht in Tabellen vom einfachen Typ LINESTRING bzw. POLYGON  abspeichern lassen, wurde dies oben (unelegant) abgefangen		
 		else {
 			echo "<br>Tabelle vom Typ Linestring, Polygon etc?";

Modified: branches/2.5/http/php/mod_setLocale.php
===================================================================
--- branches/2.5/http/php/mod_setLocale.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_setLocale.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -20,6 +20,7 @@
 session_start();
 require_once(dirname(__FILE__) . "/../classes/class_locale.php");
 require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 $_SESSION["mb_lang"] = $_REQUEST["lang"];
 $localeObj = new Mb_locale($_SESSION["mb_lang"]);
 session_write_close();

Modified: branches/2.5/http/php/mod_simpleWMSpreferences.php
===================================================================
--- branches/2.5/http/php/mod_simpleWMSpreferences.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_simpleWMSpreferences.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,7 @@
 
 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">
 

Modified: branches/2.5/http/php/mod_switchLocale.php
===================================================================
--- branches/2.5/http/php/mod_switchLocale.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_switchLocale.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -23,6 +23,7 @@
 
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_switchLocale_noreload.php
===================================================================
--- branches/2.5/http/php/mod_switchLocale_noreload.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_switchLocale_noreload.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -23,6 +23,7 @@
 
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_treefolderAdmin.php
===================================================================
--- branches/2.5/http/php/mod_treefolderAdmin.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_treefolderAdmin.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -21,6 +21,8 @@
 
 import_request_variables("PG");
 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);
 ?>

Modified: branches/2.5/http/php/mod_treefolderClient.php
===================================================================
--- branches/2.5/http/php/mod_treefolderClient.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_treefolderClient.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -21,6 +21,8 @@
 
 import_request_variables("PG");
 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);
 $guiList = $_SESSION["mb_user_gui"];

Modified: branches/2.5/http/php/mod_updateKmlInDb.php
===================================================================
--- branches/2.5/http/php/mod_updateKmlInDb.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_updateKmlInDb.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -23,6 +23,7 @@
 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");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $kmlId = $_POST["kmlId"];
 $placemarkId = $_POST["placemarkId"];

Modified: branches/2.5/http/php/mod_usemap.php
===================================================================
--- branches/2.5/http/php/mod_usemap.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_usemap.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -26,6 +26,8 @@
 </head>
 <?php
 include_once(dirname(__FILE__)."/../classes/class_gml2.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 $url = urldecode($_REQUEST["url"]);
 
 $g = new gml2();

Modified: branches/2.5/http/php/mod_wfs.php
===================================================================
--- branches/2.5/http/php/mod_wfs.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfs.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,8 @@
 
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 //require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>

Modified: branches/2.5/http/php/mod_wfsLayerObj_conf.php
===================================================================
--- branches/2.5/http/php/mod_wfsLayerObj_conf.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfsLayerObj_conf.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,8 @@
 
 require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
 require(dirname(__FILE__)."/../../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.5/http/php/mod_wfsSpatialRequest_messages.php
===================================================================
--- branches/2.5/http/php/mod_wfsSpatialRequest_messages.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfsSpatialRequest_messages.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -20,6 +20,7 @@
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../extensions/JSON.php");
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 session_start();
 

Modified: branches/2.5/http/php/mod_wfs_conf.php
===================================================================
--- branches/2.5/http/php/mod_wfs_conf.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfs_conf.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require(dirname(__FILE__)."/../../conf/mapbender.conf");
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_wfs_edit.php
===================================================================
--- branches/2.5/http/php/mod_wfs_edit.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfs_edit.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +18,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 require(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 session_start();
 ?>
 <html>

Modified: branches/2.5/http/php/mod_wfs_gazetteer_server.php
===================================================================
--- branches/2.5/http/php/mod_wfs_gazetteer_server.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfs_gazetteer_server.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -25,6 +25,7 @@
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 require_once(dirname(__FILE__)."/../classes/class_wfs_conf.php");
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
 db_select_db($DB,$con);

Modified: branches/2.5/http/php/mod_wfs_result.php
===================================================================
--- branches/2.5/http/php/mod_wfs_result.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfs_result.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -27,7 +27,9 @@
 require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
 require_once(dirname(__FILE__) . "/../classes/class_stripRequest.php");
 require_once(dirname(__FILE__) . "/../classes/class_connector.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
+
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);
 

Modified: branches/2.5/http/php/mod_wfs_save.php
===================================================================
--- branches/2.5/http/php/mod_wfs_save.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfs_save.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -20,6 +20,8 @@
 # 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");
+
 echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';	
 ?>
 <title>WFS Save</title>

Modified: branches/2.5/http/php/mod_wfs_server.php
===================================================================
--- branches/2.5/http/php/mod_wfs_server.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfs_server.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -5,7 +5,9 @@
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
 require_once(dirname(__FILE__)."/../classes/class_wfs.php");
 include_once(dirname(__FILE__) . "/../extensions/JSON.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
+
 //db connection
 $con = db_connect(DBSERVER,OWNER,PW);
 db_select_db(DB,$con);

Modified: branches/2.5/http/php/mod_wfsrequest.php
===================================================================
--- branches/2.5/http/php/mod_wfsrequest.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/php/mod_wfsrequest.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -19,6 +19,9 @@
 
 # ur # echo urldecode(stripslashes(utf8_decode($_REQUEST["filter"])));
 # ur # die;
+
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
 function checkInput($s){
 	if(!preg_match('/[^\s\d\w\-\.öüäßÄÖÜ]|--/',$s)){
 		return addslashes($s);

Modified: branches/2.5/http/print/mod_printPDF.php
===================================================================
--- branches/2.5/http/print/mod_printPDF.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/print/mod_printPDF.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -18,6 +18,7 @@
 # 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">

Modified: branches/2.5/http/print/mod_printPDF_pdf.php
===================================================================
--- branches/2.5/http/print/mod_printPDF_pdf.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/print/mod_printPDF_pdf.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -30,6 +30,7 @@
 include (dirname(__FILE__)."/../print/".$_REQUEST["conf"]);
 include (dirname(__FILE__)."/../classes/class_SaveLegend.php");
 include (dirname(__FILE__)."/../print/print_functions.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 if($log == true){
 	include (dirname(__FILE__)."/../classes/class_log.php");

Modified: branches/2.5/http/sld/sld_filter_parse.php
===================================================================
--- branches/2.5/http/sld/sld_filter_parse.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/sld/sld_filter_parse.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -28,6 +28,7 @@
 
 include_once(dirname(__FILE__)."/classes/StyledLayerDescriptor.php");
 session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 /**
  * Parses a given filter expression and creates the object structure.

Modified: branches/2.5/http/sld/sld_parse.php
===================================================================
--- branches/2.5/http/sld/sld_parse.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/sld/sld_parse.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -34,6 +34,7 @@
  */
 
 session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 /**
  *  Creates a empty SLD object up to the rule object

Modified: branches/2.5/http/sld/sld_pick_color.php
===================================================================
--- branches/2.5/http/sld/sld_pick_color.php	2008-02-19 18:32:05 UTC (rev 2110)
+++ branches/2.5/http/sld/sld_pick_color.php	2008-02-20 09:27:39 UTC (rev 2111)
@@ -34,6 +34,7 @@
 session_start();
 $id = $_REQUEST["id"];
 $color= $_REQUEST["color"];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 ?>
 <html>
 <head>

More information about the Mapbender_commits mailing list