[Mapbender-commits] r2138 - branches/2.4.5/http/php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Feb 21 12:12:42 EST 2008
Author: christoph
Date: 2008-02-21 12:12:42 -0500 (Thu, 21 Feb 2008)
New Revision: 2138
Modified:
branches/2.4.5/http/php/mb_js_exception.php
branches/2.4.5/http/php/mb_listWMCs.php
branches/2.4.5/http/php/mb_validatePermission.php
branches/2.4.5/http/php/mb_validateSession.php
branches/2.4.5/http/php/mod_SelectKeyword.php
branches/2.4.5/http/php/mod_WMSpreferences.php
branches/2.4.5/http/php/mod_addWMSfromfilteredList_server.php
branches/2.4.5/http/php/mod_addWmsFromFeatureInfo.php
branches/2.4.5/http/php/mod_changeEPSG.php
branches/2.4.5/http/php/mod_changeEPSG_dynamic.php
branches/2.4.5/http/php/mod_changePassword.php
branches/2.4.5/http/php/mod_createJSLayerObjFromXML.php
branches/2.4.5/http/php/mod_createJSObjFromDBByWMS.php
branches/2.4.5/http/php/mod_createJSObjFromXML.php
branches/2.4.5/http/php/mod_createUser.php
branches/2.4.5/http/php/mod_deleteFilteredGUI.php
branches/2.4.5/http/php/mod_deleteGUI.php
branches/2.4.5/http/php/mod_deleteWFS.php
branches/2.4.5/http/php/mod_deleteWMS.php
branches/2.4.5/http/php/mod_editElementVars.php
branches/2.4.5/http/php/mod_editElements.php
branches/2.4.5/http/php/mod_editFilteredGroup.php
branches/2.4.5/http/php/mod_editFilteredUser.php
branches/2.4.5/http/php/mod_editGroup.php
branches/2.4.5/http/php/mod_editGuiWms.php
branches/2.4.5/http/php/mod_editGuiWmsMeta.php
branches/2.4.5/http/php/mod_editSelf.php
branches/2.4.5/http/php/mod_editUser.php
branches/2.4.5/http/php/mod_editWMS_Metadata.php
branches/2.4.5/http/php/mod_edit_element_vars.php
branches/2.4.5/http/php/mod_edit_metadata.php
branches/2.4.5/http/php/mod_evalArea.php
branches/2.4.5/http/php/mod_exportElement.php
branches/2.4.5/http/php/mod_exportGUI.php
branches/2.4.5/http/php/mod_export_image.php
branches/2.4.5/http/php/mod_filteredGroup_Gui.php
branches/2.4.5/http/php/mod_filteredGroup_User.php
branches/2.4.5/http/php/mod_filteredGroup_filteredGui.php
branches/2.4.5/http/php/mod_filteredGroup_filteredUser.php
branches/2.4.5/http/php/mod_filteredGui_User.php
branches/2.4.5/http/php/mod_filteredGui_filteredGroup.php
branches/2.4.5/http/php/mod_filteredGui_filteredUser.php
branches/2.4.5/http/php/mod_filteredGui_group.php
branches/2.4.5/http/php/mod_filteredUser_Group.php
branches/2.4.5/http/php/mod_filteredUser_Gui.php
branches/2.4.5/http/php/mod_filteredUser_filteredGroup.php
branches/2.4.5/http/php/mod_filteredUser_filteredGui.php
branches/2.4.5/http/php/mod_filteredWms_layer_topic.php
branches/2.4.5/http/php/mod_filteredWms_topic.php
branches/2.4.5/http/php/mod_forgottenPassword.php
branches/2.4.5/http/php/mod_gazLayerObj_conf.php
branches/2.4.5/http/php/mod_gazLayerObj_edit.php
branches/2.4.5/http/php/mod_gazetteerMetadata.php
branches/2.4.5/http/php/mod_gazetteerMetadata_search.php
branches/2.4.5/http/php/mod_gazetteerSQL_server.php
branches/2.4.5/http/php/mod_gazetteer_conf.php
branches/2.4.5/http/php/mod_gazetteer_edit.php
branches/2.4.5/http/php/mod_getStyles.php
branches/2.4.5/http/php/mod_group_filteredGui.php
branches/2.4.5/http/php/mod_group_filteredUser.php
branches/2.4.5/http/php/mod_group_gui.php
branches/2.4.5/http/php/mod_group_user.php
branches/2.4.5/http/php/mod_gui_filteredGroup.php
branches/2.4.5/http/php/mod_gui_filteredUser.php
branches/2.4.5/http/php/mod_gui_group.php
branches/2.4.5/http/php/mod_gui_owner.php
branches/2.4.5/http/php/mod_gui_user.php
branches/2.4.5/http/php/mod_help.php
branches/2.4.5/http/php/mod_insertWmcIntoDb.php
branches/2.4.5/http/php/mod_layerMetadata.php
branches/2.4.5/http/php/mod_loadCapabilities.php
branches/2.4.5/http/php/mod_loadCapabilitiesList.php
branches/2.4.5/http/php/mod_loadCapabilities_temp.php
branches/2.4.5/http/php/mod_loadWFSCapabilities.php
branches/2.4.5/http/php/mod_loadwfs.php
branches/2.4.5/http/php/mod_loadwms.php
branches/2.4.5/http/php/mod_loadwms_temp.php
branches/2.4.5/http/php/mod_log.php
branches/2.4.5/http/php/mod_logout.php
branches/2.4.5/http/php/mod_map1.php
branches/2.4.5/http/php/mod_mapOV.php
branches/2.4.5/http/php/mod_meetingPoint.php
branches/2.4.5/http/php/mod_newGui.php
branches/2.4.5/http/php/mod_orphanWMS.php
branches/2.4.5/http/php/mod_printView1.php
branches/2.4.5/http/php/mod_renameGUI.php
branches/2.4.5/http/php/mod_saveWKT.php
branches/2.4.5/http/php/mod_showLoggedUser.php
branches/2.4.5/http/php/mod_simpleWMSpreferences.php
branches/2.4.5/http/php/mod_treefolderAdmin.php
branches/2.4.5/http/php/mod_treefolderClient.php
branches/2.4.5/http/php/mod_updateWMS.php
branches/2.4.5/http/php/mod_usemap.php
branches/2.4.5/http/php/mod_user_filteredGroup.php
branches/2.4.5/http/php/mod_user_filteredGui.php
branches/2.4.5/http/php/mod_user_group.php
branches/2.4.5/http/php/mod_user_gui.php
branches/2.4.5/http/php/mod_wfs.php
branches/2.4.5/http/php/mod_wfsLayerObj_conf.php
branches/2.4.5/http/php/mod_wfs_conf.php
branches/2.4.5/http/php/mod_wfs_edit.php
branches/2.4.5/http/php/mod_wfs_gazetteer_server.php
branches/2.4.5/http/php/mod_wfs_result.php
branches/2.4.5/http/php/mod_wfs_save.php
branches/2.4.5/http/php/mod_wfsrequest.php
branches/2.4.5/http/php/mod_zoomCoords.php
branches/2.4.5/http/php/mod_zoomCoords_en.php
branches/2.4.5/http/php/nestedSets.php
Log:
added correct form action including GET params
Modified: branches/2.4.5/http/php/mb_js_exception.php
===================================================================
--- branches/2.4.5/http/php/mb_js_exception.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mb_js_exception.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -1,4 +1,6 @@
<?php
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
$message = $_POST['text'];
$level = $_POST['level'];
Modified: branches/2.4.5/http/php/mb_listWMCs.php
===================================================================
--- branches/2.4.5/http/php/mb_listWMCs.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mb_listWMCs.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -16,7 +16,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 = $_SESSION["mb_user_gui"];
$user_id = $_SESSION["mb_user_id"];
@@ -26,8 +27,9 @@
$delWmcId = $_POST["del_wmc_id"];
$clientFilename = $_FILES['local_wmc_filename']['tmp_name'];
-$form_target = $_SERVER["PHP_SELF"] . "?" . SID;
+$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
+
require_once("../../conf/mapbender.conf");
require_once("../classes/class_administration.php");
require_once("../classes/class_mb_exception.php");
@@ -46,7 +48,7 @@
<title>Select web map contect document from list</title>
</head>
<body>
- <form name='delete_wmc' action='<?php echo $form_target; ?>' method='POST'>
+ <form name='delete_wmc' action='<?php echo $self; ?>' method='POST'>
<input type='hidden' id='delete_wmc' name='del_wmc_id' value ='' >
</form>
@@ -166,14 +168,14 @@
// load a WMC from file
?>
<h2 style='font-family: Arial, Helvetica, sans-serif; color: #808080;background-color: White;'><font align='left' color='#000000'>load WMC from file</font></h2>
-<form enctype="multipart/form-data" action="<?php echo $form_target;?>" method=POST target="_self">
+<form enctype="multipart/form-data" action="<?php echo $self;?>" method=POST target="_self">
<input type='file' name='local_wmc_filename'>
<input type='submit' value='load'>
</form>
<?php
// load a WMC from list
-echo mb_listWMCs($wmcIdArray, $form_target);
+echo mb_listWMCs($wmcIdArray, $self);
if ($wmcId && in_array($wmcId, $wmcIdArray)){
if ($action == "delete") {
Modified: branches/2.4.5/http/php/mb_validatePermission.php
===================================================================
--- branches/2.4.5/http/php/mb_validatePermission.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mb_validatePermission.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,23 +17,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();
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-include_once(dirname(__FILE__)."/../classes/class_administration.php");
-if(!isset($_SESSION["mb_user_id"]) || !isset($_SESSION["mb_user_ip"]) || $_SESSION['mb_user_ip'] != $_SERVER['REMOTE_ADDR']){
- header("Location: ".LOGIN);
- exit;
- die();
-}
-if(isset($_REQUEST["gui_id"])){
- if( !in_array($_REQUEST["gui_id"],$_SESSION["mb_user_guis"])){
- header("Location: ".LOGIN);
- exit;
- die();
- }
-}
+require(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
$n = new administration();
-$m = $n->getModulPermission($_SESSION["mb_user_id"],$_REQUEST["guiID"],$_REQUEST["elementID"]);
+$m = $n->getModulPermission($_SESSION["mb_user_id"],$_REQUEST["guiID"],$_REQUEST["elementID"]) ||
+ $n->getModulPermission($_SESSION["mb_user_id"],$_REQUEST["gui_id"],$_REQUEST["elementID"]);
if($m == false){
header("Location: ".LOGIN);
exit;
Modified: branches/2.4.5/http/php/mb_validateSession.php
===================================================================
--- branches/2.4.5/http/php/mb_validateSession.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mb_validateSession.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,14 +18,20 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
session_start();
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
+$urlParameters = SID . "&guiID=" . $_REQUEST["guiID"] . "&elementID=" . $_REQUEST["elementID"];
+$self = $PHP_SELF . "?" . $urlParameters;
+
if(!isset($_SESSION["mb_user_id"]) || !isset($_SESSION["mb_user_ip"]) || $_SESSION['mb_user_ip'] != $_SERVER['REMOTE_ADDR']){
header("Location: ".LOGIN);
exit;
die();
}
-if(isset($_REQUEST["gui_id"])){
- if( !in_array($_REQUEST["gui_id"],$_SESSION["mb_user_guis"])){
+
+if(isset($_REQUEST["gui_id"]) || isset($_REQUEST["guiID"])){
+ if( !in_array($_REQUEST["gui_id"],$_SESSION["mb_user_guis"]) &&
+ !in_array($_REQUEST["guiID"],$_SESSION["mb_user_guis"])){
header("Location: ".LOGIN);
exit;
die();
Modified: branches/2.4.5/http/php/mod_SelectKeyword.php
===================================================================
--- branches/2.4.5/http/php/mod_SelectKeyword.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_SelectKeyword.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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");
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
Modified: branches/2.4.5/http/php/mod_WMSpreferences.php
===================================================================
--- branches/2.4.5/http/php/mod_WMSpreferences.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_WMSpreferences.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
-session_start();
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_addWMSfromfilteredList_server.php
===================================================================
--- branches/2.4.5/http/php/mod_addWMSfromfilteredList_server.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_addWMSfromfilteredList_server.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,8 +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.
-session_start();
-
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
Modified: branches/2.4.5/http/php/mod_addWmsFromFeatureInfo.php
===================================================================
--- branches/2.4.5/http/php/mod_addWmsFromFeatureInfo.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_addWmsFromFeatureInfo.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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.
-import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect($DBSERVER,$OWNER,$PW);
Modified: branches/2.4.5/http/php/mod_changeEPSG.php
===================================================================
--- branches/2.4.5/http/php/mod_changeEPSG.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_changeEPSG.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,8 +18,10 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
require(dirname(__FILE__)."/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$gui_id = $_SESSION["mb_user_gui"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
?>
@@ -199,7 +201,7 @@
</script>
</head>
<body leftmargin="1" topmargin="1" onload="mod_changeEPSG_init()" bgcolor="red">
-<form action="<?php echo $PHP_SELF .'?'.SID ?>" method='POST'>
+<form action="<?php echo $self; ?>" method='POST'>
<select class='epsg' name='epsg' onchange='mod_changeEPSG()'>
<option value="">undefined</option>
<option value="EPSG:4326">EPSG:4326</option>
Modified: branches/2.4.5/http/php/mod_changeEPSG_dynamic.php
===================================================================
--- branches/2.4.5/http/php/mod_changeEPSG_dynamic.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_changeEPSG_dynamic.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -230,7 +230,7 @@
<?php
/*insert EPSG into selectbox************************************************************************************/
-echo "<form action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form action='" . $self ."' method='post'>";
echo "<select class='epsg' name='epsg' onChange='mod_changeEPSG()'>";
for($i=0; $i<$cnt_epsg_wms; $i++){
echo "<option value='" . $epsg_code[$i] . "' ";
Modified: branches/2.4.5/http/php/mod_changePassword.php
===================================================================
--- branches/2.4.5/http/php/mod_changePassword.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_changePassword.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -21,7 +21,6 @@
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-import_request_variables("PG");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -58,7 +57,7 @@
return false;
}
if(document.form1.newpassword.value.length < 6 || document.form1.newpassword.value.search(/\d/) == -1 || document.form1.newpassword.value.search(/\D/) == -1 ){
- //alert("Bitte beachten Sie die unten\naufgeführten Passwortregeln!");
+ //alert("Bitte beachten Sie die unten\naufgef�hrten Passwortregeln!");
alert("Please note the rules for choosing a password below!");
document.form1.newpassword.focus();
document.form1.upd.value='false';
@@ -66,7 +65,7 @@
}
var letter = document.form1.newpassword.value.match(/\D/);
if(eval("document.form1.newpassword.value.match(/" + letter + "/gi).length") > 4){
- //alert("Bitte beachten Sie die unten\naufgeführten Passwortregeln!");
+ //alert("Bitte beachten Sie die unten\naufgef�hrten Passwortregeln!");
alert("Please note the rules for choosing a password below!");
document.form1.newpassword.focus();
document.form1.upd.value='false';
@@ -74,21 +73,21 @@
}
var integer = document.form1.newpassword.value.match(/\d/);
if(eval("document.form1.newpassword.value.match(/" + integer + "/gi).length") > 4){
- //alert("Bitte beachten Sie die unten\naufgeführten Passwortregeln!");
+ //alert("Bitte beachten Sie die unten\naufgef�hrten Passwortregeln!");
alert("Please note the rules for choosing a password below!");
document.form1.newpassword.focus();
document.form1.upd.value='false';
return false;
}
if(document.form1.confirmpassword.value == ""){
- //alert("Bitte bestätigen Sie das Passwort.");
+ //alert("Bitte best�tigen Sie das Passwort.");
alert("Please confirm the password.");
document.form1.confirmpassword.focus();
document.form1.upd.value='false';
return false;
}
if(document.form1.newpassword.value!=document.form1.confirmpassword.value) {
- //alert("Die Passwörter stimmen nicht überein.");
+ //alert("Die Passw�rter stimmen nicht �berein.");
alert("The password entries do not match.");
document.form1.confirmpassword.value='';
document.form1.confirmpassword.focus();
@@ -132,13 +131,13 @@
array_push($t,'i');
db_prep_query($sql_update,$v,$t);
echo "<script language='javascript'>";
- //echo "alert('Passwort wurde geändert!');";
+ //echo "alert('Passwort wurde ge�ndert!');";
echo "alert('Password has been updated!');";
echo "</script>";
}
else{
echo "<script language='javascript'>";
- //echo "alert('Bitte beachten Sie die unten aufgeführten Passwortregeln!');";
+ //echo "alert('Bitte beachten Sie die unten aufgef�hrten Passwortregeln!');";
echo "alert('Please note the rules for choosing a password below!');";
echo "</script>";
}
@@ -146,7 +145,7 @@
/* HTML */
echo "<fieldset><legend>Change password:</legend>";
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self ."' method='post'>";
echo "<table cellpadding='5' cellspacing='0' border='0'>";
echo "<td>";
echo "new password:";
Modified: branches/2.4.5/http/php/mod_createJSLayerObjFromXML.php
===================================================================
--- branches/2.4.5/http/php/mod_createJSLayerObjFromXML.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_createJSLayerObjFromXML.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,6 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require(dirname(__FILE__)."/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_createJSObjFromDBByWMS.php
===================================================================
--- branches/2.4.5/http/php/mod_createJSObjFromDBByWMS.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_createJSObjFromDBByWMS.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +17,11 @@
# 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__)."/../classes/class_wms.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require(dirname(__FILE__)."/mb_validateSession.php");
$wms_id = $_GET["wms_id"];
$gui_id = $_GET["gui_id"];
@@ -52,11 +51,7 @@
}
?>
</script>
-<!--
-<script language="JavaScript" type="text/javascript">
-alert("3/3 mod_createJSObjFromDBByWMS: WMS ID = <?php echo $wms_id;?>, GUI ID = <?php echo $gui_id;?>");
-</script>
--->
+
</head>
<body bgcolor='#ffffff'>
</body>
Modified: branches/2.4.5/http/php/mod_createJSObjFromXML.php
===================================================================
--- branches/2.4.5/http/php/mod_createJSObjFromXML.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_createJSObjFromXML.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -19,6 +19,7 @@
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
+require(dirname(__FILE__)."/mb_validateSession.php");
$capabilitiesURL = html_entity_decode($_REQUEST['caps']);
?>
Modified: branches/2.4.5/http/php/mod_createUser.php
===================================================================
--- branches/2.4.5/http/php/mod_createUser.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_createUser.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -184,7 +184,7 @@
}
/* HTML */
-echo "<form name='form1' action='" . $PHP_SELF . "' method='post'>";
+echo "<form name='form1' action='" . $self . "' method='post'>";
echo "<table border='0'>";
if(isset($selected_user) && $selected_user != 0){
Modified: branches/2.4.5/http/php/mod_deleteFilteredGUI.php
===================================================================
--- branches/2.4.5/http/php/mod_deleteFilteredGUI.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_deleteFilteredGUI.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -19,12 +19,12 @@
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
$admin = new administration();
$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
?>
Modified: branches/2.4.5/http/php/mod_deleteGUI.php
===================================================================
--- branches/2.4.5/http/php/mod_deleteGUI.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_deleteGUI.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place
-session_start();
import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
#$admin = new administration();
#$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
$gui_id = $_SESSION["mb_user_gui"];
@@ -75,7 +76,7 @@
$res_gui = db_query($sql_gui);
$cnt_gui = 0;
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self ."' method='post'>";
echo "<select class='guiList' size='20' name='guiList' class='guiList'>";
while($row = db_fetch_array($res_gui)){
Modified: branches/2.4.5/http/php/mod_deleteWFS.php
===================================================================
--- branches/2.4.5/http/php/mod_deleteWFS.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_deleteWFS.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
#$admin = new administration();
#$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
$gui_id = $_SESSION["mb_user_gui"];
@@ -86,7 +86,7 @@
$res_wfs = db_query($sql_wfs);
$cnt_wfs = 0;
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self."' method='post'>";
echo "<br><b>WFS List: <b><br><br>";
echo "<select class='wfsList' size='20' name='wfsList' >";
Modified: branches/2.4.5/http/php/mod_deleteWMS.php
===================================================================
--- branches/2.4.5/http/php/mod_deleteWMS.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_deleteWMS.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,17 +17,15 @@
# 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();
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-?>
+?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<meta http-equiv="cache-control" content="no-cache">
Modified: branches/2.4.5/http/php/mod_editElementVars.php
===================================================================
--- branches/2.4.5/http/php/mod_editElementVars.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editElementVars.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,11 +18,12 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import_request_variables("PG");
-session_start();
-include(dirname(__FILE__)."/../php/mb_validateSession.php");
+require(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
+
$sParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
@@ -164,7 +165,7 @@
<body>
<?php
- echo "<form name='form1' action='" . $PHP_SELF . "?".$sParams."' method='POST'>\n";
+ echo "<form name='form1' action='" . $self ."' method='POST'>\n";
$fkey_gui_id = $_REQUEST["fkey_gui_id"];
$fkey_e_id = $_REQUEST["fkey_e_id"];
Modified: branches/2.4.5/http/php/mod_editElements.php
===================================================================
--- branches/2.4.5/http/php/mod_editElements.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editElements.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,14 @@
# 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();
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require(dirname(__FILE__)."/../php/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
-include(dirname(__FILE__)."/../php/mb_validatePermission.php");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
$sParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
$self = $PHP_SELF . "?".$sParams;
?>
Modified: branches/2.4.5/http/php/mod_editFilteredGroup.php
===================================================================
--- branches/2.4.5/http/php/mod_editFilteredGroup.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editFilteredGroup.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -20,9 +20,11 @@
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_editFilteredUser.php
===================================================================
--- branches/2.4.5/http/php/mod_editFilteredUser.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editFilteredUser.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -20,10 +20,11 @@
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
+
$myUser = true;
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_editGroup.php
===================================================================
--- branches/2.4.5/http/php/mod_editGroup.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editGroup.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,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();
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_editGuiWms.php
===================================================================
--- branches/2.4.5/http/php/mod_editGuiWms.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editGuiWms.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,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();
+import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-import_request_variables("PG");
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_editGuiWmsMeta.php
===================================================================
--- branches/2.4.5/http/php/mod_editGuiWmsMeta.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editGuiWmsMeta.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,13 +18,13 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import_request_variables("PG");
-include(dirname(__FILE__)."/../php/mb_validateSession.php");
+require(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -126,7 +126,7 @@
<body onload='windowSize()'>
<?php
- echo " <form name='editMetaData' action='".$PHP_SELF."?".SID."' method='get'>\n";
+ echo " <form name='editMetaData' action='".$self."' method='get'>\n";
$layer_id = $_REQUEST["layer_id"];
Modified: branches/2.4.5/http/php/mod_editSelf.php
===================================================================
--- branches/2.4.5/http/php/mod_editSelf.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editSelf.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -214,7 +214,7 @@
/*HTML*****************************************************************************************************/
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self."' method='post'>";
echo "<input type='hidden' name='selected_user' value='" . $_SESSION["mb_user_id"] . "'>";
echo "<table border='0'>";
Modified: branches/2.4.5/http/php/mod_editUser.php
===================================================================
--- branches/2.4.5/http/php/mod_editUser.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editUser.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -20,10 +20,10 @@
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_editWMS_Metadata.php
===================================================================
--- branches/2.4.5/http/php/mod_editWMS_Metadata.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_editWMS_Metadata.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,16 +17,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-session_start();
include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/mb_validatePermission.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
$secParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-$self = $PHP_SELF."?".$secParams;
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
@@ -296,7 +293,7 @@
die("Preview has been deleted!</body></html>");
}
?>
-<form name='form1' action='<?php $self ?>' method='post'>
+<form name='form1' action='<?php echo $self; ?>' method='post'>
<table border='0'>
<tr>
Modified: branches/2.4.5/http/php/mod_edit_element_vars.php
===================================================================
--- branches/2.4.5/http/php/mod_edit_element_vars.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_edit_element_vars.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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.
-session_start();
import_request_variables("PG");
include(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
@@ -282,7 +282,7 @@
<body>
<?php
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='get'>";
+echo "<form name='form1' action='" . $self."' method='get'>";
#Gui to edit
if(!isset($guiList1)){
Modified: branches/2.4.5/http/php/mod_edit_metadata.php
===================================================================
--- branches/2.4.5/http/php/mod_edit_metadata.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_edit_metadata.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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.
-session_start();
import_request_variables("PG");
include(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
@@ -359,7 +358,7 @@
$admin = new administration();
$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
$permguis = $admin->getGuisByPermission($_SESSION["mb_user_id"],true);
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>\n";
+echo "<form name='form1' action='" . $self."' method='post'>\n";
$sql = "SELECT * from gui WHERE gui.gui_id IN (";
$v = $ownguis;
Modified: branches/2.4.5/http/php/mod_evalArea.php
===================================================================
--- branches/2.4.5/http/php/mod_evalArea.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_evalArea.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -21,6 +21,7 @@
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_exportElement.php
===================================================================
--- branches/2.4.5/http/php/mod_exportElement.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_exportElement.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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.4.5/http/php/mod_exportGUI.php
===================================================================
--- branches/2.4.5/http/php/mod_exportGUI.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_exportGUI.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,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();
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_export_image.php
===================================================================
--- branches/2.4.5/http/php/mod_export_image.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_export_image.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -16,10 +16,14 @@
# 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");
+
import_request_variables("PG");
+
$_SESSION["mb_print_url"] = $map_url;
$_SESSION["mb_print_resolution"] = $quality;
+
header("Content-type: application/png"); // mark the following content as PNG file
$date = date("d.m.y");
header("Content-Disposition: attachment; filename=export".$date.".png");
Modified: branches/2.4.5/http/php/mod_filteredGroup_Gui.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredGroup_Gui.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredGroup_Gui.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -20,11 +20,10 @@
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
+$con = db_connect(DBSERVER,OWNER,PW);
+db_select_db(DB,$con);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredGroup_User.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredGroup_User.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredGroup_User.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,12 +18,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredGroup_filteredGui.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredGroup_filteredGui.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredGroup_filteredGui.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -20,10 +20,10 @@
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredGroup_filteredUser.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredGroup_filteredUser.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredGroup_filteredUser.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -20,11 +20,10 @@
import_request_variables("PG");
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
+$con = db_connect(DBSERVER,OWNER,PW);
+db_select_db(DB,$con);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredGui_User.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredGui_User.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredGui_User.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredGui_filteredGroup.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredGui_filteredGroup.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredGui_filteredGroup.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,12 +18,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredGui_filteredUser.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredGui_filteredUser.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredGui_filteredUser.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,12 +18,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_filteredGui_group.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredGui_group.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredGui_group.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredUser_Group.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredUser_Group.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredUser_Group.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredUser_Gui.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredUser_Gui.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredUser_Gui.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredUser_filteredGroup.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredUser_filteredGroup.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredUser_filteredGroup.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredUser_filteredGui.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredUser_filteredGui.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredUser_filteredGui.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_filteredWms_layer_topic.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredWms_layer_topic.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredWms_layer_topic.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/mb_validatePermission.php");
require_once("../classes/class_administration.php");
$logged_user_name = $_SESSION["mb_user_name"];
$logged_user_id = $_SESSION["mb_user_id"];
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
Modified: branches/2.4.5/http/php/mod_filteredWms_topic.php
===================================================================
--- branches/2.4.5/http/php/mod_filteredWms_topic.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_filteredWms_topic.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once("../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once("../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once("../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_forgottenPassword.php
===================================================================
--- branches/2.4.5/http/php/mod_forgottenPassword.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_forgottenPassword.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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__)."/../classes/class_administration.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
import_request_variables("PG");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -133,8 +132,7 @@
echo "<fieldset><legend>Forgot your Passwort ?</legend>";
#echo "<fieldset><legend>Passwort vergessen ?</legend>";
- #echo "<form name='form1' action='" . $PHP_SELF . "' method='post'>";
- echo "<form name='form1' method='post'>";
+ echo "<form name='form1' action='" . $self . "' method='post'>";
echo "<table cellpadding='5' cellspacing='0' border='0'><tr>";
echo "<td>";
echo "Username:";
Modified: branches/2.4.5/http/php/mod_gazLayerObj_conf.php
===================================================================
--- branches/2.4.5/http/php/mod_gazLayerObj_conf.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gazLayerObj_conf.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -19,7 +19,6 @@
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
?>
<html>
<head>
Modified: branches/2.4.5/http/php/mod_gazLayerObj_edit.php
===================================================================
--- branches/2.4.5/http/php/mod_gazLayerObj_edit.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gazLayerObj_edit.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,7 +18,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
?>
<html>
<head>
Modified: branches/2.4.5/http/php/mod_gazetteerMetadata.php
===================================================================
--- branches/2.4.5/http/php/mod_gazetteerMetadata.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gazetteerMetadata.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +17,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
$gui_id = $_SESSION["mb_user_gui"];
$user_id = $_SESSION["mb_user_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
+$sParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
@@ -236,7 +237,7 @@
<form name='form1' target='result' onsubmit='return validate();'>
<p>
<input class='textfield' name='search' type='text' style='width:110px'>
-<img src="../img/add.png" title="keywords" onclick="window.open('mod_SelectKeyword.php', toolbar='no', status='no');">
+<img src="../img/add.png" title="keywords" onclick="window.open('mod_SelectKeyword.php?<?php echo $sParams;?>', toolbar='no', status='no');">
<input type='submit' name='send' value='ok'>
</p>
</form>
Modified: branches/2.4.5/http/php/mod_gazetteerMetadata_search.php
===================================================================
--- branches/2.4.5/http/php/mod_gazetteerMetadata_search.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gazetteerMetadata_search.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -1,13 +1,11 @@
<?php
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../extensions/JSON.php");
$user_id = $_SESSION["mb_user_id"];
$query = $_REQUEST["search"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
-require_once(dirname(__FILE__)."/../extensions/JSON.php");
-
$n = new administration();
$myguis = $n->getGuisByPermission($user_id, true);
$mywms = $n->getWmsByOwnGuis($myguis);
Modified: branches/2.4.5/http/php/mod_gazetteerSQL_server.php
===================================================================
--- branches/2.4.5/http/php/mod_gazetteerSQL_server.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gazetteerSQL_server.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -1,9 +1,7 @@
<?php
-session_start();
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../extensions/JSON.php");
require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../../conf/gazetteerSQL.conf");
$con = pg_connect($connstring);
Modified: branches/2.4.5/http/php/mod_gazetteer_conf.php
===================================================================
--- branches/2.4.5/http/php/mod_gazetteer_conf.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gazetteer_conf.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -19,7 +19,8 @@
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
+
+$sParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<html>
<head>
@@ -61,7 +62,7 @@
<body>
Gazetteer Configuration<br>
<form method='POST' onsubmit='return validate()'>
-<a href="mod_gazetteer_edit.php">edit</a><br>
+<a href="mod_gazetteer_edit.php?<?php echo $sParams;?>">edit</a><br>
<?php
$aWFS = new wfs_conf();
$aWFS->getallwfs();
Modified: branches/2.4.5/http/php/mod_gazetteer_edit.php
===================================================================
--- branches/2.4.5/http/php/mod_gazetteer_edit.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gazetteer_edit.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,7 +18,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
+
+$sParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<html>
<head>
@@ -47,7 +48,7 @@
<body>
Gazetteer Configuration<br>
<form method='POST' onsubmit='return validate()'>
-<a href="mod_gazetteer_conf.php">new</a><br>
+<a href="mod_gazetteer_conf.php?<?php echo $sParams;?>">new</a><br>
<?php
/* save gazetteer properties */
Modified: branches/2.4.5/http/php/mod_getStyles.php
===================================================================
--- branches/2.4.5/http/php/mod_getStyles.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_getStyles.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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();
-import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+import_request_variables("PG");
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
@@ -138,7 +136,7 @@
$sql = "SELECT * FROM wms ORDER BY wms_title";
$res = db_query($sql);
$cnt = 0;
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self."' method='post'>";
echo "<select class='wmsList' size='20' name='wmsList' class='wmsList' onchange='submit()'>";
while($row = db_fetch_array($res)){
# getStyle - Request:
Modified: branches/2.4.5/http/php/mod_group_filteredGui.php
===================================================================
--- branches/2.4.5/http/php/mod_group_filteredGui.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_group_filteredGui.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_group_filteredUser.php
===================================================================
--- branches/2.4.5/http/php/mod_group_filteredUser.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_group_filteredUser.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_group_gui.php
===================================================================
--- branches/2.4.5/http/php/mod_group_gui.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_group_gui.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +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_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_group_user.php
===================================================================
--- branches/2.4.5/http/php/mod_group_user.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_group_user.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_gui_filteredGroup.php
===================================================================
--- branches/2.4.5/http/php/mod_gui_filteredGroup.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gui_filteredGroup.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_gui_filteredUser.php
===================================================================
--- branches/2.4.5/http/php/mod_gui_filteredUser.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gui_filteredUser.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_gui_group.php
===================================================================
--- branches/2.4.5/http/php/mod_gui_group.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gui_group.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_gui_owner.php
===================================================================
--- branches/2.4.5/http/php/mod_gui_owner.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gui_owner.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_gui_user.php
===================================================================
--- branches/2.4.5/http/php/mod_gui_user.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_gui_user.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,11 +18,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_help.php
===================================================================
--- branches/2.4.5/http/php/mod_help.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_help.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
?>
Modified: branches/2.4.5/http/php/mod_insertWmcIntoDb.php
===================================================================
--- branches/2.4.5/http/php/mod_insertWmcIntoDb.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_insertWmcIntoDb.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../extensions/JSON.php");
-session_start();
-
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
Modified: branches/2.4.5/http/php/mod_layerMetadata.php
===================================================================
--- branches/2.4.5/http/php/mod_layerMetadata.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_layerMetadata.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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("../../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/php/mod_loadCapabilities.php
===================================================================
--- branches/2.4.5/http/php/mod_loadCapabilities.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_loadCapabilities.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +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.
-session_start();
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
+include(dirname(__FILE__)."/../php/mb_validatePermission.php");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-include(dirname(__FILE__)."/../php/mb_validatePermission.php");
$secParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-$self = $PHP_SELF."?".$secParams;
import_request_variables("PG");
?>
Modified: branches/2.4.5/http/php/mod_loadCapabilitiesList.php
===================================================================
--- branches/2.4.5/http/php/mod_loadCapabilitiesList.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_loadCapabilitiesList.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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.
-session_start();
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
+require(dirname(__FILE__)."/../php/mb_validatePermission.php");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-include(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
?>
@@ -172,7 +170,7 @@
}
}
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self."' method='post'>";
echo "<table cellpadding='0' cellspacing='0' border='0'>";
echo "<tr>";
Modified: branches/2.4.5/http/php/mod_loadCapabilities_temp.php
===================================================================
--- branches/2.4.5/http/php/mod_loadCapabilities_temp.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_loadCapabilities_temp.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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();
include(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/mb_validateInput.php");
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
import_request_variables("PG");
?>
@@ -85,7 +83,7 @@
<?php
$con = db_connect($DBSERVER,$OWNER,$PW);
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self."' method='post'>";
$gui_id = $_SESSION["mb_user_gui"];
Modified: branches/2.4.5/http/php/mod_loadWFSCapabilities.php
===================================================================
--- branches/2.4.5/http/php/mod_loadWFSCapabilities.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_loadWFSCapabilities.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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();
-
include(dirname(__FILE__)."/../php/mb_validatePermission.php");
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
import_request_variables("PG");
@@ -95,7 +93,7 @@
$admin = new administration();
$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
echo count($ownguis)."<br>";
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self."' method='post'>";
echo "<table cellpadding='0' cellspacing='0' border='0'>";
echo "<tr>";
Modified: branches/2.4.5/http/php/mod_loadwfs.php
===================================================================
--- branches/2.4.5/http/php/mod_loadwfs.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_loadwfs.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,11 +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(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/mb_validateInput.php");
-include(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"];
echo "<br>-------------------------------<br>";
Modified: branches/2.4.5/http/php/mod_loadwms.php
===================================================================
--- branches/2.4.5/http/php/mod_loadwms.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_loadwms.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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.
-session_start();
-require_once("../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
require_once("mb_validatePermission.php");
require_once("../classes/class_wms.php");
+$con = db_connect(DBSERVER,OWNER,PW);
+db_select_db(DB,$con);
echo "file: ".$_REQUEST["xml_file"];
Modified: branches/2.4.5/http/php/mod_loadwms_temp.php
===================================================================
--- branches/2.4.5/http/php/mod_loadwms_temp.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_loadwms_temp.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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");
require_once(dirname(__FILE__)."/mb_validateInput.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
Modified: branches/2.4.5/http/php/mod_log.php
===================================================================
--- branches/2.4.5/http/php/mod_log.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_log.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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.
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-include(dirname(__FILE__)."/../php/mb_validateSession.php");
+require(dirname(__FILE__)."/../php/mb_validateSession.php");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
if($_REQUEST['req']){
Modified: branches/2.4.5/http/php/mod_logout.php
===================================================================
--- branches/2.4.5/http/php/mod_logout.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_logout.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-session_start();
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
$gui_id = $_SESSION["mb_user_gui"];
Modified: branches/2.4.5/http/php/mod_map1.php
===================================================================
--- branches/2.4.5/http/php/mod_map1.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_map1.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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();
-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.4.5/http/php/mod_mapOV.php
===================================================================
--- branches/2.4.5/http/php/mod_mapOV.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_mapOV.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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.
-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.4.5/http/php/mod_meetingPoint.php
===================================================================
--- branches/2.4.5/http/php/mod_meetingPoint.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_meetingPoint.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,10 +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("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
@@ -297,7 +294,7 @@
</head>
<body>
-<form action="" >
+<form action="<?php echo $self; ?>" >
<img id='my_getCoords' name='my_getCoords' onclick="mod_meetingPoint_run()" onmouseover ="parent.mb_regButton_frame('init_mod_meetingPoint','meetingPoint',null)" title="Treffpunkt setzen" src = '../img/button_digitize/point_off.png'>
<br>
Modified: branches/2.4.5/http/php/mod_newGui.php
===================================================================
--- branches/2.4.5/http/php/mod_newGui.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_newGui.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_orphanWMS.php
===================================================================
--- branches/2.4.5/http/php/mod_orphanWMS.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_orphanWMS.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +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.
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_printView1.php
===================================================================
--- branches/2.4.5/http/php/mod_printView1.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_printView1.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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.
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
//
import_request_variables("PG");
$_SESSION["mb_print_url"] = $map_url;
@@ -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.4.5/http/php/mod_renameGUI.php
===================================================================
--- branches/2.4.5/http/php/mod_renameGUI.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_renameGUI.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,13 +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.
-session_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_saveWKT.php
===================================================================
--- branches/2.4.5/http/php/mod_saveWKT.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_saveWKT.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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");
?>
<html>
<head>
@@ -68,12 +68,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");
@@ -92,7 +92,7 @@
//$sql = "SELECT f_table_name, f_geometry_column,type,srid FROM geometry_columns";
$res = pg_query($con,$sql);
$cnt = 0;
-echo "<form action='".$PHP_SELF."' method='POST'>";
+echo "<form action='".$self."' method='POST'>";
#echo "Selektieren: <input name='actionType' type='radio' value='select'>";
#echo "Speichern: <input name='actionType' type='radio' value='create'><br>";
echo "<select name='tablenames' onchange='submit()'>";
@@ -162,12 +162,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 +185,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 +215,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.4.5/http/php/mod_showLoggedUser.php
===================================================================
--- branches/2.4.5/http/php/mod_showLoggedUser.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_showLoggedUser.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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.
-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"];
-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/php/mod_simpleWMSpreferences.php
===================================================================
--- branches/2.4.5/http/php/mod_simpleWMSpreferences.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_simpleWMSpreferences.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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();
-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/php/mod_treefolderAdmin.php
===================================================================
--- branches/2.4.5/http/php/mod_treefolderAdmin.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_treefolderAdmin.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -21,7 +21,7 @@
import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
?>
Modified: branches/2.4.5/http/php/mod_treefolderClient.php
===================================================================
--- branches/2.4.5/http/php/mod_treefolderClient.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_treefolderClient.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,11 +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.
-session_start();
-
import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
$guiList = $_SESSION["mb_user_gui"];
Modified: branches/2.4.5/http/php/mod_updateWMS.php
===================================================================
--- branches/2.4.5/http/php/mod_updateWMS.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_updateWMS.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,14 +17,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
require_once(dirname(__FILE__)."/mb_validatePermission.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
+
+$con = db_connect(DBSERVER,OWNER,PW);
+
import_request_variables("PG");
$secParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-$self = $PHP_SELF."?".$secParams;
?>
<html>
<head>
@@ -56,7 +55,7 @@
</script>
</head>
<body>
-<form name='form1' action='<?php $self ?>' method='POST'>
+<form name='form1' action='<?php echo $self ?>' method='POST'>
<?php
Modified: branches/2.4.5/http/php/mod_usemap.php
===================================================================
--- branches/2.4.5/http/php/mod_usemap.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_usemap.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -19,7 +19,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");
+
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
<title>image map generator</title>
Modified: branches/2.4.5/http/php/mod_user_filteredGroup.php
===================================================================
--- branches/2.4.5/http/php/mod_user_filteredGroup.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_user_filteredGroup.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,11 +18,10 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_user_filteredGui.php
===================================================================
--- branches/2.4.5/http/php/mod_user_filteredGui.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_user_filteredGui.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,16 +18,13 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import_request_variables("PG");
-session_start();
+require_once(dirname(__FILE__)."/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../classes/class_wms.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);
-require_once(dirname(__FILE__)."/mb_validatePermission.php");
-require_once(dirname(__FILE__)."/../classes/class_wms.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.4.5/http/php/mod_user_group.php
===================================================================
--- branches/2.4.5/http/php/mod_user_group.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_user_group.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -18,11 +18,10 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_user_gui.php
===================================================================
--- branches/2.4.5/http/php/mod_user_gui.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_user_gui.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,15 +17,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import_request_variables("PG");
-session_start();
+
+require_once(dirname(__FILE__)."/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../classes/class_wms.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);
-require_once(dirname(__FILE__)."/mb_validatePermission.php");
-require_once(dirname(__FILE__)."/../classes/class_wms.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_wfs.php
===================================================================
--- branches/2.4.5/http/php/mod_wfs.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_wfs.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.4.5/http/php/mod_wfsLayerObj_conf.php
===================================================================
--- branches/2.4.5/http/php/mod_wfsLayerObj_conf.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_wfsLayerObj_conf.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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");
require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db($DB,$con);
?>
Modified: branches/2.4.5/http/php/mod_wfs_conf.php
===================================================================
--- branches/2.4.5/http/php/mod_wfs_conf.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_wfs_conf.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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__)."/../classes/class_wfs_conf.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
Modified: branches/2.4.5/http/php/mod_wfs_edit.php
===================================================================
--- branches/2.4.5/http/php/mod_wfs_edit.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_wfs_edit.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
<html>
Modified: branches/2.4.5/http/php/mod_wfs_gazetteer_server.php
===================================================================
--- branches/2.4.5/http/php/mod_wfs_gazetteer_server.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_wfs_gazetteer_server.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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");
include(dirname(__FILE__)."/../classes/class_gml2.php");
require_once(dirname(__FILE__)."/../extensions/JSON.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
Modified: branches/2.4.5/http/php/mod_wfs_result.php
===================================================================
--- branches/2.4.5/http/php/mod_wfs_result.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_wfs_result.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,6 +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");
+require_once("../classes/class_stripRequest.php");
+require_once("../classes/class_connector.php");
+
$filter = stripslashes($_REQUEST["filter"]);
$url = stripslashes($_REQUEST["url"]);
$js_wfs_conf_id = $_REQUEST["js_wfs_conf_id"];
@@ -24,9 +28,6 @@
$typename = $_REQUEST["typename"];
//echo $filter; die();
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_stripRequest.php");
-require_once("../classes/class_connector.php");
function sepNameSpace($s){
$c = strpos($s,":");
Modified: branches/2.4.5/http/php/mod_wfs_save.php
===================================================================
--- branches/2.4.5/http/php/mod_wfs_save.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_wfs_save.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -19,7 +19,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__)."/../../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>
@@ -145,7 +147,7 @@
<div id='a' name='a'></div>
</form>
-<form action='../extensions/geom2wfst.php' method='POST'>
+<form action='../extensions/geom2wfst.php<?php echo $urlParameters;?>' method='POST'>
<input type='text' name='url'>
<input type='text' name='filter'>
</form>
Modified: branches/2.4.5/http/php/mod_wfsrequest.php
===================================================================
--- branches/2.4.5/http/php/mod_wfsrequest.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_wfsrequest.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,9 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_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);
+
if(isset($_REQUEST["backlink"]) && $_REQUEST["backlink"] == 'parent'){
$p = 'parent';
}else{
Modified: branches/2.4.5/http/php/mod_zoomCoords.php
===================================================================
--- branches/2.4.5/http/php/mod_zoomCoords.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_zoomCoords.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,11 +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.
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -148,7 +146,7 @@
<?php
# needs intl'!
- echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+ echo "<form name='form1' action='" . $self ."' method='post'>";
echo "<span class='labelx'>Länge:</span>";
echo "<span class='labely'>Breite:</span>";
echo "<input class='textx' type='text' name='X'>";
Modified: branches/2.4.5/http/php/mod_zoomCoords_en.php
===================================================================
--- branches/2.4.5/http/php/mod_zoomCoords_en.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/mod_zoomCoords_en.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -17,12 +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.
-session_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-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">
@@ -125,14 +122,14 @@
var valid = true;
/* if(parseFloat(coordx) < 5.88 || parseFloat(coordx) > 15){
- alert("Eingabe unzulässig!");
+ alert("Eingabe unzul�ssig!");
document.form1.X.select();
document.form1.X.focus();
valid = false;
return false;
}
if(parseFloat(coordy) < 46.62 || parseFloat(coordy) > 55.71){
- alert("Eingabe unzulässig!");
+ alert("Eingabe unzul�ssig!");
document.form1.Y.select();
document.form1.Y.focus();
valid = false;
@@ -184,7 +181,7 @@
<body bgcolor='#ffffff' onload=''>
<?php
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self."' method='post'>";
#coordinates
#deutsche Version
Modified: branches/2.4.5/http/php/nestedSets.php
===================================================================
--- branches/2.4.5/http/php/nestedSets.php 2008-02-21 09:44:51 UTC (rev 2137)
+++ branches/2.4.5/http/php/nestedSets.php 2008-02-21 17:12:42 UTC (rev 2138)
@@ -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__)."/../../conf/mapbender.conf");
-import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+import_request_variables("PG");
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db(DB,$con);
?>
@@ -250,7 +248,7 @@
?>
<div style='position:absolute;top:50px;left:350px'>
-<form action='<?php $PHP_SELF ?>' method='POST'>
+<form action='<?php echo $self; ?>' method='POST'>
<br><br>
<table >
<tr><td></td><td></td></tr>
More information about the Mapbender_commits
mailing list