[Mapbender-commits] r4691 - trunk/mapbender/http/php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Sep 25 06:39:49 EDT 2009
Author: christoph
Date: 2009-09-25 06:39:48 -0400 (Fri, 25 Sep 2009)
New Revision: 4691
Added:
trunk/mapbender/http/php/output.txt
Modified:
trunk/mapbender/http/php/mod_customTree_server.php
trunk/mapbender/http/php/mod_digitize_mergePolygon.php
trunk/mapbender/http/php/mod_editApplication_server.php
trunk/mapbender/http/php/mod_gazetteerMetadata_search.php
trunk/mapbender/http/php/mod_loadwmc_server.php
trunk/mapbender/http/php/mod_loadwms.php
trunk/mapbender/http/php/mod_savewmc_server.php
trunk/mapbender/http/php/mod_updateKmlInDb.php
trunk/mapbender/http/php/mod_wfs_conf.php
trunk/mapbender/http/php/mod_wfs_edit.php
trunk/mapbender/http/php/mod_wfs_gazetteer_server.php
trunk/mapbender/http/php/mod_wfs_result.php
trunk/mapbender/http/php/mod_wfs_server.php
trunk/mapbender/http/php/mod_wmc2ol.php
Log:
Modified: trunk/mapbender/http/php/mod_customTree_server.php
===================================================================
--- trunk/mapbender/http/php/mod_customTree_server.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_customTree_server.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -1,6 +1,7 @@
<?php
-require_once(dirname(__FILE__) . "/../classes/class_json.php");
-require_once(dirname(__FILE__) . "/../classes/class_user.php");
+require_once dirname(__FILE__) . "/../classes/class_json.php";
+require_once dirname(__FILE__) . "/../classes/class_json.php";
+require_once dirname(__FILE__) . "/../classes/class_user.php";
/**
* encodes and delivers the data
@@ -15,7 +16,7 @@
}
$json = new Mapbender_JSON();
-$queryObj = $json->decode(stripslashes($_REQUEST['queryObj']));
+$queryObj = $json->decode($_REQUEST['queryObj']);
$resultObj = array();
$data = array();
$e = new mb_exception("command: " . $queryObj->command);
Modified: trunk/mapbender/http/php/mod_digitize_mergePolygon.php
===================================================================
--- trunk/mapbender/http/php/mod_digitize_mergePolygon.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_digitize_mergePolygon.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -22,7 +22,7 @@
$json = new Mapbender_JSON();
-$polygonList = stripslashes($_REQUEST["polygons"]);
+$polygonList = $_REQUEST["polygons"];
$floatPattern = "-?\d+(\.\d+)?";
$pointPattern = $floatPattern . " " . $floatPattern;
Modified: trunk/mapbender/http/php/mod_editApplication_server.php
===================================================================
--- trunk/mapbender/http/php/mod_editApplication_server.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_editApplication_server.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -17,7 +17,7 @@
$json = new Mapbender_JSON();
-$queryObj = $json->decode(stripslashes($_REQUEST['queryObj']));
+$queryObj = $json->decode($_REQUEST['queryObj']);
$resultObj = array();
$e = new mb_exception("command: " . $queryObj->command);
Modified: trunk/mapbender/http/php/mod_gazetteerMetadata_search.php
===================================================================
--- trunk/mapbender/http/php/mod_gazetteerMetadata_search.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_gazetteerMetadata_search.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -6,10 +6,10 @@
$json = new Mapbender_JSON();
$user_id = Mapbender::session()->get("mb_user_id");
-$query = stripslashes($_REQUEST["search"]);
-$srs = stripslashes($_REQUEST["srs"]);
-$searchColumnsWms = stripslashes($_REQUEST["searchColumnsWms"]);
-$searchColumnsLayer = stripslashes($_REQUEST["searchColumnsLayer"]);
+$query = $_REQUEST["search"];
+$srs = $_REQUEST["srs"];
+$searchColumnsWms = $_REQUEST["searchColumnsWms"];
+$searchColumnsLayer = $_REQUEST["searchColumnsLayer"];
if ($searchColumnsWms && !preg_match("/^[a-zA-Z_\-, ]+$/", $searchColumnsWms)) {
echo "[]"; die;
Modified: trunk/mapbender/http/php/mod_loadwmc_server.php
===================================================================
--- trunk/mapbender/http/php/mod_loadwmc_server.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_loadwmc_server.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -68,7 +68,7 @@
}
$json = new Mapbender_JSON();
-$queryObj = $json->decode(stripslashes($_REQUEST['queryObj']));
+$queryObj = $json->decode($_REQUEST['queryObj']);
$resultObj = array();
$e = new mb_exception("command: " . $queryObj->command);
Modified: trunk/mapbender/http/php/mod_loadwms.php
===================================================================
--- trunk/mapbender/http/php/mod_loadwms.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_loadwms.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -20,36 +20,35 @@
require_once(dirname(__FILE__) . "/mb_validatePermission.php");
require_once(dirname(__FILE__) . "/../classes/class_wms.php");
-if(isset($_REQUEST["wms_id"]) == false)
-{
+if(isset($_REQUEST["wms_id"]) == false) {
echo "file: ".$_REQUEST["xml_file"];
$gui_id = $_REQUEST["guiList"];
$xml = $_REQUEST["xml_file"];
- if ($_REQUEST["auth_type"] == 'basic' || $_REQUEST["auth_type"] == 'digest') {
- $auth = array();
+ if ($_REQUEST["auth_type"] == 'basic'
+ || $_REQUEST["auth_type"] == 'digest') {
+
+ $auth = array();
$auth['username'] = $_REQUEST["username"];
$auth['password'] = $_REQUEST["password"];
$auth['auth_type'] = $_REQUEST["auth_type"];
}
$mywms = new wms();
-if (isset($auth)){
- $mywms->createObjFromXML($xml,$auth);
- $mywms->writeObjInDB($gui_id,$auth);
-}
-else
-{
- $mywms->createObjFromXML($xml);
- $mywms->writeObjInDB($gui_id);
-}
+ if (isset($auth)) {
+ $mywms->createObjFromXML($xml, $auth);
+ $mywms->writeObjInDB($gui_id, $auth);
+ }
+ else {
+ $mywms->createObjFromXML($xml);
+ $mywms->writeObjInDB($gui_id);
+ }
- $mywms->displayWMS();
+ $mywms->displayWMS();
$wms_id = $mywms->wms_id;
}
-else
-{
+else {
$wms_id = $_REQUEST["wms_id"];
}
require_once(dirname(__FILE__)."/../php/mod_editWMS_Metadata.php");
- editWMSByWMSID ($wms_id);
+editWMSByWMSID ($wms_id);
?>
Modified: trunk/mapbender/http/php/mod_savewmc_server.php
===================================================================
--- trunk/mapbender/http/php/mod_savewmc_server.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_savewmc_server.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -25,11 +25,11 @@
$json = new Mapbender_JSON();
// get data from POST and SESSION
-$mapObject = $json->decode(stripslashes($_POST["mapObject"]));
+$mapObject = $json->decode($_POST["mapObject"]);
$userId = Mapbender::session()->get("mb_user_id");
$saveInSession = intval($_POST["saveInSession"]);
$generalTitle = $_POST["generalTitle"];
-$extensionData = $json->decode(stripslashes($_POST["extensionData"]));
+$extensionData = $json->decode($_POST["extensionData"]);
// create WMC object
$wmc = new wmc();
Modified: trunk/mapbender/http/php/mod_updateKmlInDb.php
===================================================================
--- trunk/mapbender/http/php/mod_updateKmlInDb.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_updateKmlInDb.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -17,14 +17,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-mb_internal_encoding("UTF-8");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
$kmlId = $_POST["kmlId"];
$placemarkId = $_POST["placemarkId"];
$command = $_POST["command"];
-$geoJSON = stripslashes($_POST["geoJSON"]);
+$geoJSON = $_POST["geoJSON"];
$kml = new KML();
// returns true if the update succeeded, false if not
Modified: trunk/mapbender/http/php/mod_wfs_conf.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_conf.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_wfs_conf.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -19,12 +19,6 @@
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-
-foreach ($_POST as $key => &$value) {
- if (is_string($value) && 1 === get_magic_quotes_gpc()) {
- $value = stripslashes($value);
- }
-}
?>
<html>
<head>
Modified: trunk/mapbender/http/php/mod_wfs_edit.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_edit.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_wfs_edit.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -19,11 +19,6 @@
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-foreach ($_POST as $key => &$value) {
- if (is_string($value) && 1 === get_magic_quotes_gpc()) {
- $value = stripslashes($value);
- }
-}
?>
<html>
<head>
Modified: trunk/mapbender/http/php/mod_wfs_gazetteer_server.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_gazetteer_server.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_wfs_gazetteer_server.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -100,6 +100,19 @@
$output = $json->encode($obj->confArray);
echo $output;
}
+elseif ($command == "getWfsConfsForThisApplication") {
+
+ $user = new User($_SESSION["mb_user_id"]);
+
+ // get all WFS conf IDs for this application
+ $availableWfsConfIds = $user->getWfsConfByPermission($_SESSION["gui_id"]);
+
+ $obj = new WfsConf();
+ $obj->load($availableWfsConfIds);
+ $json = new Mapbender_JSON();
+ $output = $json->encode($obj->confArray);
+ echo $output;
+}
else if ($command == "getSearchResults") {
$wfs_conf_id = $_REQUEST["wfs_conf_id"];
$backlink = $_REQUEST["backlink"];
@@ -115,7 +128,7 @@
$admin = new administration();
- $filter = $admin->char_decode(stripslashes($filter));
+ $filter = $admin->char_decode($filter);
$wfsId = $wfsConf->wfsId;
@@ -128,7 +141,12 @@
$gmlFactory = new UniversalGmlFactory();
$myGml = $gmlFactory->createFromXml($data, $wfsConf);
- $geoJson = $myGml->toGeoJSON();
+ if (!is_null($myGml)) {
+ $geoJson = $myGml->toGeoJSON();
+ }
+ else {
+ $geoJson = "{}";
+ }
header("Content-type:application/x-json; charset=utf-8");
echo $geoJson;
@@ -136,4 +154,4 @@
else {
echo "please enter a valid command.";
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/php/mod_wfs_result.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_result.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_wfs_result.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -25,7 +25,7 @@
require_once(dirname(__FILE__)."/../classes/class_universal_wfs_factory.php");
require_once(dirname(__FILE__)."/../classes/class_universal_gml_factory.php");
-$filter = stripslashes($_REQUEST["filter"]);
+$filter = $_REQUEST["filter"];
$db_wfs_conf_id = $_REQUEST["db_wfs_conf_id"];
$typename = $_REQUEST["typename"];
Modified: trunk/mapbender/http/php/mod_wfs_server.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_server.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_wfs_server.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -6,7 +6,7 @@
require_once(dirname(__FILE__) . "/../classes/class_universal_wfs_factory.php");
$json = new Mapbender_JSON();
-$obj = $json->decode(stripslashes($_REQUEST['obj']));
+$obj = $json->decode($_REQUEST['obj']);
//workflow:
switch($obj->action){
Modified: trunk/mapbender/http/php/mod_wmc2ol.php
===================================================================
--- trunk/mapbender/http/php/mod_wmc2ol.php 2009-09-25 10:35:21 UTC (rev 4690)
+++ trunk/mapbender/http/php/mod_wmc2ol.php 2009-09-25 10:39:48 UTC (rev 4691)
@@ -13,11 +13,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../../globalSettings.php.php");
$userId = Mapbender::session()->get("mb_user_id");
-
//check for parameter wmc_id
if (!isset($_GET["wmc_id"])) {
echo 'Error: wmc_id not requested<br>';
@@ -29,9 +28,14 @@
return htmlentities($str, ENT_QUOTES, CHARSET);
}
+if (!$userId) {
+ $userId = PUBLIC_USER;
+}
+
//the next functions should come from class administration, but they are not included as they are needed
//TODO
function getLayerPermission($wms_id, $layer_id, $user_id){
+
//$layer_id = $this->getLayerIdByLayerName($wms_id,$layer_name);
$array_guis = getGuisByPermission($user_id,true);
$v = array();
@@ -49,6 +53,7 @@
$sql .= ") AND fkey_layer_id = $".$c." AND gui_layer_status = 1"; //status 1 must be
array_push($v,$layer_id);
array_push($t,'i');
+
$res = db_prep_query($sql,$v,$t);
if($row = db_fetch_array($res)){
return true;
@@ -109,12 +114,13 @@
//Function to create an OpenLayers Javascript from a mapbender wmc document
function createOlFromWMC_id($wmc_id){
+ global $userId;
//Get WMC out of mb Database
- $sql = "SELECT wmc FROM mb_user_wmc WHERE wmc_id = '" . $wmc_id . "'";
- $res = db_query($sql);
+ $sql = "SELECT wmc FROM mb_user_wmc WHERE wmc_id = $1";
+ $res = db_prep_query($sql, array($wmc_id), array("s"));
$wmc = db_fetch_row($res);
//Read out WMC into XML object
- $xml=simplexml_load_string($wmc[0]);
+ $xml=simplexml_load_string($wmc[0], "SimpleXMLElement", LIBXML_NOBLANKS);
//generate general html data
$html='';
$html.="<html xmlns='http://www.w3.org/1999/xhtml'>\n";
@@ -153,7 +159,7 @@
$someLayerQueryable=false;
for ($i=0; $i<count($layer_array); $i++) {
$html.="var layer".$i.";\n";
- $mb_extensions=$xml->LayerList->Layer[$i]->Extension->children('http://www.mapbender.org');
+ $mb_extensions=$xml->LayerList->Layer[$i]->Extension->children('http://www.mapbender.org/context');
$layer_array_queryable[$i]=$mb_extensions->querylayer;
if (($layer_array_queryable[$i]=='1') and ($xml->LayerList->Layer[$i]->attributes()->hidden=='0')){
$someLayerQueryable=true;
@@ -260,9 +266,10 @@
if (count($layer_array) != 0){
$i=0;
$html.="layer0 = new OpenLayers.Layer.WMS( \"".$xml->LayerList->Layer[$i]->Title."\",\n";
- $extensions=$xml->LayerList->Layer[$i]->Extension->children('http://www.mapbender.org');
- $layer_id=$extensions->layer_id;
+ $extensions=$xml->LayerList->Layer[$i]->Extension->children('http://www.mapbender.org/context');
+ $layer_id=dom_import_simplexml($extensions->layer_id)->nodeValue;
$wms_id=$extensions->wms_id;
+
// ?! $has_permission=getLayerPermission($wms_id,$layer_id,2);//problem: guest user must have fix id
$has_permission=getLayerPermission($wms_id,$layer_id,$userId);//problem: guest user must have fix id
//echo $layer_id."<br>";
@@ -288,8 +295,8 @@
$html.="projection: \"".$xml->General->BoundingBox['SRS']."\",\n";
$html.="units: \"m\",\n";
$html.="numZoomLevels: ".$numberZoomLevels.",\n";
- $minScale = $extensions->guiScaleHint->attributes()->min;
- $maxScale = $extensions->guiScaleHint->attributes()->max;
+ $minScale=dom_import_simplexml($extensions->gui_minscale)->nodeValue;
+ $maxScale=dom_import_simplexml($extensions->gui_maxscale)->nodeValue;
if (!$maxScale){
$maxScale='10000000';
}
@@ -308,10 +315,11 @@
}
//create the overlay layers for which the user guest has permissions
for ($i=1; $i<count($layer_array); $i++) {
- $extensions=$xml->LayerList->Layer[$i]->Extension->children('http://www.mapbender.org');
- $layer_id=$extensions->layer_id;
+ $extensions=$xml->LayerList->Layer[$i]->Extension->children('http://www.mapbender.org/context');
$wms_id=$extensions->wms_id;
- $has_permission=getLayerPermission($wms_id,$layer_id,ANONYMOUS_USER);//problem: guest user must have fix id TODO
+ $layer_id=dom_import_simplexml($extensions->layer_id)->nodeValue;
+
+ $has_permission=getLayerPermission($wms_id,$layer_id,$userId);//problem: guest user must have fix id TODO
if (($xml->LayerList->Layer[$i]->attributes()->hidden=='0' && $has_permission) ||
($layer_id=='' && $xml->LayerList->Layer[$i]->attributes()->hidden=='0')){
@@ -336,9 +344,9 @@
$html.="units: \"m\",\n";
$html.="singleTile: true,\n";
$html.="numZoomLevels: ".$numberZoomLevels.",\n";
- //$extensions=$xml->LayerList->Layer[$i]->Extension->children('http://www.mapbender.org');
- $minScale=$extensions->guiScaleHint->attributes()->min;
- $maxScale=$extensions->guiScaleHint->attributes()->max;
+ //$extensions=$xml->LayerList->Layer[$i]->Extension->children('http://www.mapbender.org/context');
+ $minScale=dom_import_simplexml($extensions->gui_minscale)->nodeValue;
+ $maxScale=dom_import_simplexml($extensions->gui_maxscale)->nodeValue;
if (!$maxScale){
$maxScale='10000000';
}
@@ -364,7 +372,7 @@
$html.="var markers = new OpenLayers.Layer.Markers(\"Markers\", {'calculateInRange': function() { return true; }});\n";
$html.="var size = new OpenLayers.Size(15,20);\n";
$html.="calculateOffset = function(size) {return new OpenLayers.Pixel(-(size.w/2), -size.h); };\n";
- $html.="var icon = new OpenLayers.Icon('../../openlayers/img/marker.png',size, null, calculateOffset);\n";
+ $html.="var icon = new OpenLayers.Icon('../extensions/OpenLayers-2.8/img/marker.png',size, null, calculateOffset);\n";
$html.="markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(".$centralx.",".$centraly."),icon));\n";
$html.="map.addLayer(markers);\n";
}
@@ -423,7 +431,8 @@
$html.="</div>\n";
//Show coords if wished
if($_REQUEST["mb_showCoords"]=='1'){
- $html.="<div id='srs' class='csrs'>Koordinaten in <a href = '../../../mediawiki/index.php/".$xml->General->BoundingBox['SRS']."' target='_blank'>".$xml->General->BoundingBox['SRS']."</a>:</div>\n";
+// $html.="<div id='srs' class='csrs'>Koordinaten in <a href = '../../../mediawiki/index.php/".$xml->General->BoundingBox['SRS']."' target='_blank'>".$xml->General->BoundingBox['SRS']."</a>:</div>\n";
+ $html.="<div id='srs' class='csrs'>Koordinaten in ".$xml->General->BoundingBox['SRS'].":</div>\n";
}
$html.="<div id='showpos'></div>\n";
$html.="<div id='attribution'></div>\n";
@@ -435,4 +444,4 @@
//end of function createOlfromWMC_id()
createOlfromWMC_id($_GET["wmc_id"]);
-?>
+?>
\ No newline at end of file
More information about the Mapbender_commits
mailing list