[Mapbender-commits] r2144 - branches/2.5/http/php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Feb 26 18:16:15 EST 2008
Author: christoph
Date: 2008-02-26 18:16:14 -0500 (Tue, 26 Feb 2008)
New Revision: 2144
Modified:
branches/2.5/http/php/mb_js_exception.php
branches/2.5/http/php/mb_listKMLs.php
branches/2.5/http/php/mb_listWMCs.php
branches/2.5/http/php/mb_validatePermission.php
branches/2.5/http/php/mb_validateSession.php
branches/2.5/http/php/mod_SelectKeyword.php
branches/2.5/http/php/mod_WMSpreferences.php
branches/2.5/http/php/mod_addWMSfromfilteredList_server.php
branches/2.5/http/php/mod_addWmsFromFeatureInfo.php
branches/2.5/http/php/mod_button_tooltips.php
branches/2.5/http/php/mod_changeEPSG.php
branches/2.5/http/php/mod_changeEPSG_dynamic.php
branches/2.5/http/php/mod_changePassword.php
branches/2.5/http/php/mod_createJSLayerObjFromXML.php
branches/2.5/http/php/mod_createJSObjFromDB.php
branches/2.5/http/php/mod_createJSObjFromDBByWMS.php
branches/2.5/http/php/mod_createJSObjFromXML.php
branches/2.5/http/php/mod_createUser.php
branches/2.5/http/php/mod_deleteFilteredGUI.php
branches/2.5/http/php/mod_deleteGUI.php
branches/2.5/http/php/mod_deleteWFS.php
branches/2.5/http/php/mod_deleteWMS.php
branches/2.5/http/php/mod_digitize_messages.php
branches/2.5/http/php/mod_displayKML.php
branches/2.5/http/php/mod_editElementVars.php
branches/2.5/http/php/mod_editElements.php
branches/2.5/http/php/mod_editFilteredGroup.php
branches/2.5/http/php/mod_editFilteredUser.php
branches/2.5/http/php/mod_editGroup.php
branches/2.5/http/php/mod_editGuiWms.php
branches/2.5/http/php/mod_editGuiWmsMeta.php
branches/2.5/http/php/mod_editSelf.php
branches/2.5/http/php/mod_editUser.php
branches/2.5/http/php/mod_editWMS_Metadata.php
branches/2.5/http/php/mod_edit_element_vars.php
branches/2.5/http/php/mod_edit_metadata.php
branches/2.5/http/php/mod_evalArea.php
branches/2.5/http/php/mod_exportElement.php
branches/2.5/http/php/mod_exportGUI.php
branches/2.5/http/php/mod_export_image.php
branches/2.5/http/php/mod_featuretypeMetadata.php
branches/2.5/http/php/mod_filteredGroup_Gui.php
branches/2.5/http/php/mod_filteredGroup_User.php
branches/2.5/http/php/mod_filteredGroup_filteredGui.php
branches/2.5/http/php/mod_filteredGroup_filteredUser.php
branches/2.5/http/php/mod_filteredGui_User.php
branches/2.5/http/php/mod_filteredGui_filteredGroup.php
branches/2.5/http/php/mod_filteredGui_filteredUser.php
branches/2.5/http/php/mod_filteredGui_group.php
branches/2.5/http/php/mod_filteredUser_Group.php
branches/2.5/http/php/mod_filteredUser_Gui.php
branches/2.5/http/php/mod_filteredUser_filteredGroup.php
branches/2.5/http/php/mod_filteredUser_filteredGui.php
branches/2.5/http/php/mod_filteredWms_layer_topic.php
branches/2.5/http/php/mod_filteredWms_topic.php
branches/2.5/http/php/mod_forgottenPassword.php
branches/2.5/http/php/mod_gazLayerObj_conf.php
branches/2.5/http/php/mod_gazLayerObj_edit.php
branches/2.5/http/php/mod_gazetteerMetadata.php
branches/2.5/http/php/mod_gazetteerMetadata_search.php
branches/2.5/http/php/mod_gazetteerSQL_server.php
branches/2.5/http/php/mod_gazetteer_conf.php
branches/2.5/http/php/mod_gazetteer_edit.php
branches/2.5/http/php/mod_getStyles.php
branches/2.5/http/php/mod_group_filteredGui.php
branches/2.5/http/php/mod_group_filteredUser.php
branches/2.5/http/php/mod_group_gui.php
branches/2.5/http/php/mod_group_user.php
branches/2.5/http/php/mod_gui_filteredGroup.php
branches/2.5/http/php/mod_gui_filteredUser.php
branches/2.5/http/php/mod_gui_group.php
branches/2.5/http/php/mod_gui_owner.php
branches/2.5/http/php/mod_gui_user.php
branches/2.5/http/php/mod_help.php
branches/2.5/http/php/mod_insertWmcIntoDb.php
branches/2.5/http/php/mod_layerMetadata.php
branches/2.5/http/php/mod_loadCapabilities.php
branches/2.5/http/php/mod_loadCapabilitiesList.php
branches/2.5/http/php/mod_loadCapabilities_temp.php
branches/2.5/http/php/mod_loadWFSCapabilities.php
branches/2.5/http/php/mod_loadwfs.php
branches/2.5/http/php/mod_loadwms.php
branches/2.5/http/php/mod_loadwms_temp.php
branches/2.5/http/php/mod_log.php
branches/2.5/http/php/mod_logout.php
branches/2.5/http/php/mod_map1.php
branches/2.5/http/php/mod_mapOV.php
branches/2.5/http/php/mod_meetingPoint.php
branches/2.5/http/php/mod_newGui.php
branches/2.5/http/php/mod_orphanWMS.php
branches/2.5/http/php/mod_printView1.php
branches/2.5/http/php/mod_renameGUI.php
branches/2.5/http/php/mod_saveWKT.php
branches/2.5/http/php/mod_setLocale.php
branches/2.5/http/php/mod_showLoggedUser.php
branches/2.5/http/php/mod_simpleWMSpreferences.php
branches/2.5/http/php/mod_switchLocale.php
branches/2.5/http/php/mod_switchLocale_noreload.php
branches/2.5/http/php/mod_treefolderAdmin.php
branches/2.5/http/php/mod_treefolderClient.php
branches/2.5/http/php/mod_updateKmlInDb.php
branches/2.5/http/php/mod_updateWMS.php
branches/2.5/http/php/mod_usemap.php
branches/2.5/http/php/mod_user_filteredGroup.php
branches/2.5/http/php/mod_user_filteredGui.php
branches/2.5/http/php/mod_user_group.php
branches/2.5/http/php/mod_user_gui.php
branches/2.5/http/php/mod_wfs.php
branches/2.5/http/php/mod_wfsLayerObj_conf.php
branches/2.5/http/php/mod_wfsSpatialRequest_messages.php
branches/2.5/http/php/mod_wfs_conf.php
branches/2.5/http/php/mod_wfs_edit.php
branches/2.5/http/php/mod_wfs_gazetteer_server.php
branches/2.5/http/php/mod_wfs_result.php
branches/2.5/http/php/mod_wfs_save.php
branches/2.5/http/php/mod_wfs_server.php
branches/2.5/http/php/mod_wfsrequest.php
branches/2.5/http/php/mod_zoomCoords.php
branches/2.5/http/php/mod_zoomCoords_en.php
branches/2.5/http/php/nestedSets.php
Log:
changed validatesession
Modified: branches/2.5/http/php/mb_js_exception.php
===================================================================
--- branches/2.5/http/php/mb_js_exception.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mb_js_exception.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -1,9 +1,9 @@
<?php
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
$message = $_POST['text'];
$level = $_POST['level'];
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-
if ($level == "warning") {
$e = new mb_warning($message);
}
Modified: branches/2.5/http/php/mb_listKMLs.php
===================================================================
--- branches/2.5/http/php/mb_listKMLs.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mb_listKMLs.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -16,11 +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__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__) . "/../classes/class_administration.php");
-require_once(dirname(__FILE__) . "/../classes/class_mb_exception.php");
require_once(dirname(__FILE__) . "/../classes/class_connector.php");
require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
@@ -35,9 +32,6 @@
$kmlUrl = $_POST["local_kml_url"];
$form_target = $_SERVER["PHP_SELF"] . "?" . SID;
-
-$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.5/http/php/mb_listWMCs.php
===================================================================
--- branches/2.5/http/php/mb_listWMCs.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mb_listWMCs.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -16,7 +16,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_validateSession.php");
+require_once(dirname(__FILE__) . "/../classes/class_administration.php");
+require_once(dirname(__FILE__) . "/../classes/class_wmc.php");
+
$gui_id = $_SESSION["mb_user_gui"];
$user_id = $_SESSION["mb_user_id"];
@@ -27,14 +30,6 @@
$clientFilename = $_FILES['local_wmc_filename']['tmp_name'];
$form_target = $_SERVER["PHP_SELF"] . "?" . SID;
-
-require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
-require_once(dirname(__FILE__) . "/../classes/class_administration.php");
-require_once(dirname(__FILE__) . "/../classes/class_mb_exception.php");
-require_once(dirname(__FILE__) . "/../classes/class_wmc.php");
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.5/http/php/mb_validatePermission.php
===================================================================
--- branches/2.5/http/php/mb_validatePermission.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mb_validatePermission.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -21,9 +21,12 @@
require_once(dirname(__FILE__)."/../classes/class_administration.php");
$n = new administration();
-$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){
+$m = $n->getModulPermission($_SESSION["mb_user_id"], $gui_id, $e_id);
+
+if (!$m) {
+ $msg = "User " . $_SESSION["mb_user_id"] . "is not allowed to access ".
+ "module " . $e_id;
+ $e = new mb_exception($msg);
header("Location: ".LOGIN);
exit;
die();
Modified: branches/2.5/http/php/mb_validateSession.php
===================================================================
--- branches/2.5/http/php/mb_validateSession.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mb_validateSession.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -19,22 +19,59 @@
session_start();
require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-$urlParameters = SID . "&guiID=" . $_REQUEST["guiID"] . "&elementID=" . $_REQUEST["elementID"];
-$self = $PHP_SELF . "?" . $urlParameters;
+// establish database connection
+$con = db_connect($DBSERVER,$OWNER,$PW);
+db_select_db(DB,$con);
-if(!isset($_SESSION["mb_user_id"]) || !isset($_SESSION["mb_user_ip"]) || $_SESSION['mb_user_ip'] != $_SERVER['REMOTE_ADDR']){
+// check if user data is valid; if not, return to login screen
+if (!isset($_SESSION["mb_user_id"]) || !isset($_SESSION["mb_user_ip"]) ||
+ $_SESSION['mb_user_ip'] != $_SERVER['REMOTE_ADDR']) {
+ $e = new mb_exception("Invalid user: " . $_SESSION["mb_user_id"]);
header("Location: ".LOGIN);
exit;
die();
}
-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;
+// check if GUI ID is set; if not, return to login screen
+if (!isset($gui_id)) {
+ if (isset($_REQUEST["guiID"])) {
+ $gui_id = $_REQUEST["guiID"];
+ }
+ elseif (isset($_REQUEST["gui_id"])) {
+ $gui_id = $_REQUEST["gui_id"];
+ }
+ else {
+ $e = new mb_exception("gui_id not set in module: " . $e_id);
die();
}
}
+
+// check if user is allowed to access current GUI;
+// if not, return to login screen
+if (!in_array($gui_id, $_SESSION["mb_user_guis"])) {
+ $e = new mb_exception("Invalid user: " . $_SESSION["mb_user_id"]);
+ header("Location: ".LOGIN);
+ exit;
+ die();
+}
+
+// check if element ID is set
+if (!isset($e_id)) {
+ if (isset($_REQUEST["elementID"])) {
+ $e_id = $_REQUEST["elementID"];
+ }
+ elseif (isset($_REQUEST["e_id"])) {
+ $e_id = $_REQUEST["e_id"];
+ }
+ else {
+ $e = new mb_exception("e_id not set in script: " . $PHP_SELF);
+ die();
+ }
+}
+
+// set variables used for form targets or links
+$urlParameters = SID . "&guiID=" . $gui_id . "&elementID=" . $e_id;
+$self = $PHP_SELF . "?" . $urlParameters;
?>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_SelectKeyword.php
===================================================================
--- branches/2.5/http/php/mod_SelectKeyword.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_SelectKeyword.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
?>
-
<html>
<head>
<title>Select Keyword</title>
@@ -63,4 +58,4 @@
?>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_WMSpreferences.php
===================================================================
--- branches/2.5/http/php/mod_WMSpreferences.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_WMSpreferences.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,11 +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);
-session_start();
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -62,24 +58,9 @@
-->
</STYLE>
<?php
-
-$sql = "SELECT * FROM gui_element WHERE e_id = 'WMS_preferences' AND fkey_gui_id = $1";
-$v = array($_SESSION["mb_user_gui"]);
-$t = array("s");
-$res = db_prep_query($sql, $v, $t);
-$cnt = 0;
-$vis = "";
-$wmsid = "";
-
-while($row = db_fetch_array($res)){
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('WMS_preferences: ID not unique!');";}
echo '<script type="text/javascript">';
-$target = explode(",", $e_target);
-echo "var mod_WMSpreferences_target1 = '".trim($target[0])."';";
-echo "var mod_WMSpreferences_target2 = '".trim($target[1])."';";
+echo "var mod_WMSpreferences_target1 = '".trim($e_target[0])."';";
+echo "var mod_WMSpreferences_target2 = '".trim($e_target[1])."';";
echo "</script>";
$sql_visible = "SELECT * FROM gui_wms WHERE fkey_gui_id = $1";
Modified: branches/2.5/http/php/mod_addWMSfromfilteredList_server.php
===================================================================
--- branches/2.5/http/php/mod_addWMSfromfilteredList_server.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_addWMSfromfilteredList_server.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,9 +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");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
@@ -30,9 +27,6 @@
$guiId = $_GET["guiId"];
$groupId = $_GET["groupId"];
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
$admin = new administration();
$guiIdArray = $admin->getGuisByPermission($userId, false);
Modified: branches/2.5/http/php/mod_addWmsFromFeatureInfo.php
===================================================================
--- branches/2.5/http/php/mod_addWmsFromFeatureInfo.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_addWmsFromFeatureInfo.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,27 +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.
-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);
-$gui_id = $_SESSION["mb_user_gui"];
-
-$e_id_css = 'addWmsFromFeatureInfo';
include(dirname(__FILE__).'/../include/dyn_js.php');
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2 ";
-$v = array($e_id_css,$gui_id);
-$t = array('s','s');
-$res = db_prep_query($sql,$v,$t);
-$cnt = 0;
-while($row = db_fetch_array($res)){
- $e_src = $row["e_src"];
- $e_target = explode(",",$row["e_target"]);
- $cnt++;
-}
-if($cnt > 1){ echo "alert('digitize_button: ID not unique!');";}
echo "var mod_target = '".$e_target[0]."';";
?>
function addWmsFromFeatureInfo(pointer_name, version) {
Modified: branches/2.5/http/php/mod_button_tooltips.php
===================================================================
--- branches/2.5/http/php/mod_button_tooltips.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_button_tooltips.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,15 +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");
require_once(dirname(__FILE__)."/../extensions/JSON.php");
require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-session_start();
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
$buttonObj = array();
$sql = "SELECT e_id, gettext($1, e_title) AS e_title FROM gui_element WHERE fkey_gui_id = $2 AND e_element = 'img'";
Modified: branches/2.5/http/php/mod_changeEPSG.php
===================================================================
--- branches/2.5/http/php/mod_changeEPSG.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_changeEPSG.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,10 +18,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
require(dirname(__FILE__)."/mb_validateSession.php");
-$gui_id = $_SESSION["mb_user_gui"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.5/http/php/mod_changeEPSG_dynamic.php
===================================================================
--- branches/2.5/http/php/mod_changeEPSG_dynamic.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_changeEPSG_dynamic.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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.
-require(dirname(__FILE__)."/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.5/http/php/mod_changePassword.php
===================================================================
--- branches/2.5/http/php/mod_changePassword.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_changePassword.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -19,14 +19,10 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
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>
<head>
-
<?php
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
@@ -58,7 +54,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 +62,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 +70,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 +128,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>";
}
Modified: branches/2.5/http/php/mod_createJSLayerObjFromXML.php
===================================================================
--- branches/2.5/http/php/mod_createJSLayerObjFromXML.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_createJSLayerObjFromXML.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,8 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_wms.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -32,7 +32,6 @@
<title>Load WMS with one layer</title>
<?php
echo "<script type='text/javascript'>";
-require_once(dirname(__FILE__)."/../classes/class_wms.php");
$mywms = new wms();
$mywms->createObjFromXML(html_entity_decode($_REQUEST['caps']));
if(!$mywms->wms_status){ echo "alert('Error: The Capabilities Document " . html_entity_decode($_REQUEST['caps']) . " could not be accessed. Please check whether the server is responding and accessible to Mapbender.'); </script>"; die; }
@@ -44,4 +43,4 @@
<body bgcolor='#ffffff'>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_createJSObjFromDB.php
===================================================================
--- branches/2.5/http/php/mod_createJSObjFromDB.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_createJSObjFromDB.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_wms.php");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_wms.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
$sql = "SELECT fkey_wms_id FROM gui_wms WHERE fkey_gui_id = $1 ORDER BY gui_wms_position";
$v = array($_SESSION["mb_user_gui"]);
$t = array('s');
@@ -34,5 +30,4 @@
$mywms->createObjFromDB($_SESSION["mb_user_gui"],$row["fkey_wms_id"]);
$mywms->createJsObjFromWMS();
}
-?>
-//alert("WMS geladen.");
\ No newline at end of file
+?>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_createJSObjFromDBByWMS.php
===================================================================
--- branches/2.5/http/php/mod_createJSObjFromDBByWMS.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_createJSObjFromDBByWMS.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
$wms_id = $_GET["wms_id"];
-$gui_id = $_GET["gui_id"];
$user_id = $_SESSION["mb_user_id"];
?>
Modified: branches/2.5/http/php/mod_createJSObjFromXML.php
===================================================================
--- branches/2.5/http/php/mod_createJSObjFromXML.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_createJSObjFromXML.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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__)."/../classes/class_wms.php");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_wms.php");
$capabilitiesURL = html_entity_decode($_REQUEST['caps']);
?>
Modified: branches/2.5/http/php/mod_createUser.php
===================================================================
--- branches/2.5/http/php/mod_createUser.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_createUser.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,18 +18,15 @@
# 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__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_gui.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
if(PORTAL != true){
echo "This module is disabled. Please check your mapbender.conf.";
die;
}
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-require_once(dirname(__FILE__)."/../classes/class_gui.php");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.5/http/php/mod_deleteFilteredGUI.php
===================================================================
--- branches/2.5/http/php/mod_deleteFilteredGUI.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_deleteFilteredGUI.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,14 +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.
-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"];
-
require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
$admin = new administration();
$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
?>
Modified: branches/2.5/http/php/mod_deleteGUI.php
===================================================================
--- branches/2.5/http/php/mod_deleteGUI.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_deleteGUI.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +17,8 @@
# 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");
-$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"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.5/http/php/mod_deleteWFS.php
===================================================================
--- branches/2.5/http/php/mod_deleteWFS.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_deleteWFS.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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_validatePermission.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$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"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.5/http/php/mod_deleteWMS.php
===================================================================
--- branches/2.5/http/php/mod_deleteWMS.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_deleteWMS.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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();
-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.5/http/php/mod_digitize_messages.php
===================================================================
--- branches/2.5/http/php/mod_digitize_messages.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_digitize_messages.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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__)."/../extensions/JSON.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../extensions/JSON.php");
$e = new mb_notice("locale: " . $_SESSION["mb_locale"] . "; lang: " . $_SESSION["mb_lang"]);
$e = new mb_notice(setlocale(LC_ALL, $_SESSION["mb_locale"]));
Modified: branches/2.5/http/php/mod_displayKML.php
===================================================================
--- branches/2.5/http/php/mod_displayKML.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_displayKML.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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();
mb_internal_encoding("UTF-8");
-require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
-require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
$kmlId = $_GET["kmlId"];
Modified: branches/2.5/http/php/mod_editElementVars.php
===================================================================
--- branches/2.5/http/php/mod_editElementVars.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editElementVars.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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.
-import_request_variables("PG");
-session_start();
-//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);
-$sParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.5/http/php/mod_editElements.php
===================================================================
--- branches/2.5/http/php/mod_editElements.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editElements.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,15 +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__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-include(dirname(__FILE__)."/../php/mb_validatePermission.php");
+require_once(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;
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -526,7 +519,7 @@
//echo "</td>\n<td class='myTable'>". $row["e_id"]. "</td><td class='myTable'>" .$row["e_comment"]."</td>";
echo "</td>\n";
echo "<td class='myTable'>";
- echo "<a href=\"mod_editElementVars.php?".$sParams."&fkey_gui_id=".$guiList2."&fkey_e_id=".$row["e_id"]."\">";
+ echo "<a href=\"mod_editElementVars.php?".$urlParameters."&fkey_gui_id=".$guiList2."&fkey_e_id=".$row["e_id"]."\">";
echo $row["e_id"];
echo "</a>\n</td>\n";
echo "<td class='myTable'>".$row["e_comment"]."</td>";
Modified: branches/2.5/http/php/mod_editFilteredGroup.php
===================================================================
--- branches/2.5/http/php/mod_editFilteredGroup.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editFilteredGroup.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,12 +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.
-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.5/http/php/mod_editFilteredUser.php
===================================================================
--- branches/2.5/http/php/mod_editFilteredUser.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editFilteredUser.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,12 +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.
-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"];
$myUser = true;
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.5/http/php/mod_editGroup.php
===================================================================
--- branches/2.5/http/php/mod_editGroup.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editGroup.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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();
-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.5/http/php/mod_editGuiWms.php
===================================================================
--- branches/2.5/http/php/mod_editGuiWms.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editGuiWms.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,14 +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__)."/../classes/class_mb_exception.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.5/http/php/mod_editGuiWmsMeta.php
===================================================================
--- branches/2.5/http/php/mod_editGuiWmsMeta.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editGuiWmsMeta.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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.
-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);
-
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<meta http-equiv="cache-control" content="no-cache">
@@ -126,7 +119,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.5/http/php/mod_editSelf.php
===================================================================
--- branches/2.5/http/php/mod_editSelf.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editSelf.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,9 +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");
-import_request_variables("PG");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -122,9 +120,6 @@
</head>
<body>
<?php
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
#delete
if($action == 'delete'){
$sql = "DELETE FROM mb_user WHERE mb_user_id = $1 ";
Modified: branches/2.5/http/php/mod_editUser.php
===================================================================
--- branches/2.5/http/php/mod_editUser.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editUser.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,12 +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.
-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.5/http/php/mod_editWMS_Metadata.php
===================================================================
--- branches/2.5/http/php/mod_editWMS_Metadata.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_editWMS_Metadata.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,14 +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_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">
Modified: branches/2.5/http/php/mod_edit_element_vars.php
===================================================================
--- branches/2.5/http/php/mod_edit_element_vars.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_edit_element_vars.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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();
-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);
-
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.5/http/php/mod_edit_metadata.php
===================================================================
--- branches/2.5/http/php/mod_edit_metadata.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_edit_metadata.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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();
-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);
-
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.5/http/php/mod_evalArea.php
===================================================================
--- branches/2.5/http/php/mod_evalArea.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_evalArea.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -16,11 +16,9 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-import_request_variables("PG");
-include '../include/dyn_css.php';
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+include '../include/dyn_css.php';
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -32,11 +30,6 @@
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
<title>Resultset</title>
-<?php
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
-?>
<style type="text/css">
<!--
@@ -53,7 +46,6 @@
</head>
<body>
<?php
-import_request_variables("PG");
$x = $_REQUEST["x"];
$y = $_REQUEST["y"];
$epsg = $_REQUEST["srs"];
Modified: branches/2.5/http/php/mod_exportElement.php
===================================================================
--- branches/2.5/http/php/mod_exportElement.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_exportElement.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,9 +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">
<html>
@@ -37,9 +35,6 @@
</head>
<body>
<?php
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
$insert = "";
$sql = "SELECT * FROM gui_element WHERE fkey_gui_id = $1 AND e_id= $2";
$v = array($_REQUEST["gui"],$_REQUEST["element"]);
Modified: branches/2.5/http/php/mod_exportGUI.php
===================================================================
--- branches/2.5/http/php/mod_exportGUI.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_exportGUI.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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();
-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.5/http/php/mod_export_image.php
===================================================================
--- branches/2.5/http/php/mod_export_image.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_export_image.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -16,9 +16,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-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
Modified: branches/2.5/http/php/mod_featuretypeMetadata.php
===================================================================
--- branches/2.5/http/php/mod_featuretypeMetadata.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_featuretypeMetadata.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
function display_text($string) {
$string = eregi_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", "<a href=\"\\0\" target=_blank>\\0</a>", $string);
$string = eregi_replace("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@([0-9a-z](-?[0-9a-z])*\.)+[a-z]{2}([zmuvtg]|fo|me)?$", "<a href=\"mailto:\\0\" target=_blank>\\0</a>", $string);
Modified: branches/2.5/http/php/mod_filteredGroup_Gui.php
===================================================================
--- branches/2.5/http/php/mod_filteredGroup_Gui.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredGroup_Gui.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,13 +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.
-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.5/http/php/mod_filteredGroup_User.php
===================================================================
--- branches/2.5/http/php/mod_filteredGroup_User.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredGroup_User.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,12 +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.
-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.5/http/php/mod_filteredGroup_filteredGui.php
===================================================================
--- branches/2.5/http/php/mod_filteredGroup_filteredGui.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredGroup_filteredGui.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,12 +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.
-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.5/http/php/mod_filteredGroup_filteredUser.php
===================================================================
--- branches/2.5/http/php/mod_filteredGroup_filteredUser.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredGroup_filteredUser.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,13 +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.
-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.5/http/php/mod_filteredGui_User.php
===================================================================
--- branches/2.5/http/php/mod_filteredGui_User.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredGui_User.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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.
-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.5/http/php/mod_filteredGui_filteredGroup.php
===================================================================
--- branches/2.5/http/php/mod_filteredGui_filteredGroup.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredGui_filteredGroup.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,12 +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.
-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.5/http/php/mod_filteredGui_filteredUser.php
===================================================================
--- branches/2.5/http/php/mod_filteredGui_filteredUser.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredGui_filteredUser.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,12 +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.
-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.5/http/php/mod_filteredGui_group.php
===================================================================
--- branches/2.5/http/php/mod_filteredGui_group.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredGui_group.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_filteredUser_Group.php
===================================================================
--- branches/2.5/http/php/mod_filteredUser_Group.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredUser_Group.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_filteredUser_Gui.php
===================================================================
--- branches/2.5/http/php/mod_filteredUser_Gui.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredUser_Gui.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_filteredUser_filteredGroup.php
===================================================================
--- branches/2.5/http/php/mod_filteredUser_filteredGroup.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredUser_filteredGroup.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_filteredUser_filteredGui.php
===================================================================
--- branches/2.5/http/php/mod_filteredUser_filteredGui.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredUser_filteredGui.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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.
-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.5/http/php/mod_filteredWms_layer_topic.php
===================================================================
--- branches/2.5/http/php/mod_filteredWms_layer_topic.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredWms_layer_topic.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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(dirname(__FILE__) . "/../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);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.5/http/php/mod_filteredWms_topic.php
===================================================================
--- branches/2.5/http/php/mod_filteredWms_topic.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_filteredWms_topic.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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"];
+require_once(dirname(__FILE__) . "/../classes/class_administration.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -63,7 +59,6 @@
<body>
<?php
-require_once(dirname(__FILE__) . "/../classes/class_administration.php");
$fieldHeight = 20;
Modified: branches/2.5/http/php/mod_forgottenPassword.php
===================================================================
--- branches/2.5/http/php/mod_forgottenPassword.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_forgottenPassword.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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.
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-import_request_variables("PG");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -49,10 +47,6 @@
</head>
<body>
<?php
-//the database-params
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-//$con = db_connect($DBSERVER,$OWNER,$PW);
-//db_select_db(DB,$con);
if (!USE_PHP_MAILING) {
Modified: branches/2.5/http/php/mod_gazLayerObj_conf.php
===================================================================
--- branches/2.5/http/php/mod_gazLayerObj_conf.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gazLayerObj_conf.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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.
-require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
+require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
?>
<html>
<head>
@@ -75,9 +73,6 @@
/* save gazetteer properties */
if(isset($_REQUEST["save"])){
- $con = db_connect($DBSERVER,$OWNER,$PW);
- db_select_db(DB,$con);
-
$sql = "UPDATE gui_layer SET gui_layer_wfs_featuretype = $1 ";
$sql .= "WHERE fkey_gui_id = $2 AND fkey_layer_id = $3";
$v = array($_REQUEST["myWFS"], $_REQUEST["gui"], $_REQUEST["layer"]);
Modified: branches/2.5/http/php/mod_gazLayerObj_edit.php
===================================================================
--- branches/2.5/http/php/mod_gazLayerObj_edit.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gazLayerObj_edit.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,9 +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(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
?>
<html>
<head>
Modified: branches/2.5/http/php/mod_gazetteerMetadata.php
===================================================================
--- branches/2.5/http/php/mod_gazetteerMetadata.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gazetteerMetadata.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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();
-$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");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
+$user_id = $_SESSION["mb_user_id"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -39,7 +33,6 @@
<meta name="DC.Rights" content="WhereGroup GmbH & Co.KG, Bonn">
<title>Metadata search</title>
<?
-$e_id_css = 'poi';
include_once(dirname(__FILE__) . "/../include/dyn_css.php");
?>
<style type="text/css">
Modified: branches/2.5/http/php/mod_gazetteerMetadata_search.php
===================================================================
--- branches/2.5/http/php/mod_gazetteerMetadata_search.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gazetteerMetadata_search.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -1,14 +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");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
$n = new administration();
$myguis = $n->getGuisByPermission($user_id, true);
$mywms = $n->getWmsByOwnGuis($myguis);
Modified: branches/2.5/http/php/mod_gazetteerSQL_server.php
===================================================================
--- branches/2.5/http/php/mod_gazetteerSQL_server.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gazetteerSQL_server.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -1,9 +1,6 @@
<?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.5/http/php/mod_gazetteer_conf.php
===================================================================
--- branches/2.5/http/php/mod_gazetteer_conf.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gazetteer_conf.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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_validateSession.php");
+require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
?>
<html>
<head>
@@ -56,7 +55,6 @@
return true;
}
</script>
-
</head>
<body>
Gazetteer Configuration<br>
Modified: branches/2.5/http/php/mod_gazetteer_edit.php
===================================================================
--- branches/2.5/http/php/mod_gazetteer_edit.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gazetteer_edit.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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_validateSession.php");
?>
<html>
Modified: branches/2.5/http/php/mod_getStyles.php
===================================================================
--- branches/2.5/http/php/mod_getStyles.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_getStyles.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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();
-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);
$pattern = "admin_name";
?>
Modified: branches/2.5/http/php/mod_group_filteredGui.php
===================================================================
--- branches/2.5/http/php/mod_group_filteredGui.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_group_filteredGui.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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.
-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.5/http/php/mod_group_filteredUser.php
===================================================================
--- branches/2.5/http/php/mod_group_filteredUser.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_group_filteredUser.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_group_gui.php
===================================================================
--- branches/2.5/http/php/mod_group_gui.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_group_gui.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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.
-
-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.5/http/php/mod_group_user.php
===================================================================
--- branches/2.5/http/php/mod_group_user.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_group_user.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_gui_filteredGroup.php
===================================================================
--- branches/2.5/http/php/mod_gui_filteredGroup.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gui_filteredGroup.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_gui_filteredUser.php
===================================================================
--- branches/2.5/http/php/mod_gui_filteredUser.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gui_filteredUser.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_gui_group.php
===================================================================
--- branches/2.5/http/php/mod_gui_group.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gui_group.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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>
@@ -61,13 +56,7 @@
</head>
<body>
<?php
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
-
$fieldHeight = 20;
-
$cnt_gui = 0;
$cnt_group = 0;
$cnt_group = 0;
Modified: branches/2.5/http/php/mod_gui_owner.php
===================================================================
--- branches/2.5/http/php/mod_gui_owner.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gui_owner.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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");
-$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.5/http/php/mod_gui_user.php
===================================================================
--- branches/2.5/http/php/mod_gui_user.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_gui_user.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_help.php
===================================================================
--- branches/2.5/http/php/mod_help.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_help.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,14 +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__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
-$e_id_css = 'help';
-$gui_id = $_REQUEST["gui_id"];
include(dirname(__FILE__)."/../include/dyn_php.php");
+
if(!isset($mod_help_width)){
$mod_help_width = 1000;
}
Modified: branches/2.5/http/php/mod_insertWmcIntoDb.php
===================================================================
--- branches/2.5/http/php/mod_insertWmcIntoDb.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_insertWmcIntoDb.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,17 +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__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_wmc.php");
require_once(dirname(__FILE__)."/../extensions/JSON.php");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-session_start();
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
$json = new Services_JSON();
$mapObject = $json->decode(stripslashes($_POST["mapObject"]));
$user_id = $_SESSION["mb_user_id"];
Modified: branches/2.5/http/php/mod_layerMetadata.php
===================================================================
--- branches/2.5/http/php/mod_layerMetadata.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_layerMetadata.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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.
-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);
function display_text($string) {
$string = mb_eregi_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", "<a href=\"\\0\" target=_blank>\\0</a>", $string);
@@ -166,4 +163,4 @@
?>
</div>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_loadCapabilities.php
===================================================================
--- branches/2.5/http/php/mod_loadCapabilities.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_loadCapabilities.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,18 +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();
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
-$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");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<?php
@@ -81,7 +72,7 @@
}
else{
var gui_id=document.form1.guiList.options[listIndex].value;
- document.form1.action = '../php/mod_loadwms.php?<?php echo $secParams ?>';
+ document.form1.action = '../php/mod_loadwms.php?<?php echo $urlParameters ?>';
document.form1.submit();
}
}
Modified: branches/2.5/http/php/mod_loadCapabilitiesList.php
===================================================================
--- branches/2.5/http/php/mod_loadCapabilitiesList.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_loadCapabilitiesList.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,17 +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");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
-include(dirname(__FILE__)."/../php/mb_validatePermission.php");
-import_request_variables("PG");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<?php
@@ -119,7 +112,6 @@
<?php
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
$admin = new administration();
$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
Modified: branches/2.5/http/php/mod_loadCapabilities_temp.php
===================================================================
--- branches/2.5/http/php/mod_loadCapabilities_temp.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_loadCapabilities_temp.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,15 +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__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/mb_validateInput.php");
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
-import_request_variables("PG");
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<?php
@@ -71,35 +66,28 @@
<script language="JavaScript">
function validate(wert){
var gui_id= document.form1.gui_id.value;
- document.form1.action='../php/mod_loadwms_temp.php';
+ document.form1.action='../php/mod_loadwms_temp.php?<?php echo $urlParameters;?>';
document.form1.submit();
var main = parent.window.location;
main.reload();
}
-//location.reload() target="_self">reload page</a>
-
</script>
</head>
<body>
<?php
-$con = db_connect($DBSERVER,$OWNER,$PW);
-
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
-
-$gui_id = $_SESSION["mb_user_gui"];
-
+echo "<form name='form1' action='" . $self . "' method='post'>";
echo "<input type='hidden'name='gui_id' value='".$gui_id."'>";
+echo "WMS hinzuladen<br>";
-echo"WMS hinzuladen<br>";
-if (isset($xml_file)){
+if (isset($xml_file)) {
echo"<input type='text' name='xml_file' size='50' value='".$xml_file."'>";
-}else{
+}
+else {
echo"<input type='text' name='xml_file' size='50' value='http://'>";
}
-echo"<input type='button' name='loadCap' value='Laden' onClick='validate(\"guiList\")'>";
-echo "</form>";
-#echo "<a href='javascript:location.reload()' target='_parent'>reload page</a>";
?>
+<input type='button' name='loadCap' value='Laden' onClick='validate("guiList")'>
+</form>
</body>
</html>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_loadWFSCapabilities.php
===================================================================
--- branches/2.5/http/php/mod_loadWFSCapabilities.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_loadWFSCapabilities.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,17 +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__)."/../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");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<?php
@@ -90,24 +83,15 @@
<body>
<?php
-$con = db_connect(DBSERVER,OWNER,PW);
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
$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 "<table cellpadding='0' cellspacing='0' border='0'>";
echo "<tr>";
echo "<td>";
echo"GUI";
echo"<br>";
-#$sql = "SELECT * from gui_mb_user, gui WHERE gui.gui_id = gui_mb_user.fkey_gui_id ";
-#$sql .= "AND gui.gui_public = 1 AND gui_mb_user.fkey_mb_user_id = $1 Order BY fkey_gui_id ;";
-#$v = array($_SESSION["mb_user_id"]);
-#$t = array('i');
-#$res = db_prep_query($sql,$v,$t);
-#$count=0;
$gui_id =array();
if (count($ownguis)>0){
for($i=0; $i<count($ownguis); $i++){
@@ -134,9 +118,7 @@
echo "</td>";
echo "<td>";
-#echo"WFS";
echo"<br>";
-###
if(isset($guiList) && $guiList!=""){
@@ -165,7 +147,6 @@
echo "REQUEST=getCapabilities&VERSION=1.0.0&SERVICE=WFS<br>";
echo "<br><br>";
echo "Link to WFS Capabilities URL:<br>";
-#echo "Load WMS capabilities URL:<br>"
if (isset($xml_file)){
echo"<input type='text' name='xml_file' size='50' value='".$xml_file."'>";
Modified: branches/2.5/http/php/mod_loadwfs.php
===================================================================
--- branches/2.5/http/php/mod_loadwfs.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_loadwfs.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,18 +17,17 @@
# 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__)."/mb_validateInput.php");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/mb_validateInput.php");
require_once(dirname(__FILE__)."/../classes/class_wfs.php");
+
echo "file: ".$_REQUEST["xml_file"];
echo "<br>-------------------------------<br>";
-$gui_id=mb_validateInput($_REQUEST["guiList"]);
-$xml=mb_validateInput($_REQUEST["xml_file"]);
+
+$gui_id = mb_validateInput($_REQUEST["guiList"]);
+$xml = mb_validateInput($_REQUEST["xml_file"]);
$mywms = new wfs();
$mywms->createObjFromXML($xml);
$mywms->wfs2db($gui_id);
$mywms->displayWFS();
-?>
+?>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_loadwms.php
===================================================================
--- branches/2.5/http/php/mod_loadwms.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_loadwms.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,14 +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");
-$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");
-
echo "file: ".$_REQUEST["xml_file"];
$gui_id = $_REQUEST["guiList"];
@@ -34,4 +29,4 @@
$mywms->createObjFromXML($xml);
$mywms->writeObjInDB($gui_id);
$mywms->displayWMS();
-?>
+?>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_loadwms_temp.php
===================================================================
--- branches/2.5/http/php/mod_loadwms_temp.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_loadwms_temp.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,23 +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();
+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");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
-#echo "file: ".$_REQUEST["xml_file"];
-
$gui_id=mb_validateInput($_REQUEST["gui_id"]);
$xml=mb_validateInput($_REQUEST["xml_file"]);
- $mywms = new wms();
- $mywms->createObjFromXML($xml);
- $mywms->writeObjInDB($gui_id);
-
-// $mywms->displayWMS();
-#echo "<body bgcolor='#fbc327'>";
-#echo "</body>";
-?>
+$mywms = new wms();
+$mywms->createObjFromXML($xml);
+$mywms->writeObjInDB($gui_id);
+?>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_log.php
===================================================================
--- branches/2.5/http/php/mod_log.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_log.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -16,15 +16,10 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-$gui_id = $_REQUEST['gui_id'];
-$e_id = $_REQUEST['elementID'];
-session_start();
-
-include(dirname(__FILE__)."/../include/dyn_php.php");
+require(dirname(__FILE__)."/../include/dyn_php.php");
+
if($_REQUEST['req']){
ignore_user_abort();
$req = array();
@@ -36,4 +31,4 @@
$log = new log("default", $req, $time_client, $logtype);
}
echo "log into $logtype successful!";
-?>
+?>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_logout.php
===================================================================
--- branches/2.5/http/php/mod_logout.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_logout.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,14 +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"];
-
ob_start();
require_once(dirname(__FILE__)."/../include/dyn_php.php");
@@ -38,11 +32,11 @@
if (isset($logout_location) && $logout_location != ''){
header("Location: ".$logout_location);
}
-else{
- if(is_file(dirname($_SERVER['PHP_SELF'])."/login.php")){
+else {
+ if (is_file(dirname($_SERVER['PHP_SELF'])."/login.php")) {
header("Location: http://".$_SERVER['HTTP_HOST'].$dir."/login.php");
}
- else{
+ else {
header("Location: http://".$_SERVER['HTTP_HOST'].preg_replace("/\/php/","/frames",$dir)."/login.php");
}
}
Modified: branches/2.5/http/php/mod_map1.php
===================================================================
--- branches/2.5/http/php/mod_map1.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_map1.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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");
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"];
-
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<meta http-equiv="cache-control" content="no-cache">
Modified: branches/2.5/http/php/mod_mapOV.php
===================================================================
--- branches/2.5/http/php/mod_mapOV.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_mapOV.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,11 +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);
if(isset($_REQUEST["wms"])){
$rank = $_REQUEST["wms"];
Modified: branches/2.5/http/php/mod_meetingPoint.php
===================================================================
--- branches/2.5/http/php/mod_meetingPoint.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_meetingPoint.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,55 +17,23 @@
# 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(dirname(__FILE__) . "/../php/mb_validateSession.php");
-require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
-
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
-$gui_id = $_SESSION["mb_user_gui"];
-
-$sql = "SELECT DISTINCT e_target FROM gui_element WHERE e_id = '".$_REQUEST["e_id_css"]."' AND fkey_gui_id = $1";
-$v = array($gui_id);
-$t = array('s');
-
-$res = db_prep_query($sql, $v, $t);
-$cnt = 0;
-while($row = db_fetch_array($res)){
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('legend: ID not unique!');";
-}
-
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>meetingPoint</title>
-
<?php
-
-$e_id_css = 'meetingPoint';
include '../include/dyn_css.php';
?>
-
<script language='JavaScript'>
<!--
<?php
-
-
include('../include/dyn_js.php');
-
-echo "var mod_meetingPoint_target = '".$e_target."';";
+echo "var mod_meetingPoint_target = '".$e_target[0]."';";
echo "var meetingPoint_write_to = 'meetingPoint';";
-
?>
-
try{
if (meetingPoint_export_subject){}
}
@@ -320,4 +288,4 @@
<br>
</form>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_newGui.php
===================================================================
--- branches/2.5/http/php/mod_newGui.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_newGui.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_orphanWMS.php
===================================================================
--- branches/2.5/http/php/mod_orphanWMS.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_orphanWMS.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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__)."/../../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"];
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -57,7 +52,6 @@
</head>
<body>
<?php
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
$admin = new administration();
$error_msg='';
Modified: branches/2.5/http/php/mod_printView1.php
===================================================================
--- branches/2.5/http/php/mod_printView1.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_printView1.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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();
-//
-import_request_variables("PG");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+include(dirname(__FILE__)."/../../conf/print.conf");
$_SESSION["mb_print_url"] = $map_url;
$_SESSION["mb_print_resolution"] = $quality;
-include(dirname(__FILE__)."/../../conf/print.conf");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: branches/2.5/http/php/mod_renameGUI.php
===================================================================
--- branches/2.5/http/php/mod_renameGUI.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_renameGUI.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,17 +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");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../classes/class_gui.php");
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<meta name="author-mail" content="info at ccgis.de">
@@ -153,8 +147,6 @@
<body onLoad='document.form1.newGuiName.focus()'>
<?php
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
-require_once(dirname(__FILE__)."/../classes/class_gui.php");
###rename
if($rename || $copy){
Modified: branches/2.5/http/php/mod_saveWKT.php
===================================================================
--- branches/2.5/http/php/mod_saveWKT.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_saveWKT.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -18,7 +18,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<html>
Modified: branches/2.5/http/php/mod_setLocale.php
===================================================================
--- branches/2.5/http/php/mod_setLocale.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_setLocale.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,10 +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__) . "/../classes/class_locale.php");
-require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../classes/class_locale.php");
+
$_SESSION["mb_lang"] = $_REQUEST["lang"];
$localeObj = new Mb_locale($_SESSION["mb_lang"]);
session_write_close();
Modified: branches/2.5/http/php/mod_showLoggedUser.php
===================================================================
--- branches/2.5/http/php/mod_showLoggedUser.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_showLoggedUser.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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");
-$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">
<html>
Modified: branches/2.5/http/php/mod_simpleWMSpreferences.php
===================================================================
--- branches/2.5/http/php/mod_simpleWMSpreferences.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_simpleWMSpreferences.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -75,22 +73,9 @@
-->
</STYLE>
<?php
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT * FROM gui_element WHERE e_id = 'WMS_preferences' AND fkey_gui_id = $1";
-$v = array($_SESSION["mb_user_gui"]);
-$t = array("s");
-$res = db_prep_query($sql, $v, $t);
-$cnt = 0;
-while($row = db_fetch_array($res)){
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('WMS_preferences: ID not unique!');";}
echo '<script type="text/javascript">';
-$target = explode(",", $e_target);
-echo "var mod_WMSpreferences_target1 = '".trim($target[0])."';";
-echo "var mod_WMSpreferences_target2 = '".trim($target[1])."';";
+echo "var mod_WMSpreferences_target1 = '".trim($e_target[0])."';";
+echo "var mod_WMSpreferences_target2 = '".trim($e_target[1])."';";
echo "</script>";
?>
<script type="text/javascript">
Modified: branches/2.5/http/php/mod_switchLocale.php
===================================================================
--- branches/2.5/http/php/mod_switchLocale.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_switchLocale.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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();
-$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");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
-$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.5/http/php/mod_switchLocale_noreload.php
===================================================================
--- branches/2.5/http/php/mod_switchLocale_noreload.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_switchLocale_noreload.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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();
-$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");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
-$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.5/http/php/mod_treefolderAdmin.php
===================================================================
--- branches/2.5/http/php/mod_treefolderAdmin.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_treefolderAdmin.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -19,12 +19,7 @@
# 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__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
Modified: branches/2.5/http/php/mod_treefolderClient.php
===================================================================
--- branches/2.5/http/php/mod_treefolderClient.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_treefolderClient.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,15 +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();
-
-import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$guiList = $_SESSION["mb_user_gui"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
@@ -80,18 +72,8 @@
// -->
</STYLE>
<?php
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'treeConfGDE' AND fkey_gui_id = $1";
-$v = array($guiList);
-$t = array("s");
-$res = db_prep_query($sql, $v, $t);
-$cnt = 0;
-while(db_fetch_row($res)){
- $e_target = db_result($res,0,"e_target");
- $cnt++;
-}
-if($cnt > 1){ echo "alert('treeConfGDE: ID not unique!');";}
echo "<script language='JavaScript'>";
-echo "var treetarget = '".$e_target."';";
+echo "var treetarget = '".$e_target[0]."';";
echo "</script>";
?>
<SCRIPT language="JavaScript1.2">
Modified: branches/2.5/http/php/mod_updateKmlInDb.php
===================================================================
--- branches/2.5/http/php/mod_updateKmlInDb.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_updateKmlInDb.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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();
mb_internal_encoding("UTF-8");
-
-require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
-require_once(dirname(__FILE__) . "/../classes/class_mb_exception.php");
-require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
$kmlId = $_POST["kmlId"];
$placemarkId = $_POST["placemarkId"];
@@ -38,4 +34,4 @@
else {
echo "0";
}
-?>
+?>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_updateWMS.php
===================================================================
--- branches/2.5/http/php/mod_updateWMS.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_updateWMS.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,14 +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");
-$con = db_connect(DBSERVER,OWNER,PW);
require_once(dirname(__FILE__)."/mb_validatePermission.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
-import_request_variables("PG");
-$secParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-$self = $PHP_SELF."?".$secParams;
?>
<html>
<head>
Modified: branches/2.5/http/php/mod_usemap.php
===================================================================
--- branches/2.5/http/php/mod_usemap.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_usemap.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -19,14 +19,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_gml2.php");
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
<title>image map generator</title>
</head>
<?php
-include_once(dirname(__FILE__)."/../classes/class_gml2.php");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
$url = urldecode($_REQUEST["url"]);
Modified: branches/2.5/http/php/mod_user_filteredGroup.php
===================================================================
--- branches/2.5/http/php/mod_user_filteredGroup.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_user_filteredGroup.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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.
-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.5/http/php/mod_user_filteredGui.php
===================================================================
--- branches/2.5/http/php/mod_user_filteredGui.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_user_filteredGui.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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.
-import_request_variables("PG");
-session_start();
-$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">
@@ -121,10 +113,6 @@
</head>
<body>
<?php
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
require_once(dirname(__FILE__)."/../php/mb_getGUIs.php");
$fieldHeight = 25;
Modified: branches/2.5/http/php/mod_user_group.php
===================================================================
--- branches/2.5/http/php/mod_user_group.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_user_group.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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.
-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.5/http/php/mod_user_gui.php
===================================================================
--- branches/2.5/http/php/mod_user_gui.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_user_gui.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -16,16 +16,9 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-import_request_variables("PG");
-session_start();
-$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">
@@ -33,8 +26,8 @@
<head>
<?php
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
+include '../include/dyn_css.php';
?>
-<?php include '../include/dyn_css.php'; ?>
<script language="JavaScript">
function validate(wert){
if(document.forms[0]["selected_user"].selectedIndex == -1){
Modified: branches/2.5/http/php/mod_wfs.php
===================================================================
--- branches/2.5/http/php/mod_wfs.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfs.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-//require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: branches/2.5/http/php/mod_wfsLayerObj_conf.php
===================================================================
--- branches/2.5/http/php/mod_wfsLayerObj_conf.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfsLayerObj_conf.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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_validateSession.php");
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db($DB,$con);
+require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
?>
<html>
<head>
Modified: branches/2.5/http/php/mod_wfsSpatialRequest_messages.php
===================================================================
--- branches/2.5/http/php/mod_wfsSpatialRequest_messages.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfsSpatialRequest_messages.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,13 +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__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../extensions/JSON.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../extensions/JSON.php");
-session_start();
-
$e = new mb_notice("locale: " . $_SESSION["mb_locale"] . "; lang: " . $_SESSION["mb_lang"]);
setlocale(LC_ALL, $_SESSION["mb_locale"]);
Modified: branches/2.5/http/php/mod_wfs_conf.php
===================================================================
--- branches/2.5/http/php/mod_wfs_conf.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfs_conf.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-session_start();
+require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
?>
<html>
<head>
Modified: branches/2.5/http/php/mod_wfs_edit.php
===================================================================
--- branches/2.5/http/php/mod_wfs_edit.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfs_edit.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -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.
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
-session_start();
?>
<html>
<head>
Modified: branches/2.5/http/php/mod_wfs_gazetteer_server.php
===================================================================
--- branches/2.5/http/php/mod_wfs_gazetteer_server.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfs_gazetteer_server.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,19 +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();
-
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_gml2.php");
require_once(dirname(__FILE__)."/../extensions/JSON.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db($DB,$con);
-
$command = $_REQUEST["command"];
/**
Modified: branches/2.5/http/php/mod_wfs_result.php
===================================================================
--- branches/2.5/http/php/mod_wfs_result.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfs_result.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,22 +17,16 @@
# 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(dirname(__FILE__) . "/../classes/class_stripRequest.php");
+require_once(dirname(__FILE__) . "/../classes/class_connector.php");
+
$filter = stripslashes($_REQUEST["filter"]);
$url = stripslashes($_REQUEST["url"]);
$js_wfs_conf_id = $_REQUEST["js_wfs_conf_id"];
$db_wfs_conf_id = $_REQUEST["db_wfs_conf_id"];
$typename = $_REQUEST["typename"];
-session_start();
-require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
-require_once(dirname(__FILE__) . "/../classes/class_stripRequest.php");
-require_once(dirname(__FILE__) . "/../classes/class_connector.php");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-
-
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
function sepNameSpace($s){
$c = mb_strpos($s,":");
if ($c > 0){
Modified: branches/2.5/http/php/mod_wfs_save.php
===================================================================
--- branches/2.5/http/php/mod_wfs_save.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfs_save.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -1,5 +1,3 @@
-<html>
-<head>
<?php
# $Id$
# http://www.mapbender.org/index.php/Administration
@@ -19,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");
-
+?>
+<html>
+<head>
+<?php
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
<title>WFS Save</title>
Modified: branches/2.5/http/php/mod_wfs_server.php
===================================================================
--- branches/2.5/http/php/mod_wfs_server.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfs_server.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -1,17 +1,9 @@
<?php
-session_start();
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
require_once(dirname(__FILE__)."/../classes/class_wfs.php");
-include_once(dirname(__FILE__) . "/../extensions/JSON.php");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../extensions/JSON.php");
-
-//db connection
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
$json = new Services_JSON();
$obj = $json->decode(stripslashes($_REQUEST['obj']));
@@ -309,6 +301,4 @@
header("Content-Type: text/x-json");
echo $output;
}
-
-
?>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_wfsrequest.php
===================================================================
--- branches/2.5/http/php/mod_wfsrequest.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_wfsrequest.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,9 +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.
-# ur # echo urldecode(stripslashes(utf8_decode($_REQUEST["filter"])));
-# ur # die;
-
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
function checkInput($s){
@@ -30,9 +27,7 @@
die('Unzulässige Eingabe');
}
}
-require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db($DB,$con);
+
if(isset($_REQUEST["backlink"]) && $_REQUEST["backlink"] == 'parent'){
$p = 'parent';
}else{
Modified: branches/2.5/http/php/mod_zoomCoords.php
===================================================================
--- branches/2.5/http/php/mod_zoomCoords.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_zoomCoords.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,11 +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();
-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>
@@ -34,8 +30,6 @@
?>
<title>Zoom to Coordinate</title>
<?php
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
include '../include/dyn_css.php';
?>
Modified: branches/2.5/http/php/mod_zoomCoords_en.php
===================================================================
--- branches/2.5/http/php/mod_zoomCoords_en.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/mod_zoomCoords_en.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,16 +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");
-
-
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<meta http-equiv="cache-control" content="no-cache">
@@ -85,24 +78,9 @@
-->
</style>
<?php
-$gui_id = $_SESSION["mb_user_gui"];
-$e_id_css = $_REQUEST["elementID"];
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
-$v = array($e_id_css,$gui_id);
-$t = array('s','s');
-$res = db_prep_query($sql,$v,$t);
-$cnt = 0;
-while($row = db_fetch_array($res)){
- $e_target = $row["e_target"];
- $cnt++;
-}
-
echo '<script type="text/javascript">';
-if($cnt > 1){ echo "alert('zoomCoords: ID not unique!');";}
-echo "var mod_zoomCoords_target = '".$e_target."';";
+echo "var mod_zoomCoords_target = '".$e_target[0]."';";
echo "var target = mod_zoomCoords_target.split(',');";
@@ -125,14 +103,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;
Modified: branches/2.5/http/php/nestedSets.php
===================================================================
--- branches/2.5/http/php/nestedSets.php 2008-02-25 23:21:35 UTC (rev 2143)
+++ branches/2.5/http/php/nestedSets.php 2008-02-26 23:16:14 UTC (rev 2144)
@@ -17,12 +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");
-import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
More information about the Mapbender_commits
mailing list