[Mapbender-commits] r6728 - in trunk/mapbender: http/frames
http/javascripts http/php http/print/classes http/sld tools
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Aug 10 04:31:29 EDT 2010
Author: christoph
Date: 2010-08-10 08:31:29 +0000 (Tue, 10 Aug 2010)
New Revision: 6728
Modified:
trunk/mapbender/http/frames/login.php
trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php
trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php
trunk/mapbender/http/javascripts/mod_poi.php
trunk/mapbender/http/php/mb_validatePermission.php
trunk/mapbender/http/php/mb_validateSession.php
trunk/mapbender/http/php/mod_createUser.php
trunk/mapbender/http/php/mod_deleteWFS.php
trunk/mapbender/http/php/mod_forgottenPassword.php
trunk/mapbender/http/php/mod_logout.php
trunk/mapbender/http/php/mod_monitorCapabilities_read.php
trunk/mapbender/http/php/mod_owsproxy_conf.php
trunk/mapbender/http/php/mod_updateWMS.php
trunk/mapbender/http/php/mod_zoomCoords.php
trunk/mapbender/http/php/wms.php
trunk/mapbender/http/print/classes/mbPdf.php
trunk/mapbender/http/sld/sld_config.php
trunk/mapbender/tools/mapFiler.php
Log:
replaced $_SERVER["PHP_SELF"] or $PHP_SELF (or even $_PHP_SELF!) by $_SERVER["SCRIPT_NAME"]
Modified: trunk/mapbender/http/frames/login.php
===================================================================
--- trunk/mapbender/http/frames/login.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/frames/login.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -139,7 +139,7 @@
if(!isset($name) || $name == '' || !isset($password) || $password == ''){
killSession();
- echo "<form name='loginForm' action ='" . $PHP_SELF . "' method='POST'>";
+ echo "<form name='loginForm' action ='" . $_SERVER["SCRIPT_NAME"] . "' method='POST'>";
echo "<table>";
echo "<tr><td>Name: </td><td><input type='text' name='name' class='login_text' value=''></td></tr>";
echo "<tr><td>Password: </td><td><input type='password' name='password' class='login_text'></td></tr>";
@@ -187,10 +187,10 @@
#only one gui is provided
if(count($arrayGUIs) == 1){
if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
- $myURL = "Location: https://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/index.php?".strip_tags (SID)."&gui_id=".$arrayGUIs[0];
+ $myURL = "Location: https://".$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/index.php?".strip_tags (SID)."&gui_id=".$arrayGUIs[0];
}
else {
- $myURL = "Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/index.php?".strip_tags (SID)."&gui_id=".$arrayGUIs[0];
+ $myURL = "Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/index.php?".strip_tags (SID)."&gui_id=".$arrayGUIs[0];
}
# remove name and password from url, because url params are parsed later and written in javascript
$cleanUrl = preg_replace("/name=[^&]*&/","",$_SERVER["QUERY_STRING"]);
@@ -216,11 +216,11 @@
db_prep_query($sql_set_cnt,$v,$t);
if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
session_write_close();
- header ("Location: https://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/login.php?name=".$name);
+ header ("Location: https://".$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/login.php?name=".$name);
}
else {
session_write_close();
- header ("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/login.php?name=".$name);
+ header ("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/login.php?name=".$name);
}
die;
}
Modified: trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -311,7 +311,7 @@
/*INSERT HTML*/
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $_SERVER["SCRIPT_NAME"] . "?".SID."' method='post'>";
# Button
echo "<table border='0' cellpadding='3' rules='rows'>";
echo "<tr>";
Modified: trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -164,7 +164,7 @@
/*INSERT HTML*/
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $_SERVER["SCRIPT_NAME"] . "?".SID."' method='post'>";
if (empty($wms_show)){ #gui
echo $selectGuiText;
Modified: trunk/mapbender/http/javascripts/mod_poi.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_poi.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/javascripts/mod_poi.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -343,7 +343,7 @@
}
}
if($has_result == false){echo "Kein Ergebnis!";}
- echo "<form action='" . $PHP_SELF . "?".SID."' method='post'>";
+ echo "<form action='" . $_SERVER["SCRIPT_NAME"] . "?".SID."' method='post'>";
echo "</form>";
}
?>
Modified: trunk/mapbender/http/php/mb_validatePermission.php
===================================================================
--- trunk/mapbender/http/php/mb_validatePermission.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mb_validatePermission.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -25,7 +25,7 @@
//
// check if GUI id and element id are set
//
-$msg = "missing in " . $_SERVER["PHP_SELF"];
+$msg = "missing in " . $_SERVER["SCRIPT_NAME"];
if (!isset($gui_id)) {
$e = new mb_exception("GUI id " . $msg);
die();
@@ -44,9 +44,9 @@
// if the module is an iframe, also check if the filename matches the
// filename of the GUI element with the given e_id
//
-// (if PHP_SELF is "map.php", we trust the script.)
+// (if SCRIPT_NAME is "map.php", we trust the script.)
//
-if (!preg_match("/^.*\/javascripts\/map\.php$/", $_SERVER["PHP_SELF"])) {
+if (!preg_match("/^.*\/javascripts\/map\.php$/", $_SERVER["SCRIPT_NAME"])) {
$isCorrectScript = true;
@@ -55,7 +55,7 @@
$t = array("s", "s");
$res = db_prep_query($sql, $v, $t);
while ($row = db_fetch_array($res)) {
- if (!$admin->checkModulePermission_new(Mapbender::session()->get("mb_user_id"), $_SERVER["PHP_SELF"], $row["e_element"])) {
+ if (!$admin->checkModulePermission_new(Mapbender::session()->get("mb_user_id"), $_SERVER["SCRIPT_NAME"], $row["e_element"])) {
$isCorrectScript = false;
break;
}
@@ -75,7 +75,7 @@
die();
}
-$e = new mb_notice("mb_validatePermission.php: checking file " . $_SERVER["PHP_SELF"] . "...permission valid.");
+$e = new mb_notice("mb_validatePermission.php: checking file " . $_SERVER["SCRIPT_NAME"] . "...permission valid.");
//
// delete global variables
Modified: trunk/mapbender/http/php/mb_validateSession.php
===================================================================
--- trunk/mapbender/http/php/mb_validateSession.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mb_validateSession.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -19,8 +19,14 @@
require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-$e = new mb_notice("mb_validateSession.php: checking file " . $_SERVER["PHP_SELF"]);
+$e = new mb_notice("mb_validateSession.php: checking file " . $_SERVER["SCRIPT_NAME"]);
+// if cookies are off
+if ($_REQUEST["sessionName"] && $_REQUEST["sessionId"]) {
+ session_name($_REQUEST["sessionName"]);
+ session_id($_REQUEST["sessionId"]);
+}
+
//
// check if user data is valid; if not, return to login screen
//
@@ -52,7 +58,7 @@
$e = new mb_notice("gui id set to gui_id: " . $gui_id);
}
else {
- $e = new mb_notice("mb_validateSession.php: gui_id not set in script: " . $_SERVER["PHP_SELF"]);
+ $e = new mb_notice("mb_validateSession.php: gui_id not set in script: " . $_SERVER["SCRIPT_NAME"]);
}
}
@@ -67,7 +73,7 @@
$e_id = $_REQUEST["e_id"];
}
else {
- $e = new mb_notice("mb_validateSession.php: e_id not set in script: " . $_SERVER["PHP_SELF"]);
+ $e = new mb_notice("mb_validateSession.php: e_id not set in script: " . $_SERVER["SCRIPT_NAME"]);
}
}
@@ -81,7 +87,7 @@
if (isset($e_id)) {
$urlParameters .= "&elementID=" . $e_id;
}
-$self = $_SERVER["PHP_SELF"] . "?" . $urlParameters;
+$self = $_SERVER["SCRIPT_NAME"] . "?" . $urlParameters;
-$e = new mb_notice("mb_validateSession.php: GUI: " . $gui_id . ", checking file " . $_SERVER["PHP_SELF"] . "...session valid.");
+$e = new mb_notice("mb_validateSession.php: GUI: " . $gui_id . ", checking file " . $_SERVER["SCRIPT_NAME"] . "...session valid.");
?>
Modified: trunk/mapbender/http/php/mod_createUser.php
===================================================================
--- trunk/mapbender/http/php/mod_createUser.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mod_createUser.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -182,7 +182,7 @@
}
/* HTML */
-echo "<form name='form1' action='" . $PHP_SELF . "' method='post'>";
+echo "<form name='form1' action='" . $_SERVER["SCRIPT_NAME"] . "' method='post'>";
echo "<table border='0'>";
if(isset($selected_user) && $selected_user != 0){
Modified: trunk/mapbender/http/php/mod_deleteWFS.php
===================================================================
--- trunk/mapbender/http/php/mod_deleteWFS.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mod_deleteWFS.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -133,7 +133,7 @@
$res_wfs = db_query($sql_wfs);
$cnt_wfs = 0;
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $_SERVER["SCRIPT_NAME"] . "?".SID."' method='post'>";
echo "<br><b>WFS List: <b><br><br>";
echo "<select class='wfsList' size='20' name='wfsList' onchange='sel();'>";
//var wfsInfo = this.value.split(\"###\");document.form1.wfsList.value=wfsInfo[0];
Modified: trunk/mapbender/http/php/mod_forgottenPassword.php
===================================================================
--- trunk/mapbender/http/php/mod_forgottenPassword.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mod_forgottenPassword.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -129,7 +129,7 @@
echo "<fieldset><legend>Forgot your Passwort ?</legend>";
#echo "<fieldset><legend>Passwort vergessen ?</legend>";
- #echo "<form name='form1' action='" . $PHP_SELF . "' method='post'>";
+ #echo "<form name='form1' action='" . $_SERVER["SCRIPT_NAME"] . "' method='post'>";
echo "<form name='form1' method='post'>";
echo "<table cellpadding='5' cellspacing='0' border='0'>";
echo "<tr><td>";
Modified: trunk/mapbender/http/php/mod_logout.php
===================================================================
--- trunk/mapbender/http/php/mod_logout.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mod_logout.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -31,13 +31,13 @@
session_destroy();
-$dir = preg_replace("/\\\/","/", dirname($_SERVER['PHP_SELF']));
+$dir = preg_replace("/\\\/","/", dirname($_SERVER['SCRIPT_NAME']));
if (isset($logout_location) && $logout_location != ''){
header("Location: ".$logout_location);
}
else {
- if (is_file(dirname($_SERVER['PHP_SELF'])."/login.php")) {
+ if (is_file(dirname($_SERVER['SCRIPT_NAME'])."/login.php")) {
if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
header("Location: https://".$_SERVER['HTTP_HOST'].$dir."/login.php");
}
Modified: trunk/mapbender/http/php/mod_monitorCapabilities_read.php
===================================================================
--- trunk/mapbender/http/php/mod_monitorCapabilities_read.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mod_monitorCapabilities_read.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -211,15 +211,15 @@
$str = "<span style='font-size:30'>monitoring results</span><hr><br>\n";
-$str .= "<form name = 'form1' method='post' action='".$PHP_SELF."?sortby=".$_GET['sortby']."'>\n\t";
+$str .= "<form name = 'form1' method='post' action='".$_SERVER["SCRIPT_NAME"]."?sortby=".$_GET['sortby']."'>\n\t";
$str .= "\n\t<input type=submit value='update selected WMS'>\n";
-$str .= "\n\t<input type=button onclick=\"self.location.href='".$PHP_SELF."?sortby=".$_GET['sortby']."'\" value='refresh'>\n<br/><br/>\n ";
+$str .= "\n\t<input type=button onclick=\"self.location.href='".$_SERVER["SCRIPT_NAME"]."?sortby=".$_GET['sortby']."'\" value='refresh'>\n<br/><br/>\n ";
$str .= "<table cellpadding=10 cellspacing=0 border=0>";
-$str .= "<tr bgcolor='#dddddd'><th></th><th align='left'><a href='".$PHP_SELF."?sortby=wms'>wms</a></th>";
-$str .= "<th align='left' colspan = 2><a href='".$PHP_SELF."?sortby=status'>current status</a></th>";
-$str .= "<th align='left'><a href='".$PHP_SELF."?sortby=image'>image</a></th>";
-$str .= "<th align='left'><a href='".$PHP_SELF."?sortby=avgresp'>avg. response time</a></th>";
-$str .= "<th align='left'><a href='".$PHP_SELF."?sortby=avail'>overall availability</a></th><th></th><th>Diff</th></tr>";
+$str .= "<tr bgcolor='#dddddd'><th></th><th align='left'><a href='".$_SERVER["SCRIPT_NAME"]."?sortby=wms'>wms</a></th>";
+$str .= "<th align='left' colspan = 2><a href='".$_SERVER["SCRIPT_NAME"]."?sortby=status'>current status</a></th>";
+$str .= "<th align='left'><a href='".$_SERVER["SCRIPT_NAME"]."?sortby=image'>image</a></th>";
+$str .= "<th align='left'><a href='".$_SERVER["SCRIPT_NAME"]."?sortby=avgresp'>avg. response time</a></th>";
+$str .= "<th align='left'><a href='".$_SERVER["SCRIPT_NAME"]."?sortby=avail'>overall availability</a></th><th></th><th>Diff</th></tr>";
$cnt = 0;
foreach ($newArray as $k => $value) {
Modified: trunk/mapbender/http/php/mod_owsproxy_conf.php
===================================================================
--- trunk/mapbender/http/php/mod_owsproxy_conf.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mod_owsproxy_conf.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -143,7 +143,7 @@
#$ownwmsconf['log']=array();
#$ownwmsconf['price']=array();
#TODO Get root layer id for showing metadata! - function should be in admin class
-echo "<form method=\"post\" action=\"".$_PHP_SELF."\">";
+echo "<form method=\"post\" action=\"".$_SERVER["SCRIPT_NAME"]."\">";
echo "<i>Warning: Toggle proxy changes the url of the secured services!</i><br>";
echo "<table border='1'>";
echo "<tr valign = bottom>";
Modified: trunk/mapbender/http/php/mod_updateWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_updateWMS.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mod_updateWMS.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -27,7 +27,7 @@
$myURL = $_POST["myURL"];
$secParams = SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
-$self = $PHP_SELF."?".$secParams;
+$self = $_SERVER["SCRIPT_NAME"]."?".$secParams;
Modified: trunk/mapbender/http/php/mod_zoomCoords.php
===================================================================
--- trunk/mapbender/http/php/mod_zoomCoords.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/mod_zoomCoords.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -88,7 +88,7 @@
var el = document.getElementById("zoomCoords");
if(el){
el.innerHTML="<?php
-echo "<form style='font-family : Arial, Helvetica, sans-serif;font-size: 11px;' name='zoomCoordsForm' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form style='font-family : Arial, Helvetica, sans-serif;font-size: 11px;' name='zoomCoordsForm' action='" . $_SERVER["SCRIPT_NAME"] . "?".SID."' method='post'>";
#coordinates
# Deutsche Version
Modified: trunk/mapbender/http/php/wms.php
===================================================================
--- trunk/mapbender/http/php/wms.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/php/wms.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -221,7 +221,7 @@
$onlineResource = $service->appendChild($onlineResource);
$onlineResource->setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink" );
// $onlineResource->setAttribute("xlink:href", $wms_row['wms_getcapabilities']);
- $onlRes = $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"] . "?layer_id=" . $layerId."&".session_name()."=".session_id();
+ $onlRes = $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"] . "?layer_id=" . $layerId."&".session_name()."=".session_id();
if (isset($_SERVER["HTTPS"])) {
$onlRes = "https://" . $onlRes;
}
@@ -442,7 +442,7 @@
$onlineResource = $get->appendChild($onlineResource);
$onlineResource->setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
// $onlineResource->setAttribute("xlink:href", $wms_row['wms_getcapabilities']);
- $onlRes = $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"] . "?layer_id=" . $layerId;
+ $onlRes = $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"] . "?layer_id=" . $layerId;
if (isset($_SERVER["HTTPS"])) {
$onlRes = "https://" . $onlRes;
}
@@ -463,7 +463,7 @@
$onlineResource = $post->appendChild($onlineResource);
$onlineResource->setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
// $onlineResource->setAttribute("xlink:href", $wms_row['wms_getcapabilities']);
- $onlRes = $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"] . "?layer_id=" . $layerId;
+ $onlRes = $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"] . "?layer_id=" . $layerId;
if (isset($_SERVER["HTTPS"])) {
$onlRes = "https://" . $onlRes;
}
Modified: trunk/mapbender/http/print/classes/mbPdf.php
===================================================================
--- trunk/mapbender/http/print/classes/mbPdf.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/print/classes/mbPdf.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -39,7 +39,7 @@
$prot = "https://";
else
$prot = "http://";
- $absoluteUrlToPdf = $prot.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/printPDF_download.php?f=".$this->outputFileName."&".SID;
+ $absoluteUrlToPdf = $prot.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/printPDF_download.php?f=".$this->outputFileName."&".SID;
return $mbjson->encode(array("outputFileName"=>$absoluteUrlToPdf));
}
else
Modified: trunk/mapbender/http/sld/sld_config.php
===================================================================
--- trunk/mapbender/http/sld/sld_config.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/http/sld/sld_config.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -31,7 +31,7 @@
// this should come from mapbender.conf
$SLD_MAIN = "sld_main.php?".$urlParameters;
$SLD_FUNCTION_HANDLER = "sld_function_handler.php?".$urlParameters;
-$MAPBENDER_URL = "http://".$_SERVER["HTTP_HOST"].dirname($_SERVER['PHP_SELF']);
+$MAPBENDER_URL = "http://".$_SERVER["HTTP_HOST"].dirname($_SERVER['SCRIPT_NAME']);
function char_encode($s){
if(CHARSET == 'UTF-8'){
Modified: trunk/mapbender/tools/mapFiler.php
===================================================================
--- trunk/mapbender/tools/mapFiler.php 2010-08-10 08:01:11 UTC (rev 6727)
+++ trunk/mapbender/tools/mapFiler.php 2010-08-10 08:31:29 UTC (rev 6728)
@@ -14,7 +14,7 @@
</script>
</head>
<body>
- <form name='form1' action='<?php $PHP_SELF ?>' method='POST'>
+ <form name='form1' action='<?php echo $_SERVER["SCRIPT_NAME"]; ?>' method='POST'>
<b>MapFiler Version 0.2 for UMN MapServer 5.x </b>
<br><br>changes in Version 0.2
<li>multiplicate MAXSIZE with factor</li>
More information about the Mapbender_commits
mailing list