[Mapbender-commits] r2413 - in trunk/mapbender/http: javascripts php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Apr 23 12:21:05 EDT 2008
Author: christoph
Date: 2008-04-23 12:21:04 -0400 (Wed, 23 Apr 2008)
New Revision: 2413
Added:
trunk/mapbender/http/javascripts/mod_add_SLD.php
trunk/mapbender/http/javascripts/mod_exportMapImage.php
trunk/mapbender/http/javascripts/mod_fisheye.php
trunk/mapbender/http/javascripts/mod_reload.php
trunk/mapbender/http/javascripts/mod_switchLocale_noreload.php
trunk/mapbender/http/javascripts/requestGeometryConstructor.js
trunk/mapbender/http/php/mod_exportMapImage_server.php
trunk/mapbender/http/php/mod_tab_messages.php
trunk/mapbender/http/php/system.php
Removed:
trunk/mapbender/http/javascripts/mod_measure4326.php
trunk/mapbender/http/javascripts/mod_tab_translation.php
trunk/mapbender/http/javascripts/transform_coordinatesWGS84.php
trunk/mapbender/http/php/mod_monitorCapabilities_main.php
trunk/mapbender/http/php/mod_monitorCapabilities_read.php
trunk/mapbender/http/php/mod_monitorCapabilities_read_single.php
trunk/mapbender/http/php/mod_monitorCapabilities_write.php
trunk/mapbender/http/php/mod_switchLocale.php
trunk/mapbender/http/php/mod_switchLocale_noreload.php
trunk/mapbender/http/php/mod_wfs_save.php
trunk/mapbender/http/php/mod_wfsrequest.php
Modified:
trunk/mapbender/http/javascripts/core.js
trunk/mapbender/http/javascripts/core.php
trunk/mapbender/http/javascripts/event.js
trunk/mapbender/http/javascripts/geometry.js
trunk/mapbender/http/javascripts/map.js
trunk/mapbender/http/javascripts/map.php
trunk/mapbender/http/javascripts/map_obj.js
trunk/mapbender/http/javascripts/mod_addWMS.php
trunk/mapbender/http/javascripts/mod_addWMSfromList.php
trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php
trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php
trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList_ajax.php
trunk/mapbender/http/javascripts/mod_add_vendorspecific.php
trunk/mapbender/http/javascripts/mod_back.php
trunk/mapbender/http/javascripts/mod_center1.php
trunk/mapbender/http/javascripts/mod_coords.php
trunk/mapbender/http/javascripts/mod_coords_div.php
trunk/mapbender/http/javascripts/mod_copyright.php
trunk/mapbender/http/javascripts/mod_dependentDiv.php
trunk/mapbender/http/javascripts/mod_dependentIframe.php
trunk/mapbender/http/javascripts/mod_digitize_tab.php
trunk/mapbender/http/javascripts/mod_displayWmc.php
trunk/mapbender/http/javascripts/mod_dragMapSize.php
trunk/mapbender/http/javascripts/mod_dynamicOverview.php
trunk/mapbender/http/javascripts/mod_embedded_legend.php
trunk/mapbender/http/javascripts/mod_export_image.php
trunk/mapbender/http/javascripts/mod_featureInfo.php
trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php
trunk/mapbender/http/javascripts/mod_forward.php
trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php
trunk/mapbender/http/javascripts/mod_getArea.php
trunk/mapbender/http/javascripts/mod_help.php
trunk/mapbender/http/javascripts/mod_highlightPOI.php
trunk/mapbender/http/javascripts/mod_home.php
trunk/mapbender/http/javascripts/mod_horizTab.php
trunk/mapbender/http/javascripts/mod_initWmc.php
trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php
trunk/mapbender/http/javascripts/mod_insertLayerPreviewIntoDb.php
trunk/mapbender/http/javascripts/mod_key.php
trunk/mapbender/http/javascripts/mod_legend.php
trunk/mapbender/http/javascripts/mod_loadKML.php
trunk/mapbender/http/javascripts/mod_loadwmc.php
trunk/mapbender/http/javascripts/mod_log.php
trunk/mapbender/http/javascripts/mod_measure.php
trunk/mapbender/http/javascripts/mod_navFrame.php
trunk/mapbender/http/javascripts/mod_owsproxy.php
trunk/mapbender/http/javascripts/mod_pan.php
trunk/mapbender/http/javascripts/mod_perimeter.php
trunk/mapbender/http/javascripts/mod_poi.php
trunk/mapbender/http/javascripts/mod_print1.php
trunk/mapbender/http/javascripts/mod_renderGML.php
trunk/mapbender/http/javascripts/mod_repaint.php
trunk/mapbender/http/javascripts/mod_resize_mapsize.php
trunk/mapbender/http/javascripts/mod_sandclock.php
trunk/mapbender/http/javascripts/mod_sandclock2.php
trunk/mapbender/http/javascripts/mod_saveLayerPreview.php
trunk/mapbender/http/javascripts/mod_saveWmcKml.php
trunk/mapbender/http/javascripts/mod_savewmc.php
trunk/mapbender/http/javascripts/mod_scaleHint.php
trunk/mapbender/http/javascripts/mod_scaleSel.php
trunk/mapbender/http/javascripts/mod_scaleText.php
trunk/mapbender/http/javascripts/mod_scalebar.php
trunk/mapbender/http/javascripts/mod_selArea.php
trunk/mapbender/http/javascripts/mod_selArea1.php
trunk/mapbender/http/javascripts/mod_selectMapsize.php
trunk/mapbender/http/javascripts/mod_setBBOX1.php
trunk/mapbender/http/javascripts/mod_setBackground.php
trunk/mapbender/http/javascripts/mod_setBackground_all.php
trunk/mapbender/http/javascripts/mod_setPOI2Scale.php
trunk/mapbender/http/javascripts/mod_setTimeout.php
trunk/mapbender/http/javascripts/mod_state.php
trunk/mapbender/http/javascripts/mod_tab.js
trunk/mapbender/http/javascripts/mod_tab.php
trunk/mapbender/http/javascripts/mod_toggleModule.php
trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
trunk/mapbender/http/javascripts/mod_wfs_client.html
trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
trunk/mapbender/http/javascripts/mod_zoomCoords.php
trunk/mapbender/http/javascripts/mod_zoomFull.php
trunk/mapbender/http/javascripts/mod_zoomIn1.php
trunk/mapbender/http/javascripts/mod_zoomOut1.php
trunk/mapbender/http/javascripts/point.js
trunk/mapbender/http/javascripts/popup.js
trunk/mapbender/http/javascripts/wfs.js
trunk/mapbender/http/javascripts/wfs_obj.js
trunk/mapbender/http/php/mb_js_exception.php
trunk/mapbender/http/php/mb_listKMLs.php
trunk/mapbender/http/php/mb_listWMCs.php
trunk/mapbender/http/php/mb_validatePermission.php
trunk/mapbender/http/php/mb_validateSession.php
trunk/mapbender/http/php/mod_SelectKeyword.php
trunk/mapbender/http/php/mod_WMSpreferences.php
trunk/mapbender/http/php/mod_addWMSfromfilteredList_server.php
trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php
trunk/mapbender/http/php/mod_button_tooltips.php
trunk/mapbender/http/php/mod_changeEPSG.php
trunk/mapbender/http/php/mod_changeEPSG_dynamic.php
trunk/mapbender/http/php/mod_changePassword.php
trunk/mapbender/http/php/mod_createJSLayerObjFromXML.php
trunk/mapbender/http/php/mod_createJSObjFromDB.php
trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php
trunk/mapbender/http/php/mod_createJSObjFromXML.php
trunk/mapbender/http/php/mod_createUser.php
trunk/mapbender/http/php/mod_deleteFilteredGUI.php
trunk/mapbender/http/php/mod_deleteGUI.php
trunk/mapbender/http/php/mod_deleteWFS.php
trunk/mapbender/http/php/mod_deleteWMS.php
trunk/mapbender/http/php/mod_digitize_messages.php
trunk/mapbender/http/php/mod_displayKML.php
trunk/mapbender/http/php/mod_editElementVars.php
trunk/mapbender/http/php/mod_editElements.php
trunk/mapbender/http/php/mod_editFilteredGroup.php
trunk/mapbender/http/php/mod_editFilteredUser.php
trunk/mapbender/http/php/mod_editGroup.php
trunk/mapbender/http/php/mod_editGuiWms.php
trunk/mapbender/http/php/mod_editGuiWmsMeta.php
trunk/mapbender/http/php/mod_editSelf.php
trunk/mapbender/http/php/mod_editUser.php
trunk/mapbender/http/php/mod_editWMS_Metadata.php
trunk/mapbender/http/php/mod_edit_element_vars.php
trunk/mapbender/http/php/mod_edit_metadata.php
trunk/mapbender/http/php/mod_evalArea.php
trunk/mapbender/http/php/mod_exportElement.php
trunk/mapbender/http/php/mod_exportGUI.php
trunk/mapbender/http/php/mod_export_image.php
trunk/mapbender/http/php/mod_featuretypeMetadata.php
trunk/mapbender/http/php/mod_filteredGroup_Gui.php
trunk/mapbender/http/php/mod_filteredGroup_User.php
trunk/mapbender/http/php/mod_filteredGroup_filteredGui.php
trunk/mapbender/http/php/mod_filteredGroup_filteredUser.php
trunk/mapbender/http/php/mod_filteredGui_User.php
trunk/mapbender/http/php/mod_filteredGui_filteredGroup.php
trunk/mapbender/http/php/mod_filteredGui_filteredUser.php
trunk/mapbender/http/php/mod_filteredGui_group.php
trunk/mapbender/http/php/mod_filteredUser_Group.php
trunk/mapbender/http/php/mod_filteredUser_Gui.php
trunk/mapbender/http/php/mod_filteredUser_filteredGroup.php
trunk/mapbender/http/php/mod_filteredUser_filteredGui.php
trunk/mapbender/http/php/mod_filteredWms_layer_topic.php
trunk/mapbender/http/php/mod_filteredWms_topic.php
trunk/mapbender/http/php/mod_forgottenPassword.php
trunk/mapbender/http/php/mod_gazLayerObj_conf.php
trunk/mapbender/http/php/mod_gazLayerObj_edit.php
trunk/mapbender/http/php/mod_gazetteerMetadata.php
trunk/mapbender/http/php/mod_gazetteerMetadata_search.php
trunk/mapbender/http/php/mod_gazetteerSQL_server.php
trunk/mapbender/http/php/mod_gazetteer_conf.php
trunk/mapbender/http/php/mod_gazetteer_edit.php
trunk/mapbender/http/php/mod_getStyles.php
trunk/mapbender/http/php/mod_group_filteredGui.php
trunk/mapbender/http/php/mod_group_filteredUser.php
trunk/mapbender/http/php/mod_group_gui.php
trunk/mapbender/http/php/mod_group_user.php
trunk/mapbender/http/php/mod_gui_filteredGroup.php
trunk/mapbender/http/php/mod_gui_filteredUser.php
trunk/mapbender/http/php/mod_gui_group.php
trunk/mapbender/http/php/mod_gui_owner.php
trunk/mapbender/http/php/mod_gui_user.php
trunk/mapbender/http/php/mod_help.php
trunk/mapbender/http/php/mod_insertWmcIntoDb.php
trunk/mapbender/http/php/mod_layerMetadata.php
trunk/mapbender/http/php/mod_loadCapabilities.php
trunk/mapbender/http/php/mod_loadCapabilitiesList.php
trunk/mapbender/http/php/mod_loadCapabilities_temp.php
trunk/mapbender/http/php/mod_loadWFSCapabilities.php
trunk/mapbender/http/php/mod_loadwfs.php
trunk/mapbender/http/php/mod_loadwms.php
trunk/mapbender/http/php/mod_loadwms_temp.php
trunk/mapbender/http/php/mod_log.php
trunk/mapbender/http/php/mod_logout.php
trunk/mapbender/http/php/mod_map1.php
trunk/mapbender/http/php/mod_mapOV.php
trunk/mapbender/http/php/mod_meetingPoint.php
trunk/mapbender/http/php/mod_newGui.php
trunk/mapbender/http/php/mod_orphanWMS.php
trunk/mapbender/http/php/mod_owsproxy_conf.php
trunk/mapbender/http/php/mod_printView1.php
trunk/mapbender/http/php/mod_renameGUI.php
trunk/mapbender/http/php/mod_saveWKT.php
trunk/mapbender/http/php/mod_setLocale.php
trunk/mapbender/http/php/mod_showLoggedUser.php
trunk/mapbender/http/php/mod_simpleWMSpreferences.php
trunk/mapbender/http/php/mod_treefolderAdmin.php
trunk/mapbender/http/php/mod_treefolderClient.php
trunk/mapbender/http/php/mod_updateKmlInDb.php
trunk/mapbender/http/php/mod_updateWMS.php
trunk/mapbender/http/php/mod_usemap.php
trunk/mapbender/http/php/mod_user_filteredGroup.php
trunk/mapbender/http/php/mod_user_filteredGui.php
trunk/mapbender/http/php/mod_user_group.php
trunk/mapbender/http/php/mod_user_gui.php
trunk/mapbender/http/php/mod_wfs.php
trunk/mapbender/http/php/mod_wfsLayerObj_conf.php
trunk/mapbender/http/php/mod_wfsSpatialRequest_messages.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_zoomCoords.php
trunk/mapbender/http/php/mod_zoomCoords_en.php
trunk/mapbender/http/php/nestedSets.php
Log:
merge w/ 2.5 branch (8)
Modified: trunk/mapbender/http/javascripts/core.js
===================================================================
--- trunk/mapbender/http/javascripts/core.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/core.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -48,6 +48,11 @@
var eventInitMap = new MapbenderEvent();
/**
+ * Switches the locale. Triggered by module switch_locale or onload(?)
+ */
+var eventLocalize = new MapbenderEvent();
+
+/**
* Triggered after the map object has been created.
*/
var eventAfterMapObjectConstruction = new MapbenderEvent(); // possibly obsolete!
@@ -136,18 +141,30 @@
* @deprecated
*/
function mb_registerL10nFunctions(stringFunction) {
- mb_l10nFunctions[mb_l10nFunctions.length] = stringFunction;
+ eventLocalize.register(stringFunction)
+// mb_l10nFunctions[mb_l10nFunctions.length] = stringFunction;
}
+var mb_PanSubElements = [];
+function mb_registerPanSubElement(elName){
+ var ind = mb_PanSubElements.length;
+ mb_PanSubElements[ind] = elName;
+}
+
+var mb_vendorSpecific = [];
+function mb_registerVendorSpecific(stringFunction){
+ mb_vendorSpecific[mb_vendorSpecific.length] = stringFunction;
+}
+
/**
* deprecated function for writing content within a tag via innerHTML
* @deprecated
*/
function writeTag(frameName, elName, tagSource) {
- if(frameName && frameName != ""){
+ if(frameName && frameName !== ""){
window.frames[frameName].document.getElementById(elName).innerHTML = tagSource;
}
- else if(!frameName || frameName == ""){
+ else if(!frameName || frameName === ""){
document.getElementById(elName).innerHTML = tagSource;
}
}
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/core.php
===================================================================
--- trunk/mapbender/http/javascripts/core.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/core.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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.
-#if (substr_count($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')) {
-# ob_start("ob_gzhandler");
-#}
-#else {
- ob_start();
-#}
+ob_start();
header('Content-type: application/x-javascript');
-require_once("../javascripts/event.js");
-require_once("../javascripts/core.js");
+require_once(dirname(__FILE__) . "/../javascripts/event.js");
+require_once(dirname(__FILE__) . "/../javascripts/core.js");
?>
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/event.js
===================================================================
--- trunk/mapbender/http/javascripts/event.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/event.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -55,7 +55,7 @@
}
}
return false;
- }
+ };
/**
* This function triggers the event
@@ -73,6 +73,7 @@
// properties represents booleanOperator
if (typeof(booleanOperator) == "undefined") {
booleanOperator = properties;
+ properties = undefined;
}
else {
// var e = new Mb_exception("MapbenderEvent.trigger: invalid properties: %s", properties);
@@ -129,7 +130,7 @@
this.getProperties = function () {
return propertiesObj;
- }
+ };
// private
/**
@@ -185,7 +186,7 @@
var returnValue = eval(str);
return returnValue;
}
- }
+ };
// private
var func = aFunction;
Modified: trunk/mapbender/http/javascripts/geometry.js
===================================================================
--- trunk/mapbender/http/javascripts/geometry.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/geometry.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -225,7 +225,7 @@
str += "}";
return str;
-}
+};
GeometryArray.prototype.getBBox = function(){
var q = this.get(0).get(0).get(0);
@@ -256,9 +256,9 @@
isFeatureCollection = (geoJSON[i] == "FeatureCollection") ? true : false;
break;
case "crs":
- if (geoJSON[i]["type"] == "EPSG") {
- featureCollectionEpsg = geoJSON[i]["properties"]["code"];
- featureEpsg = geoJSON[i]["properties"]["code"];
+ if (geoJSON[i].type == "EPSG") {
+ featureCollectionEpsg = geoJSON[i].properties.code;
+ featureEpsg = geoJSON[i].properties.code;
}
break;
case "features":
@@ -295,8 +295,8 @@
break;
case "crs":
- if (currentFeature[k]["type"] == "EPSG") {
- featureEpsg = currentFeature[k]["properties"]["code"];
+ if (currentFeature[k].type == "EPSG") {
+ featureEpsg = currentFeature[k].properties.code;
}
break;
@@ -342,6 +342,23 @@
this.getGeometry(-1,-1).setEpsg(featureEpsg);
this.close();
break;
+
+ case "MultiLineString":
+ //
+ // MULTILINESTRING
+ //
+ this.addMember(geomType.line);
+ this.get(-1).addGeometry();
+ for (var m = 0; m < coordinates.length; m++) {
+ var currentLine = coordinates[m];
+ for (var n = 0; n < currentLine.length; n++) {
+ var currentPoint = currentLine[n];
+ this.getGeometry(-1,-1).addPointByCoordinates(currentPoint[0], currentPoint[1]);
+ }
+ }
+ this.getGeometry(-1,-1).setEpsg(featureEpsg);
+ this.close();
+ break;
case "Polygon":
//
@@ -359,6 +376,23 @@
this.getGeometry(-1,-1).setEpsg(featureEpsg);
this.close();
break;
+
+ case "MultiPolygon":
+ //
+ // MULTIPOLYGON
+ //
+ this.addMember(geomType.polygon);
+ for (var m = 0; m < coordinates.length; m++) {
+ this.get(-1).addGeometry();
+ var currentPolygon = coordinates[m];
+ for (var n = 0; n < currentPolygon.length; n++) {
+ var currentPoint = currentPolygon[n];
+ this.getGeometry(-1,-1).addPointByCoordinates(currentPoint[0], currentPoint[1]);
+ }
+ }
+ this.getGeometry(-1,-1).setEpsg(featureEpsg);
+ this.close();
+ break;
case "GeometryCollection":
var exc = new Mb_exception("Geometry: GeometryCollections are not yet supported");
@@ -390,10 +424,10 @@
var placemarkId = this.get(i).e.getElementValueByName("Mapbender:placemarkId");
// only add placemark ids once!
+ var isFound = false;
for (var j = 0; j < multiGeometriesFromKml && isFound === false; j++) {
- var isFound = false;
if (multiGeometriesFromKml == placemarkId) {
- isFound == true;
+ isFound = true;
}
}
if (!isFound) {
@@ -427,7 +461,7 @@
str += "]}";
return str;
-}
+};
/**
* @class a MultiGeometry is a List of Geometry objects
@@ -524,7 +558,7 @@
realBox.get(-1).addPointByCoordinates(bbox[1].x, bbox[0].y);
realBox.get(-1).close();
return realBox;
-}
+};
/**
* gets the center of the bounding box of this {@link MultiGeometry}.
@@ -599,7 +633,7 @@
return true;
}
return false;
-}
+};
MultiGeometry.prototype.toString = function () {
var str = this.toStringWithoutProperties();
@@ -628,7 +662,7 @@
};
MultiGeometry.prototype.toStringWithoutProperties = function () {
- var str = "{\"type\": \"Feature\", \"geometry\": ";
+ var str = "{\"type\": \"Feature\", ";
var epsg = this.getEpsg();
if (epsg) {
@@ -643,7 +677,8 @@
}
str += this.get(i).toString();
}
- str += "}";
+// this closing curly bracket is added in toString()
+// str += "}";
return str;
};
@@ -654,10 +689,10 @@
*/
MultiGeometry.prototype.getEpsg = function () {
if (this.count() > 0) {
- return this.get(0).getEpsg;
+ return this.get(0).getEpsg();
}
return false;
-}
+};
/**
* @class a Geometry is a List of Point objects. If it is a polygon, the last point has
@@ -707,8 +742,8 @@
* @param {Float} x x value of the point
* @param {Float} y y value of the point
*/
- this.addPointByCoordinates = function(x,y){
- var newPoint = new Point(x,y);
+ this.addPointByCoordinates = function(x,y,z){
+ var newPoint = new Point(x,y,z);
this.add(newPoint);
// updateDist();
};
@@ -719,7 +754,7 @@
* @param {Point} aPoint another point
*/
this.addPoint = function(aPoint){
- this.add(new Point(aPoint.x, aPoint.y));
+ this.add(new Point(aPoint.x, aPoint.y, aPoint.z));
updateDist();
};
@@ -735,7 +770,7 @@
for(var z = this.count(); z > i; z--){
this.list[z] = this.list[z-1];
}
- this.list[i] = new Point(p.x, p.y);
+ this.list[i] = new Point(p.x, p.y, p.z);
updateDist();
}
};
@@ -854,7 +889,7 @@
*/
this.getEpsg = function () {
return epsg;
- }
+ };
this.list = [];
var dist = [];
@@ -932,7 +967,7 @@
var str = "";
var epsgStr = "";
- var epsg = getEpsg();
+ var epsg = this.getEpsg();
if (epsg) {
epsgStr = "\"crs\": {\"type\": \"EPSG\", \"properties\": {\"code\": " + epsg + "}}, ";
}
@@ -964,7 +999,7 @@
}
return str;
-}
+};
@@ -1082,7 +1117,7 @@
str += "}";
}
return str;
-}
+};
/**
* @class a {@link Canvas} contains a {@link DivTag} that holds graphics rendered by {@link jsGraphics}
@@ -1116,8 +1151,15 @@
var p = realToMap(mapframe, currentGeom.get(0));
var px = p.x;
var py = p.y;
- if (px + diameter < mapframeWidth && px - diameter > 0 &&
- py + diameter < mapframeHeight && py - diameter > 0) {
+ var radius = diameter/2;
+ if ((px - radius < mapframeWidth && px + radius > 0 &&
+ py - radius < mapframeHeight && py + radius > 0) ||
+ (p.dist(new Point(0,0)) < radius ||
+ p.dist(new Point(mapframeWidth, mapframeHeight)) < radius ||
+ p.dist(new Point(0,mapframeHeight)) < radius ||
+ p.dist(new Point(mapframeWidth, 0)) < radius
+ )
+ ) {
// if the point contains a link to an icon, display the icon
if (poiIcon) {
displayIcon(poiIcon, px, py);
@@ -1180,6 +1222,10 @@
return canvas;
};
+ this.setDiameter = function (px) {
+ diameter = px;
+ };
+
/**
* draws a circle with {@link jsGraphics}.
*
@@ -1227,7 +1273,7 @@
newImg.style.left = x - Math.round(newImg.width/2);
newImg.style.zIndex = 100;
that.canvasDivTag.getTag().appendChild(newImg);
- }
+ };
/**
* This is the {@link DivTag} that contains the output by {@link jsGraphics}.
@@ -1331,6 +1377,12 @@
else {gA.get(-1).color = lineColor;}
};
+ this.hide = function () {
+ for (var i=0; i < canvas.length; i++) {
+ if (typeof(canvas[i]) == "object") {canvas[i].clean();}
+ }
+ };
+
/**
* removes all MultiGeometries.
*
@@ -1347,6 +1399,7 @@
*
*/
this.paint = function() {
+ this.hide();
for (var i=0; i < canvas.length; i++) {
if (typeof(canvas[i]) == "object") {canvas[i].clean();}
}
@@ -1358,35 +1411,43 @@
}
};
+ this.setDiameter = function (radius) {
+ for (var i = 0; i < targets.length; i++) {
+ if (typeof(canvas[i]) != "undefined") {
+ canvas[i].setDiameter(radius);
+ }
+ }
+ }
+
this.setMouseOver = function (callback) {
for (var i=0; i<targets.length; i++){
if (typeof(canvas[i]) !== 'undefined') {
canvas[i].canvasDivTag.getTag().onmouseover = function (e) {
callback(e);
- }
+ };
}
}
- }
+ };
this.setMouseOut = function (callback) {
for (var i=0; i<targets.length; i++){
if (typeof(canvas[i]) !== 'undefined') {
canvas[i].canvasDivTag.getTag().onmouseout = function (e) {
callback(e);
- }
+ };
}
}
- }
+ };
this.setMouseClick = function (callback) {
for (var i=0; i<targets.length; i++){
if (typeof(canvas[i]) !== 'undefined') {
canvas[i].canvasDivTag.getTag().onclick = function (e) {
callback(e);
- }
+ };
}
}
- }
+ };
var lineWidth = aLineWidth;
var tagname = 'mod_gaz_draw'+aTagName;
Modified: trunk/mapbender/http/javascripts/map.js
===================================================================
--- trunk/mapbender/http/javascripts/map.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/map.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -2,9 +2,6 @@
var n6 = document.getElementById&&!document.all?1:0;
var n4 = document.layers?1:0;
-var mb_feature_count = 100;
-
-var mb_resolution = 28.35;
var mb_mapObj = [];
var mb_fiWin = null;
var mb_panActive = false;
@@ -34,9 +31,12 @@
}
function localize() {
+ eventLocalize.trigger();
+/*
for(var i=0; i<mb_l10nFunctions.length; i++){
eval(mb_l10nFunctions[i]);
}
+*/
}
function mb_execloadWmsSubFunctions(){
eventAfterLoadWMS.trigger();
@@ -77,20 +77,9 @@
return null;
}
-var mb_PanSubElements = [];
-function mb_registerPanSubElement(elName){
- var ind = mb_PanSubElements.length;
- mb_PanSubElements[ind] = elName;
-}
-
-var mb_vendorSpecific = [];
-function mb_registerVendorSpecific(stringFunction){
- mb_vendorSpecific[mb_vendorSpecific.length] = stringFunction;
-}
-
var mb_security_proxy = "http://wms1.ccgis.de/mapbender/tools/security_proxy.php?mb_ows_security_proxy=";
-var mb_trans = new Image;
+var mb_trans = new Image();
mb_trans.src = "../img/transparent.gif";
/*END OF GLOBALS*/
@@ -209,7 +198,7 @@
* @type integer
*/
this.getWidth = function(){
- return parseInt(this.width);
+ return parseInt(this.width, 10);
};
/**
@@ -218,7 +207,7 @@
* @param {integer} widht the width of the mapObj
*/
this.setWidth = function(width){
- this.width = parseInt(width);
+ this.width = parseInt(width, 10);
};
/**
@@ -229,7 +218,7 @@
* @type integer
*/
this.getHeight = function(){
- return parseInt(this.height);
+ return parseInt(this.height, 10);
};
/**
@@ -238,7 +227,7 @@
* @param {integer} height the height of the mapObj
*/
this.setHeight = function(height){
- this.height = parseInt(height);
+ this.height = parseInt(height, 10);
};
/**
@@ -322,14 +311,14 @@
this.setExtent(minx,miny,maxx,maxy);
//Todo:
//setMapRequest!
- }
+ };
/**
* set the extent of the wms
*/
this.setExtent = function(minx,miny,maxx,maxy){
this.extent = String(minx)+","+String(miny)+","+String(maxx)+","+String(maxy);
- }
+ };
/**
* get the srs of the mapObj
@@ -444,18 +433,21 @@
this.move = function(wms_id, layer_id, moveUp){
var i,j;
for(i=0;i<this.wms.length;i++){
- if(wms_id==this.wms[i].wms_id)
+ if (wms_id == this.wms[i].wms_id) {
break;
+ }
}
//check if only one wms is affected?
- if(layer_id&&layer_id!=this.wms[i].objLayer[0].layer_id)
+ if (layer_id && layer_id != this.wms[i].objLayer[0].layer_id) {
return this.wms[i].moveLayer(layer_id, moveUp);
+ }
//else swap wms
j = i + (moveUp?-1:1);
- if (!(i != j && i >= 0 && i < this.wms.length && j >= 0 && j < this.wms.length))
+ if (!(i != j && i >= 0 && i < this.wms.length && j >= 0 && j < this.wms.length)) {
return false;
+ }
upper = this.wms[i];
this.wms[i] = this.wms[j];
@@ -471,7 +463,7 @@
this.querylayers[j] = upperQuerylayers;
return true;
- }
+ };
eventAfterMapObjectConstruction.trigger();
}
@@ -511,13 +503,17 @@
if (fromIndex > toIndex) {
for (var i = fromIndex; i > toIndex ; i--) {
var result = mb_swapWmsByIndex(mapObj_ind, i-1, i);
- if (result == true) changed = true;
+ if (result === true) {
+ changed = true;
+ }
}
}
else {
for (var i = fromIndex; i < toIndex ; i++) {
var result = mb_swapWmsByIndex(mapObj_ind, i, i+1);
- if (result == true) changed = true;
+ if (result === true) {
+ changed = true;
+ }
}
}
return changed;
@@ -579,8 +575,8 @@
var ind = getMapObjIndexByName(obj);
//is the id valid?
for( var i=0; i<(wms.length-1); i++){
- if(parseInt(wms[i].wms_id) >= parseInt(wms[wms.length-1].wms_id)){
- wms[wms.length-1].wms_id = parseInt(mb_mapObj[ind].wms[i].wms_id) + 1;
+ if(parseInt(wms[i].wms_id, 10) >= parseInt(wms[wms.length-1].wms_id, 10)){
+ wms[wms.length-1].wms_id = parseInt(mb_mapObj[ind].wms[i].wms_id, 10) + 1;
}
}
mb_mapObj[ind].wms[mb_mapObj[ind].wms.length] = wms[wms.length-1];
@@ -616,7 +612,7 @@
new_layerarray[new_layerarray.length] = mb_mapObj[objind].layers[i];
new_querylayerarray[new_querylayerarray.length] = mb_mapObj[objind].querylayers[i];
new_stylesarray[new_stylesarray.length] = mb_mapObj[objind].styles[i];
- new_mapURLarray[new_mapURLarray.length] = mb_mapObj[objind].mapURL[i]
+ new_mapURLarray[new_mapURLarray.length] = mb_mapObj[objind].mapURL[i];
}
else {
wms_ID = mb_mapObj[objind].wms[i].wms_id;
@@ -670,7 +666,7 @@
var ts = mb_timestamp();
- var ret = eventBeforeMapRequest.trigger("AND");
+ var ret = eventBeforeMapRequest.trigger({frameName:frameName}, "AND");
if (ret === false) {
return true;
}
@@ -692,7 +688,7 @@
//disable Layer which are out of scale
var validLayers = mb_checkScale(frameName,i,ii);
var layerNames = validLayers.toString();
- if(mb_mapObj[i].layers[ii] != "" && validLayers != ''){
+ if(mb_mapObj[i].layers[ii] !== "" && layerNames !== ''){
var newMapURL = "";
if (mb_mapObj[i].wms[ii].gui_wms_mapopacity != 1) {
@@ -725,7 +721,7 @@
if(j>0){
newMapURL += ",";
}
- if(mb_mapObj[i].wms[ii].getCurrentStyleByLayerName(layer[j])==false){
+ if(mb_mapObj[i].wms[ii].getCurrentStyleByLayerName(layer[j]) === false){
newMapURL += "";
}
else{
@@ -756,12 +752,18 @@
}
}
// add Filter
- if(mb_mapObj[i].wms[ii].wms_filter != ""){
+ if(mb_mapObj[i].wms[ii].wms_filter !== ""){
var tmp = mb_mapObj[i].wms[ii].wms_filter +"?id="+ mb_styleID;
var temp = "&SLD=" + tmp+ "&";
newMapURL += temp;
}
+ // add sld
+ if(mb_mapObj[i].wms[ii].gui_wms_sldurl !== ""){
+ //alert(mb_mapObj[i].wms[ii].gui_wms_sldurl);
+ var temp = "&SLD=" + escape(mb_mapObj[i].wms[ii].gui_wms_sldurl) + "&";
+ newMapURL += temp;
+ }
if(mb_log){
var tmp = eval(mb_log + "('" + newMapURL + "','" + ts + "')");
}
@@ -796,7 +798,7 @@
var ts = mb_timestamp();
- eventBeforeMapRequest.trigger();
+ eventBeforeMapRequest.trigger({frameName:frameName});
/*
for(var i=0; i<mb_MapRequestPreFunctions.length; i++){
eval(mb_MapRequestPreFunctions[i]);
@@ -824,19 +826,19 @@
newMapURL += "LAYERS="+layerNames+"&";
var layer = layerNames.split(",");
- newMapURL += "STYLES=";
+ newMapURL += "STYLES=";
for(var j=0; j<layer.length; j++){
if(j>0){
newMapURL += ",";
}
- if(mb_mapObj[i].wms[ii].getCurrentStyleByLayerName(layer[j])==false){
+ if(mb_mapObj[i].wms[ii].getCurrentStyleByLayerName(layer[j])===false){
newMapURL += "";
}
else{
newMapURL += mb_mapObj[i].wms[ii].getCurrentStyleByLayerName(layer[j]);
}
}
- newMapURL += "&";
+ newMapURL += "&";
newMapURL += "SRS="+mb_mapObj[i].epsg+"&";
newMapURL += "BBOX="+mb_mapObj[i].extent+"&";
newMapURL += "WIDTH="+mb_mapObj[i].width+"&";
@@ -859,15 +861,21 @@
}
}
// add Filter
- if(mb_mapObj[i].wms[ii].wms_filter != ""){
+ if(mb_mapObj[i].wms[ii].wms_filter !== ""){
var tmp = mb_mapObj[i].wms[ii].wms_filter +"?id="+ mb_styleID;
//prompt("",tmp);;
var temp = "&SLD=" + tmp+ "&";
newMapURL += temp;
}
+ // add sld
+ if(mb_mapObj[i].wms[ii].gui_wms_sldurl !== ""){
+ //alert(mb_mapObj[i].wms[ii].gui_wms_sldurl);
+ var temp = "&SLD=" + escape(mb_mapObj[i].wms[ii].gui_wms_sldurl) + "&";
+ newMapURL += temp;
+ }
//prompt("",newMapURL);
- if(mb_mapObj[i].layers[ii] != "" && layerNames!=''){
+ if(mb_mapObj[i].layers[ii] !== "" && layerNames!==''){
newMapRequest += newMapURL;
mb_mapObj[i].mapURL[ii] = newMapURL;
mb_mapObj[i].wms[ii].mapURL = newMapURL;
@@ -918,10 +926,10 @@
querylayers += mb_mapObj[ind].wms[i].objLayer[ii].layer_name;
cnt_querylayers++;
}
- mb_mapObj[ind].layers[i] = layers;
- mb_mapObj[ind].querylayers[i] = querylayers;
- mb_mapObj[ind].styles[i] = styles;
}
+ mb_mapObj[ind].layers[i] = layers;
+ mb_mapObj[ind].querylayers[i] = querylayers;
+ mb_mapObj[ind].styles[i] = styles;
}
}
}
@@ -939,10 +947,10 @@
var minscaleOK = false;
var maxscaleOK = false;
if(thisLayer[ii] == myLayername){
- if(myMinscale == 0 || thisScale >= myMinscale){minscaleOK = true;}
- if(myMaxscale == 0 || thisScale <= myMaxscale){maxscaleOK = true;}
- if(maxscaleOK == true && minscaleOK == true ){
- if(cnt_layer > 0){str_layer += ","; }//str_styles += ","; str_titles += ",";str_parent += ","; str_legendurls += ",";}
+ if(myMinscale === 0 || thisScale >= myMinscale){minscaleOK = true;}
+ if(myMaxscale === 0 || thisScale <= myMaxscale){maxscaleOK = true;}
+ if(maxscaleOK === true && minscaleOK === true && !mb_mapObj[mObj].wms[wmsObj].objLayer[i].has_childs){
+ if(cnt_layer > 0){str_layer += ","; }//str_styles += ","; str_titles += ",";str_parent += ","; str_legendurls += ",";}
str_layer += thisLayer[ii];
cnt_layer++;
}
@@ -990,7 +998,7 @@
requestParams += "X=" + x + "&";
requestParams += "Y=" + y;
- if(mb_mapObj[i].querylayers[ii] != "" && mb_mapObj[i].layers[ii] != ""){
+ if(mb_mapObj[i].querylayers[ii] !== "" && mb_mapObj[i].layers[ii] !== ""){
validation = true;
}
//add vendor-specific
@@ -1004,15 +1012,15 @@
if(document.getElementById("FeatureInfoRedirect") && validation){
newfeatureInfoRequest += requestParams;
if(path){
- window.frames["FeatureInfoRedirect"].document.getElementById(mb_mapObj[i].wms[ii].wms_id).src = path + "?url=" + escape(newfeatureInfoRequest)+"&"+mb_nr;
+ window.frames.FeatureInfoRedirect.document.getElementById(mb_mapObj[i].wms[ii].wms_id).src = path + "?url=" + escape(newfeatureInfoRequest)+"&"+mb_nr;
}
else{
- window.frames["FeatureInfoRedirect"].document.getElementById(mb_mapObj[i].wms[ii].wms_id).src = newfeatureInfoRequest;
+ window.frames.FeatureInfoRedirect.document.getElementById(mb_mapObj[i].wms[ii].wms_id).src = newfeatureInfoRequest;
}
cnt_fi++;
}
else if(path && validation){
- newfeatureInfoRequest += requestParams
+ newfeatureInfoRequest += requestParams;
try{
var p = new mb_popup("Feature Info","url:"+path + "?url=" + escape(newfeatureInfoRequest)+"&"+mb_nr,300,400);
p.show();
@@ -1024,7 +1032,7 @@
else if(validation){
newfeatureInfoRequest += requestParams;
try{
- var p = new mb_popup("Feature Info","url:"+newfeatureInfoRequest,300,400);
+ var p = new mb_popup("Feature Info","url:"+newfeatureInfoRequest,300,400);
p.show();
}
catch(e){
@@ -1035,7 +1043,9 @@
}
}
}
- if(cnt_fi == 0){alert(unescape("Please select a layer! \n Bitte waehlen Sie eine Ebene zur Abfrage aus!"));}
+ if(cnt_fi === 0){
+ alert(unescape("Please select a layer! \n Bitte waehlen Sie eine Ebene zur Abfrage aus!"));
+ }
}
/*
@@ -1160,12 +1170,12 @@
for(var ii=0; ii<mb_mapObj[ind].wms[i].objLayer.length; ii++){
if(mb_mapObj[ind].wms[i].wms_id == array_wms[j] && mb_mapObj[ind].wms[i].objLayer[ii].layer_name == array_layer[j]){
if(type == "visible"){
- mb_mapObj[ind].wms[i].objLayer[ii].gui_layer_visible = parseInt(status);
+ mb_mapObj[ind].wms[i].objLayer[ii].gui_layer_visible = parseInt(status, 10);
//alert(mb_mapObj[ind].wms[i].objLayer[ii].layer_name);
check = true;
}
if(type == "querylayer" && (mb_mapObj[ind].wms[i].objLayer[ii].gui_layer_queryable == "1" || mb_mapObj[ind].wms[i].objLayer[ii].gui_layer_queryable == 1)){
- mb_mapObj[ind].wms[i].objLayer[ii].gui_layer_querylayer = parseInt(status);
+ mb_mapObj[ind].wms[i].objLayer[ii].gui_layer_querylayer = parseInt(status, 10);
}
}
}
@@ -1174,7 +1184,7 @@
/*
* hier noch checken, welche wms sich geaendert haben und disctinct eine singleRequest aufrufen:
*/
- if(check == true){
+ if(check === true){
if(mb_mapObj[ind].wms[i].gui_wms_visible == 1){
setSingleMapRequest(mapObj,mb_mapObj[ind].wms[i].wms_id);
@@ -1188,8 +1198,8 @@
function makeClickPos2RealWorldPos(frameName, myClickX, myClickY) {
var ind = getMapObjIndexByName(frameName);
- var width = parseInt(mb_mapObj[ind].width);
- var height = parseInt(mb_mapObj[ind].height);
+ var width = parseInt(mb_mapObj[ind].width, 10);
+ var height = parseInt(mb_mapObj[ind].height, 10);
var arrayBBox = mb_mapObj[ind].extent.split(",");
var minX = parseFloat(arrayBBox[0]);
var minY = parseFloat(arrayBBox[1]);
@@ -1215,7 +1225,7 @@
var posY = parseFloat(maxY - (myClickY / height) * xtenty);
posX = Math.round(posX * roundx)/roundx;
posY = Math.round(posY * roundy)/roundy;
- return new Array(posX, posY);
+ return [posX, posY];
}
function makeRealWorld2mapPos(frameName,rw_posx, rw_posy){
@@ -1230,7 +1240,7 @@
}
function mb_arrangeElement(frameName, elName, left, top) {
- if(frameName != ""){
+ if(frameName !== ""){
window.frames[frameName].document.getElementById(elName).style.top = top;
window.frames[frameName].document.getElementById(elName).style.left = left;
}
@@ -1262,7 +1272,7 @@
clickY = e.pageY;
}
}
- var pos = new Array(clickX,clickY);
+ var pos = [clickX,clickY];
return pos;
}
// function for object-identification
@@ -1341,7 +1351,7 @@
function mb_repaintScale(frameName, x, y, scale){
var ind = getMapObjIndexByName(frameName);
- if(x == null && y == null){
+ if(x === null && y === null){
var arrayBBox = mb_mapObj[ind].extent.split(",");
x = parseFloat(arrayBBox[0]) + ((parseFloat(arrayBBox[2]) - parseFloat(arrayBBox[0]))/2);
y = parseFloat(arrayBBox[1]) + ((parseFloat(arrayBBox[3]) - parseFloat(arrayBBox[1]))/2);
@@ -1466,21 +1476,21 @@
var t = mb_mapObj[objInd].wms[wmsInd];
var pos = mb_getlayerposbyname(objInd, wmsInd,lname);
var l = [];
- l["name"] = [];
- l["title"] = [];
- l["legendurl"] = [];
+ l.name = [];
+ l.title = [];
+ l.legendurl = [];
for(var i=0; i < t.objLayer.length; i++){
if(t.objLayer[i].layer_parent == pos){
- l["name"][l["name"].length] = t.objLayer[i].layer_name;
- l["title"][l["title"].length] = t.objLayer[i].layer_title;
+ l.name[l.name.length] = t.objLayer[i].layer_name;
+ l.title[l.title.length] = t.objLayer[i].layer_title;
if(t.objLayer[i].layer_style.length>0){
- l["legendurl"][l["legendurl"].length] = t.objLayer[i].layer_style[0]["legendurl"] ;
+ l.legendurl[l.legendurl.length] = t.objLayer[i].layer_style[0].legendurl;
}else{
- l["legendurl"][l["legendurl"].length] = 0 ;
+ l.legendurl[l.legendurl.length] = 0 ;
}
}
}
- if(l["name"].length > 0){
+ if(l.name.length > 0){
return l;
}
else{
@@ -1545,7 +1555,7 @@
}
}
return newString;
- }
+ };
/**
* @private
@@ -1562,7 +1572,7 @@
}
}
}
- }
+ };
/**
* @private
@@ -1652,7 +1662,7 @@
if (isValidLevel(level)) {
if (log_js == "on") {
try {
- mb_ajaxWrap_post('../php/mb_js_exception.php', {level:level,text:message});
+ mb_ajax_post('../php/mb_js_exception.php', {level:level,text:message});
}
catch(e) {
alert(e + ": " + message);
@@ -1674,7 +1684,7 @@
}
}
};
-}
+};
/**
* class for exception logging
@@ -1780,15 +1790,15 @@
function mb_regButton_frame(wii, frameName, param){
var ind = mb_button.length;
mb_button[ind] = new mb_conButton(wii, ind);
- if (frameName == null) {
- if (param == null) {
+ if (frameName === null) {
+ if (param === null) {
eval(wii+"("+ind+")");
}
else {
eval(wii+"("+ind+", "+param+")");
}
}
- else if (param == null) {
+ else if (param === null) {
eval("window.frames['" + frameName + "']."+wii+"("+ind+")");
}
else {
@@ -1796,10 +1806,16 @@
}
mb_button[ind].prev = mb_button[ind].src;
mb_button[ind].src = mb_button[ind].img_off;
- mb_button[ind].onmouseover = new Function("mb_button_over("+ind+")");
- mb_button[ind].onmouseout = new Function("mb_button_out("+ind+")");
- mb_button[ind].onclick = new Function("mb_button_click("+ind+")");
- if (frameName==null) {
+ mb_button[ind].onmouseover = function () {
+ mb_button_over(ind);
+ };
+ mb_button[ind].onmouseout = function(){
+ mb_button_out(ind);
+ };
+ mb_button[ind].onclick = function(){
+ mb_button_click(ind);
+ };
+ if (frameName === null) {
mb_button[ind].frameName = "";
}
else {
@@ -1816,7 +1832,7 @@
return true;
}
function mb_button_over(ind){
- if(mb_button[ind].status == 0){
+ if(mb_button[ind].status === 0){
mb_button[ind].prev = mb_button[ind].src;
mb_button[ind].src = mb_button[ind].img_over;
}
@@ -1826,12 +1842,12 @@
}
function mb_button_click(ind){
var mbStatus = mb_button[ind].status;
- if(mbStatus == 0){
+ if(mbStatus === 0){
mb_disableButton(mb_button[ind].elName);
mb_button[ind].prev = mb_button[ind].img_on;
mb_button[ind].src = mb_button[ind].img_on;
mb_button[ind].status = 1;
- if (mb_button[ind].frameName != "") {
+ if (mb_button[ind].frameName !== "") {
window.frames[mb_button[ind].frameName].document.getElementById(mb_button[ind].elName).go();
}
else {
@@ -1842,7 +1858,7 @@
mb_button[ind].prev = mb_button[ind].img_off;
mb_button[ind].src = mb_button[ind].img_off;
mb_button[ind].status = 0;
- if (mb_button[ind].frameName != "") {
+ if (mb_button[ind].frameName !== "") {
window.frames[mb_button[ind].frameName].document.getElementById(mb_button[ind].elName).stop();
}
else {
@@ -1854,7 +1870,7 @@
for(var i=0; i<mb_button.length; i++){
if(mb_button[i].elName != elName && mb_button[i].status == 1){
mb_button[i].status = 0;
- if (mb_button[i].frameName != "") {
+ if (mb_button[i].frameName !== "") {
window.frames[mb_button[i].frameName].document.getElementById(mb_button[i].elName).src = mb_button[i].img_off;
window.frames[mb_button[i].frameName].document.getElementById(mb_button[i].elName).stop();
}
@@ -1872,7 +1888,7 @@
if(mb_button[i].elName == elName && mb_button[i].status == 1){
//alert(mb_button[i].elName);
mb_button[i].status = 0;
- if (mb_button[i].frameName != "") {
+ if (mb_button[i].frameName !== "") {
window.frames[mb_button[i].frameName].document.getElementById(mb_button[i].elName).src = mb_button[i].img_off;
window.frames[mb_button[i].frameName].document.getElementById(mb_button[i].elName).stop();
}
@@ -1886,51 +1902,84 @@
}
}
function updateButtonTooltips(obj) {
-// console.log("begin tooltip update");
+/*
+ * the buttons are only initialized on mouseover!
+ * So when localizing, not all buttons may have been registered
+ *
for(var i=0; i<mb_button.length; i++){
// console.log("button %i", i);
for(var j=0; j<obj.length; j++){
+ if (mb_button[i].elName == obj[j].id) {
// console.log("%s %s", mb_button[i].elName, obj[j].id);
- if (mb_button[i].elName == obj[j].id) {
- if (mb_button[i].frameName != "") {
+ if (mb_button[i].frameName !== "") {
window.frames[mb_button[i].frameName].document.getElementById(mb_button[i].elName).title = obj[j].title;
}
else {
document.getElementById(mb_button[i].elName).title = obj[j].title;
}
-
}
}
}
+*/
+
+ // an alternative, fixes above error,
+ // but this one only changes those in the main frame
+ var imageArray = document.getElementsByTagName("img");
+ for (var i = 0; i < imageArray.length; i++) {
+ for(var j=0; j<obj.length; j++){
+ if (imageArray[i].id == obj[j].id) {
+ document.getElementById(imageArray[i].id).title = obj[j].title;
+ }
+ }
+ }
}
-function mb_localizeButtons() {
+
+function mb_localizeButtons(){
mb_ajax_json("../php/mod_button_tooltips.php", function(obj, status){
updateButtonTooltips(obj);
});
}
-mb_registerInitFunctions("mb_registerL10nFunctions('mb_localizeButtons()');");
+eventLocalize.register(function () {
+ mb_localizeButtons();
+});
+
+eventInit.register(function () {
+ mb_localizeButtons();
+});
+
+
/*
***************************************************************************************
* miscellaneous functions
***************************************************************************************
*/
-function cloneObject(someObject){
- var clone = [];
-
- for (attribute in someObject) {
-
- var currentElement = someObject[attribute];
-
- if (typeof(currentElement) == "object") {
- clone[attribute] = cloneObject(currentElement);
- }
- else {
- clone[attribute] = currentElement;
- }
- }
- return clone;
+function cloneObject(obj) {
+ if (typeof obj !== 'object' || obj === null) {
+ return obj;
+ }
+ var c = obj instanceof Array ? [] : {};
+ for (var i in obj) {
+ var prop = obj[i];
+ if (typeof prop == 'object') {
+ if (prop instanceof Array) {
+ c[i] = [];
+ for (var j = 0; j < prop.length; j++) {
+ if (typeof prop[j] != 'object') {
+ c[i].push(prop[j]);
+ } else {
+ c[i].push(cloneObject(prop[j]));
+ }
+ }
+ } else {
+ c[i] = cloneObject(prop);
+ }
+ } else {
+ c[i] = prop;
+ }
+ }
+ return c;
}
@@ -1972,10 +2021,10 @@
* empties this {@link List}
*/
this.empty = function() {
- while (this.list != null && this.count() > 0) {
+ while (this.list !== null && this.count() > 0) {
this.list.pop();
}
- }
+ };
/**
* @param {Integer} i index
@@ -2046,56 +2095,7 @@
};
-
/*
- * first draft of a redesign
- *
-var FunctionArray = function() {
- this.list = [];
-
- this.register = function (aFunction) {
- this.add(aFunction);
- }
- this.execute = function () {
- for (var i = 0; i < this.count(); i++) {
- var aFunction = this.get(i);
- if (typeof(aFunction) == 'function') {
- aFunction();
- }
- else if (typeof(aFunction) == 'string') {
- eval(aFunction);
- }
- else {
- var e = new mb_exception("FunctionArray.execute: Invalid parameter: " + aFunction);
- }
- }
- }
- this.remove = function (functionString) {
- var listLength = this.count();
- for (var i = listLength - 1; i >= 0; i--) {
- if (this.get(i) == functionString){
- this.del(i);
- }
- }
- }
-}
-
-FunctionArray.prototype = new List();
-
-var mbInitFunctions = new FunctionArray();
-var mbMapRequestSubFunctions = new FunctionArray();
-var mbWfsReadSubFunctions = new FunctionArray();
-var mbWfsWriteSubFunctions = new FunctionArray();
-var mbMapRequestPreFunctions = new FunctionArray();
-var mbFeatureInfoPreFunctions = new FunctionArray();
-var mbInitFunctions = new FunctionArray();
-var mbMapObjectSubFunctions = new FunctionArray();
-var mbGetScalePreFunctions = new FunctionArray();
-var mbloadWmsSubFunctions = new FunctionArray();
-
-*/
-
-/*
***************************************************************************************
* deprecated functions
***************************************************************************************
@@ -2107,14 +2107,14 @@
var oldElement;
var newElement;
var prefix;
- if(frameName && frameName != ""){
+ if(frameName && frameName !== ""){
prefix = window.frames[frameName].document;
}
- else if(!frameName || frameName == ""){
+ else if(!frameName || frameName === ""){
prefix = document;
}
oldElement = prefix.getElementById(elementId);
- if (oldElement == null) {
+ if (oldElement === null) {
newElement = prefix.createElement(tagName);
newElement = prefix.getElementsByTagName(appendAtTagName)[0].appendChild(newElement);
}
Modified: trunk/mapbender/http/javascripts/map.php
===================================================================
--- trunk/mapbender/http/javascripts/map.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/map.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,21 +17,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
-
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
-
// see http://trac.osgeo.org/mapbender/ticket/79
ini_set('session.bug_compat_42',0);
ini_set('session.bug_compat_warn',0);
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
/*
// may be added at a later stage
$gui_changed=0;
@@ -52,7 +44,7 @@
$_SESSION['layer_preview'] = 0;
}
*/
-$_SESSION["mb_user_gui"] = $_REQUEST["gui_id"];
+$_SESSION["mb_user_gui"] = $gui_id;
session_write_close();
ob_start();
@@ -68,33 +60,39 @@
echo "var mapbender = {};";
echo "mapbender.locale = '" . $_SESSION["mb_locale"] . "';";
echo "mapbender.languageId = '" . $_SESSION["mb_lang"] . "';";
+echo "mapbender.versionNumber = '" . MB_VERSION_NUMBER . "';";
+echo "mapbender.versionAppendix = '" . MB_VERSION_APPENDIX . "';";
+echo "mapbender.releaseDate = new Date(".date("Y",MB_RELEASE_DATE).",".date("n",MB_RELEASE_DATE).",".date("j",MB_RELEASE_DATE).");";
echo "var owsproxy = '".OWSPROXY."';";
echo "var global_mb_log_js = '".LOG_JS."';";
echo "var global_mb_log_level = '".LOG_LEVEL."';";
echo "var global_log_levels = '".LOG_LEVEL_LIST."';";
+echo "var mb_feature_count = ".MB_FEATURE_COUNT.";";
+echo "var mb_resolution = ".MB_RESOLUTION.";";
//
// Load JavaScript libraries
//
-require_once("../javascripts/map.js");
-require_once("../javascripts/point.js");
-require_once("../javascripts/map_obj.js");
-require_once("../javascripts/wfs_obj.js");
-require_once("../extensions/jquery.js");
-require_once("../extensions/jqjson.js");
+require_once(dirname(__FILE__) . "/../extensions/jquery.js");
+require_once(dirname(__FILE__) . "/../javascripts/map.js");
+require_once(dirname(__FILE__) . "/../javascripts/point.js");
+require_once(dirname(__FILE__) . "/../javascripts/map_obj.js");
+require_once(dirname(__FILE__) . "/../javascripts/wfs_obj.js");
+require_once(dirname(__FILE__) . "/../extensions/jqjson.js");
+require_once(dirname(__FILE__) . "/../javascripts/style.js");
require_once("../javascripts/style.js");
//
// Load WMS
//
$sql = "SELECT fkey_wms_id FROM gui_wms WHERE fkey_gui_id = $1 ORDER BY gui_wms_position";
-$v = array($_SESSION["mb_user_gui"]);
+$v = array($gui_id);
$t = array('s');
-$res = db_prep_query($sql,$v,$t);
+$res = db_prep_query($sql, $v, $t);
-while($row = db_fetch_array($res)){
+while($row = db_fetch_array($res)) {
$mywms = new wms();
- $mywms->createObjFromDB($_SESSION["mb_user_gui"],$row["fkey_wms_id"]);
+ $mywms->createObjFromDB($gui_id, $row["fkey_wms_id"]);
$mywms->createJsObjFromWMS();
}
@@ -102,32 +100,49 @@
// Load JavaScript modules of GUI elements
//
$sql = "SELECT DISTINCT e_mb_mod FROM gui_element WHERE e_public = 1 AND fkey_gui_id = $1";
-$v = array($_REQUEST["gui_id"]);
+$v = array($gui_id);
$t = array('s');
-$res = db_prep_query($sql,$v,$t);
-$cnt = 0;
+$res = db_prep_query($sql, $v, $t);
while($row = db_fetch_array($res)){
if($row["e_mb_mod"] != ""){
- require_once("../javascripts/" . trim($row["e_mb_mod"]));
+ $moduleArray = explode(",", $row["e_mb_mod"]);
+ for ($i = 0; $i < count($moduleArray); $i++) {
+ $currentFile = dirname(__FILE__) . "/../javascripts/" . trim($moduleArray[$i]);
+ if (file_exists($currentFile)) {
+ require_once($currentFile);
+ }
+ else {
+ $e = new mb_exception("Javascript module not found: " . $currentFile);
+ }
+ }
}
- $cnt++;
}
//
// Load JavaScript files of GUI elements
//
-$mb_sql = "SELECT DISTINCT e_js_file, e_id, e_src, e_target, e_pos FROM gui_element WHERE e_public = 1 AND fkey_gui_id = $1 ORDER BY e_pos";
-$mb_v = array($_REQUEST["gui_id"]);
+$mb_sql = "SELECT DISTINCT e_js_file, e_id, e_src, e_target, e_pos, " .
+ "e_requires FROM gui_element WHERE e_public = 1 AND " .
+ "fkey_gui_id = $1 ORDER BY e_pos";
+$mb_v = array($gui_id);
$mb_t = array("s");
$mb_res = db_prep_query($mb_sql, $mb_v, $mb_t);
-//$mb_cnt = 0;
while($row_js = db_fetch_array($mb_res)){
if($row_js["e_js_file"] != ""){
$e_id = $row_js["e_id"];
- $e_id_css = $row_js["e_id"];
$e_src = $row_js["e_src"];
- $e_target = $row_js["e_target"];
- require_once($row_js["e_js_file"]);
+ $e_require = $row_js["e_requires"];
+ $e_target = explode(",",$row_js["e_target"]);
+ $currentFile = $row_js["e_js_file"];
+ if (file_exists($currentFile)) {
+ require_once($currentFile);
+ }
+ else {
+ $e = new mb_exception("Javascript not found: " . $currentFile);
+ }
}
}
+
+
+
?>
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/map_obj.js
===================================================================
--- trunk/mapbender/http/javascripts/map_obj.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/map_obj.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -56,8 +56,9 @@
gui_wms_featureinfoformat,
gui_wms_exceptionformat,
gui_wms_epsg,
- parseInt(gui_wms_visible),
+ parseInt(gui_wms_visible, 10),
parseInt(gui_wms_opacity),
+ parseInt(gui_wms_opacity),
gui_wms_sldurl);
wms_layer[wms.length - 1] = [];
}
@@ -222,6 +223,43 @@
};
/**
+ * sets Opacity of WMS
+ *
+ * @param {Integer} new opacity percentage value
+ */
+wms_const.prototype.setOpacity = function(opacity){
+ //calc new opacity
+ this.gui_wms_mapopacity = parseInt(opacity)/100;
+ if(this.gui_wms_mapopacity>1||isNaN(this.gui_wms_mapopacity))
+ this.gui_wms_mapopacity=1;
+ if(this.gui_wms_mapopacity<0)
+ this.gui_wms_mapopacity=0;
+
+ if (this.gui_wms_visible > 0) {
+
+ //get div id
+ var divId = null;
+ for (var i=0; i < wms.length; i++) {
+ if (this.wms_id == wms[i].wms_id) {
+ var divId = 'div_'+i;
+ break;
+ }
+ }
+ if(!divId)
+ return;
+
+ //TODO: check if mapframe1 is the right mapframe
+ wmsImage = parent.mapframe1.document.getElementById(divId);
+ if (wmsImage != null) {
+ wmsImage.style.opacity = this.gui_wms_mapopacity;
+ wmsImage.style.MozOpacity = this.gui_wms_mapopacity;
+ wmsImage.style.KhtmlOpacity = this.gui_wms_mapopacity;
+ wmsImage.style.filter = "alpha(opacity=" + this.gui_wms_mapopacity*100 + ")";
+ }
+ }
+}
+
+/**
* get all visible layers
*
* @return array of layernames
@@ -345,6 +383,9 @@
for(var k=0; k< this.objLayer[i].layer_style.length; k++){
if(this.objLayer[i].layer_style[k].name == guiLayerStyle){
var legendUrl = this.objLayer[i].layer_style[k].legendurl;
+ if (this.gui_wms_sldurl !== "") {
+ legendUrl += "&SLD="+escape(this.gui_wms_sldurl);
+ }
if(legendUrl !=='' && legendUrl !== null && typeof(legendUrl) != 'undefined'){
return legendUrl;
}
@@ -447,14 +488,14 @@
//Set visibility/queryability of Layer and Sublayers
for(var j = i; j < this.objLayer.length; j++){
- if (i != j && this.objLayer[i].layer_parent == this.objLayer[j].layer_parent) {
+ if (i != j && this.objLayer[i].layer_parent >= this.objLayer[j].layer_parent) {
break;
}
if(type == "visible") {
- this.objLayer[j].gui_layer_visible = parseInt(value);
+ this.objLayer[j].gui_layer_visible = parseInt(value, 10);
}
else if(type=="querylayer") {
- this.objLayer[j].gui_layer_querylayer = parseInt(value);
+ this.objLayer[j].gui_layer_querylayer = parseInt(value, 10);
}
}
@@ -469,7 +510,7 @@
else if(type=="querylayer") {
this.objLayer[j].gui_layer_querylayer = state;
}
- }
+ }
}
};
@@ -626,14 +667,14 @@
gui_layer_wms_id,
gui_layer_status,
gui_layer_style,
- parseInt(gui_layer_selectable),
- parseInt(gui_layer_visible),
- parseInt(gui_layer_queryable),
- parseInt(gui_layer_querylayer),
- parseInt(gui_layer_minscale),
- parseInt(gui_layer_maxscale),
+ parseInt(gui_layer_selectable, 10),
+ parseInt(gui_layer_visible, 10),
+ parseInt(gui_layer_queryable, 10),
+ parseInt(gui_layer_querylayer, 10),
+ parseInt(gui_layer_minscale, 10),
+ parseInt(gui_layer_maxscale, 10),
gui_layer_wfs_featuretype );
- var parentLayer = wms[wms.length-1].getLayerByLayerPos(parseInt(layer_parent));
+ var parentLayer = wms[wms.length-1].getLayerByLayerPos(parseInt(layer_parent, 10));
if(parentLayer) {
parentLayer.has_childs = true;
}
@@ -705,9 +746,9 @@
* @type boolean
*/
wms_layer.prototype.checkScale = function(mapObj){
- var minScale = parseInt(this.gui_layer_minscale);
- var maxScale = parseInt(this.gui_layer_maxscale);
- var currentScale = parseInt(mapObj.getScale());
+ var minScale = parseInt(this.gui_layer_minscale, 10);
+ var maxScale = parseInt(this.gui_layer_maxscale, 10);
+ var currentScale = parseInt(mapObj.getScale(), 10);
if(minScale === 0 && maxScale === 0){
return true;
}
@@ -721,7 +762,7 @@
* @param boolean visible visibility on/off
*/
wms_layer.prototype.setVisible = function(visible){
- this.gui_layer_visible = parseInt(visible);
+ this.gui_layer_visible = parseInt(visible, 10);
//console.log("setVisible(%i) for Layer %s",visible, this.layer_name);
};
@@ -731,6 +772,6 @@
*/
wms_layer.prototype.setQueryable = function(queryable){
- this.gui_layer_querylayer = parseInt(queryable);
+ this.gui_layer_querylayer = parseInt(queryable, 10);
//console.log("setQueryable(%i) for Layer %s",queryable, this.layer_name);
};
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_addWMS.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMS.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_addWMS.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,31 +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.
-$gui_id = $_REQUEST["gui_id"];
+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);
-
-$sql = "SELECT e_requires, e_target FROM gui_element WHERE e_id = 'addWMS' 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"];
- $e_require = $row["e_requires"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('addWMS: ID not unique!');";
-}
echo "var mod_addWMS_data = '".$e_require."';";
-$target = explode(",", $e_target);
-echo "var mod_addWMS_target1 = '".trim($target[0])."';";
-echo "var mod_addWMS_target2 = '".trim($target[1])."';";
+echo "var mod_addWMS_target1 = '".trim($e_target[0])."';";
+echo "var mod_addWMS_target2 = '".trim($e_target[1])."';";
?>
function mod_addWMS(){
Modified: trunk/mapbender/http/javascripts/mod_addWMSfromList.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMSfromList.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_addWMSfromList.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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");
-import_request_variables("PG");
-
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -63,9 +60,6 @@
<body onload='window.focus()'>
<?php
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
require_once(dirname(__FILE__)."/../php/mb_getGUIs.php");
$fieldHeight = 20;
@@ -110,14 +104,18 @@
$arrayGuis=mb_getGUIs($logged_user_id);
$sql_gui = "SELECT * FROM gui WHERE gui_id IN (";
-
-for($i=0; $i<count($arrayGuis); $i++){
- if($i>0){ $sql_gui .= ",";}
- $sql_gui .= "'".$arrayGuis[$i]."'";
+$v = $arrayGuis;
+$t = array();
+for ($i = 1; $i <= count($arrayGuis); $i++){
+ if ($i > 1) {
+ $sql_gui .= ",";
+ }
+ $sql_gui .= "$" . $i;
+ array_push($t, "s");
}
$sql_gui.= ") ORDER BY gui_name";
-$res_gui = db_query($sql_gui);
+$res_gui = db_prep_query($sql_gui, $v, $t);
while($row = db_fetch_array($res_gui)){
$gui_id[$cnt_gui] = $row["gui_id"];
$gui_name[$cnt_gui] = $row["gui_name"];
@@ -127,14 +125,18 @@
/*get allocated wms from allocated gui ********************************************************************************************/
$sql_gui_wms = "SELECT DISTINCT fkey_wms_id FROM gui_wms WHERE fkey_gui_id IN (";
-
-for($i=0; $i<count($arrayGuis); $i++){
- if($i>0){ $sql_gui_wms .= ",";}
- $sql_gui_wms .= "'".$arrayGuis[$i]."'";
+$v = $arrayGuis;
+$t = array();
+for ($i = 1; $i <= count($arrayGuis); $i++){
+ if ($i > 1) {
+ $sql_gui_wms .= ",";
+ }
+ $sql_gui_wms .= "$".$i;
+ array_push($t, "s");
}
$sql_gui_wms.= ") ORDER BY fkey_wms_id";
-$res_gui_wms = db_query($sql_gui_wms);
+$res_gui_wms = db_prep_query($sql_gui_wms, $v, $t);
while($row = db_fetch_array($res_gui_wms)){
$fkey_gui_id[$cnt_gui_wms] = $row["fkey_gui_id"];
$fkey_wms_id[$cnt_gui_wms] = $row["fkey_wms_id"];
@@ -144,15 +146,19 @@
/*get allocated wms-Abstract and wms-Capabilities from allocated gui ********************************************************************************************/
$sql_wms = "SELECT DISTINCT wms_title, wms_abstract, wms_getcapabilities,wms_version FROM wms WHERE wms_id IN (";
-
-for($i=0; $i<count($fkey_wms_id); $i++){
- if($i>0){ $sql_wms .= ",";}
- $sql_wms .= "'".$fkey_wms_id[$i]."'";
+$v = $fkey_wms_id;
+$t = array();
+for ($i = 1; $i <= count($fkey_wms_id); $i++){
+ if ($i > 1) {
+ $sql_wms .= ",";
+ }
+ $sql_wms .= "$" . $i;
+ array_push($t, "s");
}
#$sql_wms.= ") ORDER BY wms_id";
$sql_wms.= ") ORDER BY wms_title";
-$res_wms = db_query($sql_wms);
+$res_wms = db_prep_query($sql_wms, $v, $t);
while($row = db_fetch_array($res_wms)){
$wms_title[$cnt_wms] = $row["wms_title"];
$wms_abstract[$cnt_wms] = $row["wms_abstract"];
Modified: trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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>
@@ -180,9 +178,6 @@
<body onLoad="window.focus();setButtons('<?php echo $wms_show;?>','<?php echo $show_gui_configured_wms;?>','<?php echo $show_group_wms;?>','<?php echo $show_gui_wms;?>')">
<?php
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
require_once(dirname(__FILE__)."/../classes/class_wms.php");
require_once(dirname(__FILE__)."/../php/mb_getGUIs.php");
@@ -247,14 +242,20 @@
$arrayGuis=mb_getGUIs($logged_user_id);
$sql_gui = "SELECT * FROM gui WHERE gui_id IN (";
+$v = $arrayGuis;
+$t = array();
-for($i=0; $i<count($arrayGuis); $i++){
- if($i>0){ $sql_gui .= ",";}
- $sql_gui .= "'".$arrayGuis[$i]."'";
+for ($i = 1; $i <= count($arrayGuis); $i++){
+ if ($i > 1) {
+ $sql_gui .= ",";
+ }
+ $sql_gui .= "$" . $i;
+ array_push($t, "s");
}
$sql_gui.= ") ORDER BY gui_name";
-$res_gui = db_query($sql_gui);
+
+$res_gui = db_prep_query($sql_gui, $v, $t);
while($row = db_fetch_array($res_gui)){
$gui_id[$cnt_gui] = $row["gui_id"];
$gui_name[$cnt_gui] = $row["gui_name"];
@@ -266,14 +267,18 @@
/*get allocated wms from allocated gui ********************************************************************************************/
$sql_gui_wms = "SELECT DISTINCT fkey_wms_id, fkey_gui_id FROM gui_wms WHERE fkey_gui_id IN (";
-
-for($i=0; $i<count($arrayGuis); $i++){
- if($i>0){ $sql_gui_wms .= ",";}
- $sql_gui_wms .= "'".$arrayGuis[$i]."'";
+$v = $arrayGuis;
+$t = array();
+for ($i = 1; $i <= count($arrayGuis); $i++){
+ if ($i > 1) {
+ $sql_gui_wms .= ",";
+ }
+ $sql_gui_wms .= "$".$i;
+ array_push($t, "s");
}
$sql_gui_wms.= ") ORDER BY fkey_wms_id";
-$res_gui_wms = db_query($sql_gui_wms);
+$res_gui_wms = db_prep_query($sql_gui_wms, $v, $t);
while($row = db_fetch_array($res_gui_wms)){
$fkey_gui_id[$cnt_gui_wms] = $row["fkey_gui_id"];
$fkey_wms_id[$cnt_gui_wms] = $row["fkey_wms_id"];
@@ -283,14 +288,18 @@
/*get allocated wms-Abstract and wms-Capabilities from allocated gui ********************************************************************************************/
$sql_wms = "SELECT DISTINCT wms_title, wms_abstract, wms_getcapabilities, wms_version FROM wms WHERE wms_id IN (";
-
-for($i=0; $i<count($fkey_wms_id); $i++){
- if($i>0){ $sql_wms .= ",";}
- $sql_wms .= "'".$fkey_wms_id[$i]."'";
+$v = $fkey_wms_id;
+$t = array();
+for ($i = 1; $i <= count($fkey_wms_id); $i++){
+ if ($i > 1) {
+ $sql_wms .= ",";
+ }
+ $sql_wms .= "$".$i;
+ array_push($t, "s");
}
$sql_wms.= ") ORDER BY wms_title";
-$res_wms = db_query($sql_wms);
+$res_wms = db_prep_query($sql_wms, $v, $t);
while($row = db_fetch_array($res_wms)){
$wms_title[$cnt_wms] = $row["wms_title"];
$wms_abstract[$cnt_wms] = $row["wms_abstract"];
@@ -324,8 +333,10 @@
#if (isset($show_group_wms))
if (!empty($show_group_wms)){
/*get gui goup ********************************************************************************************/
- $sql_gui_mb_group = "SELECT fkey_gui_id, fkey_mb_group_id FROM gui_mb_group WHERE fkey_mb_group_id='".$show_group_wms."'";
- $res_gui_mb_group = db_query($sql_gui_mb_group);
+ $sql_gui_mb_group = "SELECT fkey_gui_id, fkey_mb_group_id FROM gui_mb_group WHERE fkey_mb_group_id=$1";
+ $v = array($show_group_wms);
+ $t = array("s");
+ $res_gui_mb_group = db_prep_query($sql_gui_mb_group, $v, $t);
while($row = db_fetch_array($res_gui_mb_group)){
$group_gui_id[$cnt_gui_mb_group] = $row["fkey_gui_id"];
@@ -339,13 +350,18 @@
/*get group gui WMS ********************************************************************************************/
if(count($group_gui_id)>0) {
$sql_fkey_group_gui_wms = "SELECT DISTINCT fkey_wms_id, fkey_gui_id FROM gui_wms WHERE fkey_gui_id IN (";
- for($i=0; $i<count($group_gui_id); $i++){
- if($i>0){ $sql_fkey_group_gui_wms .= ",";}
- $sql_fkey_group_gui_wms .= "'".$group_gui_id[$i]."'";
+ $v = $group_gui_id;
+ $t = array();
+ for ($i = 1; $i <= count($group_gui_id); $i++){
+ if ($i > 1) {
+ $sql_fkey_group_gui_wms .= ",";
+ }
+ $sql_fkey_group_gui_wms .= "$".$i;
+ array_push($t, "s");
}
$sql_fkey_group_gui_wms.= ") ORDER BY fkey_wms_id";
- $res_fkey_group_gui_wms = db_query($sql_fkey_group_gui_wms);
+ $res_fkey_group_gui_wms = db_prep_query($sql_fkey_group_gui_wms, $v, $t);
while($row = db_fetch_array($res_fkey_group_gui_wms)){
$fkey_group_gui_gui_id[$cnt_fkey_group_gui_wms] = $row["fkey_gui_id"];
$fkey_group_gui_wms_id[$cnt_fkey_group_gui_wms] = $row["fkey_wms_id"];
@@ -358,14 +374,18 @@
/*group: get allocated wms-Abstract and wms-Capabilities from allocated gui ********************************************************************************************/
if(count($fkey_group_gui_wms_id)>0){
$sql_group_gui_wms = "SELECT DISTINCT wms_title, wms_abstract, wms_getcapabilities, wms_version FROM wms WHERE wms_id IN (";
-
- for($i=0; $i<count($fkey_group_gui_wms_id); $i++){
- if($i>0){ $sql_group_gui_wms .= ",";}
- $sql_group_gui_wms .= "'".$fkey_group_gui_wms_id[$i]."'";
+ $v = $fkey_group_gui_wms_id;
+ $t = array();
+ for ($i = 1; $i <= count($fkey_group_gui_wms_id); $i++){
+ if ($i > 1) {
+ $sql_group_gui_wms .= ",";
+ }
+ $sql_group_gui_wms .= "$".$i;
+ array_push($t, "s");
}
$sql_group_gui_wms.= ") ORDER BY wms_title";
- $res_group_gui_wms = db_query($sql_group_gui_wms);
+ $res_group_gui_wms = db_prep_query($sql_group_gui_wms, $v, $t);
while($row = db_fetch_array($res_group_gui_wms)){
$group_wms_title[$cnt_group_gui_wms] = $row["wms_title"];
$group_wms_abstract[$cnt_group_gui_wms] = $row["wms_abstract"];
@@ -383,8 +403,10 @@
#if ($show_group_wms > 0)
if ($cnt_group_gui_wms > 0){
/*get goup name for showing in the table ********************************************************************************************/
- $sql_group_name = "SELECT mb_group_id, mb_group_name FROM mb_group WHERE mb_group_id ='".$show_group_wms."'";
- $res_group_name = db_query($sql_group_name);
+ $sql_group_name = "SELECT mb_group_id, mb_group_name FROM mb_group WHERE mb_group_id = $1";
+ $v = array($show_group_wms);
+ $t = array("s");
+ $res_group_name = db_prep_query($sql_group_name, $v, $t);
while($row = db_fetch_array($res_group_name)){
$group_name_table[$cnt_group_name] = $row["mb_group_name"];
$my_group_id_table[$cnt_group_name] = $row["mb_group_id"];
@@ -426,10 +448,12 @@
/*show gui wms ********************************************************************************************/
if (!empty($show_gui_wms)){
/*get group gui WMS ********************************************************************************************/
- $sql_fkey_show_gui_wms = "SELECT DISTINCT fkey_wms_id, fkey_gui_id FROM gui_wms WHERE fkey_gui_id ='".$show_gui_wms."'";
+ $sql_fkey_show_gui_wms = "SELECT DISTINCT fkey_wms_id, fkey_gui_id FROM gui_wms WHERE fkey_gui_id = $1";
+ $v = array($show_gui_wms);
+ $t = array("s");
#$sql_fkey_show_gui_wms.= ") ORDER BY fkey_wms_id";
- $res_fkey_show_gui_wms = db_query($sql_fkey_show_gui_wms);
+ $res_fkey_show_gui_wms = db_prep_query($sql_fkey_show_gui_wms, $v, $t);
while($row = db_fetch_array($res_fkey_show_gui_wms)){
$fkey_show_gui_gui_id[$cnt_fkey_show_gui_wms] = $row["fkey_gui_id"];
$fkey_show_gui_wms_id[$cnt_fkey_show_gui_wms] = $row["fkey_wms_id"];
@@ -441,14 +465,18 @@
/*gui: get allocated wms-Abstract and wms-Capabilities from allocated gui ********************************************************************************************/
if(count($fkey_show_gui_wms_id)>0){
$sql_show_gui_wms = "SELECT DISTINCT wms_title, wms_abstract, wms_getcapabilities, wms_id, wms_version FROM wms WHERE wms_id IN (";
-
- for($i=0; $i<count($fkey_show_gui_wms_id); $i++){
- if($i>0){ $sql_show_gui_wms .= ",";}
- $sql_show_gui_wms .= "'".$fkey_show_gui_wms_id[$i]."'";
+ $v = $fkey_show_gui_wms_id;
+ $t = array();
+ for ($i = 1; $i <= count($fkey_show_gui_wms_id); $i++){
+ if ($i > 1) {
+ $sql_show_gui_wms .= ",";
+ }
+ $sql_show_gui_wms .= "$".$i;
+ array_push($t, "s");
}
$sql_show_gui_wms.= ") ORDER BY wms_title";
- $res_show_gui_wms = db_query($sql_show_gui_wms);
+ $res_show_gui_wms = db_prep_query($sql_show_gui_wms, $v, $t);
while($row = db_fetch_array($res_show_gui_wms)){
$gui_wms_id[$cnt_show_gui_wms] = $row["wms_id"];
$gui_wms_title[$cnt_show_gui_wms] = $row["wms_title"];
@@ -466,8 +494,10 @@
if ($cnt_show_gui_wms > 0){
/*get selected gui name for table caption ********************************************************************************************/
- $sql_gui_table = "SELECT * FROM gui WHERE gui_id ='".$show_gui_wms."'";
- $res_gui_table = db_query($sql_gui_table);
+ $sql_gui_table = "SELECT * FROM gui WHERE gui_id = $1";
+ $v = array($show_gui_wms);
+ $t = array("s");
+ $res_gui_table = db_prep_query($sql_gui_table, $v, $t);
while($row = db_fetch_array($res_gui_table)){
$gui_id_table[$cnt_gui_table] = $row["gui_id"];
$gui_name_table[$cnt_gui_table] = $row["gui_name"];
@@ -513,10 +543,11 @@
/*show gui wms ********************************************************************************************/
if (!empty($show_gui_configured_wms)){
/*get group gui WMS ********************************************************************************************/
- $sql_fkey_show_gui_wms = "SELECT DISTINCT fkey_wms_id, fkey_gui_id FROM gui_wms WHERE fkey_gui_id ='".$show_gui_configured_wms."'";
+ $sql_fkey_show_gui_wms = "SELECT DISTINCT fkey_wms_id, fkey_gui_id FROM gui_wms WHERE fkey_gui_id = $1";
#$sql_fkey_show_gui_wms.= ") ORDER BY fkey_wms_id";
-
- $res_fkey_show_gui_wms = db_query($sql_fkey_show_gui_wms);
+ $v = array($show_gui_configured_wms);
+ $t = array("s");
+ $res_fkey_show_gui_wms = db_prep_query($sql_fkey_show_gui_wms, $v, $t);
while($row = db_fetch_array($res_fkey_show_gui_wms)){
$fkey_show_gui_gui_id[$cnt_fkey_show_gui_wms] = $row["fkey_gui_id"];
$fkey_show_gui_wms_id[$cnt_fkey_show_gui_wms] = $row["fkey_wms_id"];
@@ -528,14 +559,18 @@
/*gui: get allocated wms-Abstract and wms-Capabilities from allocated gui ********************************************************************************************/
if(count($fkey_show_gui_wms_id)>0){
$sql_show_gui_wms = "SELECT DISTINCT wms_title, wms_abstract, wms_getcapabilities, wms_id, wms_version FROM wms WHERE wms_id IN (";
-
- for($i=0; $i<count($fkey_show_gui_wms_id); $i++){
- if($i>0){ $sql_show_gui_wms .= ",";}
- $sql_show_gui_wms .= "'".$fkey_show_gui_wms_id[$i]."'";
+ $v = $fkey_show_gui_wms_id;
+ $t = array();
+ for ($i = 1; $i <= count($fkey_show_gui_wms_id); $i++){
+ if ($i > 1) {
+ $sql_show_gui_wms .= ",";
+ }
+ $sql_show_gui_wms .= "$".$i;
+ array_push($t, "s");
}
$sql_show_gui_wms.= ") ORDER BY wms_title";
- $res_show_gui_wms = db_query($sql_show_gui_wms);
+ $res_show_gui_wms = db_prep_query($sql_show_gui_wms, $v, $t);
while($row = db_fetch_array($res_show_gui_wms)){
$gui_wms_id[$cnt_show_gui_wms] = $row["wms_id"];
$gui_wms_title[$cnt_show_gui_wms] = $row["wms_title"];
@@ -553,8 +588,10 @@
if ($cnt_show_gui_wms > 0){
/*get selected gui name for table caption ********************************************************************************************/
- $sql_gui_table = "SELECT * FROM gui WHERE gui_id ='".$show_gui_configured_wms."'";
- $res_gui_table = db_query($sql_gui_table);
+ $sql_gui_table = "SELECT * FROM gui WHERE gui_id = $1";
+ $v = array($show_gui_configured_wms);
+ $t = array("s");
+ $res_gui_table = db_prep_query($sql_gui_table, $v, $t);
while($row = db_fetch_array($res_gui_table)){
$gui_id_table[$cnt_gui_table] = $row["gui_id"];
$gui_name_table[$cnt_gui_table] = $row["gui_name"];
Modified: trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_addWMSfromfilteredListDB.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -63,9 +62,6 @@
// -->
</script>
<?php
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
include '../include/dyn_css.php';
?>
</head>
@@ -101,14 +97,18 @@
$arrayGuis=mb_getGUIs($logged_user_id);
$sql_gui = "SELECT * FROM gui WHERE gui_id IN (";
-
-for($i=0; $i<count($arrayGuis); $i++){
- if($i>0){ $sql_gui .= ",";}
- $sql_gui .= "'".$arrayGuis[$i]."'";
+$v = $arrayGuis;
+$t = array();
+for ($i = 1; $i <= count($arrayGuis); $i++){
+ if ($i > 1) {
+ $sql_gui .= ",";
+ }
+ $sql_gui .= "$" . $i;
+ array_push($t, "s");
}
$sql_gui.= ") ORDER BY gui_name";
-$res_gui = db_query($sql_gui);
+$res_gui = db_prep_query($sql_gui, $v, $t);
while($row = db_fetch_array($res_gui)){
$gui_id[$cnt_gui] = $row["gui_id"];
$gui_name[$cnt_gui] = $row["gui_name"];
@@ -120,14 +120,18 @@
/*get allocated wms from allocated gui ********************************************************************************************/
$sql_gui_wms = "SELECT DISTINCT fkey_wms_id, fkey_gui_id FROM gui_wms WHERE fkey_gui_id IN (";
-
-for($i=0; $i<count($arrayGuis); $i++){
- if($i>0){ $sql_gui_wms .= ",";}
- $sql_gui_wms .= "'".$arrayGuis[$i]."'";
+$v = $arrayGuis;
+$t = array();
+for ($i = 1; $i <= count($arrayGuis); $i++) {
+ if ($i > 1) {
+ $sql_gui_wms .= ",";
+ }
+ $sql_gui_wms .= "$".$i;
+ array_push($t, "s");
}
$sql_gui_wms.= ") ORDER BY fkey_wms_id";
-$res_gui_wms = db_query($sql_gui_wms);
+$res_gui_wms = db_prep_query($sql_gui_wms, $v, $t);
while($row = db_fetch_array($res_gui_wms)){
$fkey_gui_id[$cnt_gui_wms] = $row["fkey_gui_id"];
$fkey_wms_id[$cnt_gui_wms] = $row["fkey_wms_id"];
@@ -137,14 +141,18 @@
/*get allocated wms-Abstract and wms-Capabilities from allocated gui ********************************************************************************************/
$sql_wms = "SELECT DISTINCT wms_title, wms_abstract, wms_getcapabilities, wms_version FROM wms WHERE wms_id IN (";
-
-for($i=0; $i<count($fkey_wms_id); $i++){
- if($i>0){ $sql_wms .= ",";}
- $sql_wms .= "'".$fkey_wms_id[$i]."'";
+$v = $fkey_wms_id;
+$t = array();
+for ($i = 1; $i <= count($fkey_wms_id); $i++){
+ if ($i > 1) {
+ $sql_wms .= ",";
+ }
+ $sql_wms .= "$" . $i;
+ array_push($t, "s");
}
$sql_wms.= ") ORDER BY wms_title";
-$res_wms = db_query($sql_wms);
+$res_wms = db_prep_query($sql_wms, $v, $t);
while($row = db_fetch_array($res_wms)){
$wms_title[$cnt_wms] = $row["wms_title"];
$wms_abstract[$cnt_wms] = $row["wms_abstract"];
@@ -181,10 +189,12 @@
echo "<input type='button' class='wms_button' name='wms2' value='" . $selectOtherGuiText . "' onclick = 'mod_show_gui()'></td>";
/*get group gui WMS ********************************************************************************************/
- $sql_fkey_show_gui_wms = "SELECT DISTINCT fkey_wms_id, fkey_gui_id FROM gui_wms WHERE fkey_gui_id ='".$wms_show."'";
+ $sql_fkey_show_gui_wms = "SELECT DISTINCT fkey_wms_id, fkey_gui_id FROM gui_wms WHERE fkey_gui_id = $1";
#$sql_fkey_show_gui_wms.= ") ORDER BY fkey_wms_id";
- $res_fkey_show_gui_wms = db_query($sql_fkey_show_gui_wms);
+ $v = array($wms_show);
+ $t = array("s");
+ $res_fkey_show_gui_wms = db_prep_query($sql_fkey_show_gui_wms, $v, $t);
while($row = db_fetch_array($res_fkey_show_gui_wms)){
$fkey_show_gui_gui_id[$cnt_fkey_show_gui_wms] = $row["fkey_gui_id"];
$fkey_show_gui_wms_id[$cnt_fkey_show_gui_wms] = $row["fkey_wms_id"];
@@ -196,14 +206,18 @@
/*gui: get allocated wms-Abstract and wms-Capabilities from allocated gui ********************************************************************************************/
if(count($fkey_show_gui_wms_id)>0){
$sql_show_gui_wms = "SELECT DISTINCT wms_title, wms_abstract, wms_getcapabilities, wms_id, wms_version FROM wms WHERE wms_id IN (";
-
- for($i=0; $i<count($fkey_show_gui_wms_id); $i++){
- if($i>0){ $sql_show_gui_wms .= ",";}
- $sql_show_gui_wms .= "'".$fkey_show_gui_wms_id[$i]."'";
+ $v = $fkey_show_gui_wms_id;
+ $t = array();
+ for ($i = 1; $i <= count($fkey_show_gui_wms_id); $i++){
+ if ($i > 1) {
+ $sql_show_gui_wms .= ",";
+ }
+ $sql_show_gui_wms .= "$".$i;
+ array_push($t, "s");
}
$sql_show_gui_wms.= ") ORDER BY wms_title";
- $res_show_gui_wms = db_query($sql_show_gui_wms);
+ $res_show_gui_wms = db_prep_query($sql_show_gui_wms, $v, $t);
while($row = db_fetch_array($res_show_gui_wms)){
$gui_wms_id[$cnt_show_gui_wms] = $row["wms_id"];
$gui_wms_title[$cnt_show_gui_wms] = $row["wms_title"];
@@ -221,8 +235,10 @@
if ($cnt_show_gui_wms > 0){
/*get selected gui name for table caption ********************************************************************************************/
- $sql_gui_table = "SELECT * FROM gui WHERE gui_id ='".$wms_show."'";
- $res_gui_table = db_query($sql_gui_table);
+ $sql_gui_table = "SELECT * FROM gui WHERE gui_id = $1";
+ $v = array($wms_show);
+ $t = array("s");
+ $res_gui_table = db_prep_query($sql_gui_table, $v, $t);
while($row = db_fetch_array($res_gui_table)){
$gui_id_table[$cnt_gui_table] = $row["gui_id"];
$gui_name_table[$cnt_gui_table] = $row["gui_name"];
Modified: trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList_ajax.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList_ajax.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_addWMSfromfilteredList_ajax.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -53,7 +52,7 @@
<script type="text/javascript">
<!--
var global_source = "capabilities"; // "capabilities" || "db"
-var phpUrl = "../php/mod_addWMSfromfilteredList_server.php";
+var phpUrl = "../php/mod_addWMSfromfilteredList_server.php?<?php echo $urlParameters;?>";
// ----------------- Load service --------------------
Copied: trunk/mapbender/http/javascripts/mod_add_SLD.php (from rev 2404, branches/2.5/http/javascripts/mod_add_SLD.php)
===================================================================
--- trunk/mapbender/http/javascripts/mod_add_SLD.php (rev 0)
+++ trunk/mapbender/http/javascripts/mod_add_SLD.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -0,0 +1,64 @@
+<?php
+# $Id$
+# add SLD-Parameter parameters to MapRequest
+# http://www.mapbender.org/index.php/mod_add_vendorspecific.php
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+?>
+var sldURL = "";
+var mod_remove_layer_and_styles = "";
+var removeLayerAndStylesAffectedWMSTitle = "deegree wms";
+//var addSldAffectedWMSTitle = "deegree wms";
+//var sldLocationUrl = "http://wms1.ccgis.de/mapbender_dev/tmp/";
+
+var addSldAffectedWMSTitle = "Bonn Ergebnisse";
+var sldLocationUrl = "http://localhost/bonn_orlando_svn/http/tmp/";
+
+mod_remove_layer_and_styles += "if (sldURL != '' && (functionName == 'setMapRequest' || functionName == 'setSingleMapRequest') && mb_mapObj[i].wms[ii].wms_title == removeLayerAndStylesAffectedWMSTitle){";
+mod_remove_layer_and_styles += "newMapURL = newMapURL.replace(/LAYERS=[^&]*&/, '');";
+mod_remove_layer_and_styles += "newMapURL = newMapURL.replace(/STYLES=[^&]*&/, '');";
+mod_remove_layer_and_styles += "}";
+
+function mod_sld_init(wmsTitle, functionName) {
+ //alert(sldURL + ' ' + functionName );
+ if (sldURL != ''){
+ if (functionName == 'setMapRequest' || functionName == 'setSingleMapRequest') {
+ //Stadt Bonn: if (wmsTitle == 'deegree wms'){
+
+ if (wmsTitle == addSldAffectedWMSTitle){
+ return 'SLD=' + sldURL;
+ }
+ }
+ }
+
+ return "";
+}
+
+
+mb_registerVendorSpecific(mod_remove_layer_and_styles);
+mb_registerVendorSpecific("mod_sld_init(mb_mapObj[i].wms[ii].wms_title, functionName);");
+
+
+function mod_set_sld(sldString){
+ //console.debug("%s",sldString);
+ mb_ajax_post("../orlando/saveSLD.php", {'sld':sldString}, function (json, status) {
+ var result = eval('('+json+')');
+ sldURL = sldLocationUrl + result.filename;
+ zoom("mapframe1", true,0.9999);
+ });
+
+}
Modified: trunk/mapbender/http/javascripts/mod_add_vendorspecific.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_add_vendorspecific.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_add_vendorspecific.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,6 +18,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
mb_registerVendorSpecific("mod_vs_init()");
function mod_vs_init(){
Modified: trunk/mapbender/http/javascripts/mod_back.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_back.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_back.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,21 +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.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'back' 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_src = $row["e_src"];
- $e_target = mb_split(",",$row["e_target"]);
- $cnt++;
-}
-if($cnt > 1){ echo "alert('back: ID not unique!');";}
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
echo "var mod_back_map = '".$e_target[0]."';";
echo "var mod_back_overview = '".$e_target[1]."';";
Modified: trunk/mapbender/http/javascripts/mod_center1.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_center1.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_center1.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,24 +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");
-
-$gui_id = $_REQUEST["gui_id"];
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'center1' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('center1: ID not unique!');";}
-echo "var mod_center_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+echo "var mod_center_target = '".$e_target[0]."';";
?>
var mod_center_elName = "center1";
Modified: trunk/mapbender/http/javascripts/mod_coords.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_coords.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_coords.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,22 +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");
-
-$gui_id = $_REQUEST["gui_id"];
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'showCoords' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('showCoords ID not unique!');";}
-echo "var mod_showCoords_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "var mod_showCoords_target = '".$e_target[0]."';";
?>
var mod_showCoords_win = null;
Modified: trunk/mapbender/http/javascripts/mod_coords_div.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_coords_div.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_coords_div.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,23 +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.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$gui_id = $_REQUEST["gui_id"];
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'showCoords_div' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('showCoords_div ID not unique!');";}
-echo "var mod_showCoords_div_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+echo "var mod_showCoords_div_target = '".$e_target[0]."';";
?>
var mod_showCoords_div_win = null;
Modified: trunk/mapbender/http/javascripts/mod_copyright.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_copyright.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_copyright.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,23 +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");
-$e_id_css = 'copyright';
-$gui_id = $_REQUEST["gui_id"];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
include '../include/dyn_js.php';
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'copyright' 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('copyright: ID not unique!');";}
-echo "var mod_copyright_target = '".$e_target."';";
+echo "var mod_copyright_target = '".$e_target[0]."';";
?>
try{
if (mod_copyright_text){}
Modified: trunk/mapbender/http/javascripts/mod_dependentDiv.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dependentDiv.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_dependentDiv.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,24 +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");
-$e_id_css = 'dependentDiv';
-$gui_id = $_REQUEST["gui_id"];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
include '../include/dyn_js.php';
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'dependentDiv' 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('dependentDiv: ID not unique!');";}
-echo "var mod_dependentDiv_target = '".$e_target."';";
+echo "var mod_dependentDiv_target = '".$e_target[0]."';";
?>
try{
Modified: trunk/mapbender/http/javascripts/mod_dependentIframe.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dependentIframe.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_dependentIframe.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,21 +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.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'dependentIframe' 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('dependentIframe: ID not unique!');";}
-echo "var mod_dependentIframe_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "var mod_dependentIframe_target = '".$e_target[0]."';";
?>
mod_dependentIframe_offsetLeft = 10;
mod_dependentIframe_offsetTop = 10;
Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
-import_request_variables("PG");
-require_once("../php/mb_validateSession.php");
-require_once("../../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");
+
+$e_target = $_GET["e_target"];
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html>
<head>
<meta http-equiv="cache-control" content="no-cache">
@@ -40,25 +34,36 @@
<?php
$digitize_conf_filename = "digitize_default.conf";
include '../include/dyn_css.php';
+?>
+<script language='JavaScript'>
+//
+// Buttons
+//
+function addButtonDig(id, isOn, src, titleOff, titleOn, x, y) {
+ buttonDig_id.push(id);
+ buttonDig_on.push(isOn);
+ buttonDig_src.push(src);
+ buttonDig_title_off.push(titleOff);
+ buttonDig_title_on.push(titleOn);
+ buttonDig_x.push(x);
+ buttonDig_y.push(y);
+}
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'digitize' 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_src = $row["e_src"];
- $e_target = explode(",",$row["e_target"]);
- $cnt++;
+var buttonDig_imgdir = "../img/button_digitize/";
+var buttonDig_id = [];
+var buttonDig_on = [];
+var buttonDig_src = [];
+var buttonDig_title_off = [];
+var buttonDig_title_on = [];
+var buttonDig_x = [];
+var buttonDig_y = [];
+
+<?php
+echo "var mod_digitize_target = '".$e_target."';";
+$digitizeConfFilenameAndPath = dirname(__FILE__) . "/../../conf/" . $digitize_conf_filename;
+if ($digitize_conf_filename && file_exists($digitizeConfFilenameAndPath)) {
+ include($digitizeConfFilenameAndPath);
}
-if($cnt > 1) echo "alert('digitize_button: ID not unique!');";
-
-echo "<script language='JavaScript'>";
-echo "var mod_digitize_target = '".$e_target[0]."';";
-echo "var mod_digitize_frame = '".$e_target[1]."';";
-include("../../conf/" . $digitize_conf_filename);
?>
var wfsWindow;
@@ -91,6 +96,7 @@
var featureTypeElementFormId = "featureTypeElementForm";
try {if(mod_digitize_elName){}}catch(e) {mod_digitize_elName = "digitize";}
+try {if(nonTransactionalEditable){}}catch(e) {nonTransactionalEditable = false;}
function initializeDigitize () {
d = new parent.GeometryArray();
@@ -412,8 +418,9 @@
parent.mb_registerInitFunctions("window.frames['"+ mod_digitize_elName + "'].initialiseMeasure()");
parent.mb_registerInitFunctions("window.frames['"+ mod_digitize_elName + "'].getMessages()");
parent.mb_registerSubFunctions("window.frames['" + mod_digitize_elName + "'].updateExtent()");
+ try {if(spatialRequestResultToDigitize){}}catch(e) {spatialRequestResultToDigitize = 1;}
if(spatialRequestResultToDigitize==1){
- parent.mb_registerWfsReadSubFunctions(function(geom){parent.tab_open(mod_digitize_elName);parent.window.frames[mod_digitize_elName].appendGeometryArray(geom);});
+ parent.mb_registerWfsReadSubFunctions(function(geom){parent.tab_open(mod_digitize_elName);parent.window.frames[mod_digitize_elName].appendGeometryArray(geom);});
}
parent.mb_registerWfsWriteSubFunctions(function(){parent.zoom(mod_digitize_target, true, 0.999);});
}
@@ -488,6 +495,75 @@
}
}
+function updateButtons() {
+ for (var i = 0 ; i < buttonDig_id.length ; i ++) {
+ if (parseInt(buttonDig_on[i])==1) {
+ var currentButton = document.getElementById(buttonDig_id[i]);
+ var currentStatus = buttonDig_id[i].status;
+ var currentTitle = "";
+ switch (buttonDig_id[i]) {
+ case "Point":
+ if (currentStatus == 1) {
+ currentTitle = msgObj.buttonLabelPointOn;
+ }
+ else {
+ currentTitle = msgObj.buttonLabelPointOff;
+ }
+ break;
+ case "Line":
+ if (currentStatus == 1) {
+ currentTitle = msgObj.buttonLabelLineOn;
+ }
+ else {
+ currentTitle = msgObj.buttonLabelLineOff;
+ }
+ break;
+ case "Polygon":
+ if (currentStatus == 1) {
+ currentTitle = msgObj.buttonLabelPolygonOn;
+ }
+ else {
+ currentTitle = msgObj.buttonLabelPolygonOff;
+ }
+ break;
+ case "dragBasePoint":
+ if (currentStatus == 1) {
+ currentTitle = msgObj.buttonLabelMoveBasepointOn;
+ }
+ else {
+ currentTitle = msgObj.buttonLabelMoveBasepointOff;
+ }
+ break;
+ case "setBasePoint":
+ if (currentStatus == 1) {
+ currentTitle = msgObj.buttonLabelInsertBasepointOn;
+ }
+ else {
+ currentTitle = msgObj.buttonLabelInsertBasepointOff;
+ }
+ break;
+ case "delBasePoint":
+ if (currentStatus == 1) {
+ currentTitle = msgObj.buttonLabelDeleteBasepointOn;
+ }
+ else {
+ currentTitle = msgObj.buttonLabelDeleteBasepointOff;
+ }
+ break;
+ case "clear":
+ if (currentStatus == 1) {
+ currentTitle = msgObj.buttonLabelClearListOn;
+ }
+ else {
+ currentTitle = msgObj.buttonLabelClearListOff;
+ }
+ break;
+ }
+ currentButton.title = currentTitle;
+ }
+ }
+}
+
function initDigButton(ind, pos){
parent.mb_button[ind] = document.getElementById(buttonDig_id[pos]);
parent.mb_button[ind].img_over = buttonDig_imgdir + buttonDig_src[pos].replace(/_off/,"_over");
@@ -675,57 +751,89 @@
if (!nonTransactionalEditable) {
nonTransactionalHighlight.clean();
}
+ var smP = "";
+ smP += "<div class='t_img'>";
+ smP += "<img src='"+parent.mb_trans.src+"' width='"+mod_digitize_width+"' height='0'></div>";
+ smP += "<div class='t_img'>";
+ smP += "<img src='"+parent.mb_trans.src+"' width='0' height='"+mod_digitize_height+"'></div>";
+
+ if (!nonTransactionalEditable) {
+ nonTransactionalHighlight.clean();
+ }
var smPArray = [];
smPArray[smPArray.length] = "<div class='t_img'>"
+ "<img src='"+parent.mb_trans.src+"' width='"+mod_digitize_width+"' height='0'></div>"
+ "<div class='t_img'>"
+ "<img src='"+parent.mb_trans.src+"' width='0' height='"+mod_digitize_height+"'></div>";
+ var mapObj = parent.mb_mapObj[parent.getMapObjIndexByName(mod_digitize_target)];
+ var width = mapObj.width;
+ var height = mapObj.height;
+ var arrayBBox = mapObj.extent.split(",")
+ var minX = parseFloat(arrayBBox[0]);
+ var minY = parseFloat(arrayBBox[1]);
+ var maxX = parseFloat(arrayBBox[2]);
+ var maxY = parseFloat(arrayBBox[3]);
+ var cx = width/(maxX - minX);
+ var cy = height/(maxY - minY);
+ var isMoveOrInsertOrDelete = mod_digitizeEvent == button_move || mod_digitizeEvent == button_insert || mod_digitizeEvent == button_delete;
+ var minDist = 6;
+
for(var i=0, lenGeomArray = d.count(); i < lenGeomArray; i++){
var currentGeomArray = d.get(i);
-
+
if (!nonTransactionalEditable && !isTransactional(currentGeomArray)) {
nonTransactionalHighlight.add(currentGeomArray, nonTransactionalColor);
}
else {
for(var j=0, lenGeom = currentGeomArray.count(); j < lenGeom ; j++){
- var currentGeometry = d.getGeometry(i,j);
+ var currentGeometry = d.getGeometry(i,j);
+ var isPolygon = currentGeomArray.geomType == parent.geomType.polygon;
+ var isLine = currentGeomArray.geomType == parent.geomType.line;
+ var isComplete = currentGeometry.isComplete();
+ var lastPaintedPoint = false;
+
for(var k = 0, lenPoint = currentGeometry.count(); k < lenPoint; k++){
- var currentPoint = d.getPoint(i,j,k);
- var pos = parent.makeRealWorld2mapPos(mod_digitize_target, currentPoint.x, currentPoint.y);
+ var currentPoint = currentGeometry.get(k);
+ var currentPointMap = new Point(Math.round((currentPoint.x - minX)*cx), Math.round((maxY - currentPoint.y)*cy));
- if (!currentGeometry.isComplete() &&
- ( (k == 0 && currentGeomArray.geomType == parent.geomType.polygon) || (k == currentGeometry.count()-1 && currentGeomArray.geomType == parent.geomType.line))) {
- smPArray[smPArray.length] = "<div class='bp' style='top:"+
- (pos[1]-2)+"px;left:"+(pos[0]-2)+"px;z-index:"+
- digitizeTransactionalZIndex+";background-color:"+linepointColor+"'";
+ var isTooCloseToPrevious = lastPaintedPoint && (k > 0) && Math.abs(currentPointMap.x-lastPaintedPoint.x) <= minDist && Math.abs(currentPointMap.y-lastPaintedPoint.y) <= minDist;
+ if (!isTooCloseToPrevious) {
+ var currentPointIsVisible = currentPointMap.x > 0 && currentPointMap.x < width && currentPointMap.y > 0 && currentPointMap.y < height;
+ if (currentPointIsVisible) {
+ if (!isComplete && ((k == 0 && isPolygon) || (k == lenPoint-1 && isLine))) {
+ smPArray[smPArray.length] = "<div class='bp' style='top:"+
+ (currentPointMap.y-2)+"px;left:"+(currentPointMap.x-2)+"px;z-index:"+
+ digitizeTransactionalZIndex+";background-color:"+linepointColor+"'";
+ }
+ else {
+ smPArray[smPArray.length] = "<div class='bp' style='top:"+(currentPointMap.y-2)+"px;left:"+(currentPointMap.x-2)+"px;z-index:"+digitizeTransactionalZIndex+";'";
+ }
+ if(k==0 && isPolygon && !isComplete){
+ smPArray[smPArray.length] = " title='"+msgObj.closePolygon_title+"' ";
+ }
+ if(isMoveOrInsertOrDelete) {
+ smPArray[smPArray.length] = " onmouseover='parent.window.frames[\""+mod_digitize_elName+"\"].handleBasepoint(this,"+i+","+j+","+k+")' ;";
+ }
+ smPArray[smPArray.length] = "></div>";
+ lastPaintedPoint = currentPointMap;
+ }
+ if (k > 0) {
+ points = parent.calculateVisibleDash(currentPointMap, previousPointMap, width, height);
+ if (points != false) {
+ smPArray[smPArray.length] = evaluateDashes(points[0], points[1], i, j, k);
+ }
+ }
}
- else {
- smPArray[smPArray.length] = "<div class='bp' style='top:"+(pos[1]-2)+"px;left:"+(pos[0]-2)+"px;z-index:"+digitizeTransactionalZIndex+";'";
- }
- if(j==0 && currentGeomArray.geomType == parent.geomType.polygon && !currentGeometry.isComplete()){
- smPArray[smPArray.length] = " title='"+closePolygon_title+"' ";
- }
- if(mod_digitizeEvent == button_move || mod_digitizeEvent == button_insert || mod_digitizeEvent == button_delete) {
- smPArray[smPArray.length] = " onmouseover='parent.window.frames[\""+mod_digitize_elName+"\"].handleBasepoint(this,"+i+","+j+","+k+")' ;";
- }
- smPArray[smPArray.length] = "></div>";
+ var previousPointMap = currentPointMap;
}
- var mapObj = parent.mb_mapObj[parent.getMapObjIndexByName(mod_digitize_target)];
- for(var k = 1; k < currentGeometry.count(); k++){
- var p0 = parent.realToMap(mod_digitize_target, d.getPoint(i,j,k));
- var p1 = parent.realToMap(mod_digitize_target, d.getPoint(i,j,k-1));
- points = parent.calculateVisibleDash(p0, p1, mapObj.width, mapObj.height);
- if (points != false) {
- smPArray[smPArray.length] = evaluateDashes(points[0], points[1], i, j, k);
- }
- }
}
}
}
digitizeDivTag.write(smPArray.join(""));
}
+
function evaluateDashes(start, end, memberIndex, geomIndex, pointIndex){
var strArray = [];
var delta = new parent.Point(end.x - start.x, end.y - start.y);
@@ -1406,6 +1514,7 @@
function applyMessages() {
updateMeasureTag();
updateListOfGeometries();
+ updateButtons();
}
</script>
Modified: trunk/mapbender/http/javascripts/mod_displayWmc.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_displayWmc.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_displayWmc.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,34 +16,33 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-include_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-
- $wmc_id = $_GET["wmc_id"];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
- if ($wmc_id){
- require_once(dirname(__FILE__)."/../classes/class_administration.php");
- $admin = new administration();
- $wmc_gml = $admin->getWmcById($wmc_id);
+$wmc_id = $_GET["wmc_id"];
- if ($wmc_gml){
- //Display WMC
+if ($wmc_id){
+ require_once(dirname(__FILE__)."/../classes/class_administration.php");
+ $admin = new administration();
+ $wmc_gml = $admin->getWmcById($wmc_id);
+
+ if ($wmc_gml){
+ //Display WMC
// if "short open tags" is activated, the xml output is interpreted
- // as php, because the XML begins with "<?xml "
- if (ini_get("short_open_tag") == 1) {
- echo htmlentities($wmc_gml);
- $e = new mb_warning("'Allow short open tags' is 'On' in php.ini...you might want to turn it off to allow proper WMC display.'");
- }
- else {
- header("Content-type: application/xhtml+xml; charset=".CHARSET);
- echo $wmc_gml;
- }
+ // as php, because the XML begins with "<?xml "
+ if (ini_get("short_open_tag") == 1) {
+ echo htmlentities($wmc_gml);
+ $e = new mb_warning("'Allow short open tags' is 'On' in php.ini...you might want to turn it off to allow proper WMC display.'");
}
- else{
- echo "Invalid document!";
+ else {
+ header("Content-type: application/xhtml+xml; charset=".CHARSET);
+ echo $wmc_gml;
}
}
+ else{
+ echo "Invalid document!";
+ }
+}
?>
Modified: trunk/mapbender/http/javascripts/mod_dragMapSize.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dragMapSize.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_dragMapSize.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,24 +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.
-
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'dragMapSize' 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++;
-}
-echo "var mod_dragMapSize_target = '".$e_target."';";
-if($cnt > 1){
- echo "alert('dragMapSize: ID not unique!');";
-}
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "var mod_dragMapSize_target = '".$e_target[0]."';";
?>
var mod_dagMapSize_offset = 15;
var mod_dagMapSize_active = false;
Modified: trunk/mapbender/http/javascripts/mod_dynamicOverview.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_dynamicOverview.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_dynamicOverview.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,23 +18,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");
-$e_id_css = 'dynamicOverview';
-$gui_id = $_REQUEST["gui_id"];
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
include '../include/dyn_js.php';
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'dynamicOverview' 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('dynamicOverview: ID not unique!');";}
-echo "var mod_dynamicOverview_target = '".$e_target."';";
+echo "var mod_dynamicOverview_target = '".implode(",", $e_target)."';";
?>
/*
Modified: trunk/mapbender/http/javascripts/mod_embedded_legend.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_embedded_legend.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_embedded_legend.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,8 +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__)."/../../conf/mapbender.conf");
+
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -31,10 +31,6 @@
<title>Legend</title>
<?php
-$gui_id = $_SESSION["mb_user_gui"];
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
include_once '../include/dyn_css.php';
$sql = "SELECT DISTINCT e_target, e_width, e_height FROM gui_element WHERE e_id = 'legend_embedded' AND fkey_gui_id = $1";
Copied: trunk/mapbender/http/javascripts/mod_exportMapImage.php (from rev 2404, branches/2.5/http/javascripts/mod_exportMapImage.php)
===================================================================
--- trunk/mapbender/http/javascripts/mod_exportMapImage.php (rev 0)
+++ trunk/mapbender/http/javascripts/mod_exportMapImage.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -0,0 +1,166 @@
+<?php
+# $Id$
+# http://www.mapbender.org/ExportMapimage
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+require_once(dirname(__FILE__) . "/../php/mb_validatePermission.php");
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="cache-control" content="no-cache">
+<meta http-equiv="pragma" content="no-cache">
+<meta http-equiv="expires" content="0">
+<?php
+echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
+?>
+<title>Export Mapimage</title>
+<?php
+ include '../include/dyn_css.php';
+?>
+</head>
+<style type="text/css">
+<!--
+
+input{
+ width:50px;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
+div{
+ font-family : Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
+.imageformat{
+ width:50px;
+ font-family : Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ font-weight: bold;
+}
+
+-->
+</style>
+<?php
+
+
+
+echo "<script type='text/javascript'>";
+echo "var target = '".$_REQUEST["target"]."';";
+
+echo "</script>";
+?>
+<script type="text/javascript">
+
+
+// some defaults
+try{if (pngExport){}}catch(e){pngExport = 'true';}
+try{if (jpegExport){}}catch(e){jpegExport = 'true';}
+try{if (geotiffExport){}}catch(e){geotiffExport = 'true';}
+
+
+function generateExportOptions(){
+if (pngExport=='true'){
+ document.write('<tr><td><span class="imageformat"><input type="radio" name="imageformat" value="png">PNG</span></td></tr>');
+}
+if (jpegExport=='true'){
+ document.write('<tr><td><span class="imageformat"><input type="radio" name="imageformat" value="jpeg">JPEG / JPG</span></td></tr>');
+}
+if (geotiffExport=='true'){
+ document.write('<tr><td><span class="imageformat"><input type="radio" name="imageformat" value="geotiff">GeoTIFF</span></td></tr>');
+}
+
+
+
+}
+
+function exportMapimage(){
+
+ choosen = "";
+ len = document.form1.imageformat.length;
+
+ for (i = 0; i <len; i++) {
+ if (document.form1.imageformat[i].checked) {
+ choosen = document.form1.imageformat[i].value;
+ }
+ }
+
+ if (choosen == "") {
+ alert("Keine Wahl getroffen, per DEFAULT wird die Karte als PNG exportiert");
+ choosen = document.form1.imageformat[0].value;
+ }
+ else {
+ //alert(choosen)
+ }
+
+
+ var idx = window.opener.getMapObjIndexByName(target);
+
+
+ var wms_string = "";
+
+ for(var ii=0; ii<window.opener.mb_mapObj[idx].wms.length; ii++){
+
+
+ if (window.opener.mb_mapObj[idx].mapURL[ii] == false || typeof(window.opener.mb_mapObj[idx].mapURL[ii]) == 'undefined' || window.opener.mb_mapObj[idx].mapURL[ii] == 'undefined'){
+
+ //alert('Keine WMSe vorhanden.');
+ } else{
+
+ if (ii==0){
+ wms_string = window.opener.mb_mapObj[idx].mapURL[ii];
+ } else {
+ wms_string += "___"+window.opener.mb_mapObj[idx].mapURL[ii];
+ }
+ }
+ }
+ wms_string = encodeURIComponent(wms_string);
+ var myLocation = "../php/mod_exportMapImage_server.php?target="+target+"&imagetype="+choosen+"&wms_urls="+wms_string;
+ //mynewwin = window.open("../php/mod_exportMapImage_server.php?target="+target+"&imagetype="+choosen+"&wms_urls="+wms_string+"","exportMapImage","width=180, height=200, resizable=yes ");
+ document.location.href = myLocation;
+
+// alert('ImageExport done');
+// window.close();
+
+}
+
+function close_exportMapimage(){
+ window.close();
+}
+
+</script>
+<body>
+<form name='form1' method='POST' action='' target="_blank" onSubmit="return FormCheck()">
+<table border='0'>
+<div>Please select a format for the exported image!</div><br>
+
+<script type="text/javascript"> generateExportOptions();
+</script>
+
+<tr>
+<td> <br><br> </td>
+</tr>
+
+</table>
+<div id="buttons" align='right'>
+ <input type='button' name='expImg_ok' value="OK" onclick='exportMapimage();'>
+ <input type='button' name='expImg_close' value="Close" onclick='close_exportMapimage();'>
+</div>
+</form>
+</body>
+</html>
Modified: trunk/mapbender/http/javascripts/mod_export_image.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_export_image.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_export_image.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,9 +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.
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -52,8 +52,6 @@
/**********************************/
include(dirname(__FILE__)."/../../conf/print.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
$sql = "SELECT * from gui_element WHERE fkey_gui_id = '".$_SESSION["mb_user_gui"]."' AND e_id = $1";
$v = array($mb_module_id);
$t = array('s');
@@ -192,7 +190,7 @@
//disablePrinting();
//}
//else{
- // alert("Das Format ist noch nicht ausgewählt.");
+ // alert("Das Format ist noch nicht ausgew�hlt.");
//}
// window.opener.mod_back_set();
}
@@ -210,7 +208,7 @@
<table border='0'>
<tr>
<td class="text">
- Vergrößerungsfaktor
+ Vergr��erungsfaktor
</td>
</tr>
<tr>
Modified: trunk/mapbender/http/javascripts/mod_featureInfo.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_featureInfo.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_featureInfo.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,27 +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");
-
-$gui_id = $_REQUEST["gui_id"];
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'featureInfo1' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('featureInfo1: ID not unique!');";}
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
var mod_featureInfo_elName = "featureInfo1";
var mod_featureInfo_frameName = "";
-var mod_featureInfo_target = "<?php echo $e_target; ?>";
+var mod_featureInfo_target = "<?php echo $e_target[0]; ?>";
var mod_featureInfo_img_on = new Image(); mod_featureInfo_img_on.src = "<?php echo preg_replace("/_off/","_on",$e_src); ?>";
var mod_featureInfo_img_off = new Image(); mod_featureInfo_img_off.src ="<?php echo $e_src; ?>";
Modified: trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,26 +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");
-$gui_id = $_REQUEST["gui_id"];
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'featureInfoTunnel' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('featureInfoTunnel: ID not unique!');";}
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
var mod_featureInfoTunnel_elName = "featureInfoTunnel";
var mod_featureInfoTunnel_frameName = "";
-var mod_featureInfoTunnel_target = "<?php echo $e_target; ?>";
+var mod_featureInfoTunnel_target = "<?php echo $e_target[0]; ?>";
var mod_featureInfoTunnel_img_on = new Image(); mod_featureInfoTunnel_img_on.src = "<?php echo preg_replace("/_off/","_on",$e_src); ?>";
var mod_featureInfoTunnel_img_off = new Image(); mod_featureInfoTunnel_img_off.src ="<?php echo $e_src; ?>";
Copied: trunk/mapbender/http/javascripts/mod_fisheye.php (from rev 2404, branches/2.5/http/javascripts/mod_fisheye.php)
===================================================================
--- trunk/mapbender/http/javascripts/mod_fisheye.php (rev 0)
+++ trunk/mapbender/http/javascripts/mod_fisheye.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -0,0 +1,58 @@
+<?php
+# $Id$
+# http://www.mapbender.org/index.php/mod_center1.php
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+include(dirname(__FILE__)."/../include/dyn_js.php");
+?>
+
+var fisheyeElementArray = fisheyeElements.split(",");
+var fisheyeString = "#" + fisheyeElementArray.join(",#");
+
+eventInit.register(function() {
+ var $newOuterContainer = $('<div id="fisheyeOuter">');
+ var $newInnerContainer = $('<div class="fisheyeContainer">');
+ $(fisheyeString)
+ .attr('style', '')
+ .wrapAll($newOuterContainer)
+ .wrapAll($newInnerContainer)
+ .wrap('<a href="#" class="fisheyeItem">')
+ .each(function() {
+ //$( this ).before('<span>' + $( this ).attr('title') + '</span>');
+ $( this ).before('<span></span>');
+ })
+
+ $newOuterContainer.appendTo( '#<?php echo $e_id; ?>' );
+
+ $('#fisheyeOuter').Fisheye(
+ {
+ maxWidth: 32,
+ items: 'a',
+ itemsText: 'span',
+ container: '.fisheyeContainer',
+ itemWidth: 28,
+ proximity: 20,
+ halign : 'center',
+ valign : 'bottom'
+ }
+ );
+
+});
+
+
+
Modified: trunk/mapbender/http/javascripts/mod_forward.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_forward.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_forward.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,33 +17,18 @@
# 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");
-
-$gui_id = $_REQUEST["gui_id"];
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'forward' 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_src = $row["e_src"];
- $e_target = mb_split(",",$row["e_target"]);
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('forward: ID not unique!');";
-}
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
echo "var mod_forward_map = '".$e_target[0]."';";
echo "var mod_forward_overview = '".$e_target[1]."';";
?>
var mb_MapFutureObj = new Array();
-var mod_forward_img_off = new Image(); mod_forward_img_off.src = "<?php echo preg_replace("/_off_disabled/","_off",$e_src); ?>";
-var mod_forward_img_off_disabled = new Image(); mod_forward_img_off_disabled.src = "<?php echo $e_src; ?>";
-var mod_forward_img_over = new Image(); mod_forward_img_over.src = "<?php echo preg_replace("/_off_disabled/","_over",$e_src); ?>";
+var mod_forward_img_off = new Image();
+mod_forward_img_off.src = "<?php echo preg_replace("/_off_disabled/","_off",$e_src);?>";
+var mod_forward_img_off_disabled = new Image();
+mod_forward_img_off_disabled.src = "<?php echo $e_src; ?>";
+var mod_forward_img_over = new Image();
+mod_forward_img_over.src = "<?php echo preg_replace("/_off_disabled/","_over",$e_src);?>";
var mod_forward_img_previous = mod_forward_img_off_disabled.src;
var mod_forward_cnt = 0;
var mod_forward_hist_cnt = 0;
Modified: trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_gazetteerSQL_client.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,10 +1,5 @@
<?php
-session_start();
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-
-$e_id = $_REQUEST["elementID"];
-$e_target = explode(",", $_REQUEST["e_target"]);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: trunk/mapbender/http/javascripts/mod_getArea.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_getArea.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_getArea.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,23 +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");
-
-$gui_id = $_REQUEST["gui_id"];
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'getArea' 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('copyright: ID not unique!');";}
-echo "var mod_getArea_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "var mod_getArea_target = '".$e_target[0]."';";
?>
var mod_getArea_img = new Image();
mod_getArea_img.src = "../img/button_gray/getArea_off.gif";
Modified: trunk/mapbender/http/javascripts/mod_help.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_help.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_help.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,23 +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");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-$gui_id = $_REQUEST["gui_id"];
-
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'help' 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_src = $row["e_src"];
- $cnt++;
-}
-$e_id_css = 'help';
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
include(dirname(__FILE__)."/../include/dyn_js.php");
-if($cnt > 1){ echo "alert('help: ID not unique!');";}
?>
try{if(mod_help_color){}}catch(e){mod_help_color = '#cc33cc';}
try{if(mod_help_thickness){}}catch(e){mod_help_color = 3;}
Modified: trunk/mapbender/http/javascripts/mod_highlightPOI.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_highlightPOI.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_highlightPOI.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,33 +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.
-$gui_id = $_REQUEST["gui_id"];
-include("../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'highlightPOI' AND fkey_gui_id = $1";
-$v = array($gui_id);
-$t = array('s');
-$res = db_prep_query($sql, $v, $t);
-$cnt = 0;
+echo "var mod_highlightPOI_target = '".$e_target[0]."';";
-/* Mapbender version lower 2.4
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'highlightPOI' AND fkey_gui_id = '".$gui_id."'";
-$res = db_query($sql);
-$cnt = 0;
-*/
-
-while($row = db_fetch_array($res)){
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('highlightPOI: ID not unique!');";
-}
-echo "var mod_highlightPOI_target = '".$e_target."';";
-
-$e_id_css = 'highlightPOI';
include('../include/dyn_js.php');
?>
@@ -158,7 +135,4 @@
tagSource += "</div>";
}
writeTag(mod_highlightPOI_target, "permanent", tagSource);
-}
-
-
-
+}
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_home.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_home.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_home.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,7 +18,7 @@
?>
function mod_home_init(){
<?php
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
echo "var url = '".LOGIN."';";
echo "var name = '".urlencode($_SESSION["mb_user_name"])."';";
echo "var pw = '".$_SESSION["mb_user_password"]."';";
Modified: trunk/mapbender/http/javascripts/mod_horizTab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_horizTab.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_horizTab.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,8 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/********** Configuration*************************************************/
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
$tab_ids = array();
include(dirname(__FILE__)."/../include/dyn_php.php");
Modified: trunk/mapbender/http/javascripts/mod_initWmc.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_initWmc.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_initWmc.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,30 +1,19 @@
<?php
-session_start();
-$wmc_id = $_SESSION['mb_myWmc'];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../classes/class_wmc.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml.php");
+require_once(dirname(__FILE__) . "/../classes/class_administration.php");
+
+if ($_SESSION['mb_myWmc'] && $_SESSION['mb_myWmc_action'] &&
+ in_array($_SESSION['mb_myWmc_action'],
+ array("load", "merge", "append"))) {
+
+ $action = $_SESSION['mb_myWmc_action'];
+ $wmc_id = $_SESSION['mb_myWmc'];
+}
$user = $_SESSION['mb_user_id'];
$meetingPointId = $_SESSION['mb_myKml'];
-require_once("../classes/class_wmc.php");
-require_once("../classes/class_kml.php");
-require_once("../classes/class_administration.php");
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'initWmc' 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_src = $row["e_src"];
- $e_target = explode(",",$row["e_target"]);
- $cnt++;
-}
-if ($cnt > 1 || $cnt == 0){
- echo "alert('initWMC: ID not unique!');";
-}
-
$x = false;
$y = false;
$icon = false;
@@ -33,7 +22,6 @@
$adm = new administration();
-
//KML
if (isset($meetingPointId)) {
$sql = "SELECT * FROM mb_meetingpoint WHERE mb_meetingpoint_id = $1";
@@ -81,7 +69,7 @@
echo "wmc_id = '".$wmc_id."';";
$wmc = new wmc();
$wmc->createObjFromWMC_id($wmc_id);
- $js_wmc .= $wmc->createJsObjFromWMC("", $e_target[0], "load");
+ $js_wmc .= $wmc->createJsObjFromWMC("", $e_target[0], $action);
if (!empty($x) && !empty($y) && !empty($icon)) {
Modified: trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_insertKmlIntoDb.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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.
-include("../../conf/mapbender.conf");
-include("../classes/class_kml.php");
-session_start();
-$gui_id = $_REQUEST["gui_id"];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+include(dirname(__FILE__) . "/../classes/class_kml.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -39,12 +37,7 @@
<?php
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
-<title>MB2 - <?php echo $_REQUEST["gui_id"];?></title>
-<?php
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-?>
+<title>MB2 - <?php echo $gui_id;?></title>
</head>
<body>
<?php
Modified: trunk/mapbender/http/javascripts/mod_insertLayerPreviewIntoDb.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_insertLayerPreviewIntoDb.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_insertLayerPreviewIntoDb.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,12 +17,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
-include(dirname(__FILE__)."/../../conf/geoportal.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+#include(dirname(__FILE__)."/../../conf/geoportal.conf");
require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_connector.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
function savePreview($fileName, $fileContent) {
if (strlen($fileContent) > 0) {
@@ -46,12 +44,6 @@
return false;
}
-
-$gui_id = $_REQUEST["gui_id"];
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
if ($_POST["data"]) {
$d = explode("____", $_POST["data"]);
Modified: trunk/mapbender/http/javascripts/mod_key.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_key.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_key.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,21 +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");
-$gui_id = $_REQUEST["gui_id"];
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'keyHandler' 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('keyHandler: ID not unique!');";}
-echo "var mod_key_map = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "var mod_key_map = '".$e_target[0]."';";
$sql = "SELECT e_id,e_element FROM gui_element WHERE (e_element = 'body' or e_element = 'iframe') AND fkey_gui_id = $1 AND e_public = 1";
$v = array($gui_id);
Modified: trunk/mapbender/http/javascripts/mod_legend.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_legend.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_legend.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,11 +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.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-session_start();
-$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");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Modified: trunk/mapbender/http/javascripts/mod_loadKML.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_loadKML.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_loadKML.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,13 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_kml.php");
-$gui_id = $_REQUEST["gui_id"];
+echo "var loadKmlTarget = '".$e_target[0]."';\n";
-echo "var loadKmlTarget = '".$e_target."';\n";
-
?>
var kmlHasLoaded = new MapbenderEvent();
@@ -35,7 +33,7 @@
loadKmlImgOver.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
var mpbn_loadKml = function () {
- windowKml = window.open("../php/mb_listKMLs.php?<?php echo SID;?>","displayKml","width=500, height=600, scrollbars=yes, dependent=yes");
+ windowKml = window.open("../php/mb_listKMLs.php?<?php echo $urlParameters;?>","displayKml","width=500, height=600, scrollbars=yes, dependent=yes");
};
var mpbn_loadKmlInit = function (obj) {
Modified: trunk/mapbender/http/javascripts/mod_loadwmc.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_loadwmc.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_loadwmc.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,35 +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.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_wmc.php");
-$gui_id = $_REQUEST["gui_id"];
+include(dirname(__FILE__) . "/../include/dyn_js.php");
-$con = db_connect(DBSERVER, OWNER, PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'savewmc' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('loadwmc: ID not unique!');";
-}
-$e_id_css = "loadwmc";
-include("../include/dyn_js.php");
+echo "mod_loadwmc_target = '".$e_target[0]."';";
-echo "mod_loadwmc_target = '".$e_target."';";
-
/*
// this may be added at a later stage
if ($new_wmc == 1) {
- include("../generate_defaultWmc.php");
+ include(dirname(__FILE__) . "/../generate_defaultWmc.php");
$startup = true;
$e = new mb_notice("loadwmc: new wmc");
}
@@ -56,11 +38,11 @@
if ($gui_changed == 0) {
if ($_REQUEST['portal_services']) {
$e = new mb_notice("loadwmc: merging layers");
- include("../merge_layers.php");
+ include(dirname(__FILE__) . "/../merge_layers.php");
}
if ($_SESSION['GML']) {
$e = new mb_notice("loadwmc: merging bbox");
- include("../merge_bbox.php");
+ include(dirname(__FILE__) . "/../merge_bbox.php");
}
}
*/
Modified: trunk/mapbender/http/javascripts/mod_log.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_log.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_log.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,3 +1,6 @@
+<?php
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+?>
mb_registerInitFunctions("mb_log_init()");
function mb_log_init(){
mb_log = "mb_log_set";
@@ -4,6 +7,7 @@
}
try{if(logtype){}}catch(e){logtype="";}
function mb_log_set(req, time_client){
- mb_ajax_post('../php/mod_log.php'+"?<?php echo SID; ?>&gui_id=<?php echo $gui_id;?>&elementID=<?php echo $e_id;?>&req=" + escape(req)+ "&time_client=" + time_client, {req:req, time:time_client});
+ var url = '<?php echo $self; ?>&req=" + escape(req) + "&time_client=" + time_client;
+ mb_ajax_post(url, {req:req, time:time_client});
return true;
}
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_measure.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_measure.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_measure.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,25 +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");
-$gui_id = $_REQUEST["gui_id"];
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'measure' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('measure: ID not unique!');";
-}
-echo "var mod_measure_target = '".$e_target."';";
+echo "var mod_measure_target = '".$e_target[0]."';";
?>
var mod_measure_color1 = "white";
var mod_measure_color2 = "black";
Deleted: trunk/mapbender/http/javascripts/mod_measure4326.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_measure4326.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_measure4326.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,251 +0,0 @@
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/mod_measure.php
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-
-require_once("../../conf/mapbender.conf");
-
-$gui_id = $_REQUEST["gui_id"];
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'measure' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('measure: ID not unique!');";
-}
-echo "var mod_measure_target = '".$e_target."';";
-
-require_once("../extensions/jquery.js");
-$e_id_css = "measure";
-include '../include/dyn_js.php';
-?>
-
-var mod_measure_color1 = "white";
-var mod_measure_color2 = "black";
-var mod_measure_font = "Arial, Helvetica, sans-serif";
-var mod_measure_fontsize = "9px";
-var mod_measure_basepoint = "#8a2be2";
-var mod_measure_linepoint = "#ff00ff";
-var mod_measure_bg = "";
-var mod_measure_pgsql = true;
-
-var mod_measure_win = null;
-
-var mod_measure_elName = "measure";
-var mod_measure_frameName = "";
-var mod_measure_epsg;
-var mod_measure_width;
-var mod_measure_height;
-var dist = false;
-var mod_measure_RX = new Array();
-var mod_measure_RY = new Array();
-var mod_measure_Dist = new Array();
-var mod_measure_TotalDist = new Array();
-var mod_measureSubFunctions = new Array();
-
-var mod_measure_img_on = new Image(); mod_measure_img_on.src = "<?php echo preg_replace("/_off/","_on",$e_src); ?>";
-var mod_measure_img_off = new Image(); mod_measure_img_off.src = "<?php echo $e_src; ?>";
-var mod_measure_img_over = new Image(); mod_measure_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
-
-function init_mod_measure(ind){
- mb_button[ind] = document.getElementById(mod_measure_elName);
- mb_button[ind].img_over = mod_measure_img_over.src;
- mb_button[ind].img_on = mod_measure_img_on.src;
- mb_button[ind].img_off = mod_measure_img_off.src;
- mb_button[ind].status = 0;
- mb_button[ind].elName = mod_measure_elName;
- mb_button[ind].fName = mod_measure_frameName;
- mb_button[ind].go = new Function ("mod_measure_go()");
- mb_button[ind].stop = new Function ("mod_measure_disable()");
- var ind = getMapObjIndexByName(mod_measure_target);
- mod_measure_width = mb_mapObj[ind].width;
- mod_measure_height = mb_mapObj[ind].height;
- mod_measure_epsg = mb_mapObj[ind].epsg;
- mb_registerSubFunctions("drawDashedLine()");
- mb_registerPanSubElement("measuring");
-}
-function register_measureSubFunctions(stringFunction){
- mod_measureSubFunctions[mod_measureSubFunctions.length] = stringFunction;
-}
-function mod_measure_go(){
- var el = window.frames[mod_measure_target].document;
- el.onmousedown = mod_measure_start;
- //el.onmousemove = mod_measure_run;
- var measureSub = "";
- for(var i=0; i<mod_measureSubFunctions.length; i++){
- measureSub += eval(mod_measureSubFunctions[i]);
- }
- writeTag(mod_measure_target,"measure_sub",measureSub);
-}
-function mod_measure_disable(){
- var el = window.frames[mod_measure_target].document;
- el.onmousedown = null;
- el.onmousemove = null;
- writeTag(mod_measure_target,"measure_display","");
- writeTag(mod_measure_target,"measure_sub","");
-}
-function mod_measure_timeout(){
- var el = window.frames[mod_measure_target].document;
- el.onmousedown = null;
- el.ondblclick = null;
- el.onmousemove = null;
-}
-function mod_measure_disableTimeout(){
- var el = window.frames[mod_measure_target].document;
- el.onmousedown = mod_measure_start;
- //el.onmousemove = mod_measure_run;
-}
-function use_dist() {
- if(dist != false){
- mod_measure_Dist[mod_measure_Dist.length] = dist;
- var totalDist = mod_measure_TotalDist[mod_measure_TotalDist.length-1] + dist;
- mod_measure_TotalDist[mod_measure_TotalDist.length] = Math.round(totalDist * 100)/100;
-
- }
- drawDashedLine();
- dist = false;
-}
-function mod_measure_start(e){
- mb_getMousePos(e,mod_measure_target);
- var realWorldPos = my_makeClickPos2RealWorldPos(mod_measure_target,clickX,clickY);
-
- mod_measure_RX[mod_measure_RX.length] = realWorldPos[0];
- mod_measure_RY[mod_measure_RY.length] = realWorldPos[1];
-
- if(mod_measure_RX.length > 1){
-
- convert_coords(mod_measure_RX[mod_measure_RX.length-2],mod_measure_RY[mod_measure_RY.length-2],mod_measure_RX[mod_measure_RX.length-1],mod_measure_RY[mod_measure_RY.length-1],inputEPSG);
- }
- else{
- mod_measure_Dist[mod_measure_Dist.length] = 0;
- mod_measure_TotalDist[mod_measure_TotalDist.length] = 0;
- drawDashedLine();
- }
-}
-function drawDashedLine(){
- var str_mPoints = "<div style='position:absolute;left:0px;top:0px' ><img src='"+mb_trans.src+"' width='"+mod_measure_width+"' height='0'></div>";
- str_mPoints += "<div style='position:absolute;left:0px;top:0px' ><img src='"+mb_trans.src+"' width='0' height='"+mod_measure_height+"'></div>";
- for(var i=0; i<mod_measure_RX.length; i++){
- var pos = makeRealWorld2mapPos(mod_measure_target,mod_measure_RX[i],mod_measure_RY[i]);
- str_mPoints += "<div style='font-size:1px;position:absolute;top:"+(pos[1]-2)+"px;left:"+(pos[0]-2)+"px;width:4px;height:4px;background-color:"+mod_measure_basepoint+"'></div>";
- if(i>0){
- str_mPoints += "<div style='font-family:"+mod_measure_font+";font-size:"+mod_measure_fontsize+";color:"+mod_measure_color1+";";
- if(mod_measure_bg != ""){
- str_mPoints += "background-color:"+mod_measure_bg+";";
- }
- str_mPoints += "position:absolute;top:"+(pos[1] + 3)+"px;left:"+(pos[0]+3)+"px;z-index:20'>"+mod_measure_TotalDist[i]+"</div>";
- str_mPoints += "<div style='font-family:"+mod_measure_font+";font-size:"+mod_measure_fontsize+";color:"+mod_measure_color2+";position:absolute;top:"+(pos[1] + 4)+"px;left:"+(pos[0]+4)+"px;z-index:21'>"+mod_measure_TotalDist[i]+"</div>";
- }
- }
- if(mod_measure_RX.length>1){
- for(var k=1; k<mod_measure_RX.length; k++){
- var pos0 = makeRealWorld2mapPos(mod_measure_target,mod_measure_RX[k], mod_measure_RY[k]);
- var pos1 = makeRealWorld2mapPos(mod_measure_target,mod_measure_RX[k-1], mod_measure_RY[k-1]);
-
- str_mPoints += evaluateDashes(pos1[0],pos1[1],pos0[0],pos0[1],k);
- }
- }
- writeTag(mod_measure_target,"measuring",str_mPoints);
-}
-function evaluateDashes(x1,y1,x2,y2,count){
- var str_dashedLine = "";
- var s = 10;
- var d = Math.sqrt(Math.pow((y1-y2),2) + Math.pow((x1-x2),2)) ;
- var n = Math.round(d/s);
- var s_x = (x2 - x1)/n;
- var s_y = (y2 - y1)/n;
- for(var i=1; i<n; i++){
- var x = Math.round(x1 + i * s_x)-2;
- var y = Math.round(y1 + i * s_y)-2;
- if(x >= 0 && x <= mod_measure_width && y >= 0 && y <= mod_measure_height){
- str_dashedLine += "<div style='font-size:1px;position:absolute;top:"+y+"px;left:"+x+"px;width:4px;height:4px;background-color:"+mod_measure_linepoint+"'></div>";
- }
- }
- str_dashedLine += "<div style='font-family:"+mod_measure_font+";font-size:"+mod_measure_fontsize+";color:"+mod_measure_color1+";";
- if(mod_measure_bg != ""){
- str_dashedLine += "background-color:"+mod_measure_bg+";";
- }
- str_dashedLine += "position:absolute;top:"+(Math.round(y1 + (y2-y1)/2 +3))+"px;left:"+(Math.round(x1 + (x2-x1)/2 +3))+"px'>"+mod_measure_Dist[count]+"</div>";
- str_dashedLine += "<div style='font-family:"+mod_measure_font+";font-size:"+mod_measure_fontsize+";color:"+mod_measure_color2+";position:absolute;top:"+(Math.round(y1 + (y2-y1)/2 + 4))+"px;left:"+(Math.round(x1 + (x2-x1)/2+4))+"px'>"+mod_measure_Dist[count]+"</div>";
- return str_dashedLine;
-}
-function mod_measure_close(){
- if(mod_measure_RX.length < 3 || (mod_measure_RX[mod_measure_RX.length-1] == mod_measure_RX[0] && mod_measure_RY[mod_measure_RY.length-1] == mod_measure_RY[0])){return;}
- mod_measure_RX[mod_measure_RX.length] = mod_measure_RX[0];
- mod_measure_RY[mod_measure_RY.length] = mod_measure_RY[0];
- if(mod_measure_RX.length > 1){
- // circumference
- convert_coords(mod_measure_RX[mod_measure_RX.length-2],mod_measure_RY[mod_measure_RY.length-2],mod_measure_RX[mod_measure_RX.length-1],mod_measure_RY[mod_measure_RY.length-1],inputEPSG);
- }
- else{
- mod_measure_Dist[mod_measure_Dist.length] = 0;
- mod_measure_TotalDist[mod_measure_TotalDist.length] = 0;
- drawDashedLine();
- }
-}
-function mod_measure_delete(){
- mod_measure_RX = new Array();
- mod_measure_RY = new Array();
- mod_measure_Dist = new Array();
- mod_measure_TotalDist = new Array();
- dist = false;
- writeTag(mod_measure_target,"measuring","");
- writeTag(mod_measure_target,"measure_display","");
-}
-function my_makeClickPos2RealWorldPos(frameName, myClickX, myClickY) {
- var ind = getMapObjIndexByName(frameName);
- var width = parseInt(mb_mapObj[ind].width);
- var height = parseInt(mb_mapObj[ind].height);
- var arrayBBox = mb_mapObj[ind].extent.split(",");
- var minX = parseFloat(arrayBBox[0]);
- var minY = parseFloat(arrayBBox[1]);
- var maxX = parseFloat(arrayBBox[2]);
- var maxY = parseFloat(arrayBBox[3]);
- var xtentx = maxX - minX;
- var xtenty = maxY - minY;
- var posX = parseFloat(minX + (myClickX / width) * xtentx);
- var posY = parseFloat(maxY - (myClickY / height) * xtenty);
- return new Array(posX, posY);
-}
-function convert_coords(x1,y1,x2,y2,inputEPSG){
-
- $.post(
- // zielurl
- '../javascripts/transform_coordinatesWGS84.php',
- // parameter fuer diese datei
- {
- 'x1' : x1,
- 'y1' : y1,
- 'x2' : x2,
- 'y2' : y2,
- 'inputEPSG' : inputEPSG
- },
- // callback function
- function(xml){
- dist = Math.round(parseFloat(xml));
- use_dist();
- }
- );
-}
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_navFrame.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_navFrame.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_navFrame.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,26 +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.
-
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
include '../include/dyn_js.php';
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target,e_src FROM gui_element WHERE e_id = 'navFrame' 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++;
-}
-echo "var mod_navFrame_target = '".$e_target."';";
-if($cnt > 1){
- echo "alert('navFrame: ID not unique!');";
-}
-echo "var mod_navFrame_src = '".db_result($res,0,"e_src")."';";
+echo "var mod_navFrame_target = '".$e_target[0]."';";
+echo "var mod_navFrame_src = '".$e_src."';";
?>
try{
Modified: trunk/mapbender/http/javascripts/mod_owsproxy.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_owsproxy.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_owsproxy.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,8 +16,6 @@
# 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(dirname(__FILE__)."/../../conf/mapbender.conf");
-session_start();
include(dirname(__FILE__)."/../php/mb_validateSession.php");
include(dirname(__FILE__)."/../classes/class_administration.php");
Modified: trunk/mapbender/http/javascripts/mod_pan.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_pan.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_pan.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,24 +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.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'pan1' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('pan1: ID not unique!');";
-}
-echo "var mod_pan_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "var mod_pan_target = '".$e_target[0]."';";
?>
var mod_pan_elName = "pan1";
var mod_pan_frameName = "";
Modified: trunk/mapbender/http/javascripts/mod_perimeter.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_perimeter.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_perimeter.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,30 +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");
-
-$gui_id = $_REQUEST["gui_id"];
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'perimeter' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('perimeter: ID not unique!');";
-}
-$e_id_css = 'perimeter';
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
include(dirname(__FILE__).'/../include/dyn_js.php');
?>
-var mod_perimeter_target = "<?php echo $e_target; ?>";
+var mod_perimeter_target = "<?php echo $e_target[0]; ?>";
mb_registerInitFunctions("mod_perimeter_prepare()");
mb_registerSubFunctions("mod_perimeter_draw()");
mb_registerPanSubElement("perimeter");
Modified: trunk/mapbender/http/javascripts/mod_poi.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_poi.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_poi.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,9 +1,5 @@
<?php
-require_once("../../conf/mapbender.conf");
-session_start();
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -17,9 +13,7 @@
<meta name="DC.Rights" content="CCGIS GbR, Bonn">
<title>Suche</title>
<?
- $gui_id = $_SESSION["mb_user_gui"];
- $e_id_css = 'poi';
- include_once("../include/dyn_css.php");
+ include_once(dirname(__FILE__) . "/../include/dyn_css.php");
?>
<style type="text/css">
<!--
@@ -100,7 +94,7 @@
$lingo = $_REQUEST["lingo"];
$title = "layername_".$lingo;
-require_once("../../conf/".$_REQUEST["conf_file"]);
+require_once(dirname(__FILE__) . "/../../conf/".$_REQUEST["conf_file"]);
echo "</script>";
?>
Modified: trunk/mapbender/http/javascripts/mod_print1.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_print1.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_print1.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,9 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
include(dirname(__FILE__)."/../../conf/print.conf");
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -52,8 +51,6 @@
$mb_module_id = "print1";
/**********************************/
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
$sql = "SELECT * from gui_element WHERE fkey_gui_id = '".$_SESSION["mb_user_gui"]."' AND e_id = $1";
$v = array($mb_module_id);
$t = array('s');
@@ -193,7 +190,7 @@
disablePrinting();
}
else{
- alert("Das Format ist noch nicht ausgewählt.");
+ alert("Das Format ist noch nicht ausgew�hlt.");
}
window.opener.mod_back_set();
}
Copied: trunk/mapbender/http/javascripts/mod_reload.php (from rev 2404, branches/2.5/http/javascripts/mod_reload.php)
===================================================================
--- trunk/mapbender/http/javascripts/mod_reload.php (rev 0)
+++ trunk/mapbender/http/javascripts/mod_reload.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -0,0 +1,40 @@
+<?php
+# $Id$
+# http://www.mapbender.org/index.php/reload
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+?>
+var mod_reload_img = new Image();
+mod_reload_img.src = "<?php echo $e_src; ?>";
+var mod_reload_img_over = new Image();
+mod_reload_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+
+function mod_reload(){
+ location.reload();
+}
+function mod_reload_init(obj){
+ document.getElementById("reload").src = mod_reload_img_over.src;
+ obj.onmouseover = new Function("mod_reload_over()");
+ obj.onmouseout = new Function("mod_reload_out()");
+}
+function mod_reload_over(){
+ document.getElementById("reload").src = mod_reload_img_over.src;
+}
+function mod_reload_out(){
+ document.getElementById("reload").src = mod_reload_img.src;
+}
Modified: trunk/mapbender/http/javascripts/mod_renderGML.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_renderGML.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_renderGML.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,21 +16,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__)."/../../conf/geoportal.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_gml2.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-$gui_id = $_SESSION["mb_user_gui"];
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'renderGML' AND fkey_gui_id = $1 LIMIT 1";
-$v = array($gui_id);
-$t = array('s');
-$res = db_prep_query($sql, $v, $t);
-$row = db_fetch_array($res);
-$e_target = explode(",",$row[0]);
-
$gml_string = $_SESSION["GML"];
if ($gml_string) {
@@ -59,7 +47,4 @@
else {
$e = new mb_notice("renderGML: no GML.");
}
-
-
-
?>
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_repaint.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_repaint.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_repaint.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,29 +17,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'repaint' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('repaint: ID not unique!');";
-}
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
-var mod_repaint_img = new Image(); mod_repaint_img.src = "<?php echo $e_src; ?>";
-var mod_repaint_img_over = new Image(); mod_repaint_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+var mod_repaint_img = new Image();
+mod_repaint_img.src = "<?php echo $e_src; ?>";
+var mod_repaint_img_over = new Image();
+mod_repaint_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
function mod_repaint(){
- zoom("<?php echo $e_target; ?>", true,0.999);
+ zoom("<?php echo $e_target[0]; ?>", true,0.999);
}
function mod_repaint_init(obj){
document.getElementById("repaint").src = mod_repaint_img_over.src;
Modified: trunk/mapbender/http/javascripts/mod_resize_mapsize.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_resize_mapsize.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_resize_mapsize.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,5 +1,5 @@
<?php
-# $Id$
+# $Id:mod_resize_mapsize.php 1964 2008-01-15 08:11:29Z christoph $
# http://www.mapbender.org/index.php/ResizeMapsize
# Created on 12.07.2006/07:32:08
# Copyright (C) 2002 CCGIS
@@ -20,14 +20,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");
-$gui_id = $_REQUEST["gui_id"];
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+include(dirname(__FILE__) . "/../include/dyn_js.php");
-$e_id_css = "resizeMapsize";
-include("../include/dyn_js.php");
-
$sqltarget = "SELECT e_target FROM gui_element WHERE e_id = 'resizeMapsize' AND fkey_gui_id = $1";
$v = array($gui_id);
$t = array('s');
@@ -126,5 +121,7 @@
}
}
if (resize_option == 'auto'){
- window.setTimeout('control()', 3000);
+ eventInit.register(function() {
+ control();
+ });
}
Modified: trunk/mapbender/http/javascripts/mod_sandclock.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_sandclock.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_sandclock.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,24 +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.
-
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'sandclock' 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('sandclock: ID not unique!');";
-}
-echo "var mod_sandclock_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "var mod_sandclock_target = '".$e_target[0]."';";
include '../include/dyn_js.php';
?>
try{
Modified: trunk/mapbender/http/javascripts/mod_sandclock2.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_sandclock2.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_sandclock2.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,24 +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.
-
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'sandclock2' AND fkey_gui_id = $1";
-$v = array($gui_id);
-$t = array('s');
-$res = db_query($sql, $v, $t);
-$cnt = 0;
-while($row = db_fetch_array($res)){
- $e_target = db_result($res,0,"e_target");
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('sandclock2: ID not unique!');";
-}
-echo "var mod_sandclock_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "var mod_sandclock_target = '".$e_target[0]."';";
?>
var mod_sandclock_maxWait = 1000 * 60;
var mod_sandclock_minWait = 1000 * 0;
Modified: trunk/mapbender/http/javascripts/mod_saveLayerPreview.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_saveLayerPreview.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_saveLayerPreview.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,29 +17,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+include(dirname(__FILE__) . "/../include/dyn_js.php");
-$gui_id = $_REQUEST["gui_id"];
-require_once("../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'savewmc' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('savewmc: ID not unique!');";
-}
-
-$e_id_css = "saveLayerPreview";
-include("../include/dyn_js.php");
-
-echo "mod_savewmc_target = '".$e_target."';";
+echo "mod_savewmc_target = '".$e_target[0]."';";
?>
var mod_saveLayerPreview_img = new Image(); mod_saveLayerPreview_img.src = "<?php echo $e_src; ?>";
Modified: trunk/mapbender/http/javascripts/mod_saveWmcKml.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_saveWmcKml.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_saveWmcKml.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,27 +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();
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/mod_savewmc.php");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'savewmc' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('savewmc: ID not unique!');";
-}
-
-echo "mod_savewmc_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "mod_savewmc_target = '".$e_target[0]."';";
?>
var mod_savewmc_img = new Image(); mod_savewmc_img.src = "<?php echo $e_src; ?>";
Modified: trunk/mapbender/http/javascripts/mod_savewmc.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_savewmc.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_savewmc.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,28 +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.
-$gui_id = $_REQUEST["gui_id"];
-require_once("../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'savewmc' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('savewmc: ID not unique!');";
-}
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+include(dirname(__FILE__) . "/../include/dyn_js.php");
-$e_id_css = "savewmc";
-include("../include/dyn_js.php");
-
-echo "mod_savewmc_target = '".$e_target."';";
+echo "mod_savewmc_target = '".$e_target[0]."';";
?>
function setOnUnload() {
if (ie) {
@@ -55,7 +37,8 @@
mb_registerInitFunctions('setOnUnload()');
}
-var mod_savewmc_img = new Image(); mod_savewmc_img.src = "<?php echo $e_src; ?>";
+var mod_savewmc_img = new Image();
+mod_savewmc_img.src = "<?php echo $e_src; ?>";
//var mod_savewmc_img_over = new Image(); mod_savewmc_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
function mod_savewmc_session(){
Modified: trunk/mapbender/http/javascripts/mod_scaleHint.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_scaleHint.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_scaleHint.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,29 +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.
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'setScaleHint' 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('mod_scaleHint: ID not unique!');";
-}
-$params = mb_split(",",$e_target);
+echo "var mod_scaleHint_target = '".$e_target[0]."';";
+echo "var mod_scaleHint_min = '".$e_target[1]."';";
+echo "var mod_scaleHint_max = '".$e_target[2]."';";
-echo "var mod_scaleHint_target = '".$params[0]."';";
-echo "var mod_scaleHint_min = '".$params[1]."';";
-echo "var mod_scaleHint_max = '".$params[2]."';";
-
?>
mb_registerPreFunctions("mod_scaleHint_init(frameName)");
Modified: trunk/mapbender/http/javascripts/mod_scaleSel.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_scaleSel.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_scaleSel.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,23 +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.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'scaleSelect' 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++;
-}
-echo "var mod_scaleSelect_target = '".$e_target."';";
-if($cnt > 1){
- echo "alert('scaleSelect: ID not unique!');";
-}
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+echo "var mod_scaleSelect_target = '".$e_target[0]."';";
?>
mb_registerSubFunctions("mod_scaleSelect_val(frameName)");
function mod_scaleSelect(obj){
Modified: trunk/mapbender/http/javascripts/mod_scaleText.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_scaleText.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_scaleText.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,23 +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.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'scaleText' 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++;
-}
-echo "var mod_scaleText_target = '".$e_target."';";
-if($cnt > 1){
- echo "alert('scaleSelect: ID not unique!');";
-}
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+echo "var mod_scaleText_target = '".$e_target[0]."';";
?>
function mod_scaleText(){
mod_scaleText_val(mod_scaleText_target);
Modified: trunk/mapbender/http/javascripts/mod_scalebar.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_scalebar.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_scalebar.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,23 +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.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'scalebar' 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('scalebar: ID not unique!');";
-}
-echo "var mod_scalebar_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+echo "var mod_scalebar_target = '".$e_target[0]."';";
?>
var mod_scalebar_left = 5;
Modified: trunk/mapbender/http/javascripts/mod_selArea.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_selArea.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_selArea.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,31 +17,18 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'selArea1' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('selArea1: ID not unique!');";
-}
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
var mod_selArea_elName = "selArea1";
var mod_selArea_frameName = "";
-var mod_selArea_target = "<?php echo $e_target; ?>";
+var mod_selArea_target = "<?php echo $e_target[0]; ?>";
-var mod_selArea_img_on = new Image(); mod_selArea_img_on.src = "<?php echo preg_replace("/_off/","_on",$e_src); ?>";
-var mod_selArea_img_off = new Image(); mod_selArea_img_off.src = "<?php echo $e_src; ?>";
-var mod_selArea_img_over = new Image(); mod_selArea_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+var mod_selArea_img_on = new Image();
+mod_selArea_img_on.src = "<?php echo preg_replace("/_off/","_on",$e_src); ?>";
+var mod_selArea_img_off = new Image();
+mod_selArea_img_off.src = "<?php echo $e_src; ?>";
+var mod_selArea_img_over = new Image();
+mod_selArea_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
function init_selArea1(ind){
mb_button[ind] = document.getElementById(mod_selArea_elName);
Modified: trunk/mapbender/http/javascripts/mod_selArea1.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_selArea1.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_selArea1.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,32 +17,18 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'selArea1' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('selArea1: ID not unique!');";
-}
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
var mod_selArea_elName = "selArea1";
var mod_selArea_frameName = "";
-var mod_selArea_target = "<?php echo $e_target; ?>";
+var mod_selArea_target = "<?php echo $e_target[0]; ?>";
-var mod_selArea_img_on = new Image(); mod_selArea_img_on.src = "<?php echo preg_replace("/_off/","_on",$e_src); ?>";
-var mod_selArea_img_off = new Image(); mod_selArea_img_off.src = "<?php echo $e_src; ?>";
-var mod_selArea_img_over = new Image(); mod_selArea_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+var mod_selArea_img_on = new Image();
+mod_selArea_img_on.src = "<?php echo preg_replace("/_off/","_on",$e_src); ?>";
+var mod_selArea_img_off = new Image();
+mod_selArea_img_off.src = "<?php echo $e_src; ?>";
+var mod_selArea_img_over = new Image();
+mod_selArea_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
function init_selArea1(ind){
mb_button[ind] = document.getElementById(mod_selArea_elName);
Modified: trunk/mapbender/http/javascripts/mod_selectMapsize.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_selectMapsize.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_selectMapsize.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,23 +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.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'selectMapsize' 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('selectMapsize: ID not unique!');";
-}
-echo "var mod_selectMapsize_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+echo "var mod_selectMapsize_target = '".$e_target[0]."';";
?>
function mod_selectMapsize(obj){
Modified: trunk/mapbender/http/javascripts/mod_setBBOX1.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_setBBOX1.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_setBBOX1.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,23 +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.
-$gui_id = $_REQUEST["gui_id"];
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'setBBOX' 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('setBBOX: ID not unique!');";
-}
-echo "var mod_setBBOX_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+echo "var mod_setBBOX_target = '".$e_target[0]."';";
?>
mb_registerInitFunctions("mod_setBBOX_init()");
function mod_setBBOX_init(){
Modified: trunk/mapbender/http/javascripts/mod_setBackground.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_setBackground.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_setBackground.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,23 +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.
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'setBackground' 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('setBackground: ID not unique!');";
-}
-
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
if(isset($_REQUEST["wms"])){
$wms = $_REQUEST["wms"];
}
@@ -41,7 +25,7 @@
$wms = 0;
}
echo "var mod_setBackground_wms = ".$wms.";";
-echo "var mod_setBackground_target = '".$e_target."';";
+echo "var mod_setBackground_target = '".$e_target[0]."';";
?>
mb_registerInitFunctions("mod_setBackground_init()");
var mod_setBackground_active = false;
Modified: trunk/mapbender/http/javascripts/mod_setBackground_all.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_setBackground_all.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_setBackground_all.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,23 +18,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'setBackground_all' 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('setBackground_all: ID not unique!');";}
-
-echo "var mod_setBackground_all_target = '".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+echo "var mod_setBackground_all_target = '".$e_target[0]."';";
?>
var mod_setBackground_all_wms = new Array();
Modified: trunk/mapbender/http/javascripts/mod_setPOI2Scale.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_setPOI2Scale.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_setPOI2Scale.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,25 +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.
-$gui_id = $_REQUEST["gui_id"];
-include("../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'setPOI2Scale' AND fkey_gui_id = '".$gui_id."'";
-$res = db_query($sql);
-$cnt = 0;
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+echo "var mod_setPOI2Scale_target = '".$e_target[0]."';";
+include(dirname(__FILE__) . "/../include/dyn_js.php");
-while($row = db_fetch_array($res)){
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){
- echo "alert('setPOI2SCale: ID not unique!');";
-}
-echo "var mod_setPOI2Scale_target = '".$e_target."';";
-$e_id_css = 'setPOI2Scale';
-include("../include/dyn_js.php");
-
?>
try{
Modified: trunk/mapbender/http/javascripts/mod_setTimeout.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_setTimeout.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_setTimeout.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,10 +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.
-session_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$e_id_css = 'timeout';
-$gui_id = $_REQUEST["gui_id"];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
include '../include/dyn_js.php';
?>
Modified: trunk/mapbender/http/javascripts/mod_state.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_state.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_state.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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(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);
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<HTML>
<?php
Copied: trunk/mapbender/http/javascripts/mod_switchLocale_noreload.php (from rev 2404, branches/2.5/http/javascripts/mod_switchLocale_noreload.php)
===================================================================
--- trunk/mapbender/http/javascripts/mod_switchLocale_noreload.php (rev 0)
+++ trunk/mapbender/http/javascripts/mod_switchLocale_noreload.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -0,0 +1,54 @@
+<?php
+# $Id$
+# http://www.mapbender.org/index.php/localeSwitch
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_locale.php");
+
+include(dirname(__FILE__) . "/../include/dyn_js.php");
+
+if (!USE_I18N) {
+ echo "var languages = '" . $_SESSION["mb_lang"] . "';";
+}
+?>
+
+function validate_locale(){
+ var index = document.getElementById("language").selectedIndex;
+ var lang = document.getElementById("language").options[index].value;
+ mb_ajax_post("../php/mod_setLocale.php", {"lang":lang}, function(result, status) {
+ mapbender.locale = result;
+ localize();
+ });
+}
+
+eventInit.register(function () {
+ var localeSelectNode = document.getElementById('language');
+ var languageArray = languages.split(",");
+ var selected = false;
+ for (var i = 0; i < languageArray.length; i++) {
+ if (languageArray[i] == '<?php echo $_SESSION["mb_lang"];?>') {
+ selected = true;
+ }
+ else {
+ selected = false;
+ }
+
+ var currentOption = new Option(languageArray[i], languageArray[i], selected, selected);
+ localeSelectNode.options[i] = currentOption;
+ }
+});
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_tab.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_tab.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_tab.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -9,7 +9,7 @@
}
}
catch(e){
- var e = new Mb_warning("mod_tab.js: tab_init: open_tab is not set.");
+ var z = new Mb_warning("mod_tab.js: tab_init: open_tab is not set.");
open_tab = "";
}
@@ -17,6 +17,21 @@
mb_registerInitFunctions('tab_init()');
+
+eventLocalize.register(function () {
+ localizeTabs();
+});
+
+eventInit.register(function () {
+ localizeTabs();
+});
+
+function localizeTabs() {
+ mb_ajax_json("../php/mod_tab_messages.php", function(obj, status){
+ tabs.setTitles(obj);
+ });
+}
+
function tab_init(){
var obj = document.getElementById("tabs").style;
@@ -82,12 +97,13 @@
if (top.ie) {
node.onclick = function() {
- var x = new Function ("", "tabs.toggleTab('"+that.module+"');");
- x();
+ tabs.toggleTab(that.module);
};
}
else {
- node.setAttribute("onclick", "tabs.toggleTab('"+that.module+"');");
+ node.onclick = function(){
+ tabs.toggleTab(that.module);
+ };
}
// tab header
@@ -175,7 +191,7 @@
var currentNode = this.get(i).getNode();
// parseInt removes "px"
- var currentTop = parseInt(currentNode.style.top);
+ var currentTop = parseInt(currentNode.style.top, 10);
currentNode.style.top = currentTop - tabHeight;
}
}
@@ -190,7 +206,7 @@
// if no tab is currently opening or closing
if (isAnimationFinished()) {
for (var i=0; i < this.count(); i++) {
- hideFrame(this.get(i).module)
+ hideFrame(this.get(i).module);
}
// if the opened tab is the active tab, close it
if (id === activeTabId) {
@@ -209,6 +225,20 @@
};
/**
+ * Sets the titles of each single tab after l10n
+ *
+ * @param {Object} obj an array containing objects with id and title
+ */
+ this.setTitles = function (obj) {
+ for (var i = 0; i < this.count(); i++) {
+ for(var j=0; j<obj.length; j++){
+ if (this.get(i).module == obj[j].id) {
+ this.get(i).getNode().innerHTML = obj[j].title;
+ }
+ }
+ }
+ }
+ /**
* Returns the absolute coordinates of tab by the module ID
*
* @param {String} id the ID of the GUI element within the tab.
@@ -218,8 +248,9 @@
this.getCoords = function(id) {
var coords=[];
//get indixes
- if(activeTabId)
- var indexOfOpeningTab = getIndexById(activeTabId);
+ if (activeTabId) {
+ var indexOfOpeningTab = getIndexById(activeTabId);
+ }
var index = getIndexById(id);
//left
@@ -232,7 +263,7 @@
coords[3] = coords[1] + (id==activeTabId?this.get(indexOfOpeningTab).height+tabHeight:tabHeight);
return coords.join(",");
- }
+ };
/**
* Animated opening and closing of the tab with the given id.
@@ -259,7 +290,7 @@
}
//The current 'top' position of the i-th tab
//(parseInt removes 'px')
- var currentTabCurrentTop = parseInt(this.get(i).getNode().style.top);
+ var currentTabCurrentTop = parseInt(this.get(i).getNode().style.top, 10);
// animation is finished
if (currentTabCurrentTop == currentTabNewTop) {
@@ -330,7 +361,7 @@
// if no tab is currently opening or closing
if (isAnimationFinished()) {
for (var i=0; i < this.count(); i++) {
- hideFrame(this.get(i).module)
+ hideFrame(this.get(i).module);
}
}
activeTabId = id;
@@ -353,7 +384,7 @@
try{
if(obj.tabs)
document.getElementById(obj.tabs[obj.activeTab].id).style.visibility = 'hidden';
- }
+ }
catch(e){}
}
};
@@ -385,7 +416,7 @@
obj.top = (newpos + 1) + "px";
obj.left = (tabLeftOffset) + "px";
obj.width = tabWidth;
- obj.height = (parseInt(that.get(index).height) - 2);
+ obj.height = (parseInt(that.get(index).height, 10) - 2);
obj.visibility = 'visible';
}
};
@@ -451,10 +482,10 @@
var tabInterval;
- var tabTopOffset = parseInt(rootNode.style.top);
- var tabLeftOffset = parseInt(rootNode.style.left);
- var tabWidth = parseInt(rootNode.style.width);
- var tabHeight = parseInt(rootNode.style.height);
+ var tabTopOffset = parseInt(rootNode.style.top, 10);
+ var tabLeftOffset = parseInt(rootNode.style.left, 10);
+ var tabWidth = parseInt(rootNode.style.width, 10);
+ var tabHeight = parseInt(rootNode.style.height, 10);
var tabStyle = cssString;
Modified: trunk/mapbender/http/javascripts/mod_tab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_tab.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_tab.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,11 +19,8 @@
/********** Configuration*************************************************/
-$gui_id = $_REQUEST["gui_id"];
-$e_id_css = "tabs";
-$e_id = "tabs";
-require_once(dirname(__FILE__)."/../extensions/JSON.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../classes/class_json.php");
include(dirname(__FILE__)."/../include/dyn_js.php");
$tab_ids = array();
@@ -40,10 +37,10 @@
echo "tab_titles[" . $i . "] = '" . $row["e_title"] . "';\n";
}
-$json = new Services_JSON();
+$json = new Mapbender_JSON();
$output = $json->encode($tab_ids);
echo "var tab_ids = " . $output . ";";
-include_once("mod_tab.js");
+include(dirname(__FILE__) . "/mod_tab.js");
?>
\ No newline at end of file
Deleted: trunk/mapbender/http/javascripts/mod_tab_translation.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_tab_translation.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_tab_translation.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,184 +0,0 @@
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/mod_tab.php
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-
-/********** Configuration*************************************************/
-
-$gui_id = $_REQUEST["gui_id"];
-$e_id_css = 'tabs';
-$e_id = 'tabs';
-require_once(dirname(__FILE__).'/../extensions/JSON.php');
-require_once(dirname(__FILE__).'/../classes/class_mb_exception.php');
-$e = new mb_exception("tab_ids");
-require_once(dirname(__FILE__).'/../include/dyn_js.php');
-
-$tab_ids = array();
-require_once(dirname(__FILE__).'/../include/dyn_php.php');
-
-
-echo "var tab_titles = [];\n";
-for ($i=0; $i < count($tab_ids); $i++) {
- $sql = "SELECT gettext(e_title) AS e_title FROM gui_element WHERE fkey_gui_id = $1 AND e_id = $2";
- $v = array($gui_id, $tab_ids[$i]);
- $t = array("s", "s");
- $res = db_prep_query($sql, $v, $t);
- $row = db_fetch_array($res);
- echo "tab_titles[" . $i . "] = '" . $row["e_title"] . "';\n";
-}
-
-$json = new Services_JSON();
-$output = $json->encode($tab_ids);
-
-$e = new mb_exception("tab_ids" . $output);
-echo "var tab_ids = " . $output . ";";
-
-?>
-var tab_height = false;
-var tab_width = false;
-var tab_topOffset = false;
-var tab_leftOffset = false;
-var tab_active = -1;
-var tab_check = new Array();
-var tab_iv1 = false;
-var tab_wait = false;
-
-try{
- if (open_tab){}
-}
-catch(e){
- open_tab = false;
-}
-
-/********** Configuration*************************************************/
-mb_registerInitFunctions('tab_init()');
-function tab_init(){
- var obj = document.getElementById("tabs").style;
- tab_topOffset = parseInt(obj.top);
- tab_leftOffset = parseInt(obj.left);
- tab_width = parseInt(obj.width);
- tab_height = parseInt(obj.height);
- var str = "";
-
- for(var i = 0; i<tab_ids.length; i++){
- document.getElementById(tab_ids[i]).style.visibility = 'hidden';
- tab_titles[i] = tab_prefix + tab_titles[i];
- var newId = "tab_" + i;
- str += "<div id='"+newId+"' ";
- str += "style='";
- str += tab_style;
- str += "width:"+tab_width+"px;";
- str += "height:"+tab_height+"px;";
- str += "top:" + ((i * tab_height)) + "px;";
- str += "'";
- str += " onclick='tab_set("+i+")'>";
- str += tab_titles[i];
- str += "</div>";
- }
- document.getElementById("tabs").innerHTML = str;
-
- if (open_tab != 'false'){
- tab_set(open_tab);
- }
-}
-function tab_set(ind){
- if(tab_wait){
- return;
- }
- tab_unsetFrame();
- if(ind == tab_active){
- tab_wait = true;
- tab_active = -1;
- tab_check = new Array();
- tab_iv1 = setInterval("tab_move("+tab_active+")",1);
- return;
- }
- else{
- tab_wait = true;
- tab_active = ind;
- tab_check = new Array();
- tab_iv1 = setInterval("tab_move("+tab_active+")",1);
- return;
- }
-}
-function tab_setFrame(ind){
- for(var i = 0; i<tab_ids.length; i++){
- if(i == ind){
- var obj = document.getElementById(tab_ids[i]).style;
- var newpos = ((i+1) * tab_height) + parseInt(tab_topOffset);
- obj.top = (newpos + 1) + "px";
- obj.left = (tab_leftOffset) + "px";
- obj.width = tab_width;
- obj.height = (parseInt(tab_frameHeight[ind]) - 2);
- obj.visibility = 'visible';
- }
- }
-}
-function tab_unsetFrame(){
- for(var i = 0; i<tab_ids.length; i++){
- var obj = document.getElementById(tab_ids[i]).style;
- obj.visibility = 'hidden';
- }
-}
-function tab_open(tabid){
- var t = false;
- for(var i = 0; i<tab_ids.length; i++){
- if(tab_ids[i] == tabid){
- t = i;
- }
- }
- if(tab_active != t){
- tab_set(t);
- }
-}
-function tab_move(ind){
- for(var i = 0; i<tab_ids.length; i++){
- var newpos = (i * tab_height);
- if(i > ind && tab_active >= 0){
- newpos += parseInt(tab_frameHeight[ind]);
- }
- var myid = "tab_" + i;
- var pos = parseInt(document.getElementById(myid).style.top);
- if(pos == newpos){
- tab_check[i] = true;
- }
- else if(pos < newpos){
- document.getElementById(myid).style.top = (pos + 10) + "px";
- tab_check[i] = false;
- }
- else if(pos > newpos){
- document.getElementById(myid).style.top = (pos - 10) + "px";
- tab_check[i] = false;
- }
- }
-
- var check = true;
- for(var j=0; j<tab_check.length; j++){
- if(tab_check[j] == false){
- check = false;
- }
- }
- if(check == true){
- clearInterval(tab_iv1);
- tab_check = new Array();
- tab_wait = false;
- if(ind >= 0){
- tab_setFrame(ind);
- }
- return;
- }
-}
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_toggleModule.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_toggleModule.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_toggleModule.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,24 +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.
-
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'toggleModule' 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('toggleModule: ID not unique!');";
-}
-echo "var mod_toggleModule ='".$e_target."';";
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+echo "var mod_toggleModule ='".$e_target[0]."';";
?>
mb_registerInitFunctions('mod_toggleModule_init()');
function mod_toggleModule_init(){
Modified: trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_wfs_SpatialRequest.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,31 +17,19 @@
# 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);
-
-$gui_id = $_REQUEST["gui_id"];
-$e_id_css = "setSpatialRequest";
-
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
$wfs_conf_filename = "wfs_default.conf";
include '../include/dyn_php.php';
-include("../../conf/" . $wfs_conf_filename);
+$fname = dirname(__FILE__) . "/../../conf/" . $wfs_conf_filename;
+if (file_exists($fname)) {
+ include($fname);
+}
+else {
+ $e = new mb_exception("mod_wfs_SpatialRequest.php: Configuration file " . $wfs_conf_filename . " not found.");
+}
include '../include/dyn_js.php';
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'setSpatialRequest' AND fkey_gui_id = '".$gui_id."'";
-$res = db_query($sql);
-$cnt = 0;
-while($row = db_fetch_array($res)){
- $e_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('setExtRequest: ID not unique!');\n";}
-echo "var mod_wfs_spatialRequest_target = '".$e_target."';\n";
+echo "var mod_wfs_spatialRequest_target = '".$e_target[0]."';\n";
?>
//element var openLinkFromSearch for opening attribute link directly onclick of searchResult entry
try{
@@ -780,7 +768,12 @@
}
wfsPopup.show();
}
-
+try{
+ if (wfsResultToPopupDiv){}
+}
+catch(e){
+ wfsResultToPopupDiv =0;
+}
if(wfsResultToPopupDiv==1){
mb_registerWfsReadSubFunctions(function(geom){displayPopup(geom);});
}
Modified: trunk/mapbender/http/javascripts/mod_wfs_client.html
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_client.html 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_wfs_client.html 2008-04-23 16:21:04 UTC (rev 2413)
@@ -46,6 +46,12 @@
var vupdateWfs = {};
/*
+ * deleteWfs_['action']: instructs the servercomponent
+ * deleteWfs_['wfs']: id of wfs to update
+ */
+var deleteWfs_ = {};
+
+/*
* geturl['action']: instructs the servercomponent
* geturl['wfs']: id of wfs to get the url for
* geturl['column']: column of the url to get in table wfs
@@ -143,11 +149,11 @@
}
function deleteWfs(){
- deleteWfs['action'] = 'deleteWfs';
- deleteWfs['wfs'] = getSelectedWfs();
- if(deleteWfs['wfs']&&deleteWfs['wfs']!="gui_confs"){
- if(confirm("Do you really want to delete the Wfs with Wfs-id:"+deleteWfs['wfs']+"?")){
- getData(deleteWfs);
+ deleteWfs_['action'] = 'deleteWfs';
+ deleteWfs_['wfs'] = getSelectedWfs();
+ if(deleteWfs_['wfs']&&deleteWfs_['wfs']!="gui_confs"){
+ if(confirm("Do you really want to delete the Wfs with Wfs-id:"+deleteWfs_['wfs']+"?")){
+ getData(deleteWfs_);
}
return true;
}
@@ -221,8 +227,10 @@
break;
case "deleteWfs":
if(dsJson['success']){
+ clearList(document.forms[0].wfsList);
+ clearList(document.forms[0].guiList);
getWfsList();
- getGuis();
+ getGuis();
alert("WFS deleted.");
}
break;
@@ -281,7 +289,9 @@
wfsConf['wfsConf'] = {};
wfsConf['wfsConf'] = dsJson.wfsConf;
var o = wfsConf['wfsConf'];
- document.forms[0].wfsConfList.innerHTML = '';
+ document.forms[0].wfsConfList.innerHTML = '';
+ if(typeof(o.id)=="undefined")
+ return;
for(var i=0; i<o.id.length; i++){
appendOption(document.forms[0].wfsConfList, o.abstract[i], o.id[i], false);
}
@@ -306,7 +316,11 @@
function appendOption(boxObject, optionText, optionValue, selected){
var newOption = new Option(optionText,optionValue,false,selected);
boxObject.options[boxObject.length] = newOption;
-}
+}
+function clearList(boxObject){
+ boxObject.length = 0;
+}
+
/*
* returns id and abstract from a wfs configuration
*/
Modified: trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,476 +1,476 @@
-<?php
-# $Id$
-# maintained by http://www.mapbender.org/index.php/User:Verena Diewald
-# http://www.mapbender.org/index.php/WFS_gazetteer
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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();
-$gui_id = $_SESSION["mb_user_gui"];
-
-$target = $_REQUEST["e_target"];
-$e_id_css = $_REQUEST["e_id_css"];
-
-require_once("../../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="Content-Type" content="text/html; charset='<?php echo CHARSET;?>'">
-<title>mod_wfs_gazetteer</title>
-
-<?php
-include '../include/dyn_css.php';
-?>
-<script type="text/javascript">
-<?php
- echo "var targetString = '" . $target . "';";
- echo "var wfsConfIdString = '" . $wfsConfIdString . "';";
-?>
-
-// Element var maxHighlightedPoints
-try{
- if (maxHighlightedPoints){
- maxHighlightedPoints = Number(maxHighlightedPoints);
-
- if (isNaN(maxHighlightedPoints)) {
-// var e = new parent.Mb_warning("mod_wfs_gazetteer_client.php: Element var maxHighlightedPoints must be a number.");
- }
- }
-}
-catch(e){
- maxHighlightedPoints = 0;
-// var e = new parent.Mb_warning("mod_wfs_gazetteer_client.php: Element var maxHighlightedPoints is not set, see 'edit element vars'.");
-}
-
-var targetArray = targetString.split(",");
-var global_wfsConfObj;
-var global_selectedWfsConfId;
-var point_px = 10;
-var resultGeom = null;
-var cw_fillcolor = "#cc33cc";
-
-
-parent.mb_registerInitFunctions("window.frames['"+this.name+"'].initModWfsGazetteer()");
-
-function openwindow(Adresse) {
- Fenster1 = window.open(Adresse, "Informationen", "width=500,height=500,left=100,top=100,scrollbars=yes,resizable=no");
- Fenster1.focus();
-}
-//----------------------------------------------------------------------------------
-
-function appendWfsConf(newWfsConfIdString) {
- // merge with existing wfs conf ids
- if (wfsConfIdString !== "") {
- if (newWfsConfIdString !== "") {
- wfsConfIdString += "," + newWfsConfIdString;
-
- // rebuild form
- initModWfsGazetteer();
- }
- }
- else {
- wfsConfIdString = newWfsConfIdString;
-
- // rebuild form
- initModWfsGazetteer();
- }
-
-}
-
-function removeChildNodes(node) {
- while (node.childNodes.length > 0) {
- var childNode = node.firstChild;
- node.removeChild(childNode);
- }
-}
-
-/**
- * removes whitespaces and endlines before and after a string
- *
- */
-function trimString (str) {
- return str.replace(/^\s+|\s+|\n+$/g, '');
-}
-
-function appendStyles() {
- var styleObj;
- var rule = global_wfsConfObj[global_selectedWfsConfId].g_style + global_wfsConfObj[global_selectedWfsConfId].g_res_style;
- if (parent.ie) {
- var styleSheetObj=document.createStyleSheet();
- styleObj=styleSheetObj.owningElement || styleSheetObj.ownerNode;
- styleObj.setAttribute("type","text/css");
- ruleArray = rule.split("}");
- for (var i=0; i < ruleArray.length - 1; i++) {
- var currentRule = trimString(ruleArray[i]);
- var nameValueArray = currentRule.split("{");
- var name = nameValueArray[0];
- var value = nameValueArray[1];
- styleSheetObj.addRule(name,value);
- }
- }
- else {
- styleObj=document.createElement("style");
- styleObj.setAttribute("type","text/css");
- document.getElementsByTagName("head")[0].appendChild(styleObj);
- styleObj.appendChild(document.createTextNode(rule+"\n"));
- }
-}
-
-//----------------------------------------------------------------------------------
-
-
-function initModWfsGazetteer() {
- // empty nodes
- var nodesToEmpty = ["selectWfsConfForm", "wfsForm", "res", "wfsInfo"];
- while (nodesToEmpty.length > 0) {
- var currentId = nodesToEmpty.pop();
- var currentNode = document.getElementById(currentId);
- removeChildNodes(currentNode);
- }
- document.getElementById("wfsGeomType").style.visibility = "hidden";
- document.getElementById("wfsRemove").style.visibility = "hidden";
-
- parent.mb_ajax_json("../php/mod_wfs_gazetteer_server.php", {command:"getWfsConf",wfsConfIdString:wfsConfIdString}, function(json, status) {
- global_wfsConfObj = json;
- var wfsCount = 0;
- for (var wfsConfId in global_wfsConfObj) {
- global_selectedWfsConfId = wfsConfId;
- if (typeof(global_wfsConfObj[wfsConfId] != 'function')) {
- wfsCount++;
- }
- }
- if (wfsCount === 0) {
- var e = parent.Mb_exception("no wfs conf id available.");
- }
- else if (wfsCount === 1) {
- appendStyles();
- appendWfsForm();
- setWfsInfo();
- }
- else {
- appendWfsConfSelectBox();
- setWfsInfo();
- }
- parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
- });
-}
-
-function setWfsInfo() {
- var bulbNode = document.getElementById("wfsInfo");
-
- // append bulb image
- removeChildNodes(bulbNode);
- var imgNode = document.createElement("img");
- imgNode.id = "wfsInfoImg";
- imgNode.src = "../img/button_digitize/geomInfo.png";
- imgNode.border = 0;
- bulbNode.appendChild(imgNode);
- bulbNode.href = "javascript:openwindow('../php/mod_featuretypeMetadata.php?wfs_conf_id=" + global_selectedWfsConfId.toString() + "');";
- bulbNode.style.visibility = "visible";
-
- // set wfsGeomType image
- var wfsGeomTypeNode = document.getElementById("wfsGeomType");
- var wfsGeomType = "";
- for (var i=0; i < global_wfsConfObj[global_selectedWfsConfId].element.length; i++) {
- if (parseInt(global_wfsConfObj[global_selectedWfsConfId].element[i].f_geom)) {
- wfsGeomType = global_wfsConfObj[global_selectedWfsConfId].element[i].element_type;
- }
- }
- if (wfsGeomType.match(/Point/)) {
- wfsGeomTypeNode.src = "../img/button_digitize/point_off.png";
- wfsGeomTypeNode.style.visibility = 'visible';
- }
- else if (wfsGeomType.match(/Line/)) {
- wfsGeomTypeNode.src = "../img/button_digitize/line_off.png";
- wfsGeomTypeNode.style.visibility = 'visible';
- }
- else if (wfsGeomType.match(/Polygon/)) {
- wfsGeomTypeNode.src = "../img/button_digitize/polygon_off.png";
- wfsGeomTypeNode.style.visibility = 'visible';
- }
- else {
- var e = new parent.Mb_exception("WFS gazetteer: geometry type unknown.");
- }
-
- // set image: remove this WFS
- var wfsRemoveNode = document.getElementById("wfsRemove");
- wfsRemoveNode.src = "../img/button_digitize/geomRemove.png";
- wfsRemoveNode.style.visibility = 'visible';
- // Internet explorer
- if (parent.ie) {
- wfsRemoveNode.onclick = function() {
- var x = new Function ("", "delete global_wfsConfObj[global_selectedWfsConfId];setWfsConfIdString();initModWfsGazetteer();parent.mb_setWmcExtensionData({'wfsConfIdString':wfsConfIdString});");
- x();
- };
- }
- // Firefox
- else {
- wfsRemoveNode.onclick = function () {
- delete global_wfsConfObj[global_selectedWfsConfId];
- setWfsConfIdString();
- initModWfsGazetteer();
- parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
- }
- }
-}
-
-function setWfsConfIdString() {
- var str = [];
- for (var wfsConfId in global_wfsConfObj) {
- global_selectedWfsConfId = wfsConfId;
- if (typeof(global_wfsConfObj[wfsConfId] != 'function')) {
- str.push(wfsConfId);
- }
- }
- wfsConfIdString = str.join(",");
-}
-
-function appendWfsConfSelectBox() {
- var selectNode = document.createElement("select");
- selectNode.name = "wfs_conf_sel";
- var wfsFormNode = document.getElementById("selectWfsConfForm");
- if (parent.ie) {
- selectNode.onchange = function() {
- global_selectedWfsConfId = this.value;
- setWfsInfo();
- appendStyles();
- appendWfsForm();
- };
- }
- else{
- selectNode.setAttribute("onchange", "global_selectedWfsConfId = this.value;setWfsInfo();appendStyles();appendWfsForm();");
- }
- var isSelected = false;
- for (var wfsConfId in global_wfsConfObj) {
- var optionNode = document.createElement("option");
-
- optionNode.value = wfsConfId;
- optionNode.innerHTML = global_wfsConfObj[wfsConfId].g_label;
-
- if (!isSelected) {
- optionNode.selected = true;
- isSelected = true;
- global_selectedWfsConfId = wfsConfId;
- }
- selectNode.appendChild(optionNode);
- }
-
- var form = document.getElementById('selectWfsConfForm');
- form.appendChild(selectNode);
-
- appendStyles();
- appendWfsForm();
-}
-
-function appendWfsForm() {
- var form = document.getElementById("wfsForm");
- removeChildNodes(form);
- var resultDiv = document.getElementById("res");
- removeChildNodes(resultDiv);
-
- var divContainer = document.createElement("div");
- divContainer.className = global_wfsConfObj[global_selectedWfsConfId].g_label_id;
-
- divContainer.innerHTML = global_wfsConfObj[global_selectedWfsConfId].g_label;
-
- form.appendChild(divContainer);
-
- var wfsConfElementArray = global_wfsConfObj[global_selectedWfsConfId].element;
-
- for (var i = 0; i < wfsConfElementArray.length; i++){
- if (parseInt(wfsConfElementArray[i].f_search)) {
- var spanNode = document.createElement("span");
- spanNode.setAttribute("id", "ttttt");
- spanNode.className = wfsConfElementArray[i].f_label_id;
- spanNode.innerHTML = wfsConfElementArray[i].f_label;
- var inputNode = document.createElement("input");
- inputNode.type = "text";
- inputNode.className = wfsConfElementArray[i].f_style_id;
- inputNode.id = wfsConfElementArray[i].element_name;
-
- form.appendChild(spanNode);
- form.appendChild(inputNode);
- form.appendChild(document.createElement("br"));
- }
- }
- var submitButton = document.createElement("input");
- submitButton.type = "submit";
- submitButton.className = global_wfsConfObj[global_selectedWfsConfId].g_button_id;
- submitButton.value = global_wfsConfObj[global_selectedWfsConfId].g_button;
-
- form.appendChild(submitButton);
-}
-
-function validate(){
- global_resultHighlight = new parent.Highlight(targetArray, "wfs_gazetteer_highlight", {"position":"absolute", "top":"0px", "left":"0px", "z-index":100}, 2);
-
- var filterParameterCount = getNumberOfFilterParameters();
-
- if(filterParameterCount == 0){
- return false;
- }
- else{
- var andConditions = "";
-
- var el = global_wfsConfObj[global_selectedWfsConfId].element;
-
- for (var i = 0; i < el.length; i++) {
- if (el[i]['f_search'] == 1 && document.getElementById(el[i]['element_name']).value != '') {
-
- var a = new Array();
- a = document.getElementById(el[i]['element_name']).value.split(",");
- var orConditions = "";
- for (var j=0; j < a.length; j++) {
-
- orConditions += "<ogc:PropertyIsLike wildCard='*' singleChar='.' escape='!'>";
- orConditions += "<ogc:PropertyName>" + el[i]['element_name'] + "</ogc:PropertyName>";
- orConditions += "<ogc:Literal>*";
- if(el[i]['f_toupper'] == 1){
- orConditions += a[j].toUpperCase();
- }
- else{
- orConditions += a[j];
- }
- orConditions += "*</ogc:Literal>";
- orConditions += "</ogc:PropertyIsLike>";
- }
- if(a.length > 1){
- andConditions += "<Or>" + orConditions + "</Or>";
- }
- else {
- andConditions += orConditions;
- }
- }
- }
-
- var u = global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature + parent.mb_getConjunctionCharacter(global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature);
- u += "REQUEST=getFeature&Typename="+global_wfsConfObj[global_selectedWfsConfId].featuretype_name+"&Version=1.0.0&service=WFS";
- u += "&filter=";
-
- if (filterParameterCount > 1) {
- andConditions = "<And>" + andConditions + "</And>";
- }
-
- var filter = "<ogc:Filter xmlns:ogc='http://ogc.org' xmlns:gml='http://www.opengis.net/gml'>"+andConditions+"</ogc:Filter>";
-
- document.getElementById("res").innerHTML = "<table><tr><td><img src='../img/indicator_wheel.gif'></td><td>Searching...</td></tr></table>";
- var parameters = {command:"getSearchResults", "wfs_conf_id":global_selectedWfsConfId, "frame":this.name, "url":u, "filter":filter, "backlink":""};
- parent.mb_ajax_get("../php/mod_wfs_gazetteer_server.php", parameters, function (jsCode, status) {
- document.getElementById("res").innerHTML = "<table><tr><td>Arranging search results...</td></tr></table>";
-
- eval(jsCode);
-
- for (var i=0; i < parent.wms.length; i++) {
- for (var j=0; j < parent.wms[i].objLayer.length; j++) {
-
- var currentLayer = parent.wms[i].objLayer[j];
- var wms_id = parent.wms[i].wms_id;
-
- if (currentLayer.gui_layer_wfs_featuretype == global_selectedWfsConfId) {
- var layer_name = currentLayer.layer_name;
- parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'querylayer',1);
- parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'visible',1);
- }
- }
- }
-
- var body = "";
- if (typeof(geom) == 'object') {
- resultGeom = geom; // set the global variable
- for (var i=0; i < geom.count(); i++) {
- body += "<div id='geom"+i+"'style='cursor:pointer;' ";
- if ((i % 2) === 0) {
- body += "class='even'";
- }
- else {
- body += "class='uneven'";
- }
- body += " onmouseover=\"setResult('over', this.id)\" ";
- body += " onmouseout=\"setResult('out', this.id)\" ";
- body += " onclick=\"setResult('click', this.id)\">";
- for (var j=0; j < geom.get(i).e.count(); j++) {
- body += geom.get(i).e.getValue(j) + " ";
- }
- body += "</div>";
- }
- }
- else {
- body = "Kein Ergebnis.";
- }
- document.getElementById('res').innerHTML = body;
- });
- }
- return false;
-}
-
-function getNumberOfFilterParameters(){
- var cnt = 0;
- var el = global_wfsConfObj[global_selectedWfsConfId].element;
-
- for (var i = 0; i < el.length; i++){
- if( el[i]['f_search'] == 1){
- if (document.getElementById(el[i]['element_name']).value != '') {
- cnt++;
- }
- }
- }
- return cnt;
-}
-/*
-* event -> {over || out || click}
-* geom -> commaseparated coordinates x1,y1,x2,y2 ...
-*/
-function setResult(event, id){
- var index = parseInt(id.slice(4));
-
- var currentGeom = resultGeom.get(index);
- if (maxHighlightedPoints > 0 && currentGeom.getTotalPointCount() > maxHighlightedPoints) {
- currentGeom = currentGeom.getBBox4();
- }
- if (event == "over") {
- global_resultHighlight.add(currentGeom, cw_fillcolor);
- }
- else if (event == "out"){
- global_resultHighlight.del(currentGeom, cw_fillcolor);
- }
- else if (event == "click"){
- global_resultHighlight.del(currentGeom, cw_fillcolor);
- var bbox = currentGeom.getBBox();
- var bufferFloat = parseFloat(global_wfsConfObj[global_selectedWfsConfId].g_buffer);
- var buffer = new parent.Point(bufferFloat,bufferFloat);
- bbox[0] = bbox[0].minus(buffer);
- bbox[1] = bbox[1].plus(buffer);
- parent.mb_calculateExtent(targetArray[0], bbox[0].x, bbox[0].y, bbox[1].x, bbox[1].y);
- parent.zoom(targetArray[0], 'true', 1.0);
- global_resultHighlight.add(currentGeom, cw_fillcolor);
- }
- return true;
-}
-</script>
-</head>
-<body leftmargin='0' topmargin='10' bgcolor='#ffffff'>
-<form name='selectWfsConfForm' id='selectWfsConfForm'></form>
-<img src = "" name='wfsGeomType' id='wfsGeomType'>
-<img src = "" name='wfsRemove' id='wfsRemove'>
-<a name='wfsInfo' id='wfsInfo'></a>
-<form name='wfsForm' id='wfsForm' onsubmit='return validate()'></form>
-<div name='res' id='res' style='width:180px'></div>
-</body>
+<?php
+# $Id$
+# maintained by http://www.mapbender.org/index.php/User:Verena Diewald
+# http://www.mapbender.org/index.php/WFS_gazetteer
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+
+$gui_id = $_SESSION["mb_user_gui"];
+$target = $_REQUEST["e_target"];
+$isLoaded = $_REQUEST["isLoaded"];
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset='<?php echo CHARSET;?>'">
+<title>mod_wfs_gazetteer</title>
+
+<?php
+include '../include/dyn_css.php';
+?>
+<script type="text/javascript">
+<?php
+ include '../include/dyn_js.php';
+ include '../include/dyn_php.php';
+
+ echo "var targetString = '" . $target . "';";
+ echo "var wfsConfIdString = '" . $wfsConfIdString . "';";
+ echo "var e_id_css = '" . $e_id_css . "';";
+?>
+
+// Element var maxHighlightedPoints
+try{
+ if (maxHighlightedPoints){
+ maxHighlightedPoints = Number(maxHighlightedPoints);
+
+ if (isNaN(maxHighlightedPoints)) {
+// var e = new parent.Mb_warning("mod_wfs_gazetteer_client.php: Element var maxHighlightedPoints must be a number.");
+ }
+ }
+}
+catch(e){
+ maxHighlightedPoints = 0;
+// var e = new parent.Mb_warning("mod_wfs_gazetteer_client.php: Element var maxHighlightedPoints is not set, see 'edit element vars'.");
+}
+
+var targetArray = targetString.split(",");
+var global_wfsConfObj;
+var global_selectedWfsConfId;
+var point_px = 10;
+var resultGeom = null;
+var cw_fillcolor = "#cc33cc";
+
+
+parent.mb_registerInitFunctions("window.frames['"+this.name+"'].initModWfsGazetteer()");
+
+function openwindow(Adresse) {
+ Fenster1 = window.open(Adresse, "Informationen", "width=500,height=500,left=100,top=100,scrollbars=yes,resizable=no");
+ Fenster1.focus();
+}
+//----------------------------------------------------------------------------------
+
+function appendWfsConf(newWfsConfIdString) {
+ // merge with existing wfs conf ids
+ if (wfsConfIdString !== "") {
+ if (newWfsConfIdString !== "") {
+ wfsConfIdString += "," + newWfsConfIdString;
+
+ // rebuild form
+ initModWfsGazetteer();
+ }
+ }
+ else {
+ wfsConfIdString = newWfsConfIdString;
+
+ // rebuild form
+ initModWfsGazetteer();
+ }
+
+}
+
+function removeChildNodes(node) {
+ while (node.childNodes.length > 0) {
+ var childNode = node.firstChild;
+ node.removeChild(childNode);
+ }
+}
+
+/**
+ * removes whitespaces and endlines before and after a string
+ *
+ */
+function trimString (str) {
+ return str.replace(/^\s+|\s+|\n+$/g, '');
+}
+
+function appendStyles() {
+ var styleObj;
+ var rule = global_wfsConfObj[global_selectedWfsConfId].g_style + global_wfsConfObj[global_selectedWfsConfId].g_res_style;
+ if (parent.ie) {
+ var styleSheetObj=document.createStyleSheet();
+ styleObj=styleSheetObj.owningElement || styleSheetObj.ownerNode;
+ styleObj.setAttribute("type","text/css");
+ ruleArray = rule.split("}");
+ for (var i=0; i < ruleArray.length - 1; i++) {
+ var currentRule = trimString(ruleArray[i]);
+ var nameValueArray = currentRule.split("{");
+ var name = nameValueArray[0];
+ var value = nameValueArray[1];
+ styleSheetObj.addRule(name,value);
+ }
+ }
+ else {
+ styleObj=document.createElement("style");
+ styleObj.setAttribute("type","text/css");
+ document.getElementsByTagName("head")[0].appendChild(styleObj);
+ styleObj.appendChild(document.createTextNode(rule+"\n"));
+ }
+}
+
+//----------------------------------------------------------------------------------
+
+
+function initModWfsGazetteer() {
+ // empty nodes
+ var nodesToEmpty = ["selectWfsConfForm", "wfsForm", "res", "wfsInfo"];
+ while (nodesToEmpty.length > 0) {
+ var currentId = nodesToEmpty.pop();
+ var currentNode = document.getElementById(currentId);
+ removeChildNodes(currentNode);
+ }
+ document.getElementById("wfsGeomType").style.visibility = "hidden";
+ document.getElementById("wfsRemove").style.visibility = "hidden";
+
+ parent.mb_ajax_json("../php/mod_wfs_gazetteer_server.php", {command:"getWfsConf",wfsConfIdString:wfsConfIdString}, function(json, status) {
+ global_wfsConfObj = json;
+ var wfsCount = 0;
+ for (var wfsConfId in global_wfsConfObj) {
+ global_selectedWfsConfId = wfsConfId;
+ if (typeof(global_wfsConfObj[wfsConfId] != 'function')) {
+ wfsCount++;
+ }
+ }
+ if (wfsCount === 0) {
+ var e = new parent.Mb_exception("no wfs conf id available.");
+ }
+ else if (wfsCount === 1) {
+ appendStyles();
+ appendWfsForm();
+ setWfsInfo();
+ }
+ else {
+ appendWfsConfSelectBox();
+ setWfsInfo();
+ }
+ parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
+ });
+}
+
+function setWfsInfo() {
+ var bulbNode = document.getElementById("wfsInfo");
+
+ // append bulb image
+ removeChildNodes(bulbNode);
+ var imgNode = document.createElement("img");
+ imgNode.id = "wfsInfoImg";
+ //imgNode.src = "../img/button_digitize/geomInfo.png";
+ imgNode.src = "../img/tree_new/info.png";
+ imgNode.border = 0;
+ bulbNode.appendChild(imgNode);
+ bulbNode.href = "javascript:openwindow('../php/mod_featuretypeMetadata.php?wfs_conf_id=" + global_selectedWfsConfId.toString() + "');";
+ bulbNode.style.visibility = "visible";
+
+ // set wfsGeomType image
+ var wfsGeomTypeNode = document.getElementById("wfsGeomType");
+ var wfsGeomType = "";
+ for (var i=0; i < global_wfsConfObj[global_selectedWfsConfId].element.length; i++) {
+ if (parseInt(global_wfsConfObj[global_selectedWfsConfId].element[i].f_geom)) {
+ wfsGeomType = global_wfsConfObj[global_selectedWfsConfId].element[i].element_type;
+ }
+ }
+ if (wfsGeomType.match(/Point/)) {
+ wfsGeomTypeNode.src = "../img/button_digitize/point.png";
+ wfsGeomTypeNode.style.visibility = 'visible';
+ }
+ else if (wfsGeomType.match(/Line/)) {
+ wfsGeomTypeNode.src = "../img/button_digitize/line.png";
+ wfsGeomTypeNode.style.visibility = 'visible';
+ }
+ else if (wfsGeomType.match(/Polygon/)) {
+ wfsGeomTypeNode.src = "../img/button_digitize/polygon.png";
+ wfsGeomTypeNode.style.visibility = 'visible';
+ }
+ else {
+ var e = new parent.Mb_exception("WFS gazetteer: geometry type unknown.");
+ }
+
+ // set image: remove this WFS
+ var wfsRemoveNode = document.getElementById("wfsRemove");
+ //wfsRemoveNode.src = "../img/button_digitize/geomRemove.png";
+ wfsRemoveNode.src = "../img/tree_new/delete_wms.png";
+ wfsRemoveNode.style.visibility = 'visible';
+ // Internet explorer
+ if (parent.ie) {
+ wfsRemoveNode.onclick = function() {
+ var x = new Function ("", "delete global_wfsConfObj[global_selectedWfsConfId];setWfsConfIdString();initModWfsGazetteer();parent.mb_setWmcExtensionData({'wfsConfIdString':wfsConfIdString});");
+ x();
+ };
+ }
+ // Firefox
+ else {
+ wfsRemoveNode.onclick = function () {
+ delete global_wfsConfObj[global_selectedWfsConfId];
+ setWfsConfIdString();
+ initModWfsGazetteer();
+ parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
+ }
+ }
+}
+
+function setWfsConfIdString() {
+ var str = [];
+ for (var wfsConfId in global_wfsConfObj) {
+ global_selectedWfsConfId = wfsConfId;
+ if (typeof(global_wfsConfObj[wfsConfId] != 'function')) {
+ str.push(wfsConfId);
+ }
+ }
+ wfsConfIdString = str.join(",");
+}
+
+function appendWfsConfSelectBox() {
+ var selectNode = document.createElement("select");
+ selectNode.name = "wfs_conf_sel";
+ var wfsFormNode = document.getElementById("selectWfsConfForm");
+ selectNode.onchange = function() {
+ global_selectedWfsConfId = this.value;
+ setWfsInfo();
+ appendStyles();
+ appendWfsForm();
+ };
+ var isSelected = false;
+ for (var wfsConfId in global_wfsConfObj) {
+ var optionNode = document.createElement("option");
+
+ optionNode.value = wfsConfId;
+ optionNode.innerHTML = global_wfsConfObj[wfsConfId].g_label;
+
+ if (!isSelected) {
+ optionNode.selected = true;
+ isSelected = true;
+ global_selectedWfsConfId = wfsConfId;
+ }
+ selectNode.appendChild(optionNode);
+ }
+
+ var form = document.getElementById('selectWfsConfForm');
+ form.appendChild(selectNode);
+
+ appendStyles();
+ appendWfsForm();
+}
+
+function appendWfsForm() {
+ var form = document.getElementById("wfsForm");
+ removeChildNodes(form);
+ var resultDiv = document.getElementById("res");
+ removeChildNodes(resultDiv);
+
+ var divContainer = document.createElement("div");
+ divContainer.className = global_wfsConfObj[global_selectedWfsConfId].g_label_id;
+
+ divContainer.innerHTML = global_wfsConfObj[global_selectedWfsConfId].g_label;
+
+ form.appendChild(divContainer);
+
+ var wfsConfElementArray = global_wfsConfObj[global_selectedWfsConfId].element;
+
+ for (var i = 0; i < wfsConfElementArray.length; i++){
+ if (parseInt(wfsConfElementArray[i].f_search)) {
+ var spanNode = document.createElement("span");
+ spanNode.setAttribute("id", "ttttt");
+ spanNode.className = wfsConfElementArray[i].f_label_id;
+ spanNode.innerHTML = wfsConfElementArray[i].f_label;
+ var inputNode = document.createElement("input");
+ inputNode.type = "text";
+ inputNode.className = wfsConfElementArray[i].f_style_id;
+ inputNode.id = wfsConfElementArray[i].element_name;
+
+ form.appendChild(spanNode);
+ form.appendChild(inputNode);
+ form.appendChild(document.createElement("br"));
+ }
+ }
+ var submitButton = document.createElement("input");
+ submitButton.type = "submit";
+ submitButton.className = global_wfsConfObj[global_selectedWfsConfId].g_button_id;
+ submitButton.value = global_wfsConfObj[global_selectedWfsConfId].g_button;
+
+ form.appendChild(submitButton);
+}
+
+function validate(){
+ global_resultHighlight = new parent.Highlight(targetArray, "wfs_gazetteer_highlight", {"position":"absolute", "top":"0px", "left":"0px", "z-index":100}, 2);
+
+ var filterParameterCount = getNumberOfFilterParameters();
+
+ if(filterParameterCount == 0){
+ return false;
+ }
+ else{
+ var andConditions = "";
+
+ var el = global_wfsConfObj[global_selectedWfsConfId].element;
+
+ for (var i = 0; i < el.length; i++) {
+ if (el[i]['f_search'] == 1 && document.getElementById(el[i]['element_name']).value != '') {
+
+ var a = new Array();
+ a = document.getElementById(el[i]['element_name']).value.split(",");
+ var orConditions = "";
+ for (var j=0; j < a.length; j++) {
+
+ orConditions += "<ogc:PropertyIsLike wildCard='*' singleChar='.' escape='!'>";
+ orConditions += "<ogc:PropertyName>" + el[i]['element_name'] + "</ogc:PropertyName>";
+ orConditions += "<ogc:Literal>*";
+ if(el[i]['f_toupper'] == 1){
+ orConditions += a[j].toUpperCase();
+ }
+ else{
+ orConditions += a[j];
+ }
+ orConditions += "*</ogc:Literal>";
+ orConditions += "</ogc:PropertyIsLike>";
+ }
+ if(a.length > 1){
+ andConditions += "<Or>" + orConditions + "</Or>";
+ }
+ else {
+ andConditions += orConditions;
+ }
+ }
+ }
+
+ var u = global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature + parent.mb_getConjunctionCharacter(global_wfsConfObj[global_selectedWfsConfId].wfs_getfeature);
+ u += "REQUEST=getFeature&Typename="+global_wfsConfObj[global_selectedWfsConfId].featuretype_name+"&Version=1.0.0&service=WFS";
+ u += "&filter=";
+
+ if (filterParameterCount > 1) {
+ andConditions = "<And>" + andConditions + "</And>";
+ }
+
+ var filter = "<ogc:Filter xmlns:ogc='http://ogc.org' xmlns:gml='http://www.opengis.net/gml'>"+andConditions+"</ogc:Filter>";
+
+ document.getElementById("res").innerHTML = "<table><tr><td><img src='../img/indicator_wheel.gif'></td><td>Searching...</td></tr></table>";
+ var parameters = {command:"getSearchResults", "wfs_conf_id":global_selectedWfsConfId, "frame":this.name, "url":u, "filter":filter, "backlink":""};
+ parent.mb_ajax_get("../php/mod_wfs_gazetteer_server.php", parameters, function (jsCode, status) {
+ document.getElementById("res").innerHTML = "<table><tr><td>Arranging search results...</td></tr></table>";
+
+ eval(jsCode);
+
+ for (var i=0; i < parent.wms.length; i++) {
+ for (var j=0; j < parent.wms[i].objLayer.length; j++) {
+
+ var currentLayer = parent.wms[i].objLayer[j];
+ var wms_id = parent.wms[i].wms_id;
+
+ if (currentLayer.gui_layer_wfs_featuretype == global_selectedWfsConfId) {
+ var layer_name = currentLayer.layer_name;
+ parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'querylayer',1);
+ parent.handleSelectedLayer_array(targetArray[0],[wms_id],[layer_name],'visible',1);
+ }
+ }
+ }
+
+ var body = "";
+ if (typeof(geom) == 'object') {
+ resultGeom = geom; // set the global variable
+ for (var i=0; i < geom.count(); i++) {
+ body += "<div id='geom"+i+"'style='cursor:pointer;' ";
+ if ((i % 2) === 0) {
+ body += "class='even'";
+ }
+ else {
+ body += "class='uneven'";
+ }
+ body += " onmouseover=\"setResult('over', this.id)\" ";
+ body += " onmouseout=\"setResult('out', this.id)\" ";
+ body += " onclick=\"setResult('click', this.id)\">";
+ for (var j=0; j < geom.get(i).e.count(); j++) {
+ body += geom.get(i).e.getValue(j) + " ";
+ }
+ body += "</div>";
+ }
+ }
+ else {
+ body = "Kein Ergebnis.";
+ }
+ document.getElementById('res').innerHTML = body;
+ });
+ }
+ return false;
+}
+
+function getNumberOfFilterParameters(){
+ var cnt = 0;
+ var el = global_wfsConfObj[global_selectedWfsConfId].element;
+
+ for (var i = 0; i < el.length; i++){
+ if( el[i]['f_search'] == 1){
+ if (document.getElementById(el[i]['element_name']).value != '') {
+ cnt++;
+ }
+ }
+ }
+ return cnt;
+}
+/*
+* event -> {over || out || click}
+* geom -> commaseparated coordinates x1,y1,x2,y2 ...
+*/
+function setResult(event, id){
+ var index = parseInt(id.slice(4));
+
+ var currentGeom = resultGeom.get(index);
+ if (maxHighlightedPoints > 0 && currentGeom.getTotalPointCount() > maxHighlightedPoints) {
+ currentGeom = currentGeom.getBBox4();
+ }
+ if (event == "over") {
+ global_resultHighlight.add(currentGeom, cw_fillcolor);
+ global_resultHighlight.paint();
+ }
+ else if (event == "out"){
+ global_resultHighlight.del(currentGeom, cw_fillcolor);
+ global_resultHighlight.paint();
+ }
+ else if (event == "click"){
+ global_resultHighlight.del(currentGeom, cw_fillcolor);
+ var bbox = currentGeom.getBBox();
+ var bufferFloat = parseFloat(global_wfsConfObj[global_selectedWfsConfId].g_buffer);
+ var buffer = new parent.Point(bufferFloat,bufferFloat);
+ bbox[0] = bbox[0].minus(buffer);
+ bbox[1] = bbox[1].plus(buffer);
+ parent.mb_calculateExtent(targetArray[0], bbox[0].x, bbox[0].y, bbox[1].x, bbox[1].y);
+ parent.zoom(targetArray[0], 'true', 1.0);
+ global_resultHighlight.add(currentGeom, cw_fillcolor);
+ global_resultHighlight.paint();
+ }
+ return true;
+}
+</script>
+</head>
+<body leftmargin='0' topmargin='10' bgcolor='#ffffff'>
+<form name='selectWfsConfForm' id='selectWfsConfForm'></form>
+<img src = "" name='wfsGeomType' id='wfsGeomType'>
+<img src = "" name='wfsRemove' id='wfsRemove'>
+<a name='wfsInfo' id='wfsInfo'></a>
+<form name='wfsForm' id='wfsForm' onsubmit='return validate()'></form>
+<div name='res' id='res' style='width:180px'></div>
+</body>
</html>
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/mod_zoomCoords.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_zoomCoords.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_zoomCoords.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,9 +1,6 @@
<?php
#$Id$
#$Header: /cvsroot/mapbender/mapbender/http/javascripts/mod_zoomCoords.php,v 1.10 2006/03/09 08:57:13 uli_rothstein Exp $
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-session_start();
-import_request_variables("PG");
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
@@ -67,21 +64,8 @@
-->
</style>
<?php
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'zoomCoords' AND fkey_gui_id = '".$_SESSION["mb_user_gui"]."'";
-$res = db_query($sql);
-$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(',')";
echo "</script>";
?>
Modified: trunk/mapbender/http/javascripts/mod_zoomFull.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_zoomFull.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_zoomFull.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,25 +1,15 @@
<?php
#$Id$
#$Header: /cvsroot/mapbender/mapbender/http/javascripts/mod_zoomFull.php,v 1.8 2005/09/13 18:16:42 bjoern_heuser Exp $
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'zoomFull' AND fkey_gui_id = '".$gui_id."'";
-$res = db_query($sql);
-$cnt = 0;
-while($row = db_fetch_array($res)){
- $e_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('zoomFull: ID not unique!');";}
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
- var mod_zoomFull_img = new Image(); mod_zoomFull_img.src = "<?php echo $e_src; ?>";
- var mod_zoomFull_img_over = new Image(); mod_zoomFull_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+ var mod_zoomFull_img = new Image();
+ mod_zoomFull_img.src = "<?php echo $e_src; ?>";
+ var mod_zoomFull_img_over = new Image();
+ mod_zoomFull_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
function mod_zoomFull(){
- var ind = this.getMapObjIndexByName("<?php echo $e_target; ?>");
+ var ind = this.getMapObjIndexByName("<?php echo $e_target[0]; ?>");
var arrayThemen = new Array();
var arrayThemen = mb_mapObj[ind].wms[0].objLayer[0].layer_name;
this.Layer0 = arrayThemen;
@@ -30,7 +20,7 @@
//mb_mapObj[ind].epsg = "EPSG:31493";
//alert(Layer0);
var arrayExt = new Array();
- var frameName = "<?php echo $e_target; ?>"
+ var frameName = "<?php echo $e_target[0]; ?>"
var exts = setExtent(width,height,epsg);
arrayExt = exts.split(",");
Modified: trunk/mapbender/http/javascripts/mod_zoomIn1.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_zoomIn1.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_zoomIn1.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,29 +17,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'zoomIn1' 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_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('zoomIn1: ID not unique!');";}
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
-var mod_zoom1_img = new Image(); mod_zoom1_img.src = "<?php echo $e_src; ?>";
-var mod_zoom1_img_over = new Image(); mod_zoom1_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+var mod_zoom1_img = new Image();
+mod_zoom1_img.src = "<?php echo $e_src; ?>";
+var mod_zoom1_img_over = new Image();
+mod_zoom1_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
-
function mod_zoomIn1(){
- zoom("<?php echo $e_target; ?>", true,2.0);
+ zoom("<?php echo $e_target[0]; ?>", true,2.0);
}
function mod_zoomIn1_init(obj){
document.getElementById("zoomIn1").src = mod_zoom1_img_over.src;
Modified: trunk/mapbender/http/javascripts/mod_zoomOut1.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_zoomOut1.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/mod_zoomOut1.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -2,26 +2,16 @@
#$Id$
#$Header: /cvsroot/mapbender/mapbender/http/javascripts/mod_zoomOut1.php,v 1.8 2005/09/13 18:16:42 bjoern_heuser Exp $
-$gui_id = $_REQUEST["gui_id"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = 'zoomOut1' AND fkey_gui_id = '".$gui_id."'";
-$res = db_query($sql);
-$cnt = 0;
-while($row = db_fetch_array($res)){
- $e_src = $row["e_src"];
- $e_target = $row["e_target"];
- $cnt++;
-}
-if($cnt > 1){ echo "alert('zoomOut1: ID not unique!');";}
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
-var mod_zoomOut_img = new Image(); mod_zoomOut_img.src = "<?php echo $e_src; ?>";
-var mod_zoomOut_img_over = new Image(); mod_zoomOut_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+var mod_zoomOut_img = new Image();
+mod_zoomOut_img.src = "<?php echo $e_src; ?>";
+var mod_zoomOut_img_over = new Image();
+mod_zoomOut_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
function mod_zoomOut1(){
- zoom("<?php echo $e_target; ?>", false,2.0);
+ zoom("<?php echo $e_target[0]; ?>", false,2.0);
}
function mod_zoomOut1_init(obj){
document.getElementById("zoomOut1").src = mod_zoomOut_img_over.src;
Modified: trunk/mapbender/http/javascripts/point.js
===================================================================
--- trunk/mapbender/http/javascripts/point.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/point.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -12,7 +12,7 @@
* @param {Float} x x value of the {@link Point}
* @param {Float} y y value of the {@link Point}
*/
- function Point(x, y){
+ function Point(x, y, z){
/**
* x value of the {@link Point}
*
@@ -27,6 +27,9 @@
*/
// this.y = parseFloat(y);
this.y = y;
+
+ this.z = z;
+
}
/**
* computes the distance between a {@link Point} p and this {@link Point}
@@ -36,7 +39,7 @@
*/
Point.prototype.dist = function(p){
return Math.sqrt(Math.pow(this.y-p.y,2) + Math.pow(this.x-p.x,2)) ;
-}
+};
/**
* checks if the coordinates of this {@link Point} match the coordinates of a {@link Point} p
*
@@ -46,7 +49,7 @@
Point.prototype.equals = function(p){
if (this.x == p.x && this.y == p.y) {return true;}
return false;
-}
+};
/**
* subtracts a {@link Point} p from this {@link Point}
*
@@ -55,7 +58,7 @@
*/
Point.prototype.minus = function(p){
return new Point(this.x-p.x, this.y-p.y);
-}
+};
/**
* adds this {@link Point} to a {@link Point} p
*
@@ -64,7 +67,7 @@
*/
Point.prototype.plus = function(p){
return new Point(this.x+p.x, this.y+p.y);
-}
+};
/**
* divides this {@link Point} by a scalar c
*
@@ -72,12 +75,12 @@
* @return a new {@link Point} divided by c
*/
Point.prototype.dividedBy = function(c){
- if (c != 0) {
+ if (c !== 0) {
return new Point(this.x/c, this.y/c);
}
var e = new Mb_exception("Point.dividedBy: Division by zero");
return false;
-}
+};
/**
* multiplies this {@link Point} by a scalar c
*
@@ -86,7 +89,7 @@
*/
Point.prototype.times = function(c){
return new Point(this.x*c, this.y*c);
-}
+};
/**
* rounds the coordinates to numOfDigits digits
*
@@ -96,14 +99,19 @@
*/
Point.prototype.round = function(numOfDigits){
return new Point(roundToDigits(this.x, numOfDigits), roundToDigits(this.y, numOfDigits));
-}
+};
/**
* @returns a {String} representation of this Point
* @type String
*/
Point.prototype.toString = function(){
- return "[" + this.x + ", " + this.y + "]";
-}
+ if (typeof(this.z == "undefined")) {
+ return "[" + this.x + ", " + this.y + "]";
+ }
+ else {
+ return "[" + this.x + ", " + this.y + ", " + this.z + "]";
+ }
+};
//------------------------------------------------------------------------
@@ -111,11 +119,19 @@
/**
* @ignore
*/
-function mapToReal(frameName, aPoint) {
+function mapToReal(frameName, aPoint){
var v;
- if (typeof(mb_mapObj) == 'object') v = makeClickPos2RealWorldPos(frameName, aPoint.x, aPoint.y);
- else if (typeof(parent.mb_mapObj) == 'object') v = parent.makeClickPos2RealWorldPos(frameName, aPoint.x, aPoint.y);
- else alert('where am i?');
+ if (typeof(mb_mapObj) == 'object') {
+ v = makeClickPos2RealWorldPos(frameName, aPoint.x, aPoint.y);
+ }
+ else {
+ if (typeof(parent.mb_mapObj) == 'object') {
+ v = parent.makeClickPos2RealWorldPos(frameName, aPoint.x, aPoint.y);
+ }
+ else {
+ alert('where am i?');
+ }
+ }
return new Point(v[0], v[1]);
}
/**
@@ -172,5 +188,5 @@
* @ignore
*/
function roundToDigits(aFloat, numberOfDigits) {
- return Math.round(aFloat*Math.pow(10, parseInt(numberOfDigits)))/Math.pow(10, parseInt(numberOfDigits));
+ return Math.round(aFloat*Math.pow(10, parseInt(numberOfDigits, 10)))/Math.pow(10, parseInt(numberOfDigits, 10));
}
Modified: trunk/mapbender/http/javascripts/popup.js
===================================================================
--- trunk/mapbender/http/javascripts/popup.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/popup.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -51,7 +51,8 @@
break;
}
- this.id="popup"+String(create_pos);
+// this.id="popup"+String(create_pos);
+ this.id="popup"+String(popup_top);
//Set defaults
defaults = {
@@ -67,7 +68,7 @@
//Set vars
if(posx)this.options.left=posx;
- if(posy)this.options.top=posx;
+ if(posy)this.options.top=posy;
if(width)this.options.width=width;
if(height)this.options.height=height;
if(title)this.options.title=title;
Copied: trunk/mapbender/http/javascripts/requestGeometryConstructor.js (from rev 2404, branches/2.5/http/javascripts/requestGeometryConstructor.js)
===================================================================
--- trunk/mapbender/http/javascripts/requestGeometryConstructor.js (rev 0)
+++ trunk/mapbender/http/javascripts/requestGeometryConstructor.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -0,0 +1,201 @@
+/*
+* $Id: requestGeometryConstructor.js 1882 2007-12-03 09:01:24Z verenadiewald $
+* COPYRIGHT: (C) 2001 by ccgis. This program is free software under the GNU General Public
+* License (>=v2). Read the file gpl.txt that comes with Mapbender for details.
+*/
+//http://www.mapbender.org/index.php/requestGeometryConstructor.js
+
+/**
+ * @class A class representing a constructor for a geometry/WFS request.
+ *
+ * @constructor
+ * @param {String} geomType type of the {@link RequestGeometryConstructor}
+ * @param {String} geomType target of the {@link RequestGeometryConstructor}
+ */
+ function RequestGeometryConstructor(geomTarget){
+ /**
+ * geomTarget target of the {@link RequestGeometryConstructor}
+ *
+ * @type String
+ */
+
+ this.geomTarget = geomTarget;
+
+ this.getGeometry = function(queryType,callbackFunction){
+ var target = this.geomTarget;
+ s = new Snapping(this.geomTarget);
+ callback = callbackFunction;
+
+ var el = window.frames[target].document;
+ el.onmouseover = null;
+ el.onmousedown = null;
+ el.onmouseup = null;
+ el.onmousemove = null;
+
+ if (queryType == "point") {
+ queryGeom = new Geometry(geomType.point);
+ el.onmousedown = function (e) {
+ mb_getMousePos(e,target);
+ realWorldPos = mapToReal(target,new Point(clickX,clickY));
+ queryGeom.addPoint(realWorldPos);
+ callback(target, queryGeom);
+ el.onmouseover = null;
+ el.onmousedown = null;
+ el.onmouseup = null;
+ el.onmousemove = null;
+ queryGeom = null;
+ };
+ }
+ else if (queryType == "polygon") {
+ queryGeom = new Geometry(geomType.polygon);
+ el.onmousedown = wfsSpatialRequestStart;
+ el.onmousemove = wfsSpatialRequestRun;
+ }
+ else if (queryType == "rectangle") {
+ queryGeom = new Geometry(geomType.line);
+ el.onmouseover = selAreaExtInit;
+ el.onmousedown = mod_box_start;
+ el.onmouseup = selAreaExtGet;
+ el.onmousemove = mod_box_run;
+ }
+ else if (queryType == "extent") {
+ queryGeom = new Geometry(geomType.line);
+ var ind = getMapObjIndexByName(target);
+ var p0 = mapToReal(target, new Point(0,0));
+ var p1 = mapToReal(target, new Point(mb_mapObj[ind].width,mb_mapObj[ind].height));
+ queryGeom.addPoint(p0);
+ queryGeom.addPoint(p1);
+ callback(target, queryGeom);
+ el.onmouseover = null;
+ el.onmousedown = null;
+ el.onmouseup = null;
+ el.onmousemove = null;
+ queryGeom = null;
+ }
+
+ }
+
+ var s;
+ var callback;
+
+ var wfsSpatialRequestStart = function(e){
+ this.geomTarget = geomTarget;
+ var that = this;
+ var realWorldPos;
+ if (s.isSnapped() == true) {
+ realWorldPos = s.getSnappedPoint();
+ s.clean();
+ }
+ else {
+ mb_getMousePos(e,that.geomTarget);
+ realWorldPos = mapToReal(that.geomTarget,new Point(clickX,clickY));
+ }
+ queryGeom.addPoint(realWorldPos);
+
+ if (queryGeom.count() == 1) {
+ s.add(queryGeom.get(0));
+ }
+ if (s.isSnapped() && queryGeom.count() >= 3 && queryGeom.get(-1).equals(queryGeom.get(0))) {
+ queryGeom.close();
+ callback(that.geomTarget,queryGeom);
+ writeTag(that.geomTarget,"measuring","");
+ writeTag(that.geomTarget,"measure_display","");
+ var el = window.frames[that.geomTarget].document;
+ el.onmouseover = null;
+ el.onmousedown = null;
+ el.onmouseup = null;
+ el.onmousemove = null;
+ queryGeom = null;
+ return;
+ }
+ drawDashedLineExt();
+ }
+
+ var wfsSpatialRequestRun = function(e){
+ this.geomTarget = geomTarget;
+ var that = this;
+ if (queryGeom.count() >= 3) {
+ mb_getMousePos(e,that.geomTarget);
+ var pos = new Point(clickX,clickY);
+ s.check(pos);
+ }
+ }
+
+ var drawDashedLineExt = function(e){
+ this.geomTarget = geomTarget;
+ var that = this;
+ var ind = getMapObjIndexByName(that.geomTarget);
+ var str_mPoints = "<div style='position:absolute;left:0px;top:0px' ><img src='"+mb_trans.src+"' width='"+mb_mapObj[ind].width+"' height='0'></div>";
+ str_mPoints += "<div style='position:absolute;left:0px;top:0px' ><img src='"+mb_trans.src+"' width='0' height='"+mb_mapObj[ind].height+"'></div>";
+ if (queryGeom != null) {
+ for(var i=0; i<queryGeom.count(); i++){
+ var pos = realToMap(that.geomTarget,queryGeom.get(i));
+ str_mPoints += "<div style='font-size:1px;position:absolute;top:"+(pos.y-2)+"px;left:"+(pos.x-2)+"px;width:3px;height:3px;background-color:#ff0000'></div>";
+ }
+ if(queryGeom.count()>1){
+ for(var k=1; k<queryGeom.count(); k++){
+ var pos0 = realToMap(that.geomTarget,queryGeom.get(k));
+ var pos1 = realToMap(that.geomTarget,queryGeom.get(k-1));
+ str_mPoints += evaluateDashesExt(pos1,pos0,k);
+ }
+ }
+ }
+ writeTag(that.geomTarget,"measuring",str_mPoints);
+ }
+
+ var evaluateDashesExt = function(p1,p0,count){
+ this.geomTarget = geomTarget;
+ var that = this;
+ var ind = getMapObjIndexByName(that.geomTarget);
+ var str_dashedLine = "";
+ var d = p0.dist(p1);
+ var n = Math.round(d);
+ var s = p0.minus(p1).dividedBy(n);
+ for(var i=1; i<n; i++){
+ var currPoint = p1.plus(s.times(i)).minus(new Point(2,2)).round(0);
+ if(currPoint.x >= 0 && currPoint.x <= mb_mapObj[ind].width && currPoint.y >= 0 && currPoint.y <= mb_mapObj[ind].height){
+ str_dashedLine += "<div style='font-size:1px;position:absolute;top:"+currPoint.y+"px;left:"+currPoint.x+"px;width:3px;height:3px;background-color:#ff0000'></div>";
+ }
+ }
+ return str_dashedLine;
+ }
+
+ var selAreaExtInit = function(e){
+ this.geomTarget = geomTarget;
+ var that = this;
+ mb_isBF = that.geomTarget;
+ mb_zF = that.geomTarget;
+ }
+
+ var selAreaExtGet = function(e){
+ this.geomTarget = geomTarget;
+ var that = this;
+ selAreaExtSetValidClipping(mod_box_stop(e));
+ mb_isBF = that.geomTarget;
+ mb_zF = that.geomTarget;
+ }
+
+ var selAreaExtSetValidClipping = function(coords){
+ this.geomTarget = geomTarget;
+ var that = this;
+ if (queryGeom != null) {
+ queryGeom.addPoint(new Point(coords[0],coords[1]));
+ queryGeom.addPoint(new Point(coords[2],coords[3]));
+
+ if(queryGeom.count() == 2){
+ callback(that.geomTarget,queryGeom);
+ var el = window.frames[that.geomTarget].document;
+ el.onmouseover = null;
+ el.onmousedown = null;
+ el.onmouseup = null;
+ el.onmousemove = null;
+ queryGeom = null;
+ }
+ else{
+ callback(that.geomTarget,queryGeom);
+ }
+ }
+ }
+}
+
+
Deleted: trunk/mapbender/http/javascripts/transform_coordinatesWGS84.php
===================================================================
--- trunk/mapbender/http/javascripts/transform_coordinatesWGS84.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/transform_coordinatesWGS84.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,49 +0,0 @@
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/mod_measure.php
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-
-require_once("../../conf/mapbender.conf");
-
-$DBSERVER = '192.168.0.100';
-$OWNER = "admin";
-$PW = "&see5Toxu?";
-
-$con = pg_connect('host=' . $DBSERVER . ' user=' . $OWNER . ' password=' . $PW . ' dbname=merlin');
-
-
-
-$sql_pointA = "SELECT X(transform(GeometryFromText('POINT(".$_POST['x1']." ".$_POST['y1'].")',4326),".$_POST['inputEPSG'].")) as minx, Y(transform(GeometryFromText('POINT(".$_POST['x1']." ".$_POST['y1'].")',4326),".$_POST['inputEPSG'].")) as miny;";
-
-$resA = db_query($sql_pointA);
-$recA = pg_fetch_array($resA);
-
-$sql_pointB = "SELECT X(transform(GeometryFromText('POINT(".$_POST['x2']." ".$_POST['y2'].")',4326),".$_POST['inputEPSG'].")) as maxx, Y(transform(GeometryFromText('POINT(".$_POST['x2']." ".$_POST['y2'].")',4326),".$_POST['inputEPSG'].")) as maxy;";
-
-$resB = db_query($sql_pointB);
-$recB = pg_fetch_array($resB);
-
-$sql_dist = "SELECT distance('POINT(".$recA['minx']." ".$recA['miny']. ")','POINT(" . $recB['maxx']." ". $recB['maxy'].")') as dist;";
-$res_dist = db_query($sql_dist);
-$rec_dist = pg_fetch_array($res_dist);
-
-echo $rec_dist['dist'];
-#echo $recA['minx']. "," . $recA['miny'] . "," . $recB['maxx']. "," . $recB['maxy']. "," .$rec_dist['dist'];
-
-
-
-?>
Modified: trunk/mapbender/http/javascripts/wfs.js
===================================================================
--- trunk/mapbender/http/javascripts/wfs.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/wfs.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,15 +19,14 @@
session_start();
import_request_variables("PG");
-require_once("../php/mb_validateSession.php");
-require_once("../../conf/mapbender.conf");
+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 = $_REQUEST["gui_id"];
$e_id_css = "wfs";
include '../include/dyn_js.php';
-require_once("wfs_usemap.js");
+require_once(dirname(__FILE__) . "/wfs_usemap.js");
?>
var highlight_tag_id = "wfs_highlight_tag";
var mb_wfs_fetched = [];
@@ -165,34 +164,41 @@
highlight.add(mb_wfs_fetch.get(i), '#00ff00');
highlight.paint();
}
- else highlight.del(mb_wfs_fetch.get(i), '#00ff00');
+ else {
+ highlight.del(mb_wfs_fetch.get(i), '#00ff00');
+ highlight.paint();
+ }
}
function mb_wfs_perform(type,m){
var wfs_conf = window.frames["wfs_conf"].get_wfs_conf();
if(type=='over') {
- highlight.add(m, '#0000ff');
+ highlight.add(m, '#ff0000');
highlight.paint();
}
- else if(type=='out') highlight.del(m, '#0000ff');
- else if(type=='click') {
- var tmp = m.getBBox();
- if (m.geomType == geomType.point) {
- var b = 1;
+ else if (type == 'out') {
+ highlight.del(m, '#ff0000');
+ highlight.paint();
+ }
+ else
+ if (type == 'click') {
+ var tmp = m.getBBox();
+ if (m.geomType == geomType.point) {
+ var b = 1;
+ }
+ else {
+ var b = 0;
+ }
+ if (typeof(m.wfs_conf) != "undefined") {
+ b = parseFloat(wfs_conf[m.wfs_conf]['g_buffer']);
+ }
+ var buffer = new Point(b, b);
+ var bbox_ll = tmp[0].minus(buffer);
+ var bbox_ru = tmp[1].plus(buffer);
+ mb_calcExtent(mb_wfs_targets[0], bbox_ll, bbox_ru);
+ zoom(mb_wfs_targets[0], 'true', 1.0);
}
- else {
- var b = 0;
- }
- if (typeof(m.wfs_conf) != "undefined") {
- b = parseFloat(wfs_conf[m.wfs_conf]['g_buffer']);
- }
- var buffer = new Point(b,b);
- var bbox_ll = tmp[0].minus(buffer);
- var bbox_ru = tmp[1].plus(buffer);
- mb_calcExtent(mb_wfs_targets[0],bbox_ll, bbox_ru);
- zoom(mb_wfs_targets[0], 'true', 1.0);
- }
}
function get_wfs_str(myconf, d, m, type, fid) {
Modified: trunk/mapbender/http/javascripts/wfs_obj.js
===================================================================
--- trunk/mapbender/http/javascripts/wfs_obj.js 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/javascripts/wfs_obj.js 2008-04-23 16:21:04 UTC (rev 2413)
@@ -69,7 +69,7 @@
//elements
function wfs_add_featuretype_element(element_name, element_type, element_count, featuretype_count){
wfs[wfs.length-1].wfs_featuretype[featuretype_count].element[element_count] = [];
- wfs[wfs.length-1].wfs_featuretype[featuretype_count].element[element_count]["name"] = element_name;
- wfs[wfs.length-1].wfs_featuretype[featuretype_count].element[element_count]["type"] = element_type;
+ wfs[wfs.length-1].wfs_featuretype[featuretype_count].element[element_count].name = element_name;
+ wfs[wfs.length-1].wfs_featuretype[featuretype_count].element[element_count].type = element_type;
//alert(element_name +" , "+element_type);
}
Modified: trunk/mapbender/http/php/mb_js_exception.php
===================================================================
--- trunk/mapbender/http/php/mb_js_exception.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mb_js_exception.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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: trunk/mapbender/http/php/mb_listKMLs.php
===================================================================
--- trunk/mapbender/http/php/mb_listKMLs.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mb_listKMLs.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,14 +16,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__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../classes/class_administration.php");
+require_once(dirname(__FILE__) . "/../classes/class_connector.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_administration.php");
-require_once("../classes/class_mb_exception.php");
-require_once("../classes/class_connector.php");
-require_once("../classes/class_kml_ows.php");
-
$gui_id = $_SESSION["mb_user_gui"];
$user_id = $_SESSION["mb_user_id"];
@@ -34,10 +31,7 @@
$clientFilename = $_FILES["local_kml_filename"]["tmp_name"];
$kmlUrl = $_POST["local_kml_url"];
-$form_target = $_SERVER["PHP_SELF"] . "?" . SID;
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
+$form_target = $self;
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -101,8 +95,10 @@
}
function getTarget($gui_id) {
- $sql = "SELECT e_requires, e_target FROM gui_element WHERE e_id = 'loadkml' AND fkey_gui_id = '".$gui_id."'";
- $res = db_query($sql);
+ $sql = "SELECT e_requires, e_target FROM gui_element WHERE e_id = 'loadkml' 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"];
Modified: trunk/mapbender/http/php/mb_listWMCs.php
===================================================================
--- trunk/mapbender/http/php/mb_listWMCs.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mb_listWMCs.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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"];
@@ -26,15 +29,6 @@
$delWmcId = $_POST["del_wmc_id"];
$clientFilename = $_FILES['local_wmc_filename']['tmp_name'];
-$form_target = $_SERVER["PHP_SELF"] . "?" . SID;
-
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_administration.php");
-require_once("../classes/class_mb_exception.php");
-require_once("../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>
@@ -46,7 +40,7 @@
<title>Select web map contect document from list</title>
</head>
<body>
- <form name='delete_wmc' action='<?php echo $form_target; ?>' method='POST'>
+ <form name='delete_wmc' action='<?php echo $self; ?>' method='POST'>
<input type='hidden' id='delete_wmc' name='del_wmc_id' value ='' >
</form>
@@ -98,8 +92,10 @@
}
function getTarget($gui_id) {
- $sql = "SELECT e_requires, e_target FROM gui_element WHERE e_id = 'loadwmc' AND fkey_gui_id = '".$gui_id."'";
- $res = db_query($sql);
+ $sql = "SELECT e_requires, e_target FROM gui_element WHERE e_id = 'loadwmc' 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"];
@@ -164,14 +160,14 @@
// load a WMC from file
?>
<h2 style='font-family: Arial, Helvetica, sans-serif; color: #808080;background-color: White;'><font align='left' color='#000000'>load WMC from file</font></h2>
-<form enctype="multipart/form-data" action="<?php echo $form_target;?>" method=POST target="_self">
+<form enctype="multipart/form-data" action="<?php echo $self;?>" method=POST target="_self">
<input type='file' name='local_wmc_filename'>
<input type='submit' value='load'>
</form>
<?php
// load a WMC from list
-echo mb_listWMCs($wmcIdArray, $form_target);
+echo mb_listWMCs($wmcIdArray, $self);
if ($wmcId && in_array($wmcId, $wmcIdArray)){
if ($action == "delete") {
Modified: trunk/mapbender/http/php/mb_validatePermission.php
===================================================================
--- trunk/mapbender/http/php/mb_validatePermission.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mb_validatePermission.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,26 +17,68 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-include_once(dirname(__FILE__)."/../classes/class_administration.php");
-if(!isset($_SESSION["mb_user_id"]) || !isset($_SESSION["mb_user_ip"]) || $_SESSION['mb_user_ip'] != $_SERVER['REMOTE_ADDR']){
- header("Location: ".LOGIN);
- exit;
+require(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+
+$admin = new administration();
+
+//
+// check if GUI id and element id are set
+//
+$msg = "missing in " . $_SERVER["PHP_SELF"];
+if (!isset($gui_id)) {
+ $e = new mb_exception("GUI id " . $msg);
die();
}
-if(isset($_REQUEST["gui_id"])){
- if( !in_array($_REQUEST["gui_id"],$_SESSION["mb_user_guis"])){
- header("Location: ".LOGIN);
- exit;
- die();
+if (!isset($e_id)) {
+ $e = new mb_exception("Element id " . $msg);
+ die();
+}
+
+//
+// check if the user is allowed to access this module
+//
+$isAllowed = $admin->getModulPermission($_SESSION["mb_user_id"], $gui_id, $e_id);
+
+//
+// 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 (!preg_match("/^.*\/javascripts\/map\.php$/", $_SERVER["PHP_SELF"])) {
+
+ $isCorrectScript = true;
+
+ $sql = "SELECT e_element FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
+ $v = array($e_id, $gui_id);
+ $t = array("s", "s");
+ $res = db_prep_query($sql, $v, $t);
+ while ($row = db_fetch_array($res)) {
+ if (!$admin->checkModulePermission_new($_SESSION["mb_user_id"], $_SERVER["PHP_SELF"], $row["e_element"])) {
+ $isCorrectScript = false;
+ break;
+ }
}
+// $e = new mb_notice($e_id . ": isAllowed: " . $isAllowed . ", isCorrectScript: " . $isCorrectScript);
+ $isAllowed = $isAllowed && $isCorrectScript;
}
-$n = new administration();
-$m = $n->getModulPermission($_SESSION["mb_user_id"],$_REQUEST["guiID"],$_REQUEST["elementID"]);
-if($m == false){
+
+//
+// If the user is not allowed to access the module, return to the login screen.
+//
+if (!$isAllowed) {
+ $msg = "mb_validatePermission.php: User " . $_SESSION["mb_user_id"] . " is not allowed to access ".
+ "module " . $e_id;
+ $e = new mb_exception($msg);
header("Location: ".LOGIN);
- exit;
die();
}
+
+$e = new mb_notice("mb_validatePermission.php: checking file " . $_SERVER["PHP_SELF"] . "...permission valid.");
+
+//
+// delete global variables
+//
+unset($admin, $isAllowed, $e, $isCorrectScript, $msg, $myGuisArray);
?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mb_validateSession.php
===================================================================
--- trunk/mapbender/http/php/mb_validateSession.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mb_validateSession.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,17 +18,75 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
session_start();
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-if(!isset($_SESSION["mb_user_id"]) || !isset($_SESSION["mb_user_ip"]) || $_SESSION['mb_user_ip'] != $_SERVER['REMOTE_ADDR']){
- header("Location: ".LOGIN);
- exit;
- die();
+
+require_once(dirname(__FILE__)."/../php/system.php");
+require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+
+//
+// establish database connection
+//
+$con = db_connect($DBSERVER, $OWNER, $PW);
+db_select_db(DB, $con);
+
+$e = new mb_notice("mb_validateSession.php: checking file " . $_SERVER["PHP_SELF"]);
+
+//
+// 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("mb_validateSession.php: Invalid user: " . $_SESSION["mb_user_id"]);
+ header("Location: " . LOGIN);
+ die();
}
-if(isset($_REQUEST["gui_id"])){
- if( !in_array($_REQUEST["gui_id"],$_SESSION["mb_user_guis"])){
- header("Location: ".LOGIN);
- exit;
- die();
+
+//
+// set the global var gui_id
+//
+if (!$gui_id) {
+ $e = new mb_notice("gui id not set");
+ if ($_REQUEST["guiID"]) {
+ $e = new mb_notice("gui id set to guiID");
+ $gui_id = $_REQUEST["guiID"];
}
+ elseif ($_REQUEST["gui_id"]) {
+ $e = new mb_notice("gui id set to gui_id");
+ $gui_id = $_REQUEST["gui_id"];
+ }
+ else {
+ $e = new mb_notice("mb_validateSession.php: gui_id not set in script: " . $_SERVER["PHP_SELF"]);
+ }
}
+
+//
+// set the global var e_id
+//
+if (!$e_id) {
+ if (isset($_REQUEST["elementID"])) {
+ $e_id = $_REQUEST["elementID"];
+ }
+ elseif (isset($_REQUEST["e_id"])) {
+ $e_id = $_REQUEST["e_id"];
+ }
+ else {
+ $e = new mb_notice("mb_validateSession.php: e_id not set in script: " . $_SERVER["PHP_SELF"]);
+ }
+}
+
+//
+// set variables used for form targets or links
+//
+$urlParameters = SID;
+if (isset($gui_id)) {
+ $urlParameters .= "&guiID=" . $gui_id;
+}
+if (isset($e_id)) {
+ $urlParameters .= "&elementID=" . $e_id;
+}
+$self = $_SERVER["PHP_SELF"] . "?" . $urlParameters;
+
+$e = new mb_notice("mb_validateSession.php: GUI: " . $gui_id . ", checking file " . $_SERVER["PHP_SELF"] . "...session valid.");
?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_SelectKeyword.php
===================================================================
--- trunk/mapbender/http/php/mod_SelectKeyword.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_SelectKeyword.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
-
<html>
<head>
<title>Select Keyword</title>
@@ -62,4 +58,4 @@
?>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_WMSpreferences.php
===================================================================
--- trunk/mapbender/http/php/mod_WMSpreferences.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_WMSpreferences.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -61,26 +58,29 @@
-->
</STYLE>
<?php
-
-$sql = "SELECT * FROM gui_element WHERE e_id = 'WMS_preferences' AND fkey_gui_id = '".$_SESSION["mb_user_gui"]."'";
-$res = db_query($sql);
-$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])."';";
+$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!');";}
+$e_target = explode(",", $e_target);
+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 = '".$_SESSION["mb_user_gui"]."'";
-$res_visible = db_query($sql_visible);
+$sql_visible = "SELECT * FROM gui_wms WHERE fkey_gui_id = $1";
+$v = array($_SESSION["mb_user_gui"]);
+$t = array("s");
+$res_visible = db_prep_query($sql_visible, $v, $t);
$cnt_visible = 0;
while($row = db_fetch_array($res_visible)){
@@ -110,26 +110,15 @@
// Opacity version
-function setMapOpacity(val) {
- var tmp = val.split(",");
- my.wms[tmp[0]].gui_wms_mapopacity = tmp[1];
- loadWMS();
+function cambia_opacity(id,incremento){
+ opacity = my.wms[id].gui_wms_mapopacity*100 + parseInt(incremento);
+ my.wms[id].setOpacity(opacity);
+ loadWMS();
}
-function cambia_opacity(id,incremento){
- objeto = opener.mapframe1.document.getElementById('div_'+id);
- opacity = objeto.style.opacity*100 - (-incremento);
- opacity = (opacity < 100)? ((opacity > 0)? opacity : 0) : 100;
- objeto.style.opacity = (opacity / 100);
- objeto.style.MozOpacity = (opacity / 100);
- objeto.style.KhtmlOpacity = (opacity / 100);
- objeto.style.filter = "alpha(opacity=" + opacity + ")";
- setMapOpacity(id+","+(opacity / 100));
-}
-
function setMapformat(val){
var tmp = val.split(",");
my.wms[tmp[0]].gui_wms_mapformat = tmp[1];
Modified: trunk/mapbender/http/php/mod_addWMSfromfilteredList_server.php
===================================================================
--- trunk/mapbender/http/php/mod_addWMSfromfilteredList_server.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_addWMSfromfilteredList_server.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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.
-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__)."/../extensions/JSON.php");
+require_once(dirname(__FILE__)."/../classes/class_json.php");
$userId = $_SESSION["mb_user_id"];
$command = $_GET["command"];
$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);
@@ -135,7 +129,7 @@
}
}
-$json = new Services_JSON();
+$json = new Mapbender_JSON();
$output = $json->encode($resultObj);
echo $output;
?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php
===================================================================
--- trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,25 +19,8 @@
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: trunk/mapbender/http/php/mod_button_tooltips.php
===================================================================
--- trunk/mapbender/http/php/mod_button_tooltips.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_button_tooltips.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,14 +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__)."/../extensions/JSON.php");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_json.php");
require_once(dirname(__FILE__)."/../classes/class_mb_exception.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'";
@@ -35,9 +31,9 @@
array_push($buttonObj, array("id" => $row["e_id"], "title" => $row["e_title"]));
}
-$json = new Services_JSON();
+$json = new Mapbender_JSON();
$output = $json->encode($buttonObj);
-header("Content-type:text/plain; Charset='UTF-8'");
+header("Content-type:text/plain; charset=utf-8");
echo $output;
?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_changeEPSG.php
===================================================================
--- trunk/mapbender/http/php/mod_changeEPSG.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_changeEPSG.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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">
@@ -53,66 +49,79 @@
# transform coordinates
if(isset($_REQUEST["srs"])){
- require_once("../../conf/mapbender.conf");
+ require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
$arraymapObj = mb_split("###", $_REQUEST["srs"]);
echo "<script type='text/javascript'>";
echo "var newExtent = new Array();";
for($i=0; $i < count($arraymapObj); $i++){
$temp = mb_split(",",$arraymapObj[$i]);
- if(SYS_DBTYPE=='pgsql'){
- $con = db_connect($DBSERVER,$OWNER,$PW);
- $sqlMinx = "SELECT X(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as minx";
- $resMinx = db_query($sqlMinx);
- $minx = db_result($resMinx,0,"minx");
-
- $sqlMiny = "SELECT Y(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as miny";
- $resMiny = db_query($sqlMiny);
- $miny = db_result($resMiny,0,"miny");
-
- $sqlMaxx = "SELECT X(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as maxx";
- $resMaxx =db_query($sqlMaxx);
- $maxx = db_result($resMaxx,0,"maxx");
-
- $sqlMaxy = "SELECT Y(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as maxy";
- $resMaxy = db_query($sqlMaxy);
- $maxy = db_result($resMaxy,0,"maxy");
- }else{
- $con_string = "host=$GEOS_DBSERVER port=$GEOS_PORT dbname=$GEOS_DB user=$GEOS_OWNER password=$GEOS_PW";
- $con = pg_connect($con_string) or die ("Error while connecting database");
-
- $sqlMinx = "SELECT X(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as minx";
- $resMinx = pg_query($con,$sqlMinx);
- $minx = pg_fetch_result($resMinx,0,"minx");
-
- $sqlMiny = "SELECT Y(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as miny";
- $resMiny = pg_query($con,$sqlMiny);
- $miny = pg_fetch_result($resMiny,0,"miny");
-
- $sqlMaxx = "SELECT X(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as maxx";
- $resMaxx = pg_query($con,$sqlMaxx);
- $maxx = pg_fetch_result($resMaxx,0,"maxx");
-
- $sqlMaxy = "SELECT Y(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as maxy";
- $resMaxy = pg_query($con,$sqlMaxy);
- $maxy = pg_fetch_result($resMaxy,0,"maxy");
- }
- $extenty = $maxy - $miny;
- $extentx = $maxx - $minx;
- $relation_px_x = $temp[6] / $temp[7];
- $relation_px_y = $temp[7] / $temp[6];
- $relation_bbox_x = $extentx / $extenty;
- if($relation_bbox_x <= $relation_px_x){
- $centerx = $minx + ($extentx/2);
- $minx = $centerx - $relation_px_x * $extenty / 2;
- $maxx = $centerx + $relation_px_x * $extenty / 2;
+ // check if parameters are valid geometries to
+ // avoid SQL injections
+
+ $oldEPSG = preg_replace("/EPSG:/","",$temp[1]);
+ $newEPSG = preg_replace("/EPSG:/","",$_REQUEST["newSRS"]);
+
+ if (is_numeric($temp[2]) && is_numeric($temp[3]) && is_numeric($temp[4]) && is_numeric($temp[5]) && is_numeric($oldEPSG) && is_numeric($newEPSG)) {
+
+ if(SYS_DBTYPE=='pgsql'){
+ $con = db_connect($DBSERVER,$OWNER,$PW);
+ $sqlMinx = "SELECT X(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".$oldEPSG."),".$newEPSG.")) as minx";
+ $resMinx = db_query($sqlMinx);
+ $minx = db_result($resMinx,0,"minx");
+
+ $sqlMiny = "SELECT Y(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".$oldEPSG."),".$newEPSG.")) as miny";
+ $resMiny = db_query($sqlMiny);
+ $miny = db_result($resMiny,0,"miny");
+
+ $sqlMaxx = "SELECT X(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".$oldEPSG."),".$newEPSG.")) as maxx";
+ $resMaxx = db_query($sqlMaxx);
+ $maxx = db_result($resMaxx,0,"maxx");
+
+ $sqlMaxy = "SELECT Y(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".$oldEPSG."),".$newEPSG.")) as maxy";
+ $resMaxy = db_query($sqlMaxy);
+ $maxy = db_result($resMaxy,0,"maxy");
+ }else{
+ $con_string = "host=$GEOS_DBSERVER port=$GEOS_PORT dbname=$GEOS_DB user=$GEOS_OWNER password=$GEOS_PW";
+ $con = pg_connect($con_string) or die ("Error while connecting database");
+
+ $sqlMinx = "SELECT X(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".$oldEPSG."),".$newEPSG.")) as minx";
+ $resMinx = pg_query($con,$sqlMinx);
+ $minx = pg_fetch_result($resMinx,0,"minx");
+
+ $sqlMiny = "SELECT Y(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".$oldEPSG."),".$newEPSG.")) as miny";
+ $resMiny = pg_query($con,$sqlMiny);
+ $miny = pg_fetch_result($resMiny,0,"miny");
+
+ $sqlMaxx = "SELECT X(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".$oldEPSG."),".$newEPSG.")) as maxx";
+ $resMaxx = pg_query($con,$sqlMaxx);
+ $maxx = pg_fetch_result($resMaxx,0,"maxx");
+
+ $sqlMaxy = "SELECT Y(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".$oldEPSG."),".$newEPSG.")) as maxy";
+ $resMaxy = pg_query($con,$sqlMaxy);
+ $maxy = pg_fetch_result($resMaxy,0,"maxy");
+ }
+ $extenty = $maxy - $miny;
+ $extentx = $maxx - $minx;
+ $relation_px_x = $temp[6] / $temp[7];
+ $relation_px_y = $temp[7] / $temp[6];
+ $relation_bbox_x = $extentx / $extenty;
+
+ if($relation_bbox_x <= $relation_px_x){
+ $centerx = $minx + ($extentx/2);
+ $minx = $centerx - $relation_px_x * $extenty / 2;
+ $maxx = $centerx + $relation_px_x * $extenty / 2;
+ }
+ if($relation_bbox_x > $relation_px_x){
+ $centery = $miny + ($extenty/2);
+ $miny = $centery - $relation_px_y * $extentx / 2;
+ $maxy = $centery + $relation_px_y * $extentx / 2;
+ }
+ echo "newExtent[".$i."] = '".$temp[0].",".$_REQUEST["newSRS"].",".$minx.",".$miny.",".$maxx.",".$maxy."';";
}
- if($relation_bbox_x > $relation_px_x){
- $centery = $miny + ($extenty/2);
- $miny = $centery - $relation_px_y * $extentx / 2;
- $maxy = $centery + $relation_px_y * $extentx / 2;
- }
- echo "newExtent[".$i."] = '".$temp[0].",".$_REQUEST["newSRS"].",".$minx.",".$miny.",".$maxx.",".$maxy."';";
+ else {
+ echo "var e = new parent.Mb_exception('mod_changeEPSG.php: invalid input parameter (p1 = (" . $temp[2] . "," . $temp[3] . "), p2 = (" . $temp[4] . "," . $temp[5] . "), old EPSG: " . $oldEPSG . ", new EPSG: " . $newEPSG . ", ).');";
+ }
}
echo "</script>";
}
@@ -186,7 +195,7 @@
</script>
</head>
<body leftmargin="1" topmargin="1" onload="mod_changeEPSG_init()" bgcolor="red">
-<form action="<?php echo $PHP_SELF .'?'.SID ?>" method='POST'>
+<form action="<?php echo $self; ?>" method='POST'>
<select class='epsg' name='epsg' onchange='mod_changeEPSG()'>
<option value="">undefined</option>
<option value="EPSG:4326">EPSG:4326</option>
Modified: trunk/mapbender/http/php/mod_changeEPSG_dynamic.php
===================================================================
--- trunk/mapbender/http/php/mod_changeEPSG_dynamic.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_changeEPSG_dynamic.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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>
@@ -230,7 +229,7 @@
<?php
/*insert EPSG into selectbox************************************************************************************/
-echo "<form action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form action='" . $self ."' method='post'>";
echo "<select class='epsg' name='epsg' onChange='mod_changeEPSG()'>";
for($i=0; $i<$cnt_epsg_wms; $i++){
echo "<option value='" . $epsg_code[$i] . "' ";
Modified: trunk/mapbender/http/php/mod_changePassword.php
===================================================================
--- trunk/mapbender/http/php/mod_changePassword.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_changePassword.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,15 +18,12 @@
# 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__)."/../../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>
-
<?php
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
@@ -58,7 +55,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 +63,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 +71,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 +129,13 @@
array_push($t,'i');
db_prep_query($sql_update,$v,$t);
echo "<script language='javascript'>";
- //echo "alert('Passwort wurde geändert!');";
+ //echo "alert('Passwort wurde ge�ndert!');";
echo "alert('Password has been updated!');";
echo "</script>";
}
else{
echo "<script language='javascript'>";
- //echo "alert('Bitte beachten Sie die unten aufgeführten Passwortregeln!');";
+ //echo "alert('Bitte beachten Sie die unten aufgef�hrten Passwortregeln!');";
echo "alert('Please note the rules for choosing a password below!');";
echo "</script>";
}
@@ -146,7 +143,7 @@
/* HTML */
echo "<fieldset><legend>Change password:</legend>";
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self ."' method='post'>";
echo "<table cellpadding='5' cellspacing='0' border='0'>";
echo "<td>";
echo "new password:";
Modified: trunk/mapbender/http/php/mod_createJSLayerObjFromXML.php
===================================================================
--- trunk/mapbender/http/php/mod_createJSLayerObjFromXML.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_createJSLayerObjFromXML.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,7 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(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>
@@ -31,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; }
@@ -43,4 +43,4 @@
<body bgcolor='#ffffff'>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_createJSObjFromDB.php
===================================================================
--- trunk/mapbender/http/php/mod_createJSObjFromDB.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_createJSObjFromDB.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,12 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+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');
@@ -33,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: trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,15 +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");
$wms_id = $_GET["wms_id"];
-$gui_id = $_GET["gui_id"];
$user_id = $_SESSION["mb_user_id"];
?>
Modified: trunk/mapbender/http/php/mod_createJSObjFromXML.php
===================================================================
--- trunk/mapbender/http/php/mod_createJSObjFromXML.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_createJSObjFromXML.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
$capabilitiesURL = html_entity_decode($_REQUEST['caps']);
Modified: trunk/mapbender/http/php/mod_createUser.php
===================================================================
--- trunk/mapbender/http/php/mod_createUser.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_createUser.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,15 +19,14 @@
# 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__)."/../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;
}
-$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: trunk/mapbender/http/php/mod_deleteFilteredGUI.php
===================================================================
--- trunk/mapbender/http/php/mod_deleteFilteredGUI.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_deleteFilteredGUI.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,13 +18,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$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: trunk/mapbender/http/php/mod_deleteGUI.php
===================================================================
--- trunk/mapbender/http/php/mod_deleteGUI.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_deleteGUI.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,16 +17,9 @@
# 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_validateSession.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_validatePermission.php");
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">
@@ -48,7 +41,7 @@
var ind = document.form1.guiList.selectedIndex;
if(ind > -1){
var permission = confirm("delete: " + document.form1.guiList.options[ind].text + " ?");
- if(permission == true){
+ if(permission === true){
document.form1.del.value = 1;
document.form1.submit();
}
@@ -65,16 +58,17 @@
###delete
if($guiList){
- $sql = "DELETE FROM gui WHERE gui_id = '".$guiList."'";
- $res = db_query($sql);
+ $sql = "DELETE FROM gui WHERE gui_id = $1";
+ $v = array($guiList);
+ $t = array("s");
+ $res = db_prep_query($sql, $v, $t);
}
-$sql_gui = "SELECT * FROM gui ";
-$sql_gui .= " ORDER BY gui_name";
+$sql_gui = "SELECT * FROM gui ORDER BY gui_name";
$res_gui = db_query($sql_gui);
$cnt_gui = 0;
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self ."' method='post'>";
echo "<select class='guiList' size='20' name='guiList' class='guiList'>";
while($row = db_fetch_array($res_gui)){
Modified: trunk/mapbender/http/php/mod_deleteWFS.php
===================================================================
--- trunk/mapbender/http/php/mod_deleteWFS.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_deleteWFS.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
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);
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
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">
@@ -48,7 +41,7 @@
var ind = document.form1.wfsList.selectedIndex;
if(ind > -1){
var permission = confirm("delete: " + document.form1.wfsList.options[ind].text + " ?");
- if(permission == true){
+ if(permission === true){
document.form1.del.value = 1;
document.form1.submit();
}
@@ -76,16 +69,17 @@
###delete
if($wfsList){
- $sql = "DELETE FROM wfs WHERE wfs_id = '".$wfsList."'";
- $res = db_query($sql);
+ $sql = "DELETE FROM wfs WHERE wfs_id = $1";
+ $v = array($wfsList);
+ $t = array("i");
+ $res = db_prep_query($sql, $v, $t);
}
-$sql_wfs = "SELECT * FROM wfs ";
-$sql_wfs .= " ORDER BY wfs_id";
+$sql_wfs = "SELECT * FROM wfs ORDER BY wfs_id";
$res_wfs = db_query($sql_wfs);
$cnt_wfs = 0;
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self ."' method='post'>";
echo "<br><b>WFS List: <b><br><br>";
echo "<select class='wfsList' size='20' name='wfsList' >";
Modified: trunk/mapbender/http/php/mod_deleteWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_deleteWMS.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_deleteWMS.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -47,7 +42,7 @@
var ind = document.form1.wmsList.selectedIndex;
if(ind > -1) {
var permission = confirm("delete: " + document.form1.wmsList.options[ind].text + " ?");
- if(permission == true) {
+ if(permission === true) {
document.form1.del.value = 1;
document.form1.submit();
}
@@ -60,7 +55,7 @@
if(ind > -1)
{
var permission = confirm("A mail will be sent to the owners of '" + document.form1.wmsList.options[ind].text + "', suggesting its deletion.");
- if(permission == true) {
+ if(permission === true) {
document.form2.suggest.value = 1;
document.form2.wms_name.value = document.form1.wmsList.options[ind].text;
document.form2.owners.value = email_str;
Modified: trunk/mapbender/http/php/mod_digitize_messages.php
===================================================================
--- trunk/mapbender/http/php/mod_digitize_messages.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_digitize_messages.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,12 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_json.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../extensions/JSON.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-
$e = new mb_notice("locale: " . $_SESSION["mb_locale"] . "; lang: " . $_SESSION["mb_lang"]);
$e = new mb_notice(setlocale(LC_ALL, $_SESSION["mb_locale"]));
@@ -30,47 +27,47 @@
// Messages
//
$msg_obj = array();
-$msg_obj["messageDescriptionPolygon"] = _("polygon");
-$msg_obj["messageDescriptionLine"] = _("line");
-$msg_obj["messageDescriptionPoint"] = _("point");
-$msg_obj["messageErrorNotAnInteger"] = _("Not an integer value.");
-$msg_obj["messageErrorNotAFloat"] = _("Not a double value.");
-$msg_obj["messageErrorFieldIsEmpty"] = _("This field may not be empty.");
-$msg_obj["messageErrorFormEvaluation"] = _("Failure during form evaluation.");
-$msg_obj["messageErrorWfsWrite"] = _("An error occured.");
-$msg_obj["messageSuccessWfsWrite"] = _("Success.");
-$msg_obj["messageConfirmDeleteGeomFromDb"] = _("Delete geometry from database?");
-$msg_obj["messageConfirmDeleteAllGeomFromList"] = _("Clear list of geometries?");
-$msg_obj["messageSelectAnOption"] = _("Please select an entry.");
-$msg_obj["buttonLabelSaveGeometry"] = _("Save");
-$msg_obj["buttonLabelUpdateGeometry"] = _("Update");
-$msg_obj["buttonLabelDeleteGeometry"] = _("Delete");
-$msg_obj["buttonLabelAbort"] = _("Abort");
-$msg_obj["errorMessageEpsgMismatch"] = _("Fatal error: EPSG mismatch. ");
-$msg_obj["errorMessageNoGeometrySelected"] = _("No geometry selected!");
-$msg_obj["buttonLabelPointOff"] = _("add point");
-$msg_obj["buttonLabelPointOn"] = _("cancel editing");
-$msg_obj["buttonLabelLineOff"] = _("add line");
-$msg_obj["buttonLabelLineOn"] = _("finish line");
-$msg_obj["buttonLabelPolygonOff"] = _("add polygon");
-$msg_obj["buttonLabelPolygonOn"] = _("close polygon");
-$msg_obj["buttonLabelMoveBasepointOff"] = _("move basepoint");
-$msg_obj["buttonLabelMoveBasepointOn"] = _("move basepoint");
-$msg_obj["buttonLabelInsertBasepointOff"] = _("Insert basepoint");
-$msg_obj["buttonLabelInsertBasepointOn"] = _("Insert basepoint");
-$msg_obj["buttonLabelDeleteBasepointOff"] = _("Delete basepoint");
-$msg_obj["buttonLabelDeleteBasepointOn"] = _("Delete basepoint");
-$msg_obj["buttonLabelClearListOff"] = _("clear list of geometries");
-$msg_obj["buttonLabelClearListOn"] = _("clear list of geometries");
-$msg_obj["buttonDig_wfs_title"] = _("save / update / delete");
-$msg_obj["buttonDig_remove_title"] = _("remove from workspace");
-$msg_obj["buttonDig_removeDb_title"] = _("remove from database");
-$msg_obj["closePolygon_title"] = _("click the first basepoint to close the polygon");
-$msg_obj["measureTagLabelCurrent"] = _("Current: ");
-$msg_obj["measureTagLabelTotal"] = _("Total: ");
-$msg_obj["digitizeDefaultGeometryName"] = _("new");
+$msg_obj["messageDescriptionPolygon"] = _mb("polygon");
+$msg_obj["messageDescriptionLine"] = _mb("line");
+$msg_obj["messageDescriptionPoint"] = _mb("point");
+$msg_obj["messageErrorNotAnInteger"] = _mb("Not an integer value.");
+$msg_obj["messageErrorNotAFloat"] = _mb("Not a double value.");
+$msg_obj["messageErrorFieldIsEmpty"] = _mb("This field may not be empty.");
+$msg_obj["messageErrorFormEvaluation"] = _mb("Failure during form evaluation.");
+$msg_obj["messageErrorWfsWrite"] = _mb("An error occured.");
+$msg_obj["messageSuccessWfsWrite"] = _mb("Success.");
+$msg_obj["messageConfirmDeleteGeomFromDb"] = _mb("Delete geometry from database?");
+$msg_obj["messageConfirmDeleteAllGeomFromList"] = _mb("Clear list of geometries?");
+$msg_obj["messageSelectAnOption"] = _mb("Please select an entry.");
+$msg_obj["buttonLabelSaveGeometry"] = _mb("Save");
+$msg_obj["buttonLabelUpdateGeometry"] = _mb("Update");
+$msg_obj["buttonLabelDeleteGeometry"] = _mb("Delete");
+$msg_obj["buttonLabelAbort"] = _mb("Abort");
+$msg_obj["errorMessageEpsgMismatch"] = _mb("Fatal error: EPSG mismatch. ");
+$msg_obj["errorMessageNoGeometrySelected"] = _mb("No geometry selected!");
+$msg_obj["buttonLabelPointOff"] = _mb("add point");
+$msg_obj["buttonLabelPointOn"] = _mb("cancel editing");
+$msg_obj["buttonLabelLineOff"] = _mb("add line");
+$msg_obj["buttonLabelLineOn"] = _mb("finish line");
+$msg_obj["buttonLabelPolygonOff"] = _mb("add polygon");
+$msg_obj["buttonLabelPolygonOn"] = _mb("close polygon");
+$msg_obj["buttonLabelMoveBasepointOff"] = _mb("move basepoint");
+$msg_obj["buttonLabelMoveBasepointOn"] = _mb("move basepoint");
+$msg_obj["buttonLabelInsertBasepointOff"] = _mb("Insert basepoint");
+$msg_obj["buttonLabelInsertBasepointOn"] = _mb("Insert basepoint");
+$msg_obj["buttonLabelDeleteBasepointOff"] = _mb("Delete basepoint");
+$msg_obj["buttonLabelDeleteBasepointOn"] = _mb("Delete basepoint");
+$msg_obj["buttonLabelClearListOff"] = _mb("clear list of geometries");
+$msg_obj["buttonLabelClearListOn"] = _mb("clear list of geometries");
+$msg_obj["buttonDig_wfs_title"] = _mb("save / update / delete");
+$msg_obj["buttonDig_remove_title"] = _mb("remove from workspace");
+$msg_obj["buttonDig_removeDb_title"] = _mb("remove from database");
+$msg_obj["closePolygon_title"] = _mb("click the first basepoint to close the polygon");
+$msg_obj["measureTagLabelCurrent"] = _mb("Current: ");
+$msg_obj["measureTagLabelTotal"] = _mb("Total: ");
+$msg_obj["digitizeDefaultGeometryName"] = _mb("new");
-$json = new Services_JSON();
+$json = new Mapbender_JSON();
$output = $json->encode($msg_obj);
header("Content-type:application/x-json; charset=utf-8");
Modified: trunk/mapbender/http/php/mod_displayKML.php
===================================================================
--- trunk/mapbender/http/php/mod_displayKML.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_displayKML.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,11 +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("../../conf/mapbender.conf");
-require_once("../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: trunk/mapbender/http/php/mod_editElementVars.php
===================================================================
--- trunk/mapbender/http/php/mod_editElementVars.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editElementVars.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,12 +18,7 @@
# 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">
@@ -172,7 +167,7 @@
<body>
<?php
- echo "<form name='form1' action='" . $PHP_SELF . "?".$sParams."' method='POST'>\n";
+ echo "<form name='form1' action='" . $self ."' method='POST'>\n";
$fkey_gui_id = $_REQUEST["fkey_gui_id"];
$fkey_e_id = $_REQUEST["fkey_e_id"];
@@ -188,7 +183,7 @@
echo "<input type='button' class='' name='' value='save' onclick='thisSave()'> \n";
echo "<input type='button' class='' name='' value='delete' onclick='thisDelete()'> \n";
- $href = "self.location.href='mod_editElements.php?".$sParams."&guiList1=".$fkey_gui_id."&guiList2=".$fkey_gui_id."'";
+ $href = "self.location.href='mod_editElements.php?".$urlParameters."&guiList1=".$fkey_gui_id."&guiList2=".$fkey_gui_id."'";
echo "<input type='button' class='' name='' value='return' onclick=\"".$href."\"> \n";
echo "</div>\n";
Modified: trunk/mapbender/http/php/mod_editElements.php
===================================================================
--- trunk/mapbender/http/php/mod_editElements.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editElements.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,15 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
import_request_variables("PG");
-require_once(dirname(__FILE__)."/../../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">
@@ -169,7 +163,7 @@
if ($mySave == '1'){
//copy element vars
$sql = "SELECT * FROM gui_element_vars WHERE fkey_e_id = $1 AND fkey_gui_id = $2";
- $v = array($e_id,$_POST["originGuiOfSelectedElement"]);
+ $v = array($e_id_,$_POST["originGuiOfSelectedElement"]);
$t = array('s','s');
$c = 0;
$res_vars = db_prep_query($sql,$v,$t);
@@ -177,7 +171,7 @@
db_begin();
$sql = "DELETE FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2 ";
- $v = array($e_id,$guiList1);
+ $v = array($e_id_,$guiList1);
$t = array('s','s');
$res = db_prep_query($sql,$v,$t);
@@ -191,7 +185,7 @@
$sql .= "e_attributes,e_left,e_top,e_width,e_height,e_z_index,e_more_styles,e_content,";
$sql .= "e_closetag,e_js_file,e_mb_mod,e_target,e_requires,e_url,e_title) ";
$sql .= "VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22)";
- $v = array($guiList1,$e_id,$e_pos,$e_public,$e_comment,$e_element,$e_src,$e_attributes,$e_left,
+ $v = array($guiList1,$e_id_,$e_pos,$e_public,$e_comment,$e_element,$e_src,$e_attributes,$e_left,
$e_top,$e_width,$e_height,$e_z_index,$e_more_styles,$e_content,$e_closetag,$e_js_file,
$e_mb_mod,$e_target,$e_requires,$e_url,$e_title);
$t = array('s','s','i','i','s','s','s','s','i','i','i','i','i','s','s','s','s','s','s','s','s','s');
@@ -209,7 +203,7 @@
$r = array();
$sql[$c] = "INSERT INTO gui_element_vars (fkey_gui_id,fkey_e_id,var_name,var_value,context,var_type) ";
$sql[$c] .= "VALUES ($1,$2,$3,$4,$5,$6)";
- $v[$c] = array($guiList1,$e_id,$row["var_name"],$row["var_value"],$row["context"],$row["var_type"]);
+ $v[$c] = array($guiList1,$e_id_,$row["var_name"],$row["var_value"],$row["context"],$row["var_type"]);
$t[$c] = array('s','s','s','s','s','s');
$r[$c] = db_prep_query($sql[$c],$v[$c],$t[$c]);
if(!$r){
@@ -230,10 +224,10 @@
}
if(isset($myDelete) && $myDelete == '1'){
$sql = "DELETE FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
- $v = array($e_id,$guiList1);
+ $v = array($e_id_,$guiList1);
$t = array('s','s');
$res = db_prep_query($sql,$v,$t);
- $e_id = ""; $e_pos = ""; $e_public = ""; $e_comment = ""; $e_element = "";
+ $e_id_ = ""; $e_pos = ""; $e_public = ""; $e_comment = ""; $e_element = "";
$e_src = ""; $e_attributes = ""; $e_left = ""; $e_top = ""; $e_width = ""; $e_height = ""; $e_z_index = "";
$e_more_styles = ""; $e_content = ""; $e_closetag = ""; $e_js_file = ""; $e_mb_mod = "";
$e_target = ""; $e_requires = ""; $e_url = "";
@@ -325,17 +319,17 @@
}
}
function thisSave(){
- if(document.form1.e_id.value == ""){
+ if(document.form1.e_id_.value == ""){
alert("ID ? ");
- document.form1.e_id.focus();
+ document.form1.e_id_.focus();
return;
}
var permission = false;
var isElement = false;
for(var i=0; i<guiIDs.length; i++){
clearRadio();
- if(document.form1.e_id.value == guiIDs[i]){
- permission = confirm("update: " + document.form1.e_id.value + " ?");
+ if(document.form1.e_id_.value == guiIDs[i]){
+ permission = confirm("update: " + document.form1.e_id_.value + " ?");
isElement = true;
break;
}
@@ -348,7 +342,7 @@
function thisDelete(){
clearRadio();
- var permission = confirm("delete: " + document.form1.e_id.value + " ?");
+ var permission = confirm("delete: " + document.form1.e_id_.value + " ?");
if(permission == true){
document.form1.myDelete.value = 1;
document.form1.submit();
@@ -367,7 +361,7 @@
}
function thisExport(){
- window.open("mod_exportElement.php?element=" + document.forms[0].e_id.value+ "&gui=" +document.forms[0].guiList1.value ,"","");
+ window.open("mod_exportElement.php?element=" + document.forms[0].e_id_.value+ "&gui=" +document.forms[0].guiList1.value ,"","");
}
function editDesc(){
var newDesc = prompt("Enter new GUI description", document.form1.guiDesc.value);
@@ -526,7 +520,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>";
@@ -545,7 +539,7 @@
$t = array();
$res = db_prep_query($sql,$v,$t);
if($row = db_fetch_array($res)){
- echo "<tr><td>ID: </td><td><input type='text' class='textfield' name='e_id' value='".$row["e_id"]."'></td></tr>\n";
+ echo "<tr><td>ID: </td><td><input type='text' class='textfield' name='e_id_' value='".$row["e_id"]."'></td></tr>\n";
echo "<tr><td>Position: </td><td><input type='text' class='textfield' name='e_pos' value='".$row["e_pos"]."'></td></tr>\n";
echo "<tr><td>ON/OFF: </td><td><input type='text' class='textfield' name='e_public' value='".$row["e_public"]."'></td></tr>\n";
echo "<tr><td>Comment: </td><td><textarea cols='32' rows='5' name='e_comment' >".stripslashes($row["e_comment"])."</textarea></td></tr>\n";
@@ -570,7 +564,7 @@
echo "</table>";
}
else if(isset($guiList1)){
- echo "<tr><td>ID: </td><td><input type='text' class='textfield' name='e_id' value='".$e_id."'></td></tr>\n";
+ echo "<tr><td>ID: </td><td><input type='text' class='textfield' name='e_id_' value='".$e_id_."'></td></tr>\n";
echo "<tr><td>Position: </td><td><input type='text' class='textfield' name='e_pos' value='".$e_pos."'></td></tr>\n";
echo "<tr><td>ON/OFF: </td><td><input type='text' class='textfield' name='e_public' value='".$e_public."'></td></tr>\n";
echo "<tr><td>Comment: </td><td><textarea cols='32' rows='5' name='e_comment' >".stripslashes($e_comment)."</textarea></td></tr>\n";
Modified: trunk/mapbender/http/php/mod_editFilteredGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_editFilteredGroup.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editFilteredGroup.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,11 +19,7 @@
# 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>
@@ -50,7 +46,7 @@
if(val == 'delete'){
permission = confirm("Delete Group?");
}
- if(permission == true){
+ if(permission === true){
document.forms[0].action.value = val;
document.forms[0].submit();
}
@@ -58,7 +54,7 @@
}
function validateInput(){
var str_alert = "Input incorrect !";
- if(document.forms[0].name.value == ''){
+ if(document.forms[0].name.value === ''){
alert(str_alert);
document.forms[0].name.focus();
return 'false';
@@ -138,11 +134,15 @@
echo "<select name='selected_group' onchange='submit()'>";
echo "<option value='new'>NEW...</option>";
$sql = "SELECT mb_group_name,mb_group_id FROM mb_group ";
+ $v = array();
+ $t = array();
if(isset($myGroup)){
- $sql .= "WHERE mb_group_owner = ".$_SESSION["mb_user_id"];
+ $sql .= "WHERE mb_group_owner = $1";
+ array_push($v, $_SESSION["mb_user_id"]);
+ array_push($t, "i");
}
$sql .= " ORDER BY mb_group_name ";
- $res = db_query($sql);
+ $res = db_prep_query($sql, $v, $t);
$count=0;
while($row = db_fetch_array($res)){
echo "<option value='".$row["mb_group_id"]."' ";
Modified: trunk/mapbender/http/php/mod_editFilteredUser.php
===================================================================
--- trunk/mapbender/http/php/mod_editFilteredUser.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editFilteredUser.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,11 +19,7 @@
# 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">
@@ -53,7 +49,7 @@
if(val == 'delete'){
permission = confirm("Delete User?");
}
- if(permission == true){
+ if(permission === true){
if(document.forms[0].password.value == myPW){
document.forms[0].password.value = '';
}
@@ -64,27 +60,27 @@
}
function validateInput(){
var str_alert = "Input incorrect !";
- if(document.forms[0].name.value == ''){
+ if(document.forms[0].name.value === ''){
alert(str_alert);
document.forms[0].name.focus();
return 'false';
}
- if(document.forms[0].password.value == ''){
+ if(document.forms[0].password.value === ''){
alert(str_alert);
document.forms[0].password.focus();
return 'false';
}
- if((document.forms[0].password.value != myPW || document.forms[0].v_password.value != '' )&& document.forms[0].password.value != document.forms[0].v_password.value){
+ if((document.forms[0].password.value != myPW || document.forms[0].v_password.value !== '' )&& document.forms[0].password.value != document.forms[0].v_password.value){
alert("Password verification failed. You have to enter the same password twice!");
document.forms[0].password.value = myPW;
document.forms[0].password.focus();
return 'false';
}
- if(document.forms[0].resolution.value == ''){
+ if(document.forms[0].resolution.value === ''){
document.forms[0].resolution.value = 72;
return 'true';
}
- if(document.forms[0].login_count.value == ''){
+ if(document.forms[0].login_count.value === ''){
document.forms[0].login_count.value = 0;
return 'true';
}
@@ -98,23 +94,25 @@
var selection=[];
var i,j,selected;
for(i=0;i<list.options.length;i++){
- if(list.options[i].selected)
- selection[selection.length]=list.options[i].value;
+ if (list.options[i].selected) {
+ selection[selection.length] = list.options[i].value;
+ }
}
list.options.length = 1;
for(i=0; i<all.length; i++){
- if(all[i]['name'].toLowerCase().indexOf(str)==-1)
+ if (all[i].name.toLowerCase().indexOf(str) == -1) {
continue;
+ }
selected=false;
for(j=0;j<selection.length;j++){
- if(selection[j]==all[i]['id']){
+ if(selection[j]==all[i].id){
selected=true;
break;
}
}
- var newOption = new Option(all[i]['name'],all[i]['id'],false,selected);
- newOption.setAttribute("title", all[i]['email']);
+ var newOption = new Option(all[i].name, all[i].id,false,selected);
+ newOption.setAttribute("title", all[i].email);
list.options[list.options.length] = newOption;
}
}
@@ -212,10 +210,16 @@
echo "<input type='text' value='' onkeyup='filterUser(document.getElementById(\"selecteduser\"),user,this.value);'/>";
echo "<br /><select id='selecteduser' name='selected_user' onchange='submit()'>";
echo "<option value='new'>NEW...</option>";
- $sql = "SELECT mb_user_name,mb_user_id,mb_user_email FROM mb_user ";
- if(isset($myUser)){ $sql .= "WHERE mb_user_owner = ".$_SESSION["mb_user_id"];}
- $sql .= " ORDER BY mb_user_name ";
- $res = db_query($sql);
+ $sql = "SELECT mb_user_name,mb_user_id,mb_user_email FROM mb_user ";
+ $v = array();
+ $t = array();
+ if (isset($myUser)) {
+ $sql .= "WHERE mb_user_owner = $1";
+ array_push($v, $_SESSION["mb_user_id"]);
+ array_push($t, "i");
+ }
+ $sql .= " ORDER BY mb_user_name ";
+ $res = db_prep_query($sql, $v, $t);
$count=0;
while($row = db_fetch_array($res)){
echo "<option value='".$row["mb_user_id"]."' title='".$row["mb_user_email"]."'";
@@ -338,14 +342,16 @@
echo "</td>";
echo "</tr>";
+echo"</table>";
+
#resolution
-echo "<tr>";
- echo "<td>Resolution: </td>";
- echo "<td>";
- echo "<input type='text' size='30' name='resolution' value='".$resolution."'>";
- echo "</td>";
-echo "</tr>";
-echo"</table>";
+#echo "<tr>";
+# echo "<td>Resolution: </td>";
+# echo "<td>";
+ echo "<input type='hidden' size='30' name='resolution' value='".$resolution."'>";
+# echo "</td>";
+#echo "</tr>";
+
if($selected_user == 'new' || !isset($selected_user)){
echo "<input type='button' value='save' onclick='validate(\"save\")'>";
}
Modified: trunk/mapbender/http/php/mod_editGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_editGroup.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editGroup.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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>
@@ -136,9 +130,15 @@
echo "<select name='selected_group' onchange='submit()'>";
echo "<option value='new'>NEW...</option>";
$sql = "SELECT mb_group_name,mb_group_id FROM mb_group ";
- if(isset($myGroup)){ $sql .= "WHERE mb_group_owner = ".$_SESSION["mb_user_id"];}
+ $v = array();
+ $t = array();
+ if (isset($myGroup)) {
+ $sql .= "WHERE mb_group_owner = $1";
+ array_push($v, $_SESSION["mb_user_id"]);
+ array_push($t, "i");
+ }
$sql .= " ORDER BY mb_group_name ";
- $res = db_query($sql);
+ $res = db_prep_query($sql, $v, $t);
$count=0;
while($row = db_fetch_array($res)){
echo "<option value='".$row["mb_group_id"]."' ";
Modified: trunk/mapbender/http/php/mod_editGuiWms.php
===================================================================
--- trunk/mapbender/http/php/mod_editGuiWms.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editGuiWms.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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");
-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">
@@ -144,6 +138,15 @@
}
}
}
+function showSld(origUrl){
+ var url = document.getElementById("this_gui_wms_sldurl").value;
+ if(url==""){
+ if(origUrl=="")
+ return;
+ url=origUrl;
+ }
+ window.open(url);
+}
</script>
</head>
@@ -258,19 +261,19 @@
if(isset($this_gui_wms_epsg)){
$sql = "UPDATE gui_wms set gui_wms_epsg = $1, gui_wms_mapformat = $2, ";
$sql .= "gui_wms_featureinfoformat = $3, gui_wms_exceptionformat = $4, ";
- $sql .= "gui_wms_visible = $5, gui_wms_opacity = $6 ";
- $sql .= "WHERE fkey_gui_id = $7 AND fkey_wms_id = $8";
- $v = array($this_gui_wms_epsg,$this_gui_wms_mapformat,$this_gui_wms_featureinfoformat,$this_gui_wms_exceptionformat,$this_gui_wms_visible,$this_gui_wms_opacity,$this_gui,$this_wms);
- $t = array('s','s','s','s','i','i','s','i');
+ $sql .= "gui_wms_visible = $5, gui_wms_opacity = $6, gui_wms_sldurl = $7 ";
+ $sql .= "WHERE fkey_gui_id = $8 AND fkey_wms_id = $9";
+ $v = array($this_gui_wms_epsg,$this_gui_wms_mapformat,$this_gui_wms_featureinfoformat,$this_gui_wms_exceptionformat,$this_gui_wms_visible,$this_gui_wms_opacity,$this_gui_wms_sldurl,$this_gui,$this_wms);
+ $t = array('s','s','s','s','i','i','s','s','i');
$res = db_prep_query($sql,$v,$t);
}
else{
$sql = "UPDATE gui_wms set gui_wms_mapformat = $1, ";
$sql .= "gui_wms_featureinfoformat = $2, gui_wms_exceptionformat = $3, ";
- $sql .= "gui_wms_visible = $4 , gui_wms_opacity = $5 ";
- $sql .= "WHERE fkey_gui_id = $6 AND fkey_wms_id = $7";
- $v = array($this_gui_wms_mapformat,$this_gui_wms_featureinfoformat,$this_gui_wms_exceptionformat,$this_gui_wms_visible,$this_gui_wms_opacity,$this_gui,$this_wms);
- $t = array('s','s','s','i','i','s','i');
+ $sql .= "gui_wms_visible = $4, gui_wms_opacity = $5, gui_wms_sldurl = $6 ";
+ $sql .= "WHERE fkey_gui_id = $7 AND fkey_wms_id = $8";
+ $v = array($this_gui_wms_mapformat,$this_gui_wms_featureinfoformat,$this_gui_wms_exceptionformat,$this_gui_wms_visible,$this_gui_wms_opacity,$this_gui_wms_sldurl,$this_gui,$this_wms);
+ $t = array('s','s','s','i','i','s','s','i');
$res = db_prep_query($sql,$v,$t);
}
@@ -393,6 +396,7 @@
$gui_wms_epsg[$cnt_gw] = $row["gui_wms_epsg"];
$gui_wms_visible[$cnt_gw] = $row["gui_wms_visible"];
$gui_wms_opacity[$cnt_gw] = $row["gui_wms_opacity"];
+ $gui_wms_sldurl[$cnt_gw] = $row["gui_wms_sldurl"]; # sld url
$cnt_gw++;
}
#wms
@@ -407,6 +411,7 @@
$wms_title[$cnt_w] = $row["wms_title"];
$wms_abstract[$cnt_w] = $row["wms_abstract"];
$wms_getcapabilities[$cnt_w] = $row["wms_getcapabilities"];
+ $wms_supportsld[$cnt_w] = $row["wms_supportsld"]; # Buttons zum sld support anzeigen?
$cnt_w++;
}
#wms_format
@@ -421,9 +426,10 @@
$cnt_wf++;
}
#gui_layer
-$sql_gl = "SELECT * FROM layer AS l, gui_layer AS gl WHERE l.layer_id = gl.fkey_layer_id AND gl.gui_layer_wms_id = $1 AND gl.fkey_gui_id = $2 ORDER BY l.layer_pos";
-$v = array($wmsList,$guiList);
-$t = array('i','s');
+$sql_gl = "SELECT l.*, gl.*, sld.sld_user_layer_id, sld.use_sld FROM layer AS l, gui_layer AS gl left outer join sld_user_layer AS sld on sld.fkey_layer_id = gl.fkey_layer_id WHERE l.layer_id = gl.fkey_layer_id AND gl.gui_layer_wms_id = $1 AND gl.fkey_gui_id = $2 AND (sld.fkey_gui_id = $3 or sld.fkey_gui_id is NULL) AND (sld.fkey_mb_user_id = $4 or sld.fkey_mb_user_id is NULL) ORDER BY l.layer_pos";
+$v = array($wmsList,$guiList,$guiList,$mb_user_id);
+$t = array('i','s','s','i');
+
$res_gl = db_prep_query($sql_gl,$v,$t);
$gui_layer_status = array();
$gui_layer_selectable = array();
@@ -435,6 +441,7 @@
$gui_layer_priority = array();
$gui_layer_style = array();
$gui_layer_wfs_featuretype = array();
+$layer_maxscale = array();
$layer_id = array();
$layer_parent = array();
$layer_name = array();
@@ -442,6 +449,8 @@
$layer_queryable = array();
$layer_minscale = array();
$layer_maxscale = array();
+$sld_user_layer_id = array();
+$use_sld = array();
while($row = db_fetch_array($res_gl)){
array_push($gui_layer_status, $row["gui_layer_status"]);
array_push($gui_layer_selectable, $row["gui_layer_selectable"]);
@@ -460,6 +469,8 @@
array_push($layer_queryable, $row["layer_queryable"]);
array_push($layer_minscale, $row["layer_minscale"]);
array_push($layer_maxscale, $row["layer_maxscale"]);
+ array_push($sld_user_layer_id, $row["sld_user_layer_id"]);
+ array_push($use_sld, $row["use_sld"]);
}
#layer_epsg
@@ -581,11 +592,25 @@
echo "</tr>";
+# sld support
+if($wms_supportsld[0]) {
+ echo "<tr>";
+ echo "<td>SLD-URL: </td><td>";
+ echo "<input type='text' class='myText' name='this_gui_wms_sldurl' id='this_gui_wms_sldurl' title='".$gui_wms_sldurl[0]."' value='".$gui_wms_sldurl[0]."'>";
+ #echo "<a href='' onclick='return window.open(\"editor-start.php\");'><img src='sld_editor.png' border=0></a>";
+ #$layer_names = implode(",", $layer_name);
+ echo " <a href='javascript:showSld(\"".$gui_wms_sldurl[0]."\");'>SLD laden/anzeigen</a>";
+ echo "</td>";
+ echo "</tr>";
+} else {
+ echo "<input type='hidden' value='' name='this_gui_wms_sldurl'>";
+}
+
echo "</table><br>";
echo "<table border='1' cellpadding='1'>";
+ echo "<tr>";
- echo "<tr>";
echo "<td>Nr.</td>";
echo "<td>ID</td>";
echo "<td>" . toImage('Parent') . "</td>";
@@ -601,6 +626,7 @@
echo "<td>" . toImage('Style') . "</td>";
echo "<td>" . toImage('Prio') . "</td>";
echo "<td>" . toImage('setWFS') . "</td>";
+ if($wms_supportsld[0]) {echo "<td>" . toImage('SLD') . "</td>";}
echo "</tr>";
#echo "<tr><td>Nr.</td><td>ID</td><td>Parent</td><td>Name</td><td>Title</td><td>on/off</td><td>sel</td><td>sel_default</td><td>info</td><td>info_default</td><td>minScale 1:</td><td>maxScale 1:</td><td>Prio</td><td>setWFS</td></tr>";
@@ -656,7 +682,7 @@
if($gui_layer_querylayer[$i] == 1){ echo "checked";}
if($layer_queryable[$i] == 0){ echo "disabled";}
echo "></td>";
-
+
echo "<td><input name='L_".$layer_id[$i]."___gui_layer_minscale' type='text' size='5' value='".$gui_layer_minscale[$i]."'></td>";
echo "<td style='background:lightgrey'><input name='L_".$layer_id[$i]."___gui_layer_maxscale' type='text' size='5' value='".$gui_layer_maxscale[$i]."'></td>";
@@ -695,6 +721,18 @@
echo "'>";
}
echo "</td>";
+ if($wms_supportsld[0]) {
+ echo "<td>";
+ if ($i > 0) {
+ echo "<input class='button3' name='gui_layer_sld' type='button' onclick='window.open(\"../sld/sld_main.php?".$urlParameters."&sld_gui_id=".$guiList."&sld_wms_id=".$wms_id[0]."&sld_layer_name=".$layer_name[$i]."\");' value='";
+ if ($sld_user_layer_id[$i] != "")
+ echo "sld:".$sld_user_layer_id[$i]."(".$use_sld[$i].")";
+ else
+ echo "SLD";
+ echo "'>";
+ }
+ echo "</td>";
+ }
echo "</tr>\n";
if($i == 0){ echo "<tr><td colspan='14'><hr></td></tr>";}
}
Modified: trunk/mapbender/http/php/mod_editGuiWmsMeta.php
===================================================================
--- trunk/mapbender/http/php/mod_editGuiWmsMeta.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editGuiWmsMeta.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,14 +19,8 @@
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 +120,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"];
@@ -134,19 +128,23 @@
$function = $_REQUEST["function"];
if ( $function = "update" ) {
- $sql = "UPDATE layer SET layer_meta_datum = '".$_REQUEST["layer_meta_datum"]."'";
- $sql.= ", layer_meta_lieferant = '".$_REQUEST["layer_meta_lieferant"]."'";
- $sql.= ", layer_meta_quelle = '".$_REQUEST["layer_meta_quelle"]."'";
- $sql.= ", layer_meta_ansprechpartner = '".$_REQUEST["layer_meta_ansprechpartner"]."'";
- $sql.= ", layer_meta_lieferant_basis = '".$_REQUEST["layer_meta_lieferant_basis"]."'";
- $sql.= ", layer_meta_copyright = '".$_REQUEST["layer_meta_copyright"]."'";
- $sql.= " WHERE layer_id = ".$layer_id.";";
- $res = db_query($sql);
+ $sql = "UPDATE layer SET layer_meta_datum = $1, ";
+ $sql.= "layer_meta_lieferant = $2, ";
+ $sql.= "layer_meta_quelle = $3, ";
+ $sql.= "layer_meta_ansprechpartner = $4, ";
+ $sql.= "layer_meta_lieferant_basis = $5, ";
+ $sql.= "layer_meta_copyright = $6 ";
+ $sql.= " WHERE layer_id = $7;";
+ $v = array($_REQUEST["layer_meta_datum"], $_REQUEST["layer_meta_lieferant"], $_REQUEST["layer_meta_quelle"], $_REQUEST["layer_meta_ansprechpartner"], $_REQUEST["layer_meta_lieferant_basis"], $_REQUEST["layer_meta_copyright"], $layer_id);
+ $t = array("s", "s", "s", "s", "s", "s", "i");
+ $res = db_prep_query($sql, $v, $t);
}
}
- $sql = "SELECT * FROM layer WHERE layer_id = '".$layer_id."';";
- $res = db_query($sql);
+ $sql = "SELECT * FROM layer WHERE layer_id = $1;";
+ $v = array($layer_id);
+ $t = array("i");
+ $res = db_prep_query($sql, $v, $t);
if ( db_fetch_row($res, 0) ) {
echo " <h3>Editieren von Metadaten</h3>\n";
Modified: trunk/mapbender/http/php/mod_editSelf.php
===================================================================
--- trunk/mapbender/http/php/mod_editSelf.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editSelf.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,9 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
import_request_variables("PG");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -122,9 +121,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 ";
@@ -214,7 +210,7 @@
/*HTML*****************************************************************************************************/
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self ."' method='post'>";
echo "<input type='hidden' name='selected_user' value='" . $_SESSION["mb_user_id"] . "'>";
echo "<table border='0'>";
Modified: trunk/mapbender/http/php/mod_editUser.php
===================================================================
--- trunk/mapbender/http/php/mod_editUser.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editUser.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,11 +19,7 @@
# 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>
@@ -228,9 +224,15 @@
echo "<br /><select id='selecteduser' name='selected_user' onchange='submit()'>";
echo "<option value='new'>NEW...</option>";
$sql = "SELECT mb_user_name,mb_user_id,mb_user_email FROM mb_user ";
- if(isset($myUser)){ $sql .= "WHERE mb_user_owner = ".$_SESSION["mb_user_id"];}
+ $v = array();
+ $t = array();
+ if (isset($myUser)) {
+ $sql .= "WHERE mb_user_owner = $1";
+ array_push($v, $_SESSION["mb_user_id"]);
+ array_push($t, "i");
+ }
$sql .= " ORDER BY mb_user_name ";
- $res = db_query($sql);
+ $res = db_prep_query($sql, $v, $t);
$count=0;
while($row = db_fetch_array($res)){
echo "<option value='".$row["mb_user_id"]."' title='".$row["mb_user_email"]."'";
@@ -353,14 +355,16 @@
echo "</td>";
echo "</tr>";
+echo"</table>";
+
#resolution
-echo "<tr>";
- echo "<td>Resolution: </td>";
- echo "<td>";
- echo "<input type='text' size='30' name='resolution' value='".$resolution."'>";
- echo "</td>";
-echo "</tr>";
-echo"</table>";
+#echo "<tr>";
+# echo "<td>Resolution: </td>";
+# echo "<td>";
+ echo "<input type='hidden' size='30' name='resolution' value='".$resolution."'>";
+# echo "</td>";
+#echo "</tr>";
+
if($selected_user == 'new' || !isset($selected_user)){
echo "<input type='button' value='save' onclick='validate(\"save\")'>";
}
Modified: trunk/mapbender/http/php/mod_editWMS_Metadata.php
===================================================================
--- trunk/mapbender/http/php/mod_editWMS_Metadata.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_editWMS_Metadata.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,135 +17,127 @@
# 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;
+include_once '../include/dyn_css.php';
+
+$adm = new administration();
?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>Edit WMS Metadata</title>
-
-<?php
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-include_once '../include/dyn_css.php';
-#Error reporting
-error_reporting(E_ALL);
-ini_set('display_errors', TRUE);
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
-$adm = new administration();
-
-?>
-
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
<script language="JavaScript">
var dTarget;
-function save()
-{
+function save() {
document.forms[0].update_content.value=1;
document.forms[0].submit();
}
-function deletepreview(layer_id)
-{
+function deletepreview(layer_id) {
var url = String(document.location);
url = url.substr(0, url.indexOf('?'));
- window.open(url+"?<?php echo strip_tags(SID);?>&guiID=<?php echo $_REQUEST["guiID"]?>&elementID=<?php echo $_REQUEST["elementID"];?>&delete_preview=1&layer_id="+layer_id,'delete preview', 'height=50, width=150, dependent=yes');
+ window.open(url+"?<?php echo $urlParameters; ?>&delete_preview=1&layer_id="+layer_id,'delete preview', 'height=50, width=150, dependent=yes');
document.getElementById(layer_id+"_dp").style.display="none";
}
-function pick_the_date(obj)
-{
+function pick_the_date(obj) {
dTarget = obj;
- var dp =
-window.open('../tools/datepicker/datepicker.php?m=Jan_Feb_Mrz_Apr_Mai_Jun_Jul_Aug_Sep_Okt_Nov_Dez&d=Mo_Di_Mi_Do_Fr_Sa_So&t=heute','dp','left=200,top=200,width=230,height=210,toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=0');
+ var datePickerParameters = "m=Jan_Feb_Mrz_Apr_Mai_Jun_Jul_Aug_Sep_Okt_Nov_Dez&d=Mo_Di_Mi_Do_Fr_Sa_So&t=heute";
+ var datePickerStyle = "left=200,top=200,width=230,height=210,toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=0"
+ var dp = window.open('../extensions/datepicker/datepicker.php?' + datePickerParameters,'dp',datePickerStyle);
dp.focus();
- return false
+ return false;
}
</script>
</head>
<body>
<?php
-function guessTimestamp($timestr)
-{
+function guessTimestamp($timestr) {
- if (mb_strpos($timestr, '.'))
- {
+ if (mb_strpos($timestr, '.')) {
list($day, $month, $year) = explode(".", $timestr);
}
- elseif (mb_strpos($timestr, '/'))
- {
+ elseif (mb_strpos($timestr, '/')) {
list($month, $day, $year) = explode("/", $timestr);
}
- elseif (mb_strpos($timestr, '-'))
- {
+ elseif (mb_strpos($timestr, '-')) {
list($year, $month, $day) = explode("-", $timestr);
}
- else
- {
+ else {
$year = 0;
$month = 0;
$day = 0;
}
return mktime(0, 0, 0, $month, $day, intval($year));
-
}
#Update handling
-if(isset($_REQUEST['update_content']) && $_REQUEST['update_content'] == true)
-{
+if (isset($_REQUEST['update_content']) && $_REQUEST['update_content'] == true) {
- $update_wms_sql = "UPDATE wms SET " .
- "wms_title = '".$_REQUEST['wms_title_box']."', " .
- "wms_abstract = '".$_REQUEST['wms_abstract_box']."', " .
- "fees = '".$_REQUEST['fees_box']."', " .
- "accessconstraints = '".$_REQUEST['accessconstraints_box']."', " .
- "contactperson = '".$_REQUEST['contactperson_box']."', " .
- "contactposition = '".$_REQUEST['contactposition_box']."', " .
- "contactorganization = '".$_REQUEST['contactorganization_box']."', " .
- "address = '".$_REQUEST['address_box']."', " .
- "city = '".$_REQUEST['city_box']."', " .
- "stateorprovince = '".$_REQUEST['stateorprovince_box']."', " .
- "postcode = '".$_REQUEST['postcode_box']."', " .
- "country = '".$_REQUEST['country_box']."', " .
- "contactvoicetelephone = '".$_REQUEST['contactvoicetelephone_box']."', " .
- "contactfacsimiletelephone = '".$_REQUEST['contactfacsimiletelephone_box']."', " .
- "contactelectronicmailaddress = '".$_REQUEST['contactelectronicmailaddress_box']."'";
- if (isset($_REQUEST['wms_timestamp_box']) && $_REQUEST['wms_timestamp_box'] <> "")
- {
- $update_wms_sql .= ", " . "wms_timestamp = " .
- "'".guessTimestamp($_REQUEST['wms_timestamp_box'])."' ";
- }
- $update_wms_sql .= "WHERE wms_id = '".$_REQUEST['wms_id']."'";
- $res_update_wms_sql = db_query($update_wms_sql);
- while(list($key,$val) = each($_REQUEST))
- {
- if(preg_match("/___/", $key))
- {
+ $update_wms_sql = "UPDATE wms SET ";
+ $update_wms_sql .= "wms_title = $1, wms_abstract = $2, fees = $3, ";
+ $update_wms_sql .= "accessconstraints = $4, contactperson = $5, ";
+ $update_wms_sql .= "contactposition = $6, contactorganization = $7, ";
+ $update_wms_sql .= "address = $8, city = $9, stateorprovince = $10, ";
+ $update_wms_sql .= "postcode = $11, country = $12, ";
+ $update_wms_sql .= "contactvoicetelephone = $13, ";
+ $update_wms_sql .= "contactfacsimiletelephone = $14, ";
+ $update_wms_sql .= "contactelectronicmailaddress = $15 ";
+
+ $v = array();
+ array_push($v, $_REQUEST['wms_title_box']);
+ array_push($v, $_REQUEST['wms_abstract_box']);
+ array_push($v, $_REQUEST['fees_box']);
+ array_push($v, $_REQUEST['accessconstraints_box']);
+ array_push($v, $_REQUEST['contactperson_box']);
+ array_push($v, $_REQUEST['contactposition_box']);
+ array_push($v, $_REQUEST['contactorganization_box']);
+ array_push($v, $_REQUEST['address_box']);
+ array_push($v, $_REQUEST['city_box']);
+ array_push($v, $_REQUEST['stateorprovince_box']);
+ array_push($v, $_REQUEST['postcode_box']);
+ array_push($v, $_REQUEST['country_box']);
+ array_push($v, $_REQUEST['contactvoicetelephone_box']);
+ array_push($v, $_REQUEST['contactfacsimiletelephone_box']);
+ array_push($v, $_REQUEST['contactelectronicmailaddress_box']);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s");
+
+ if (isset($_REQUEST['wms_timestamp_box']) && $_REQUEST['wms_timestamp_box'] <> "") {
+ $update_wms_sql .= ", wms_timestamp = $16 ";
+ array_push($v, guessTimestamp($_REQUEST['wms_timestamp_box']));
+ array_push($t, "s");
+
+ $update_wms_sql .= "WHERE wms_id = $17";
+ }
+ else {
+ $update_wms_sql .= "WHERE wms_id = $16";
+ }
+ array_push($v, $_REQUEST['wms_id']);
+ array_push($t, "s");
+
+ $res_update_wms_sql = db_prep_query($update_wms_sql, $v, $t);
+
+ while(list($key,$val) = each($_REQUEST)) {
+ if(preg_match("/___/", $key)) {
$myKey = explode("___", $key);
$layer_id = preg_replace("/L_/","",$myKey[0]);
- if($myKey[1]=="layer_abstract")
- {
- $layer_sql = "UPDATE layer SET layer_abstract = '$val' " .
- "WHERE layer_id = $layer_id AND fkey_wms_id = '".$_REQUEST['wms_id']."'";
- $res_keyword_sql = db_query($layer_sql);
+ if($myKey[1]=="layer_abstract") {
+ $layer_sql = "UPDATE layer SET layer_abstract = $1 ";
+ $layer_sql .= "WHERE layer_id = $2 AND fkey_wms_id = $3";
+ $v = array($val, $layer_id, $_REQUEST['wms_id']);
+ $t = array("s", "i", "s");
+ $res_keyword_sql = db_prep_query($layer_sql, $v, $t);
}
- if($myKey[1]=="layer_keywords")
- {
+ if($myKey[1]=="layer_keywords") {
#Get all keywords depending on the given layer after user modification
$keywords = explode(",",$val);
#delete all blanks from the keywords list
- for($j = 0; $j < count($keywords); $j++)
- {
+ for ($j = 0; $j < count($keywords); $j++) {
$word = $keywords[$j];
$word = trim($word);
$keywords[$j] = $word;
@@ -155,9 +147,12 @@
$keyword_sql = "SELECT keyword_id, keyword FROM keyword, layer_keyword, layer " .
"WHERE keyword.keyword_id = layer_keyword.fkey_keyword_id " .
"AND layer_keyword.fkey_layer_id = layer.layer_id " .
- "AND layer.fkey_wms_id = '".$_REQUEST['wms_id']."'" .
- "AND layer.layer_id = $layer_id";
- $res_keyword_sql = db_query($keyword_sql);
+ "AND layer.fkey_wms_id = $1 " .
+ "AND layer.layer_id = $2";
+
+ $v = array($_REQUEST['wms_id'], $layer_id);
+ $t = array("s", "i");
+ $res_keyword_sql = db_prep_query($keyword_sql, $v, $t);
while($keyword_row = db_fetch_array($res_keyword_sql))
{
$keyword = $keyword_row['keyword'];
@@ -171,19 +166,25 @@
#echo "1c: Keyword nicht in User Liste: Keyword: ", $keyword, ";<br>";
#Deleting reference to the keyword from the layer_keyword table.
$keyword_sql = "DELETE FROM layer_keyword " .
- "WHERE fkey_layer_id = $layer_id " .
- "AND fkey_keyword_id = $keyword_id";
- db_query($keyword_sql);
+ "WHERE fkey_layer_id = $1 " .
+ "AND fkey_keyword_id = $2";
+ $v = array($layer_id, $keyword_id);
+ $t = array("i", "i");
+ db_prep_query($keyword_sql, $v, $t);
#Checking, if the keyword is in use by any layer
$layer_sql = "SELECT * FROM layer_keyword " .
- "WHERE fkey_keyword_id = $keyword_id";
- $res_layer_sql = db_query($layer_sql);
+ "WHERE fkey_keyword_id = $1";
+ $v = array($keyword_id);
+ $t = array("i");
+ $res_layer_sql = db_prep_query($layer_sql, $v, $t);
if(!($row = db_fetch_array($res_layer_sql)))
{
#If keyword will not longer be in use, delete it from keyword table
$keyword_sql = "DELETE FROM keyword " .
- "WHERE keyword_id = $keyword_id";
- db_query($keyword_sql);
+ "WHERE keyword_id = $1";
+ $v = array($keyword_id);
+ $t = array("i");
+ db_prep_query($keyword_sql, $v, $t);
}
}
#Keyword exists in the database and in the user data
@@ -211,8 +212,10 @@
$keyword = trim($keywords[$i]);
#Check, if the keyword is exsiting in the database
$keyword_sql = "SELECT keyword_id FROM keyword " .
- "WHERE UPPER(keyword) = UPPER('$keyword')";
- $res_keyword_sql = db_query($keyword_sql);
+ "WHERE UPPER(keyword) = UPPER($1)";
+ $v = array($keyword);
+ $t = array("s");
+ $res_keyword_sql = db_prep_query($keyword_sql, $v, $t);
$keyword_row = db_fetch_array($res_keyword_sql);
#Keyword exists in the database
if($keyword_row != null)
@@ -223,10 +226,15 @@
#Keyword does not exist in the database
else
{
- $keyword_sql = "INSERT INTO keyword (keyword) VALUES ('$keyword')";
- $res_keyword_sql = db_query($keyword_sql);
- $keyword_sql = "SELECT keyword_id FROM keyword WHERE keyword = '$keyword'";
- $res_keyword_sql = db_query($keyword_sql);
+ $keyword_sql = "INSERT INTO keyword (keyword) VALUES ($1)";
+ $v = array($keyword);
+ $t = array("s");
+ $res_keyword_sql = db_prep_query($keyword_sql, $v, $t);
+
+ $keyword_sql = "SELECT keyword_id FROM keyword WHERE keyword = $1";
+ $v = array($keyword);
+ $t = array("s");
+ $res_keyword_sql = db_prep_query($keyword_sql, $v, $t);
$keyword_row = db_fetch_array($res_keyword_sql);
if($keyword_row != null)
{
@@ -236,8 +244,10 @@
}
#Inserting the reference between layer and keyword in the layer_keyword table
$keyword_sql = "INSERT INTO layer_keyword (fkey_layer_id, fkey_keyword_id) " .
- "VALUES ('$layer_id', '$keyword_id')";
- $res_keyword_sql = db_query($keyword_sql);
+ "VALUES ($1, $2)";
+ $v = array($layer_id, $keyword_id);
+ $t = array("s", "s");
+ $res_keyword_sql = db_prep_query($keyword_sql, $v, $t);
}
}
#Delete all elements from array
@@ -253,12 +263,14 @@
if(isset($_REQUEST['delete_preview']) && $_REQUEST['delete_preview']=='1'
&& isset($_REQUEST['layer_id']))
{
- $preview_sql = "DELETE FROM layer_preview WHERE fkey_layer_id = ".$_REQUEST['layer_id']."";
- $res_preview_sql = db_query($preview_sql);
+ $preview_sql = "DELETE FROM layer_preview WHERE fkey_layer_id = $1";
+ $v = array($_REQUEST['layer_id']);
+ $t = array("s");
+ $res_preview_sql = db_prep_query($preview_sql, $v, $t);
die("Preview has been deleted!</body></html>");
}
?>
-<form name='form1' action='<?php $self ?>' method='post'>
+<form name='form1' action='<?php echo $self . "&show_wms_list=true"; ?>' method='post'>
<table border='0'>
<tr>
@@ -277,8 +289,10 @@
{
#Querying information from wms data table
- $wms_sql = "SELECT wms_id, wms_title FROM wms WHERE wms_owner = ".$_SESSION["mb_user_id"]. " ORDER BY wms_title";
- $res_wms_sql = db_query($wms_sql);
+ $wms_sql = "SELECT wms_id, wms_title FROM wms WHERE wms_owner = $1 ORDER BY wms_title";
+ $v = array($_SESSION["mb_user_id"]);
+ $t = array("i");
+ $res_wms_sql = db_prep_query($wms_sql, $v, $t);
#wms-selection
$selectBox = "";
@@ -321,8 +335,10 @@
if(isset($wms_id) == true && $wms_id <>0)
{
- $selected_wms_sql = "SELECT * FROM wms WHERE wms_id = '".$wms_id."'";
- $res_selected_wms_sql = db_query($selected_wms_sql);
+ $selected_wms_sql = "SELECT * FROM wms WHERE wms_id = $1";
+ $v = array($wms_id);
+ $t = array("s");
+ $res_selected_wms_sql = db_prep_query($selected_wms_sql, $v, $t);
$selected_row = db_fetch_array($res_selected_wms_sql);
?>
@@ -400,9 +416,11 @@
<?php
- $layer_sql = "SELECT * FROM layer WHERE layer.fkey_wms_id = '".$wms_id."'" .
+ $layer_sql = "SELECT * FROM layer WHERE layer.fkey_wms_id = $1" .
" ORDER BY layer_pos";
- $res_layer_sql = db_query($layer_sql);
+ $v = array($wms_id);
+ $t = array("s");
+ $res_layer_sql = db_prep_query($layer_sql, $v, $t);
while($layer_row = db_fetch_array($res_layer_sql))
{
@@ -419,9 +437,11 @@
$keyword_sql = "SELECT keyword FROM keyword, layer_keyword, layer " .
"WHERE keyword.keyword_id = layer_keyword.fkey_keyword_id " .
"AND layer_keyword.fkey_layer_id = layer.layer_id " .
- "AND layer.fkey_wms_id = '".$wms_id."' " .
- "AND layer.layer_id = ".$layer_row['layer_id']."";
- $res_keyword_sql = db_query($keyword_sql);
+ "AND layer.fkey_wms_id = $1 " .
+ "AND layer.layer_id = $2";
+ $v = array($wms_id, $layer_row['layer_id']);
+ $t = array("s", "i");
+ $res_keyword_sql = db_prep_query($keyword_sql, $v, $t);
$keywordList = "";
$seperator = "";
while($keyword_row = db_fetch_array($res_keyword_sql))
@@ -458,15 +478,10 @@
<?php }*/?>
</td>
</tr>
-
-
<?php
}
-
-
#editWMSByWMSID(961);
?>
-
</table>
<input type='hidden' name='update_content' value=''/>
<input type='hidden' name='wms_id' value='<?php echo $wms_id ?>'/>
@@ -479,4 +494,4 @@
</html>
<?php
}
-?>
+?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_edit_element_vars.php
===================================================================
--- trunk/mapbender/http/php/mod_edit_element_vars.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_edit_element_vars.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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");
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">
@@ -110,13 +105,20 @@
<?php
# handle database updates etc.....
if(isset($mySave) && $mySave == '1'){
- if($SYS_DBTYPE=='pgsql'){
- $sql[0] = "SET AUTOCOMMIT=1;";}
- else{
- $sql[0] = "SET AUTOCOMMIT=0;shit happens";
- }
- $sql[1] = "BEGIN;";
- $sql[2] = "DELETE FROM gui_element_vars WHERE fkey_e_id = '".$e_id."' AND fkey_gui_id = '".$guiList1."' and ....";
+ if ($SYS_DBTYPE=='pgsql') {
+ $sql[0] = "SET AUTOCOMMIT=1;";
+ }
+ else {
+ $sql[0] = "SET AUTOCOMMIT=0;shit happens";
+ }
+ $v[0] = array();
+ $t[0] = array();
+ $sql[1] = "BEGIN;";
+ $v[1] = array();
+ $t[1] = array();
+ $sql[2] = "DELETE FROM gui_element_vars WHERE fkey_e_id = $1 AND fkey_gui_id = $2";
+ $v[2] = array($e_id, $guiList1);
+ $t[2] = array("s", "s");
if($e_left < 1){$e_left = "NULL";}
@@ -124,25 +126,32 @@
if($e_width < 1){$e_width = "NULL";}
if($e_height < 1){$e_height = "NULL";}
if($e_z_index < 1){$e_z_index = "NULL";}
- $sql[3] = "INSERT INTO gui_element_vars(fkey_gui_id,e_id,e_pos,e_public,e_comment,e_element,e_src,e_attributes,e_left,e_top,e_width,e_height,e_z_index,e_more_styles,e_content,e_closetag,e_js_file,e_mb_mod,e_target,e_requires) ";
- $sql[3] .= "VALUES ('".$guiList1."','".$e_id."','".$e_pos."','".$e_public."','".db_escape_string($e_comment)."','".$e_element."','".$e_src."','".db_escape_string($e_attributes)."',".$e_left.",".$e_top.",".$e_width.",".$e_height.",".$e_z_index.",'".$e_more_styles."','".$e_content."','".$e_closetag."','".$e_js_file."','".$e_mb_mod."','".$e_target."','".$e_requires."')";
+ $sql[3] = "INSERT INTO gui_element_vars ";
+ $sql[3] .= "(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_element, e_src, ";
+ $sql[3] .= "e_attributes, e_left, e_top, e_width, e_height, e_z_index, ";
+ $sql[3] .= "e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, ";
+ $sql[3] .= "e_requires) ";
+ $sql[3] .= "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)";
+ $v[3] = array($guiList1, $e_id, $e_pos, $e_public, db_escape_string($e_comment), $e_element, $e_src, db_escape_string($e_attributes), $e_left, $e_top, $e_width, $e_height, $e_z_index, $e_more_styles, $e_content, $e_closetag, $e_js_file, $e_mb_mod, $e_target, $e_requires);
+ $t[3] = array("s", "s", "i", "s", "s", "s", "s", "s", "i", "i", "i", "i", "i", "s", "s", "s", "s", "s", "s", "s");
#echo $sql[3];
- foreach ($sql as $mysql){
- $res = db_query($mysql);
- if(!$res){echo $mysql; break;}
+ for ($i = 0; $i < count($sql); $i++) {
+ $res = db_prep_query($sql[$i], $v[$i], $t[$i]);
}
if($res){
- $res = db_query( "COMMIT");
+ $res = db_query( "COMMIT");
$res = db_query( "SET AUTOCOMMIT=1");
}
else{
$res = db_query( "ROLLBACK");
$res = db_query( "SET AUTOCOMMIT=1");
}
- }
+}
if(isset($myDelete) && $myDelete == '1'){
- $sql = "DELETE FROM gui_element_vars WHERE fkey_e_id = '".$e_id."' AND fkey_gui_id = '".$guiList1."' AND var_name='".$var_name."'";
- $res = db_query($sql);
+ $sql = "DELETE FROM gui_element_vars WHERE fkey_e_id = $1 AND fkey_gui_id = $2 AND var_name= $3";
+ $v = array($e_id, $guiList1, $var_name);
+ $t = array("s", "s", "s");
+ $res = db_prep_query($sql, $v, $t);
$e_id = ""; $e_pos = ""; $e_public = ""; $e_comment = ""; $e_element = "";
$e_src = ""; $e_attributes = ""; $e_left = ""; $e_top = ""; $e_width = ""; $e_height = ""; $e_z_index = "";
$e_more_styles = ""; $e_content = ""; $e_closetag = ""; $e_js_file = ""; $e_mb_mod = ""; $e_target = ""; $e_requires = "";
@@ -154,24 +163,37 @@
echo "</script>";
}
if(isset($all) && $all == '1'){
- $sql = "SELECT * FROM gui_element_vars WHERE fkey_gui_id = '".$guiList2."' AND fkey_e_id = '".$e_id."' and var_name='".$var_name."' ;";
- $res = db_query($sql);
+ $sql = "SELECT * FROM gui_element_vars WHERE fkey_gui_id = $1 AND fkey_e_id = $2 and var_name= $3;";
+ $v = array($guiList2, $e_id, $var_name);
+ $t = array("s", "s", "s");
+ $res = db_prep_query($sql, $v, $t);
$cnt = 0;
while(db_fetch_row($res)){
- $sql_del = "DELETE FROM gui_element_vars WHERE fkey_gui_id = '".$guiList1."' AND fkey_e_id = '".db_result($res,$cnt,"fkey_e_id")."' and var_name='".$var_name."' ";
- $res_del = db_query($sql_del);
+ $sql_del = "DELETE FROM gui_element_vars WHERE fkey_gui_id = $1 AND fkey_e_id = $2 and var_name= $3";
+ $v = array($guiList1, db_result($res,$cnt,"fkey_e_id"), $var_name);
+ $t = array("s", "s", "s");
+ $res_del = db_prep_query($sql_del, $v, $t);
if(db_result($res,$cnt,"e_left") == ""){$myleft = 'NULL';} else{$myleft = db_result($res,$cnt,"e_left");}
if(db_result($res,$cnt,"e_top") == ""){$mytop = 'NULL';} else{$mytop = db_result($res,$cnt,"e_top");}
if(db_result($res,$cnt,"e_width") == ""){$mywidth = 'NULL';} else{$mywidth = db_result($res,$cnt,"e_width");}
if(db_result($res,$cnt,"e_height") == ""){$myheight = 'NULL';} else{$myheight = db_result($res,$cnt,"e_height");}
if(db_result($res,$cnt,"e_z_index") == ""){$my_z_index = 'NULL';} else{$my_z_index = db_result($res,$cnt,"e_z_index");}
- $sql_ins = "INSERT INTO gui_element_vars(fkey_gui_id,e_id,e_pos,e_public,e_comment,e_element,e_src,e_attributes,e_left,e_top,e_width,e_height,e_z_index,e_more_styles,e_content,e_closetag,e_js_file,e_mb_mod,e_target,e_requires) ";
- $sql_ins .= "VALUES ('".$guiList1."','".db_result($res,$cnt,"e_id")."','".db_result($res,$cnt,"e_pos")."','".db_result($res,$cnt,"e_public")."','".db_escape_string(db_result($res,$cnt,"e_comment"))."','".db_result($res,$cnt,"e_element")."','".db_result($res,$cnt,"e_src")."','".db_escape_string(db_result($res,$cnt,"e_attributes"))."',".$myleft.",";
- $sql_ins .= $mytop.",".$mywidth.",".$myheight.",".$my_z_index.",'".db_result($res,$cnt,"e_more_styles")."','".db_escape_string(db_result($res,$cnt,"e_content"))."','".db_result($res,$cnt,"e_closetag")."','".db_result($res,$cnt,"e_js_file")."','".db_result($res,$cnt,"e_mb_mod")."','".db_result($res,$cnt,"e_target")."','".db_result($res,$cnt,"e_requires")."')";
+ $sql_ins = "INSERT INTO gui_element_vars ";
+ $sql_ins .= "(fkey_gui_id, e_id, e_pos,e_public, e_comment, e_element, ";
+ $sql_ins .= "e_src, e_attributes, e_left, e_top, e_width, e_height, ";
+ $sql_ins .= "e_z_index, e_more_styles, e_content, e_closetag, e_js_file, ";
+ $sql_ins .= "e_mb_mod, e_target, e_requires) ";
+ $sql_ins .= "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, ";
+ $sql_ins .= "$10, $11, $12, $13, $14, $15, $16, $17, $18, ";
+ $sql_ins .= "$19, $20)";
+ $v = array($guiList1, db_result($res,$cnt,"e_id"), db_result($res,$cnt,"e_pos"), db_result($res,$cnt,"e_public"), db_escape_string(db_result($res,$cnt,"e_comment")), db_result($res,$cnt,"e_element"), db_result($res,$cnt,"e_src"), db_escape_string(db_result($res,$cnt,"e_attributes")), $myleft, $mytop, $mywidth, $myheight, $my_z_index, db_result($res,$cnt,"e_more_styles"), db_escape_string(db_result($res,$cnt,"e_content")), db_result($res,$cnt,"e_closetag"), db_result($res,$cnt,"e_js_file"), db_result($res,$cnt,"e_mb_mod"), db_result($res,$cnt,"e_target"), db_result($res,$cnt,"e_requires"));
+ $t = array("s", "s", "s", "s", "s", "s", "s", "s", "i", "i", "i", "i", "i", "s", "s", "s", "s", "s", "s", "s");
- $res_ins = db_query($sql_ins);
- if(!$res_ins){echo db_error($connect); }
+ $res_ins = db_prep_query($sql_ins, $v, $t);
+ if (!$res_ins) {
+ echo db_error($connect);
+ }
$cnt++;
}
}
@@ -179,8 +201,10 @@
echo "<script language='javascript'>";
echo "var varIDs = new Array();";
if(isset($guiList1)){
- $sql = "SELECT var_name FROM gui_element_vars WHERE fkey_gui_id = '".$guiList1."' AND fkey_e_id = '".$e_id."'";
- $res = db_query($sql);
+ $sql = "SELECT var_name FROM gui_element_vars WHERE fkey_gui_id = $1 AND fkey_e_id = $2";
+ $v = array($guiList1, $e_id);
+ $t = array("s", "s");
+ $res = db_prep_query($sql, $v, $t);
$cnt = 0;
while(db_fetch_row($res)){
echo "varIDs[".$cnt."] = '".db_result($res,$cnt,"var_name")."'; ";
@@ -253,7 +277,7 @@
<body>
<?php
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='get'>";
+echo "<form name='form1' action='" . $self ."' method='get'>";
#Gui to edit
if(!isset($guiList1)){
@@ -284,8 +308,10 @@
if(isset($guiList1)){
echo "<div class='guiList2_header'>Templates</div>";
- $sql = "SELECT * FROM gui_element_vars WHERE fkey_gui_id = '".$guiList1."' AND fkey_e_id='".$e_id."'";
- $res = db_query($sql);
+ $sql = "SELECT * FROM gui_element_vars WHERE fkey_gui_id = $1 AND fkey_e_id = $2";
+ $v = array($guiList1, $e_id);
+ $t = array("s", "s");
+ $res = db_prep_query($sql, $v, $t);
$cnt = 0;
echo "<div class='myElements'><table>";
while($row = db_fetch_array($res)){
@@ -303,9 +329,11 @@
#Formular:
echo "<table class='myForm'>";
if(isset($guiList1) && isset($var_name)){
- $sql = "SELECT * FROM gui_element_vars WHERE fkey_gui_id = '".$guiList1."' AND fkey_e_id = '".$e_id."' AND var_name='".$var_name."'";
+ $sql = "SELECT * FROM gui_element_vars WHERE fkey_gui_id = $1 AND fkey_e_id = '".$e_id."' AND var_name = $2";
+ $v = array($guiList1, $var_name);
+ $t = array("s", "s");
//echo $sql;
- $res = db_query($sql);
+ $res = db_prep_query($sql, $v, $t);
if($row = db_fetch_array($res)){
echo "<tr><td>ID: </td><td><input type='text' class='textfield' readonly name='e_id' value='".$e_id."'></td></tr>";
echo "<tr><td>Var Type: </td><td><input type='text' class='textfield' name='type' value='".$row["type"]."'></td></tr>";
Modified: trunk/mapbender/http/php/mod_edit_metadata.php
===================================================================
--- trunk/mapbender/http/php/mod_edit_metadata.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_edit_metadata.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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");
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">
@@ -112,45 +107,72 @@
# handle database updates etc.....
if(isset($mySave) && ($mySave == '1' || $mySave == '2')) {
if ($mySave == '1'){
- $sql_vars = "SELECT * FROM gui_element_vars WHERE fkey_e_id = '".$e_id."' AND fkey_gui_id = '".$guiList1."'";
- $res_vars = db_query($sql_vars);
+ $sql_vars = "SELECT * FROM gui_element_vars WHERE fkey_e_id = $1 AND fkey_gui_id = $2";
+ $v = array($e_id, $guiList1);
+ $t = array("s", "s");
+ $res_vars = db_prep_query($sql_vars, $v, $t);
//$rows = db_fetch_array($res_vars);
- if($SYS_DBTYPE=='pgsql')
- {
- $sql[0] = "SET AUTOCOMMIT=1";
- }
- else
- {
- $sql[0] = "SET AUTOCOMMIT=0";
- }
- $sql[1] = "BEGIN";
- $sql[2] = "DELETE FROM gui_element WHERE e_id = '".$e_id."' AND fkey_gui_id = '".$guiList1."'";
+ $sql = array();
+ $v = array();
+ $t = array();
+ if ($SYS_DBTYPE == "pgsql") {
+ $sql[0] = "SET AUTOCOMMIT=1";
+ $v[0] = array();
+ $t[0] = array();
+ }
+ else {
+ $sql[0] = "SET AUTOCOMMIT=0";
+ $v[0] = array();
+ $t[0] = array();
+ }
+ $sql[1] = "BEGIN";
+ $v[1] = array();
+ $t[1] = array();
+
+ $sql[2] = "DELETE FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
+ $v[2] = array($e_id, $guiList1);
+ $t[2] = array("s", "s");
+ if($e_left < 1){$e_left = "NULL";}
+ if($e_top < 1){$e_top = "NULL";}
+ if($e_width < 1){$e_width = "NULL";}
+ if($e_height < 1){$e_height = "NULL";}
+ if($e_z_index < 1){$e_z_index = "NULL";}
- if($e_left < 1){$e_left = "NULL";}
- if($e_top < 1){$e_top = "NULL";}
- if($e_width < 1){$e_width = "NULL";}
- if($e_height < 1){$e_height = "NULL";}
- if($e_z_index < 1){$e_z_index = "NULL";}
- $sql[3] = "INSERT INTO gui_element(fkey_gui_id,e_id,e_pos,e_public,e_comment,e_element,e_src,e_attributes,e_left,e_top,e_width,e_height,e_z_index,e_more_styles,e_content,e_closetag,e_js_file,e_mb_mod,e_target,e_requires) ";
- $sql[3] .= "VALUES ('".$guiList1."','".$e_id."','".$e_pos."','".$e_public."','".db_escape_string($e_comment)."','".$e_element."','".$e_src."','".db_escape_string($e_attributes)."',".$e_left.",".$e_top.",".$e_width.",".$e_height.",".$e_z_index.",'".$e_more_styles."','".db_escape_string($e_content)."','".$e_closetag."','".$e_js_file."','".$e_mb_mod."','".$e_target."','".$e_requires."')";
-
+ $sql[3] = "INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, ";
+ $sql[3] .= "e_comment, e_element, e_src, e_attributes, e_left, e_top, ";
+ $sql[3] .= "e_width, e_height, e_z_index, e_more_styles, e_content, ";
+ $sql[3] .= "e_closetag, e_js_file, e_mb_mod, e_target, e_requires) ";
+ $sql[3] .= "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, ";
+ $sql[3] .= "$13, $14, $15, $16, $17, $18, $19, $20)";
+ $v[3] = array($guiList1, $e_id, $e_pos, $e_public, db_escape_string($e_comment), $e_element, $e_src, db_escape_string($e_attributes), $e_left, $e_top, $e_width, $e_height, $e_z_index, $e_more_styles, db_escape_string($e_content), $e_closetag, $e_js_file, $e_mb_mod, $e_target, $e_requires);
+ $t[3] = array("s", "s", "s", "s", "s", "s", "s", "s", "i", "i", "i", "i", "i", "s", "s", "s", "s", "s", "s", "s");
}
# mySave == 2 <=> just save GUI description
elseif ($mySave == '2') {
- if($SYS_DBTYPE=='pgsql')
- {
- $sql[0] = "SET AUTOCOMMIT=1";
- }
- else
- {
- $sql[0] = "SET AUTOCOMMIT=0";
+ $sql = array();
+ $v = array();
+ $t = array();
+ if ($SYS_DBTYPE == "pgsql") {
+ $sql[0] = "SET AUTOCOMMIT=1";
+ $v[0] = array();
+ $t[0] = array();
}
- $sql[1] = "BEGIN";
- $sql[3] = "UPDATE gui SET gui_description = '". $guiDesc."' WHERE gui_id ='".$guiId."'";
- }
- foreach ($sql as $mysql){
- $res = db_query($mysql);
+ else {
+ $sql[0] = "SET AUTOCOMMIT=0";
+ $v[0] = array();
+ $t[0] = array();
+ }
+ $sql[1] = "BEGIN";
+ $v[1] = array();
+ $t[1] = array();
+
+ $sql[2] = "UPDATE gui SET gui_description = $1 WHERE gui_id = $2";
+ $v[2] = array($guiDesc, $guiId);
+ $t[2] = array("s", "s");
+ }
+ for ($i = 0; $i < count($sql); $i++) {
+ $res = db_prep_query($sql[$i], $v[$i], $t[$i]);
if(!$res){break;}
}
if($res){
@@ -161,19 +183,25 @@
$res = db_query( "ROLLBACK");
$res = db_query( "SET AUTOCOMMIT=1");
}
- if(isset($sql_vars)){//sicherstellen das keine Element_Vars gelöscht wurden
+ if(isset($sql_vars)){//sicherstellen das keine Element_Vars gel�scht wurden
while($row = db_fetch_array($res_vars)){
- $securesql = "INSERT INTO gui_element_vars (fkey_gui_id,fkey_e_id,var_name,var_value,context,type) VALUES ('".$guiList1."','".$e_id."','".$row["var_name"]."','".$row["var_value"]."','".$row["context"]."','".$row["type"]."');";
- //echo $securesql."<BR>";
- $secureinsert = db_query($securesql);
- }
- }
+ $securesql = "INSERT INTO gui_element_vars (fkey_gui_id, ";
+ $securesql .= "fkey_e_id, var_name, var_value, context,type) ";
+ $securesql .= "VALUES ($1, $2, $3, $4, $5, $6)";
+ $v = array($guiList1, $e_id, $row["var_name"], $row["var_value"], $row["context"], $row["type"]);
+ $t = array("s", "s", "s", "s", "s", "s");
+ //echo $securesql."<BR>";
+ $secureinsert = db_prep_query($securesql, $v, $t);
+ }
+ }
if(!$res){break;}
}
if(isset($myDelete) && $myDelete == '1'){
- $sql = "DELETE FROM gui_element WHERE e_id = '".$e_id."' AND fkey_gui_id = '".$guiList1."'";
- $res = db_query($sql);
+ $sql = "DELETE FROM gui_element WHERE e_id = $1 AND fkey_gui_id = $2";
+ $v = array($e_id, $guiList1);
+ $t = array("s", "s");
+ $res = db_prep_query($sql, $v, $t);
$e_id = ""; $e_pos = ""; $e_public = ""; $e_comment = ""; $e_element = "";
$e_src = ""; $e_attributes = ""; $e_left = ""; $e_top = ""; $e_width = ""; $e_height = ""; $e_z_index = "";
$e_more_styles = ""; $e_content = ""; $e_closetag = ""; $e_js_file = ""; $e_mb_mod = ""; $e_target = ""; $e_requires = "";
@@ -185,33 +213,47 @@
echo "</script>";
}
if(isset($all) && $all == '1'){
- $sql = "SELECT * FROM gui_element WHERE fkey_gui_id = '".$guiList2."'";
- $res = db_query($sql);
+ $sql = "SELECT * FROM gui_element WHERE fkey_gui_id = $1";
+ $v = array($guiList2);
+ $t = array("s");
+ $res = db_prep_query($sql, $v, $t);
$cnt = 0;
while(db_fetch_row($res)){
- $sql_del = "DELETE FROM gui_element WHERE fkey_gui_id = '".$guiList1."' AND e_id = '".db_result($res,$cnt,"e_id")."'";
- $res_del = db_query($sql_del);
+ $sql_del = "DELETE FROM gui_element WHERE fkey_gui_id = $1 AND e_id = $2";
+ $v = array($guiList1, db_result($res,$cnt,"e_id"));
+ $t = array("s", "s");
+ $res_del = db_prep_query($sql_del, $v, $t);
if(db_result($res,$cnt,"e_left") == ""){$myleft = 'NULL';} else{$myleft = db_result($res,$cnt,"e_left");}
if(db_result($res,$cnt,"e_top") == ""){$mytop = 'NULL';} else{$mytop = db_result($res,$cnt,"e_top");}
if(db_result($res,$cnt,"e_width") == ""){$mywidth = 'NULL';} else{$mywidth = db_result($res,$cnt,"e_width");}
if(db_result($res,$cnt,"e_height") == ""){$myheight = 'NULL';} else{$myheight = db_result($res,$cnt,"e_height");}
if(db_result($res,$cnt,"e_z_index") == ""){$my_z_index = 'NULL';} else{$my_z_index = db_result($res,$cnt,"e_z_index");}
- $sql_ins = "INSERT INTO gui_element(fkey_gui_id,e_id,e_pos,e_public,e_comment,e_element,e_src,e_attributes,e_left,e_top,e_width,e_height,e_z_index,e_more_styles,e_content,e_closetag,e_js_file,e_mb_mod,e_target,e_requires) ";
- $sql_ins .= "VALUES ('".$guiList1."','".db_result($res,$cnt,"e_id")."','".db_result($res,$cnt,"e_pos")."','".db_result($res,$cnt,"e_public")."','".db_escape_string(db_result($res,$cnt,"e_comment"))."','".db_result($res,$cnt,"e_element")."','".db_result($res,$cnt,"e_src")."','".db_escape_string(db_result($res,$cnt,"e_attributes"))."',".$myleft.",";
- $sql_ins .= $mytop.",".$mywidth.",".$myheight.",".$my_z_index.",'".db_result($res,$cnt,"e_more_styles")."','".db_escape_string(db_result($res,$cnt,"e_content"))."','".db_result($res,$cnt,"e_closetag")."','".db_result($res,$cnt,"e_js_file")."','".db_result($res,$cnt,"e_mb_mod")."','".db_result($res,$cnt,"e_target")."','".db_result($res,$cnt,"e_requires")."')";
-
- $res_ins = db_query($sql_ins);
+ $sql_ins = "INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, ";
+ $sql_ins .= "e_comment, e_element, e_src, e_attributes, e_left, e_top, ";
+ $sql_ins .= "e_width, e_height, e_z_index, e_more_styles, e_content, ";
+ $sql_ins .= "e_closetag, e_js_file, e_mb_mod, e_target, e_requires) ";
+ $sql_ins .= "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, ";
+ $sql_ins .= "$10, $11, $12, $13, $14, $15, $16, $17, $18, $19);";
+ $v = array($guiList1, db_result($res,$cnt,"e_id"), db_result($res,$cnt,"e_pos"), db_result($res,$cnt,"e_public"), db_escape_string(db_result($res,$cnt,"e_comment")), db_result($res,$cnt,"e_element"), db_result($res,$cnt,"e_src"), db_escape_string(db_result($res,$cnt,"e_attributes")), $myleft, $mytop, $mywidth, $myheight, $my_z_index, db_result($res,$cnt,"e_more_styles"), db_escape_string(db_result($res,$cnt,"e_content")), db_result($res,$cnt,"e_closetag"), db_result($res,$cnt,"e_js_file"), db_result($res,$cnt,"e_mb_mod"), db_result($res,$cnt,"e_target"), db_result($res,$cnt,"e_requires"));
+ $t = array("s", "s", "s", "s", "s", "s", "s", "s", "i", "i", "i", "i", "i", "s", "s", "s", "s", "s", "s", "s");
+
+ $res_ins = db_prep_query($sql_ins, $v, $t);
if(!$res_ins){echo db_error($con); }
$cnt++;
}
- $sql = "SELECT * FROM gui_element_vars WHERE fkey_gui_id = '".$guiList2."'";
- $res = db_query($sql);
+ $sql = "SELECT * FROM gui_element_vars WHERE fkey_gui_id = $1";
+ $v = array($guiList2);
+ $t = array("s");
+ $res = db_prep_query($sql, $v, $t);
$cnt = 0;
while(db_fetch_row($res)){
- $sql_ins2 = "INSERT INTO gui_element_vars(fkey_gui_id,fkey_e_id,var_name,var_value,context,type) ";
- $sql_ins2 .= "VALUES ('".$guiList1."','".db_result($res,$cnt,"fkey_e_id")."','".db_result($res,$cnt,"var_name")."','".db_escape_string(db_result($res,$cnt,"var_value"))."','".db_escape_string(db_result($res,$cnt,"context"))."','".db_result($res,$cnt,"type")."')";
- $res_ins2 = db_query($sql_ins2);
+ $sql_ins2 = "INSERT INTO gui_element_vars (fkey_gui_id, fkey_e_id, ";
+ $sql_ins2 .= "var_name, var_value, context, type) VALUES (";
+ $sql_ins2 .= "$1, $2, $3, $4, $5, $6);";
+ $v = array($guiList1, db_result($res,$cnt,"fkey_e_id"), db_result($res,$cnt,"var_name"), db_escape_string(db_result($res,$cnt,"var_value")), db_escape_string(db_result($res,$cnt,"context")), db_result($res,$cnt,"type"));
+ $t = array("s", "s", "s", "s", "s", "s");
+ $res_ins2 = db_prep_query($sql_ins2, $v, $t);
if(!$res_ins2){echo db_error($connect); }
$cnt++;
@@ -223,8 +265,10 @@
echo "<script language='javascript'>";
echo "var guiIDs = new Array();";
if(isset($guiList1)){
- $sql = "SELECT e_id FROM gui_element WHERE fkey_gui_id = '".$guiList1."'";
- $res = db_query($sql);
+ $sql = "SELECT e_id FROM gui_element WHERE fkey_gui_id = $1";
+ $v = array($guiList1);
+ $t = array("s");
+ $res = db_prep_query($sql, $v, $t);
$cnt = 0;
while(db_fetch_row($res)){
echo "guiIDs[".$cnt."] = '".db_result($res,$cnt,"e_id")."'; ";
@@ -311,16 +355,22 @@
$admin = new administration();
$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
$permguis = $admin->getGuisByPermission($_SESSION["mb_user_id"],true);
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>\n";
+echo "<form name='form1' action='" . $self ."' method='post'>\n";
-$sql = "SELECT * from gui WHERE gui.gui_id IN(";
-for($i=0; $i<count($ownguis); $i++){
- if($i>0){ $sql .= ",";}
- $sql .= "'".$ownguis[$i]."'";
+$sql = "SELECT * from gui WHERE gui.gui_id IN (";
+$v = $ownguis;
+$t = array();
+
+for ($i = 1; $i <= count($ownguis); $i++) {
+ if ($i > 1) {
+ $sql .= ",";
+ }
+ $sql .= "$" . $i;
+ array_push($t, "s");
}
$sql .= ")";
//echo $sql;
-$res = db_query($sql);
+$res = db_prep_query($sql, $v, $t);
$count=0;
while(db_fetch_row($res)){
$gui_id_own[$count]=db_result($res,$count,"gui_id");
@@ -330,13 +380,19 @@
}
-$sql = "SELECT * from gui WHERE gui.gui_id IN(";
-for($i=0; $i<count($permguis); $i++){
- if($i>0){ $sql .= ",";}
- $sql .= "'".$permguis[$i]."'";
+$sql = "SELECT * from gui WHERE gui.gui_id IN (";
+$v = $permguis;
+$t = array();
+
+for ($i = 1; $i <= count($permguis); $i++){
+ if ($i > 1) {
+ $sql .= ",";
+ }
+ $sql .= "$" . $i;
+ array_push($t, "s");
}
$sql .= ")";
-$res = db_query($sql);
+$res = db_prep_query($sql, $v, $t);
$count=0;
while($row = db_fetch_array($res)){
$gui_id_perm[$count]= $row["gui_id"];
@@ -413,8 +469,10 @@
else{
echo "<div class='guiList2_header'>Templates</div>\n";
}
- $sql = "SELECT * FROM gui_element WHERE fkey_gui_id = '".$guiList2."' ORDER BY e_id";
- $res = db_query($sql);
+ $sql = "SELECT * FROM gui_element WHERE fkey_gui_id = $1 ORDER BY e_id";
+ $v = array($guiList2);
+ $t = array("s");
+ $res = db_prep_query($sql, $v, $t);
$cnt = 0;
echo "<div class='myElements'>\n<table>\n";
@@ -440,8 +498,10 @@
#Formular:
echo "<table class='myForm'>\n";
if(isset($myElement)){
- $sql = "SELECT * FROM gui_element WHERE fkey_gui_id = '".$guiList2."' AND e_id = '".$myElement."'";
- $res = db_query($sql);
+ $sql = "SELECT * FROM gui_element WHERE fkey_gui_id = $1 AND e_id = $2";
+ $v = array($guiList2, $myElement);
+ $t = array("s", "s");
+ $res = db_prep_query($sql, $v, $t);
if(db_fetch_row($res)){
echo "<tr><td>ID: </td><td><input type='text' class='textfield' name='e_id' value='".db_result($res,0,"e_id")."'></td></tr>\n";
echo "<tr><td>Position: </td><td><input type='text' class='textfield' name='e_pos' value='".db_result($res,0,"e_pos")."'></td></tr>\n";
Modified: trunk/mapbender/http/php/mod_evalArea.php
===================================================================
--- trunk/mapbender/http/php/mod_evalArea.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_evalArea.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,10 +16,11 @@
# 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__)."/../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>
@@ -31,11 +32,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">
<!--
@@ -52,7 +48,6 @@
</head>
<body>
<?php
-import_request_variables("PG");
$x = $_REQUEST["x"];
$y = $_REQUEST["y"];
$epsg = $_REQUEST["srs"];
@@ -78,7 +73,7 @@
echo "Fläche: 0 m<sup>2</sup>";
}
}else{
- #echo "Flächenberechnung für MySQL liegt derzeit nicht vor<br></sup>";
+ #echo "Fl�chenberechnung f�r MySQL liegt derzeit nicht vor<br></sup>";
#$con = db_connect($GEOS_DBSERVER,$GEOS_PORT,$GEOS_OWNER,$GEOS_PW);
#db_select_db($GEOS_DBSERVER,$con);
$con_string = "host=$GEOS_DBSERVER port=$GEOS_PORT dbname=$GEOS_DB user=$GEOS_OWNER password=$GEOS_PW";
Modified: trunk/mapbender/http/php/mod_exportElement.php
===================================================================
--- trunk/mapbender/http/php/mod_exportElement.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_exportElement.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -35,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: trunk/mapbender/http/php/mod_exportGUI.php
===================================================================
--- trunk/mapbender/http/php/mod_exportGUI.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_exportGUI.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
Copied: trunk/mapbender/http/php/mod_exportMapImage_server.php (from rev 2404, branches/2.5/http/php/mod_exportMapImage_server.php)
===================================================================
--- trunk/mapbender/http/php/mod_exportMapImage_server.php (rev 0)
+++ trunk/mapbender/http/php/mod_exportMapImage_server.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -0,0 +1,54 @@
+<?php
+# $Id$
+# http://www.mapbender.org/ExportMapimage
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+require_once(dirname(__FILE__) . "/../php/mb_validateSession.php");
+include_once(dirname(__FILE__)."/../classes/class_weldMaps2Image.php");
+
+$imageType = "";
+if(isset($_REQUEST["imagetype"])){
+
+ $imageType = $_REQUEST["imagetype"];
+
+}
+
+$urls = "";
+if(isset($_REQUEST["wms_urls"])){
+
+ $wms_urls = $_REQUEST["wms_urls"];
+
+}
+
+$array_file = array();
+$array_file["dir"] = TMPDIR;
+$array_file["filename"] = "image";
+
+$array_urls = explode("___", $wms_urls);
+foreach ($array_urls as $key => $value) {
+ if (is_null($value) || $value=="") {
+ unset($array_urls[$key]);
+ }
+}
+
+$new_array = array_values($array_urls);
+
+$image = new weldMaps2Image($new_array, $array_file);
+$image->getImage($imageType, 'file');
+
+
+?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_export_image.php
===================================================================
--- trunk/mapbender/http/php/mod_export_image.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_export_image.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,8 +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.
-session_start();
+
import_request_variables("PG");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+
$_SESSION["mb_print_url"] = $map_url;
$_SESSION["mb_print_resolution"] = $quality;
header("Content-type: application/png"); // mark the following content as PNG file
Modified: trunk/mapbender/http/php/mod_featuretypeMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_featuretypeMetadata.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_featuretypeMetadata.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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("../../conf/mapbender.conf");
-require_once("../../conf/geoportal.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
function display_text($string) {
$string = eregi_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", "<a href=\"\\0\" target=_blank>\\0</a>", $string);
@@ -39,7 +36,8 @@
<meta http-equiv="pragma" content="no-cache">
<meta http-equiv="expires" content="0">
<meta http-equiv="content-language" content="de" />
- <meta http-equiv="content-style-type" content="text/css" />
+ <meta http-equiv="content-style-type" content="text/css" />
+ <link rel="stylesheet" type="text/css" href="../css/metadata.css" />
<?php
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
@@ -47,7 +45,7 @@
<body id="top">
- <div>
+
<?php
$wfs_conf_id = $_GET['wfs_conf_id'];
//for testing only
@@ -121,7 +119,7 @@
$featuretype['E-Mail'] = $row['electronicmailaddress'];
$featuretype['Land'] = $row['country'];
- echo "<table class='contenttable-0-wide'>\n";
+ echo "<table >\n";
$t_a = "\t<tr>\n\t\t<th>\n\t\t\t";
$t_b = "\n\t\t</th>\n\t\t<td>\n\t\t\t";
$t_c = "\n\t\t</td>\n\t</tr>\n";
@@ -133,6 +131,6 @@
echo "</td></tr></table>\n";
?>
- </div>
+
</body>
</html>
Modified: trunk/mapbender/http/php/mod_filteredGroup_Gui.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGroup_Gui.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredGroup_Gui.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,12 +19,7 @@
# 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: trunk/mapbender/http/php/mod_filteredGroup_User.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGroup_User.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredGroup_User.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,11 +19,7 @@
# 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: trunk/mapbender/http/php/mod_filteredGroup_filteredGui.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGroup_filteredGui.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredGroup_filteredGui.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,11 +19,7 @@
# 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: trunk/mapbender/http/php/mod_filteredGroup_filteredUser.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGroup_filteredUser.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredGroup_filteredUser.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,12 +19,7 @@
# 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: trunk/mapbender/http/php/mod_filteredGui_User.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGui_User.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredGui_User.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,12 +18,7 @@
# 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: trunk/mapbender/http/php/mod_filteredGui_filteredGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGui_filteredGroup.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredGui_filteredGroup.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,11 +19,7 @@
# 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: trunk/mapbender/http/php/mod_filteredGui_filteredUser.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGui_filteredUser.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredGui_filteredUser.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,11 +19,7 @@
# 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: trunk/mapbender/http/php/mod_filteredGui_group.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredGui_group.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredGui_group.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_filteredUser_Group.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredUser_Group.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredUser_Group.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_filteredUser_Gui.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredUser_Gui.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredUser_Gui.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_filteredUser_filteredGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredUser_filteredGroup.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredUser_filteredGroup.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_filteredUser_filteredGui.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredUser_filteredGui.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredUser_filteredGui.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,12 +18,7 @@
# 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: trunk/mapbender/http/php/mod_filteredWms_layer_topic.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredWms_layer_topic.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredWms_layer_topic.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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("../classes/class_administration.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: trunk/mapbender/http/php/mod_filteredWms_topic.php
===================================================================
--- trunk/mapbender/http/php/mod_filteredWms_topic.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_filteredWms_topic.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import_request_variables("PG");
-require_once("../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-require_once("../php/mb_validatePermission.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
+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>
@@ -63,7 +60,6 @@
<body>
<?php
-require_once("../classes/class_administration.php");
$fieldHeight = 20;
Modified: trunk/mapbender/http/php/mod_forgottenPassword.php
===================================================================
--- trunk/mapbender/http/php/mod_forgottenPassword.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_forgottenPassword.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,9 +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__)."/../classes/class_administration.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
import_request_variables("PG");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -48,10 +48,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) {
@@ -70,7 +66,7 @@
if ($_POST["sendnew"]) {
if ($_POST["username"]) {
$id = $admin->getUserIdByUserName($_POST["username"]);
- $user_id = $id[0];
+ $user_id = $id;
if ($user_id) {
$upd=true;
Modified: trunk/mapbender/http/php/mod_gazLayerObj_conf.php
===================================================================
--- trunk/mapbender/http/php/mod_gazLayerObj_conf.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gazLayerObj_conf.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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__)."/../php/mb_validateSession.php");
require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
?>
<html>
<head>
@@ -73,12 +73,11 @@
/* 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 = '".$_REQUEST["myWFS"]."' ";
- $sql .= "WHERE fkey_gui_id='".$_REQUEST["gui"]."' AND fkey_layer_id=".$_REQUEST["layer"];
- $res = db_query($sql);
+ $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"]);
+ $t = array("s", "s", "i");
+ $res = db_prep_query($sql, $v, $t);
echo "layer is connected with: ".$_REQUEST["myWFS"];
die();
}
Modified: trunk/mapbender/http/php/mod_gazLayerObj_edit.php
===================================================================
--- trunk/mapbender/http/php/mod_gazLayerObj_edit.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gazLayerObj_edit.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<html>
<head>
@@ -54,29 +54,34 @@
if(isset($_REQUEST["save"])){
$sql = "UPDATE gazetteer SET ";
- $sql .= "gazetteer_abstract = '".$_REQUEST["gazetteer_abstract"]."',";
- $sql .= "g_label = '".$_REQUEST["g_label"]."',";
- $sql .= "g_label_id = '".$_REQUEST["g_label_id"]."',";
- $sql .= "g_button = '".$_REQUEST["g_button"]."',";
- $sql .= "g_button_id = '".$_REQUEST["g_button_id"]."',";
- $sql .= "g_style = '".$_REQUEST["g_style"]."',";
- $sql .= "g_buffer = '".$_REQUEST["g_buffer"]."'";
- $sql .= " WHERE gazetteer_id = ".$_REQUEST["fkey_gazetteer_id"].";";
+ $sql .= "gazetteer_abstract = $1, ";
+ $sql .= "g_label = $2, ";
+ $sql .= "g_label_id = $3, ";
+ $sql .= "g_button = $4, ";
+ $sql .= "g_button_id = $5, ";
+ $sql .= "g_style = $6, ";
+ $sql .= "g_buffer = $7 ";
+ $sql .= "WHERE gazetteer_id = $8;";
- $res = db_query($sql);
+ $v = array($_REQUEST["gazetteer_abstract"], $_REQUEST["g_label"], $_REQUEST["g_label_id"], $_REQUEST["g_button"], $_REQUEST["g_button_id"], $_REQUEST["g_style"], $_REQUEST["g_buffer"], $_REQUEST["fkey_gazetteer_id"]);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "i");
+ $res = db_prep_query($sql, $v, $t);
- for($i=0; $i<count($_REQUEST["f_id"]); $i++){
+ for ($i = 0; $i < count($_REQUEST["f_id"]); $i++){
$sql = "UPDATE gazetteer_element SET ";
- $sql .= "f_search = '".$_REQUEST["f_search"][$i]."',";
- $sql .= "f_pos = '".$_REQUEST["f_pos"][$i]."',";
- $sql .= "f_style_id = '".$_REQUEST["f_style_id"][$i]."',";
- $sql .= "f_label = '".$_REQUEST["f_label"][$i]."',";
- $sql .= "f_label_id = '".$_REQUEST["f_label_id"][$i]."',";
- $sql .= "f_show = '".$_REQUEST["f_show"][$i]."',";
- $sql .= "f_respos = '".$_REQUEST["f_respos"][$i]."'";
- $sql .= " WHERE fkey_gazetteer_id = ".$_REQUEST["fkey_gazetteer_id"]." AND f_id = ".$_REQUEST["f_id"][$i].";";
+ $sql .= "f_search = $1, ";
+ $sql .= "f_pos = $2, ";
+ $sql .= "f_style_id = $3, ";
+ $sql .= "f_label = $4, ";
+ $sql .= "f_label_id = $5, ";
+ $sql .= "f_show = $6, ";
+ $sql .= "f_respos = $7 ";
+ $sql .= "WHERE fkey_gazetteer_id = $8 AND f_id = $9;";
- $res = db_query($sql);
+ $v = array($_REQUEST["f_search"][$i], $_REQUEST["f_pos"][$i], $_REQUEST["f_style_id"][$i], $_REQUEST["f_label"][$i], $_REQUEST["f_label_id"][$i], $_REQUEST["f_show"][$i], $_REQUEST["f_respos"][$i], $_REQUEST["fkey_gazetteer_id"], $_REQUEST["f_id"][$i]);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "i", "i");
+
+ $res = db_prep_query($sql, $v, $t);
}
}
@@ -92,8 +97,10 @@
/* configure elements */
if(isset($_REQUEST["fkey_gazetteer_id"])){
- $sql = "SELECT * FROM gazetteer WHERE gazetteer_id = ".$_REQUEST["fkey_gazetteer_id"];
- $res = db_query($sql);
+ $sql = "SELECT * FROM gazetteer WHERE gazetteer_id = $1";
+ $v = array($_REQUEST["fkey_gazetteer_id"]);
+ $t = array("i");
+ $res = db_prep_query($sql, $v, $t);
if($row = db_fetch_array($res)){
echo "<table>";
echo "<tr><td>ID:</td><td>".$row["gazetteer_id"]."</td></tr>" ;
@@ -110,8 +117,10 @@
/* set element options */
$sql = "SELECT * FROM gazetteer_element ";
$sql .= "JOIN wfs_element ON gazetteer_element.f_id = wfs_element.element_id ";
- $sql .= "WHERE fkey_gazetteer_id = ".$_REQUEST["fkey_gazetteer_id"];
- $res = db_query($sql);
+ $sql .= "WHERE fkey_gazetteer_id = $1";
+ $v = array($_REQUEST["fkey_gazetteer_id"]);
+ $t = array("i");
+ $res = db_prep_query($sql, $v, $t);
echo "<table border='1'>";
echo "<tr>";
Modified: trunk/mapbender/http/php/mod_gazetteerMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_gazetteerMetadata.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gazetteerMetadata.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
-$gui_id = $_SESSION["mb_user_gui"];
-$user_id = $_SESSION["mb_user_id"];
-
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+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>
@@ -38,8 +33,7 @@
<meta name="DC.Rights" content="WhereGroup GmbH & Co.KG, Bonn">
<title>Metadata search</title>
<?
-$e_id_css = 'poi';
-include_once("../include/dyn_css.php");
+include_once(dirname(__FILE__) . "/../include/dyn_css.php");
?>
<style type="text/css">
<!--
Modified: trunk/mapbender/http/php/mod_gazetteerMetadata_search.php
===================================================================
--- trunk/mapbender/http/php/mod_gazetteerMetadata_search.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gazetteerMetadata_search.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,13 +1,11 @@
<?php
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../classes/class_json.php");
$user_id = $_SESSION["mb_user_id"];
$query = $_REQUEST["search"];
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
-require_once(dirname(__FILE__)."/../extensions/JSON.php");
-
$n = new administration();
$myguis = $n->getGuisByPermission($user_id, true);
$mywms = $n->getWmsByOwnGuis($myguis);
@@ -71,7 +69,7 @@
array_push($obj, array('wms_getcapabilities' => $row['wms_getcapabilities'], 'wms_version' => $row['wms_version'], 'layer_name' => $row['layer_name'], 'layer_id' => $row['layer_id'], 'title' => $row['layer_title']));
}
}
-$json = new Services_JSON();
+$json = new Mapbender_JSON();
$output = $json->encode($obj);
echo $output;
?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_gazetteerSQL_server.php
===================================================================
--- trunk/mapbender/http/php/mod_gazetteerSQL_server.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gazetteerSQL_server.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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__)."/../classes/class_json.php");
require_once(dirname(__FILE__)."/../../conf/gazetteerSQL.conf");
$con = pg_connect($connstring);
@@ -196,7 +193,7 @@
$e = new mb_exception("unknown command: " . $command);
}
-$json = new Services_JSON();
+$json = new Mapbender_JSON();
$output = $json->encode($obj);
echo $output;
?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_gazetteer_conf.php
===================================================================
--- trunk/mapbender/http/php/mod_gazetteer_conf.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gazetteer_conf.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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__)."/../php/mb_validateSession.php");
require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
?>
<html>
<head>
@@ -55,7 +55,6 @@
return true;
}
</script>
-
</head>
<body>
Gazetteer Configuration<br>
@@ -72,36 +71,22 @@
$con = db_connect($DBSERVER,$OWNER,$PW);
db_select_db($DB,$con);
- $sql = "INSERT INTO gazetteer (gazetteer_abstract,fkey_wfs_id,fkey_featuretype_id,g_label,g_label_id,g_button,g_button_id,g_style,g_buffer,g_res_style,g_use_wzgraphics) VALUES(";
- $sql .= "'".$_REQUEST["gazetteer_abstract"]."',";
- $sql .= "'".$_REQUEST["wfs"]."',";
- $sql .= "'".$_REQUEST["featuretype"]."',";
- $sql .= "'".$_REQUEST["g_label"]."',";
- $sql .= "'".$_REQUEST["g_label_id"]."',";
- $sql .= "'".$_REQUEST["g_button"]."',";
- $sql .= "'".$_REQUEST["g_button_id"]."',";
- $sql .= "'".$_REQUEST["g_style"]."',";
- $sql .= "'".$_REQUEST["g_buffer"]."',";
- $sql .= "'".$_REQUEST["g_res_style"]."',";
- $sql .= $_REQUEST["g_use_wzgraphics"];
- $sql .= "); ";
-
- $res = db_query($sql);
+ $sql = "INSERT INTO gazetteer (gazetteer_abstract, fkey_wfs_id, ";
+ $sql .= "fkey_featuretype_id, g_label, g_label_id, g_button, ";
+ $sql .= "g_button_id, g_style, g_buffer, g_res_style, g_use_wzgraphics) ";
+ $sql .= "VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11);";
+ $v = array($_REQUEST["gazetteer_abstract"], $_REQUEST["wfs"], $_REQUEST["featuretype"], $_REQUEST["g_label"], $_REQUEST["g_label_id"], $_REQUEST["g_button"], $_REQUEST["g_button_id"], $_REQUEST["g_style"], $_REQUEST["g_buffer"], $_REQUEST["g_res_style"], $_REQUEST["g_use_wzgraphics"]);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "i");
+ $res = db_prep_query($sql, $v, $t);
$wfsID = db_insert_id($con);
for($i=0; $i<count($_REQUEST["f_id"]); $i++){
- $sql = "INSERT INTO gazetteer_element (fkey_gazetteer_id,f_id,f_search,f_pos,f_style_id,f_toupper,f_label,f_label_id,f_show,f_respos) VALUES(";
- $sql .= "'".$wfsID."',";
- $sql .= "'".$_REQUEST["f_id"][$i]."',";
- $sql .= "'".$_REQUEST["f_search"][$i]."',";
- $sql .= "'".$_REQUEST["f_pos"][$i]."',";
- $sql .= "'".$_REQUEST["f_style_id"][$i]."',";
- $sql .= "'".$_REQUEST["f_toupper"][$i]."',";
- $sql .= "'".$_REQUEST["f_label"][$i]."',";
- $sql .= "'".$_REQUEST["f_label_id"][$i]."',";
- $sql .= "'".$_REQUEST["f_show"][$i]."',";
- $sql .= "'".$_REQUEST["f_respos"][$i]."'";
- $sql .= "); ";
- $res = db_query($sql);
+ $sql = "INSERT INTO gazetteer_element (fkey_gazetteer_id, ";
+ $sql .= "f_id, f_search, f_pos, f_style_id, f_toupper, f_label, ";
+ $sql .= "f_label_id, f_show, f_respos) VALUES (";
+ $sql .= "$1, $2, $3, $4, $5, $6, $7, $8, $9, $10);";
+ $v = array($wfsID, $_REQUEST["f_id"][$i], $_REQUEST["f_search"][$i], $_REQUEST["f_pos"][$i], $_REQUEST["f_style_id"][$i], $_REQUEST["f_toupper"][$i], $_REQUEST["f_label"][$i], $_REQUEST["f_label_id"][$i], $_REQUEST["f_show"][$i], $_REQUEST["f_respos"][$i]);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "s", "s", "s");
+ $res = db_prep_query($sql, $v, $t);
}
}
Modified: trunk/mapbender/http/php/mod_gazetteer_edit.php
===================================================================
--- trunk/mapbender/http/php/mod_gazetteer_edit.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gazetteer_edit.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<html>
<head>
@@ -56,31 +56,34 @@
if(isset($_REQUEST["save"])){
$sql = "UPDATE gazetteer SET ";
- $sql .= "gazetteer_abstract = '".$_REQUEST["gazetteer_abstract"]."',";
- $sql .= "g_label = '".$_REQUEST["g_label"]."',";
- $sql .= "g_label_id = '".$_REQUEST["g_label_id"]."',";
- $sql .= "g_button = '".$_REQUEST["g_button"]."',";
- $sql .= "g_button_id = '".$_REQUEST["g_button_id"]."',";
- $sql .= "g_style = '".$_REQUEST["g_style"]."',";
- $sql .= "g_buffer = '".$_REQUEST["g_buffer"]."',";
- $sql .= "g_res_style = '".$_REQUEST["g_res_style"]."',";
- $sql .= "g_use_wzgraphics = ".$_REQUEST["g_use_wzgraphics"];
- $sql .= " WHERE gazetteer_id = ".$_REQUEST["gaz"].";";
- $res = db_query($sql);
+ $sql .= "gazetteer_abstract = $1, ";
+ $sql .= "g_label = $2, ";
+ $sql .= "g_label_id = $3, ";
+ $sql .= "g_button = $4, ";
+ $sql .= "g_button_id = $5, ";
+ $sql .= "g_style = $6, ";
+ $sql .= "g_buffer = $7, ";
+ $sql .= "g_res_style = $8, ";
+ $sql .= "g_use_wzgraphics = $9 ";
+ $sql .= "WHERE gazetteer_id = $10;";
+ $v = array($_REQUEST["gazetteer_abstract"], $_REQUEST["g_label"], $_REQUEST["g_label_id"], $_REQUEST["g_button"], $_REQUEST["g_button_id"], $_REQUEST["g_style"], $_REQUEST["g_buffer"], $_REQUEST["g_res_style"], $_REQUEST["g_use_wzgraphics"], $_REQUEST["gaz"]);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "s", "i", "i");
+ $res = db_prep_query($sql, $v, $t);
for($i=0; $i<count($_REQUEST["f_id"]); $i++){
$sql = "UPDATE gazetteer_element SET ";
- $sql .= "f_search = '".$_REQUEST["f_search"][$i]."',";
- $sql .= "f_pos = '".$_REQUEST["f_pos"][$i]."',";
- $sql .= "f_style_id = '".$_REQUEST["f_style_id"][$i]."',";
- $sql .= "f_toupper = '".$_REQUEST["f_toupper"][$i]."',";
- $sql .= "f_label = '".$_REQUEST["f_label"][$i]."',";
- $sql .= "f_label_id = '".$_REQUEST["f_label_id"][$i]."',";
- $sql .= "f_show = '".$_REQUEST["f_show"][$i]."',";
- $sql .= "f_respos = '".$_REQUEST["f_respos"][$i]."'";
- $sql .= " WHERE fkey_gazetteer_id = ".$_REQUEST["gaz"]." AND f_id = ".$_REQUEST["f_id"][$i].";";
-
- $res = db_query($sql);
+ $sql .= "f_search = $1, ";
+ $sql .= "f_pos = $2, ";
+ $sql .= "f_style_id = $3, ";
+ $sql .= "f_toupper = $4, ";
+ $sql .= "f_label = $5, ";
+ $sql .= "f_label_id = $6, ";
+ $sql .= "f_show = $7, ";
+ $sql .= "f_respos = $8 ";
+ $sql .= "WHERE fkey_gazetteer_id = $9 AND f_id = $10;";
+ $v = array($_REQUEST["f_search"][$i], $_REQUEST["f_pos"][$i], $_REQUEST["f_style_id"][$i], $_REQUEST["f_toupper"][$i], $_REQUEST["f_label"][$i], $_REQUEST["f_label_id"][$i], $_REQUEST["f_show"][$i], $_REQUEST["f_respos"][$i], $_REQUEST["gaz"], $_REQUEST["f_id"][$i]);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "s", "i", "i");
+ $res = db_prep_query($sql, $v, $t);
}
}
@@ -110,8 +113,10 @@
/* configure elements */
if(isset($_REQUEST["gaz"])){
- $sql = "SELECT * FROM gazetteer WHERE gazetteer_id = ".$_REQUEST["gaz"];
- $res = db_query($sql);
+ $sql = "SELECT * FROM gazetteer WHERE gazetteer_id = $1";
+ $v = array($_REQUEST["gaz"]);
+ $t = array("i");
+ $res = db_prep_query($sql, $v, $t);
if($row = db_fetch_array($res)){
echo "<table>";
echo "<tr><td>GazetterID:</td><td>".$row["gazetteer_id"]."</td></tr>" ;
@@ -132,9 +137,11 @@
/* set element options */
$sql = "SELECT * FROM gazetteer_element ";
$sql .= "JOIN wfs_element ON gazetteer_element.f_id = wfs_element.element_id ";
- $sql .= "WHERE fkey_gazetteer_id = ".$_REQUEST["gaz"];
+ $sql .= "WHERE fkey_gazetteer_id = $1";
+ $v = array($_REQUEST["gaz"]);
+ $t = array("i");
echo $sql;
- $res = db_query($sql);
+ $res = db_prep_query($sql, $v, $t);
echo "<table border='1'>";
echo "<tr>";
Modified: trunk/mapbender/http/php/mod_getStyles.php
===================================================================
--- trunk/mapbender/http/php/mod_getStyles.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_getStyles.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
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";
?>
@@ -127,23 +123,27 @@
fclose($style_file);
#include(dirname(__FILE__)."/../../conf/www.conf");
$pattern = "/" . basename($login) . "/";
- $sql = "UPDATE wms SET wms_filter = '".preg_replace($pattern,$style_filename,$login)."' WHERE wms_id = ". $wmsList;
+ $sql = "UPDATE wms SET wms_filter = $1 WHERE wms_id = $2";
+ $v = array(preg_replace($pattern,$style_filename,$login), $wmsList);
+ $t = array("s", "i");
echo $sql;
- db_query($sql) or die("unable to change filter!");
+ db_prep_query($sql, $v, $t) or die("unable to change filter!");
}
###
$sql = "SELECT * FROM wms ORDER BY wms_title";
$res = db_query($sql);
$cnt = 0;
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self ."' method='post'>";
echo "<select class='wmsList' size='20' name='wmsList' class='wmsList' onchange='submit()'>";
while($row = db_fetch_array($res)){
# getStyle - Request:
if($wmsList && $row["wms_id"] == $wmsList){
$getStyle = $row["wms_getmap"]."&VERSION=1.1.1&REQUEST=getStyles&SERVICE=WMS&LAYERS=";
- $sql_style = "SELECT layer_name FROM layer WHERE fkey_wms_id = " . $wmsList;
- $res_style = db_query($sql_style);
+ $sql_style = "SELECT layer_name FROM layer WHERE fkey_wms_id = $1";
+ $v = array($wmsList);
+ $t = array("i");
+ $res_style = db_prep_query($sql_style, $v, $t);
$cnt_style = 0;
while($row2 = db_fetch_array($res_style)){
Modified: trunk/mapbender/http/php/mod_group_filteredGui.php
===================================================================
--- trunk/mapbender/http/php/mod_group_filteredGui.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_group_filteredGui.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,12 +18,7 @@
# 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: trunk/mapbender/http/php/mod_group_filteredUser.php
===================================================================
--- trunk/mapbender/http/php/mod_group_filteredUser.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_group_filteredUser.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_group_gui.php
===================================================================
--- trunk/mapbender/http/php/mod_group_gui.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_group_gui.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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.
-
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: trunk/mapbender/http/php/mod_group_user.php
===================================================================
--- trunk/mapbender/http/php/mod_group_user.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_group_user.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_gui_filteredGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_gui_filteredGroup.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gui_filteredGroup.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_gui_filteredUser.php
===================================================================
--- trunk/mapbender/http/php/mod_gui_filteredUser.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gui_filteredUser.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_gui_group.php
===================================================================
--- trunk/mapbender/http/php/mod_gui_group.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gui_group.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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 +57,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: trunk/mapbender/http/php/mod_gui_owner.php
===================================================================
--- trunk/mapbender/http/php/mod_gui_owner.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gui_owner.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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");
-$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"];
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: trunk/mapbender/http/php/mod_gui_user.php
===================================================================
--- trunk/mapbender/http/php/mod_gui_user.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_gui_user.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_help.php
===================================================================
--- trunk/mapbender/http/php/mod_help.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_help.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,20 +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__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
-$e_id_css = 'help';
-$gui_id = $_REQUEST["gui_id"];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
include(dirname(__FILE__)."/../include/dyn_php.php");
+
if(!isset($mod_help_width)){
$mod_help_width = 1000;
}
if(!isset($mod_help_height)){
$mod_help_height = 1000;
}
-?>
+?>
<img src='../img/transparent.gif' style='cursor:help' width='<?php echo $mod_help_width ?>' height='<?php echo $mod_help_height ?>' usemap='#mod_help_imagemap' border='0'>
<map name='mod_help_imagemap'>
<?php
@@ -45,7 +41,7 @@
if($row["e_id"] != 'help'){
echo "window.open('".$row["e_url"]."');";
}
- echo "\" ";
+ echo "\" ";
echo "id=\"helpArea_".$row['e_id']."\" ";
echo "shape=\"rect\" coords=\"".$row['e_left'].",".$row['e_top'].",";
echo ($row['e_left']+$row['e_width']).",".($row['e_top']+$row['e_height'])."\" ";
Modified: trunk/mapbender/http/php/mod_insertWmcIntoDb.php
===================================================================
--- trunk/mapbender/http/php/mod_insertWmcIntoDb.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_insertWmcIntoDb.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,17 +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.
-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__)."/../classes/class_json.php");
-session_start();
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
-$json = new Services_JSON();
+$json = new Mapbender_JSON();
$mapObject = $json->decode(stripslashes($_POST["mapObject"]));
$user_id = $_SESSION["mb_user_id"];
$save_in_session = $_POST["saveInSession"];
Modified: trunk/mapbender/http/php/mod_layerMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_layerMetadata.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_layerMetadata.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,10 +17,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once("../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+$redirectToMetadataUrl = $_GET["redirectToMetadataUrl"];
+
function display_text($string) {
$string = mb_eregi_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", "<a href=\"\\0\" target=_blank>\\0</a>", $string);
$string = mb_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);
@@ -39,24 +39,21 @@
}
return trim($epsg_list);
}
-?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
- <head>
- <title>Metadaten</title>
- <meta name="description" content="Metadaten" xml:lang="de" />
- <meta name="keywords" content="Metadaten" xml:lang="de" />
- <meta http-equiv="cache-control" content="no-cache">
- <meta http-equiv="pragma" content="no-cache">
- <meta http-equiv="expires" content="0">
- <meta http-equiv="content-language" content="de" />
- <meta http-equiv="content-style-type" content="text/css" />
- <link rel="stylesheet" type="text/css" href="../css/metadata.css" />
-<?php
- echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
- </head>
- <body>
-<?php
+$metadataStr = "";
+$metadataStr .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">' .
+ '<head>' .
+ '<title>Metadaten</title>' .
+ '<meta name="description" content="Metadaten" xml:lang="de" />'.
+ '<meta name="keywords" content="Metadaten" xml:lang="de" />' .
+ '<meta http-equiv="cache-control" content="no-cache">'.
+ '<meta http-equiv="pragma" content="no-cache">'.
+ '<meta http-equiv="expires" content="0">'.
+ '<meta http-equiv="content-language" content="de" />'.
+ '<meta http-equiv="content-style-type" content="text/css" />'.
+ '<link rel="stylesheet" type="text/css" href="../css/metadata.css" />' .
+ '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">' .
+ '</head>'.
+ '<body>';
$layer_id = $_GET['id'];
$wms_getmap = urldecode($_GET['wms']);
$layer_name = urldecode($_GET['name']);
@@ -87,7 +84,7 @@
}
else die("layer not specified!");
$res = db_prep_query($sql,$v,$t);
- echo db_error();
+ $metadataStr .= db_error();
$layer = array();
$row = db_fetch_array($res);
$layer_id = $row['layer_id'];
@@ -130,39 +127,44 @@
$layer['Fax'] = $row['contactfacsimiletelephone'];
$layer['E-Mail'] = $row['contactelectronicmailaddress'];
$layer['Land'] = $row['country'];
+ $metadataUrl = $row['layer_metadataurl'];
- echo "<table >\n";
- $t_a = "\t<tr>\n\t\t<th>\n\t\t\t";
- $t_b = "\n\t\t</th>\n\t\t<td>\n\t\t\t";
- $t_c = "\n\t\t</td>\n\t</tr>\n";
-
- $keys = array_keys($layer);
- for ($j=0; $j<count($layer); $j++) {
- echo $t_a . $keys[$j] . $t_b . display_text($layer[$keys[$j]]) . $t_c;
+ if ($metadataUrl && $redirectToMetadataUrl) {
+ header("Location: " . $metadataUrl);
+ }
+ else {
+ $metadataStr .= "<table >\n";
+ $t_a = "\t<tr>\n\t\t<th>\n\t\t\t";
+ $t_b = "\n\t\t</th>\n\t\t<td>\n\t\t\t";
+ $t_c = "\n\t\t</td>\n\t</tr>\n";
+
+ $keys = array_keys($layer);
+ for ($j=0; $j<count($layer); $j++) {
+ $metadataStr .= $t_a . $keys[$j] . $t_b . display_text($layer[$keys[$j]]) . $t_c;
+ }
+
+ if (!$row['layer_pos'] && !$row['layer_parent']) {
+ $wms_id = $row['wms_id'];
+ $sql = "SELECT layer.layer_title, layer.layer_id FROM layer WHERE fkey_wms_id = $1 AND layer_pos <> 0";
+ $v = array($wms_id);
+ $t = array('i');
+ $res = db_prep_query($sql,$v,$t);
+ $i=0;
+ $layer = array();
+ while ($row = db_fetch_array($res)) {
+ $layer[$i] = array();
+ $layer[$i]['Titel'] = $row['layer_title'];
+ $layer[$i]['id'] = $row['layer_id'];
+ $i++;
+ }
+ $metadataStr .= "<tr><th>Ebenen</th><td>";
+ for ($i=0; $i<count($layer); $i++) {
+ if ($i >0) echo ", ";
+ $metadataStr .= "<a href='mod_layerMetadata.php?id=".$layer[$i]['id']."'>" . $layer[$i]['Titel'] . "</a>";
+ }
+ }
+ $metadataStr .= "</td></tr></table>\n";
+ $metadataStr .= '</div></body></html>';
+ echo $metadataStr;
}
-
- if (!$row['layer_pos'] && !$row['layer_parent']) {
- $wms_id = $row['wms_id'];
- $sql = "SELECT layer.layer_title, layer.layer_id FROM layer WHERE fkey_wms_id = $1 AND layer_pos <> 0";
- $v = array($wms_id);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- $i=0;
- $layer = array();
- while ($row = db_fetch_array($res)) {
- $layer[$i] = array();
- $layer[$i]['Titel'] = $row['layer_title'];
- $layer[$i]['id'] = $row['layer_id'];
- $i++;
- }
- echo "<tr><th>Ebenen</th><td>";
- for ($i=0; $i<count($layer); $i++) {
- if ($i >0) echo ", ";
- echo "<a href='mod_layerMetadata.php?id=".$layer[$i]['id']."'>" . $layer[$i]['Titel'] . "</a>";
- }
- }
- echo "</td></tr></table>\n";
?>
- </div>
- </body>
-</html>
Modified: trunk/mapbender/http/php/mod_loadCapabilities.php
===================================================================
--- trunk/mapbender/http/php/mod_loadCapabilities.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_loadCapabilities.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,18 +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");
-$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 +73,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: trunk/mapbender/http/php/mod_loadCapabilitiesList.php
===================================================================
--- trunk/mapbender/http/php/mod_loadCapabilitiesList.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_loadCapabilitiesList.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
-include(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
-include(dirname(__FILE__)."/../php/mb_validateSession.php");
import_request_variables("PG");
+require(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -92,7 +87,7 @@
}
else{
var gui_id=document.form1.guiList.options[listIndex].value;
- document.form1.action='../php/mod_loadwms.php';
+ document.form1.action='../php/mod_loadwms.php<?php echo SID;?>';
document.form1.submit();
}
}
@@ -104,13 +99,13 @@
}
var gui_ind = document.form1.guiList.selectedIndex;
var ind = document.form1.wmsID.selectedIndex;
- var ind2 = document.form1.guiID.selectedIndex;
- var permission = confirm("Load " + document.form1.wmsID.options[ind].text + " FROM " + document.form1.guiID.options[ind2].value + " INTO "+document.form1.guiList.options[gui_ind].value+" ?");
+ var ind2 = document.form1.guiID_.selectedIndex;
+ var permission = confirm("Load " + document.form1.wmsID.options[ind].text + " FROM " + document.form1.guiID_.options[ind2].value + " INTO "+document.form1.guiList.options[gui_ind].value+" ?");
if(permission == true){
document.form1.submit();
}
else{
- document.form1.guiID.selectedIndex = -1;
+ document.form1.guiID_.selectedIndex = -1;
}
}
</script>
@@ -126,7 +121,7 @@
###INSERT
-if(isset($wmsID) && isset($guiID)){
+if(isset($wmsID) && isset($guiID_)){
$sql_pos = "SELECT MAX(gui_wms_position) AS my_gui_wms_position FROM gui_wms WHERE fkey_gui_id = $1";
$v = array($guiList);
$t = array('s');
@@ -139,38 +134,40 @@
}
$sql = "SELECT * FROM gui_wms WHERE fkey_gui_id = $1 AND fkey_wms_id = $2";
- $v = array($guiID,$wmsID);
+ $v = array($guiID_,$wmsID);
$t = array('s','i');
$res = db_prep_query($sql,$v,$t);
$cnt = 0;
while($row = db_fetch_array($res)){
$sql_ins = "INSERT INTO gui_wms (fkey_gui_id,fkey_wms_id,gui_wms_position,gui_wms_mapformat,";
- $sql_ins .= "gui_wms_featureinfoformat,gui_wms_exceptionformat,gui_wms_epsg,gui_wms_visible) ";
- $sql_ins .= "VALUES ($1,$2,$3,$4,$5,$6,$7,$8)";
+ $sql_ins .= "gui_wms_featureinfoformat,gui_wms_exceptionformat,gui_wms_epsg,gui_wms_visible,gui_wms_opacity,gui_wms_sldurl) ";
+ $sql_ins .= "VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)";
$v = array($guiList,$wmsID,$gui_wms_position,$row["gui_wms_mapformat"],$row["gui_wms_featureinfoformat"],
- $row["gui_wms_exceptionformat"],$row["gui_wms_epsg"],$row["gui_wms_visible"]);
- $t = array('s','i','i','s','s','s','s','i');
+ $row["gui_wms_exceptionformat"],$row["gui_wms_epsg"],$row["gui_wms_visible"],$row["gui_wms_opacity"],$row["gui_wms_sldurl"]);
+ $t = array('s','i','i','s','s','s','s','i','i','s');
db_prep_query($sql_ins,$v,$t);
$cnt++;
}
- $sql = "SELECT * FROM gui_layer WHERE fkey_gui_id = '".$guiID."' AND gui_layer_wms_id = ".$wmsID;
- $res = db_query($sql);
+ $sql = "SELECT * FROM gui_layer WHERE fkey_gui_id = $1 AND gui_layer_wms_id = $2";
+ $v = array($guiID_, $wmsID);
+ $t = array("s", "i");
+ $res = db_prep_query($sql, $v, $t);
$cnt = 0;
while($row = db_fetch_array($res)){
$sql_ins = "INSERT INTO gui_layer (fkey_gui_id,fkey_layer_id,gui_layer_wms_id,gui_layer_status,gui_layer_selectable,";
- $sql_ins .= "gui_layer_visible,gui_layer_queryable,gui_layer_querylayer,gui_layer_minscale,gui_layer_maxscale,gui_layer_priority) ";
- $sql_ins .= "VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)";
+ $sql_ins .= "gui_layer_visible,gui_layer_queryable,gui_layer_querylayer,gui_layer_minscale,gui_layer_maxscale,gui_layer_priority,gui_layer_style,gui_layer_wfs_featuretype) ";
+ $sql_ins .= "VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13)";
$v = array($guiList,$row["fkey_layer_id"],$wmsID,$row["gui_layer_status"],$row["gui_layer_selectable"],
$row["gui_layer_visible"],$row["gui_layer_queryable"],$row["gui_layer_querylayer"],$row["gui_layer_minscale"],
- $row["gui_layer_maxscale"],$row["gui_layer_priority"]);
- $t = array('s','i','i','i','i','i','i','i','i','i','i');
+ $row["gui_layer_maxscale"],$row["gui_layer_priority"],$row["gui_layer_style"],$row["gui_layer_wfs_featuretype"]);
+ $t = array('s','i','i','i','i','i','i','i','i','i','i','s','s');
db_prep_query($sql_ins,$v,$t);
$cnt++;
}
}
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self."' method='post'>";
echo "<table cellpadding='0' cellspacing='0' border='0'>";
echo "<tr>";
@@ -180,16 +177,20 @@
echo"<br>";
$sql = "SELECT * FROM gui WHERE gui_id IN (";
- for($i=0; $i<count($ownguis); $i++){
- if($i>0){ $sql .= ",";}
- $sql .= "'".$ownguis[$i]."'";
+ $v = $ownguis;
+ $t = array();
+ for ($i = 1; $i <= count($ownguis); $i++){
+ if ($i > 1) {
+ $sql .= ",";
+ }
+ $sql .= "$".$i;
+ array_push($t, "s");
}
$sql .= ") ORDER BY gui_name";
- $res = db_query($sql);
+ $res = db_prep_query($sql, $v, $t);
$count=0;
echo"<select size='8' name='guiList' style='width:200px' onClick='submit()'>";
while($row = db_fetch_array($res)){
- $gui_id[$count]=$row["gui_id"];
$gui_name[$count]=$row["gui_name"];
$gui_description[$count]=$row["gui_description"];
$count++;
@@ -236,12 +237,17 @@
echo"<div class='text1'>Load WMS</div>";
$sql = "SELECT DISTINCT wms.wms_id,wms.wms_title,wms.wms_abstract,wms.wms_owner FROM gui_wms JOIN wms ON ";
$sql .= "wms.wms_id = gui_wms.fkey_wms_id WHERE gui_wms.fkey_gui_id IN(";
- for($i=0; $i<count($arrayGUIs); $i++){
- if($i>0){$sql .= ",";}
- $sql .= "'".$arrayGUIs[$i]."'";
+ $v = $arrayGUIs;
+ $t = array();
+ for ($i = 1; $i <= count($arrayGUIs); $i++){
+ if ($i > 1) {
+ $sql .= ",";
+ }
+ $sql .= "$" . $i;
+ array_push($t, "s");
}
$sql .= ") ORDER BY wms.wms_title";
- $res = db_query($sql);
+ $res = db_prep_query($sql, $v, $t);
echo "<select class='select1' name='wmsID' size='20' onchange='submit()'>";
$cnt = 0;
while($row = db_fetch_array($res)){
@@ -263,9 +269,11 @@
if(isset($wmsID)){
echo "<div class='text2'>FROM:</div>";
- $sql = "SELECT * from gui_wms WHERE fkey_wms_id ='".$wmsID."' ORDER BY fkey_gui_id";
- $res = db_query($sql);
- echo "<select class='select2' name='guiID' size='20' onchange='load()'>";
+ $sql = "SELECT * from gui_wms WHERE fkey_wms_id = $1 ORDER BY fkey_gui_id";
+ $v = array($wmsID);
+ $t = array("s");
+ $res = db_prep_query($sql, $v, $t);
+ echo "<select class='select2' name='guiID_' size='20' onchange='load()'>";
$cnt = 0;
while($row = db_fetch_array($res)){
echo "<option value='".$row["fkey_gui_id"]."' ";
Modified: trunk/mapbender/http/php/mod_loadCapabilities_temp.php
===================================================================
--- trunk/mapbender/http/php/mod_loadCapabilities_temp.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_loadCapabilities_temp.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,15 +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();
+import_request_variables("PG");
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 +67,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: trunk/mapbender/http/php/mod_loadWFSCapabilities.php
===================================================================
--- trunk/mapbender/http/php/mod_loadWFSCapabilities.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_loadWFSCapabilities.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
-
-include(dirname(__FILE__)."/../php/mb_validateSession.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
@@ -80,7 +74,7 @@
}
else{
var gui_id=document.form1.guiList.options[listIndex].value;
- document.form1.action='../php/mod_loadwfs.php';
+ document.form1.action='../php/mod_loadwfs.php?<?php echo $urlParameters;?>';
document.form1.submit();
}
}
@@ -90,24 +84,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 "<form name='form1' action='" . $self ."' 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 +119,7 @@
echo "</td>";
echo "<td>";
-#echo"WFS";
echo"<br>";
-###
if(isset($guiList) && $guiList!=""){
@@ -165,7 +148,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: trunk/mapbender/http/php/mod_loadwfs.php
===================================================================
--- trunk/mapbender/http/php/mod_loadwfs.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_loadwfs.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,17 +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__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/mb_validateInput.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
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"]);
+
+$guiList = mb_validateInput($_REQUEST["guiList"]);
+$xml = mb_validateInput($_REQUEST["xml_file"]);
$mywms = new wfs();
$mywms->createObjFromXML($xml);
-$mywms->wfs2db($gui_id);
+$mywms->wfs2db($guiList);
$mywms->displayWFS();
-?>
+?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_loadwms.php
===================================================================
--- trunk/mapbender/http/php/mod_loadwms.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_loadwms.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,21 +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.
-session_start();
-require_once("../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-require_once("mb_validatePermission.php");
-require_once("../classes/class_wms.php");
+require_once(dirname(__FILE__) . "/mb_validatePermission.php");
+require_once(dirname(__FILE__) . "/../classes/class_wms.php");
-
-echo "file: ".$_REQUEST["xml_file"];
-
-$gui_id = $_REQUEST["guiList"];
+$guiList = $_REQUEST["guiList"];
$xml = $_REQUEST["xml_file"];
+echo "file: ".$xml;
+
$mywms = new wms();
$mywms->createObjFromXML($xml);
-$mywms->writeObjInDB($gui_id);
+$mywms->writeObjInDB($guiList);
$mywms->displayWMS();
-?>
+?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_loadwms_temp.php
===================================================================
--- trunk/mapbender/http/php/mod_loadwms_temp.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_loadwms_temp.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,22 +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");
-
-#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: trunk/mapbender/http/php/mod_log.php
===================================================================
--- trunk/mapbender/http/php/mod_log.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_log.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,14 +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");
-$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_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require(dirname(__FILE__)."/../include/dyn_php.php");
+
if($_REQUEST['req']){
ignore_user_abort();
$req = array();
@@ -33,6 +29,6 @@
if(empty($req)){$req = "init";}
include(dirname(__FILE__)."/../classes/class_log.php");
$log = new log("default", $req, $time_client, $logtype);
-}
-echo "log into $logtype successful!";
-?>
+}
+echo "log into $logtype successful!";
+?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_logout.php
===================================================================
--- trunk/mapbender/http/php/mod_logout.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_logout.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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");
-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");
@@ -37,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: trunk/mapbender/http/php/mod_map1.php
===================================================================
--- trunk/mapbender/http/php/mod_map1.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_map1.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,15 +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);
-$gui_id = $_SESSION["mb_user_gui"];
-
+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">
@@ -37,8 +31,10 @@
<title>mod_map1</title>
<?php
-$sql = "SELECT e_width, e_height FROM gui_element WHERE e_id = 'mapframe1' AND fkey_gui_id = '".$_SESSION["mb_user_gui"]."'";
-$res = db_query($sql);
+$sql = "SELECT e_width, e_height FROM gui_element WHERE e_id = 'mapframe1' 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_width = $row["e_width"];
Modified: trunk/mapbender/http/php/mod_mapOV.php
===================================================================
--- trunk/mapbender/http/php/mod_mapOV.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_mapOV.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,10 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
if(isset($_REQUEST["wms"])){
$rank = $_REQUEST["wms"];
@@ -45,8 +42,10 @@
?>
<?php
$gui_id = $_SESSION["mb_user_gui"];
-$sql = "SELECT e_width,e_height, e_target FROM gui_element WHERE e_id = 'overview' AND fkey_gui_id = '".$gui_id."'";
-$res = db_query($sql);
+$sql = "SELECT e_width,e_height, e_target FROM gui_element WHERE e_id = 'overview' AND fkey_gui_id = $1";
+$v = array($gui_id);
+$t = array("s");
+$res = db_prep_query($sql, $v, $t);
$cnt = 0;
echo "<script type='text/javascript'>";
while($row = db_fetch_array($res)){
Modified: trunk/mapbender/http/php/mod_meetingPoint.php
===================================================================
--- trunk/mapbender/http/php/mod_meetingPoint.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_meetingPoint.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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("../php/mb_validateSession.php");
-require_once("../../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
Deleted: trunk/mapbender/http/php/mod_monitorCapabilities_main.php
===================================================================
--- trunk/mapbender/http/php/mod_monitorCapabilities_main.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_monitorCapabilities_main.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,213 +0,0 @@
-<?php
-# $Id: mod_monitorCapabilities_main.php 1240 2007-10-24 09:27:00Z baudson $
-# http://www.mapbender.org/index.php/Monitor_Capabilities
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-//require_once("../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-//session_start();
-//import_request_variables("PG");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-$admin = new administration();
-
-//$user = "root";
-$user = "";
-$gui = "";
-$cl = 0;
-
-
-function getConjunctionCharacter($onlineresource){
- if(strstr($onlineresource, "?")) {
- $lastChar = substr($onlineresource,strlen($onlineresource)-1, 1);
- if ($lastChar == "?" || $lastChar == "&") {return "";}
- else{return "&";}
- }
- else {return "?";}
-}
-
-// retrieve username and gui_id
-if ($_REQUEST['user']) {
- $cl = 0;
- //browser
- echo "browser";
- $user = $_REQUEST['user'];
- $gui = $_REQUEST['gui'];
-}
-elseif ($_SERVER["argv"][1]) {
- $cl = 1;
- //command line
- $p1 = $_SERVER["argv"][1];
- $p2 = $_SERVER["argv"][2];
- if (substr($p1, 0,5) == "user:") {
- $user = substr($p1, 5);
- if (substr($p2, 0,4) == "gui:") {
- $gui = substr($p2, 4);
- }
- }
-}
-else {
- echo "Please specify a username!\n";die();
-}
-
-$userid = $admin->getUserIdByUserName($user);
-
-/*
- * if the current user is a valid user...
- */
-if ($userid) {
- $ownguis = $admin->getGuisByOwner($userid,true);
- /*
- * if monitoring is restricted to a single GUI...
- */
- if ($gui) {
- // ... abort if the GUI doesn't exist
- if (!$admin->guiExists($gui)) {
- echo "GUI " . $gui . " doesn't exist.\n"; die();
- }
- // ... add the GUI to the array of GUIs that will be monitored
- elseif (in_array($gui, $ownguis)) {
- $ownguis = array($gui);
- }
- // ... abort if the GUI is not owned by the current user
- else {
- echo "User " . $user . " is not owner of GUI " . $gui . ".\n"; die();
- }
- }
-}
-/*
- * if current user is not a valid user, abort
- */
-else {
- echo $user . " is not a valid username.\n"; die();
-}
-
-/**
- * Array of WMS IDs. These are the WMS that the user owns.
- */
-$wms_id_own = $admin->getWmsByOwnGuis($ownguis);
-
-// initialise monitoring processes
-echo "Starting monitoring cycle...\n\n";
-if ($cl == 0) echo "<br/><br/>";
-echo "WMS services are requested for availability.\n";
-if ($cl == 0) echo "<br/>";
-echo "Capabilities documents are requested and all changes synchronized with the database cache.\n\n";
-if ($cl == 0) echo "<br/><br/>";
-
-$time = strval(time()-2);
-
-for ($k=0; $k<count($wms_id_own); $k++) {
- $sql = "SELECT wms_upload_url FROM wms WHERE wms_id = $1";
- $v = array($wms_id_own[$k]);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- $someArray = db_fetch_row($res);
- $url = $someArray[0];
-
- if (!$upload_url || $upload_url == "") {
- $sql = "SELECT wms_version, wms_getcapabilities FROM wms WHERE wms_id = $1";
- $v = array($wms_id_own[$k]);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- $someArray = db_fetch_row($res);
-
- $version = $someArray[0];
- $capabilities = $someArray[1];
- if ($version == "1.0.0" ) {
- $url = $capabilities . getConjunctionCharacter($capabilities) . "REQUEST=capabilities&WMTVER=1.0.0";
- }
- else {
- $url = $capabilities . getConjunctionCharacter($capabilities) . "REQUEST=GetCapabilities&SERVICE=WMS&VERSION=" . $version;
- }
- }
-
- $sql = "INSERT INTO mb_monitor (upload_id, fkey_wms_id, status, status_comment, timestamp_begin, timestamp_end, upload_url, updated) ";
- $sql .= "VALUES ($1, $2, $3, $4, $5, $6, $7, $8)";
- $v = array($time,$wms_id_own[$k],"-2","Monitoring is still in progress...", time(),time(),$url,"0");
- $t = array('s', 'i', 's', 's', 's', 's', 's', 's');
- $res = db_prep_query($sql,$v,$t);
-}
-
-for ($k=0; $k<count($wms_id_own); $k++) {
-
- if (intval(AUTO_UPDATE)) {
- $exec = PHP_PATH . "php5 mod_monitorCapabilities_write.php ".$wms_id_own[$k]." ".$time." 1 > ../tmp/output_".$time."_".$wms_id_own[$k].".txt &";
- }
- else {
- $exec = PHP_PATH . "php5 mod_monitorCapabilities_write.php ".$wms_id_own[$k]." ".$time." 0 > ../tmp/output_".$time."_".$wms_id_own[$k].".txt &";
- }
- exec($exec);
-}
-echo "Monitoring Cycle completed (total: " . count($wms_id_own) . " wms).\n\n";
-if ($cl == 0) echo "<br/><br/>";
-set_time_limit(2*TIME_LIMIT);
-
-// wait until all monitoring processes are finished
-echo "please wait " . TIME_LIMIT . " seconds for the monitoring to finish...\n\n";
-if ($cl == 0) echo "<br/><br/>";
-sleep(TIME_LIMIT);
-
-$sql = "SELECT fkey_wms_id, status, status_comment, timestamp_begin, timestamp_end, upload_url FROM mb_monitor WHERE upload_id = $1";
-$v = array($time);
-$t = array('i');
-$res = db_prep_query($sql,$v,$t);
-
-$cnt=0;
-while ($row = db_fetch_array($res)) {
- $status[$cnt] = intval(db_result($res,$cnt,"status"));
- $wms_id[$cnt] = db_result($res,$cnt,"fkey_wms_id");
- $comment[$cnt] = db_result($res,$cnt,"status_comment");
- $upload_url[$cnt] = db_result($res,$cnt,"upload_url");
- $timestamp_begin[$cnt] = db_result($res,0,"timestamp_begin");
- $timestamp_end[$cnt] = db_result($res,0,"timestamp_end");
- $cnt++;
-}
-
-$body = "";
-for ($i=0; $i<$cnt; $i++) {
- // if monitoring is still in progress and time limit has expired, update database
- if ($status[$i] == -2 && intval(time())-intval($timestamp_begin[$i]) > intval(TIME_LIMIT)) {
- $comment[$i] = "Monitoring process timed out.";
- $status[$i] = -1;
- $new_sql = "UPDATE mb_monitor SET status = '-1', isImage = '-1', status_comment = 'Monitoring process timed out.', timestamp_end = $1 WHERE fkey_wms_id = $2 AND upload_id = $3";
- $new_v = array((intval($upload_id[$i])+intval(TIME_LIMIT)), $wms_id[$i], $time);
- $new_t = array('s', 'i', 's');
- $new_res = db_prep_query($new_sql,$new_v,$new_t);
- }
- // compose mail message
- echo $wms_id[$i] . ": status " . $status[$i] . "\n";
- if ($cl == 0) echo "<br/><br/>";
- if ($status[$i] == -1) {
- $body .= $admin->getWmsTitleByWmsId($wms_id[$i]) . " (" . $wms_id[$i] . "): " . $comment[$i] . "\n\n";
- }
-}
-
-// Send an email to the user
-if ($body) {
- $error_msg = "";
- if ($admin->getEmailByUserId($userid)) {
-// $admin->sendEmail(MAILADMIN, MAILADMINNAME, $admin->getEmailByUserId($userid), $user, "WMS monitor report " . date("F j, Y, G:i:s", $time), utf8_decode($body), &$error_msg);
- }
- else {
- $error_msg = "Email address of user '" . $admin->getUserNameByUserId($userid) . "' unknown!\n";
- }
- if ($error_msg) {
- echo "\n ERROR: " . $error_msg;
- }
-}
-?>
Deleted: trunk/mapbender/http/php/mod_monitorCapabilities_read.php
===================================================================
--- trunk/mapbender/http/php/mod_monitorCapabilities_read.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_monitorCapabilities_read.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,247 +0,0 @@
-
-<?php
-# $Id: mod_monitorCapabilities_read.php 1283 2007-10-25 15:20:25Z baudson $
-# http://www.mapbender.org/index.php/Monitor_Capabilities
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-#require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
-session_start();
-import_request_variables("PG");
-$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">
-<meta http-equiv="pragma" content="no-cache">
-<meta http-equiv="expires" content="0">
-<?php
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
-</head>
-<body>
-<?php
-$admin = new administration();
-
-// update selected wms
-for ($i=0; $i < $_POST['cbs']; $i++) {
- $upd_wmsid = intval($_POST['cb'.$i]);
- if ($upd_wmsid) {
-
- $now = time();
- $sql = "UPDATE mb_monitor SET status = '-2', status_comment = 'Monitoring is still in progress...', timestamp_begin = $1, timestamp_end = $2 WHERE upload_id = $3 AND fkey_wms_id = $4";
- $v = array($now, $now, $_POST['upl_id'.$i], $upd_wmsid);
- $t = array('s', 's', 's', 'i');
- $res = db_prep_query($sql,$v,$t);
-
- $exec = PHP_PATH . "php mod_monitorCapabilities_write.php ".$upd_wmsid." ".$_POST['upl_id'.$i]." 1 > output.txt &";
- exec($exec);
- }
-}
-
-$sql = "SELECT DISTINCT fkey_wms_id FROM mb_monitor";
-$res = db_prep_query($sql, array(), array());
-$cnt = 0;
-$wms = array();
-while(db_fetch_row($res)){
- $wms[$cnt] = db_result($res,$cnt,"fkey_wms_id");
- $cnt++;
-}
-
-$status = array();
-$upload_id = array();
-for ($i=0; $i<count($wms); $i++) {
- $wms_id[$wms[$i]] = $wms[$i];
- // get upload id
- $sql = "SELECT MAX(upload_id) FROM mb_monitor WHERE fkey_wms_id = $1";
- $v = array($wms[$i]);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- $upload_id[$wms[$i]] = db_result($res,0,0);
-
- $sql = "SELECT AVG(timestamp_begin), AVG(timestamp_end) FROM mb_monitor WHERE fkey_wms_id = $1 AND NOT status = '-1' AND NOT status = '-2'";
- $v = array($wms[$i]);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- if (db_result($res,0,1) == 0 && db_result($res,0,0) == 0) {
- $avg_response_time[$wms[$i]] = NULL;
- }
- else {
- $avg_response_time[$wms[$i]] = round(db_result($res,0,1)-db_result($res,0,0), 1);
- }
-
- $sql = "SELECT status, status_comment, timestamp_begin, timestamp_end, upload_url, updated, image, map_url FROM mb_monitor ";
- $sql .= "WHERE upload_id = $1 AND fkey_wms_id = $2 ORDER BY status, status_comment, timestamp_end, fkey_wms_id";
- $v = array($upload_id[$wms[$i]], $wms_id[$wms[$i]]);
- $t = array('s', 'i');
- $res = db_prep_query($sql,$v,$t);
-
- $status[$wms[$i]] = intval(db_result($res,0,"status"));
- $comment[$wms[$i]] = db_result($res,0,"status_comment");
- $timestamp_begin[$wms[$i]] = db_result($res,0,"timestamp_begin");
- $timestamp_end[$wms[$i]] = db_result($res,0,"timestamp_end");
- $upload_url[$wms[$i]] = db_result($res,0,"upload_url");
- $updated[$wms[$i]] = db_result($res,0,"updated");
- $mapurl[$wms[$i]] = db_result($res,0,"map_url");
- $image[$wms[$i]] = db_result($res,0,"image");
-
- if ($status[$wms[$i]] == -2 && intval(time())-intval($timestamp_begin[$wms[$i]]) > intval(TIME_LIMIT)) {
- $comment[$wms[$i]] = "Monitoring process timed out.";
-
- $new_sql = "UPDATE mb_monitor SET status = '-1', status_comment = 'Monitoring process timed out.', timestamp_end = $1 WHERE fkey_wms_id = $2 AND upload_id = $3";
- $new_v = array((intval($upload_id[$wms[$i]])+intval(TIME_LIMIT)), $wms_id[$wms[$i]], $upload_id[$wms[$i]]);
- $new_t = array('s', 'i', 's');
- $new_res = db_prep_query($new_sql,$new_v,$new_t);
- }
-
- $sql = "SELECT COUNT(upload_id) FROM mb_monitor WHERE fkey_wms_id = $1 AND NOT status = '-2'";
- $v = array($wms[$i]);
- $t = array('i');
- $res = db_prep_query($sql, $v, $t);
- $total[$wms[$i]] = db_result($res, 0, 0);
-
- $sql = "SELECT COUNT(upload_id) FROM mb_monitor WHERE fkey_wms_id = $1 AND status = '-1'";
- $v = array($wms[$i]);
- $t = array('i');
- $res = db_prep_query($sql, $v, $t);
- $fail = db_result($res, 0, 0);
-
- $percentage[$wms[$i]] = 100 - round(100*floatval($fail)/floatval($total[$wms[$i]]), 1);
-}
-
-
-$newArray = $status;
-if ($_GET['sortby']) {
- if ($_GET['sortby'] == "wms") {
- $newArray = $wms_id;
- asort($newArray);
- }
- elseif ($_GET['sortby'] == "status") {
- $newArray = $status;
- asort($newArray);
- }
- elseif ($_GET['sortby'] == "avgresp") {
- $newArray = $avg_response_time;
- asort($newArray);
- }
- elseif ($_GET['sortby'] == "avail") {
- $newArray = $percentage;
- arsort($newArray);
- }
- elseif ($_GET['sortby'] == "last") {
- $newArray = $upload_id;
- arsort($newArray);
- }
- elseif ($_GET['image'] == "last") {
- $newArray = $image;
- arsort($newArray);
- }
-}
-
-
-
-$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 .= "\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 .= "<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></tr>";
-
-$cnt = 0;
-foreach ($newArray as $k => $value) {
- $img = "stop.bmp";
- if ($status[$k]==0) $img = "wait.bmp";
- elseif ($status[$k]==1) $img = "go.bmp";
-
- if ($updated[$k] == "0" && $status[$k] == 0) $fill = "checked"; else $fill = "disabled";
-
- if (fmod($cnt, 2) == 1) {
- $str .= "\n\t\t<tr bgcolor='#e6e6e6'>";
- }
- else {
- $str .= "\n\t\t<tr bgcolor='#f0f0f0'>";
- }
- $str .= "\n\t\t\t<td><input name='cb".$cnt."' value='" . $wms_id[$k] . "' type=checkbox ".$fill." /><input type=hidden name='upl_id".$cnt."' value='".$upload_id[$k]."'></td>";
- $str .= "\n\t\t\t<td valign='top'><b>" . $wms_id[$k] . "</b><br>" . $admin->getWmsTitleByWmsId($wms_id[$k]) . "</td>";
- $str .= "\n\t\t\t<td valign='top'><a href='".$upload_url[$k]."' target=_blank><img title='Connect to service' border=0 src = '../img/trafficlights/". $img. "'></a></td>";
- $str .= "\n\t\t\t<td valign='top'>" . $comment[$k] . "<br><div style='font-size:12'>".date("F j, Y, G:i:s", $upload_id[$k])."</div></td>";
- $str .= "\n\t\t\t<td valign='top'>";
-
- $str .= "<table bgcolor='black' border=1 cellspacing=1 cellpadding=0><tr><td height=20 width=20 align=center valign=middle bgcolor='";
-
- if ($image[$k] == -1) {
- $str .= "red";
- }
- elseif ($image[$k] == 0) {
- $str .= "yellow";
- }
- elseif ($image[$k] == 1) {
- $str .= "green";
- }
-
- if ($image[$k] != -1) {
- $str .= "'><a href='".$mapurl[$k]."'>o</a></td></tr></table></td>";
- }
- else {
- $str .= "'><a href='".$mapurl[$k]."'>x</a></td></tr></table></td>";
- }
-
- $str .= "\n\t\t\t<td valign='top' align = 'left'>";
- if ($avg_response_time[$k] == NULL) {
- $str .= "n/a";
- }
- else {
- $str .= $avg_response_time[$k] . " s";
- }
- $str .= "</td>";
- $str .= "\n\t\t\t<td valign='top'><b>" . $percentage[$k] . " %</b> <span style='font-size:12'>(" . $total[$k] . " cycles)</span><br>";
- $str .= "<table bgcolor='black' border=1 cellspacing=1 cellpadding=0><tr>";
- $val = $percentage[$k];
- for ($i=0; $i<10; $i++) {
- if ($val>=10) {
- $str .= "<td height=10 width='10' bgcolor='red'></td>";
- $val-=10;
- }
- elseif($val>0){
- $str .= "<td height=10 width='" . round($val) . "' bgcolor='red'></td>";
- if (round($val) < 10) {
- $str .= "<td height=10 width='" . (9-round($val)) . "' bgcolor='white'></td>";
- }
- $val=-1;
- }
- else {
- $str .= "<td height=10 width='10' bgcolor='white'></td>";
- }
- }
- $str .= "</tr></table></td>";
-
-# $str .= "\n\t\t\t<td><a href='output_".$wms_id[$k]."_".$max.".txt' target=_blank>log</a></td>";
- $str .= "\n\t\t<td><input type=button value='details' onclick=\"var newWindow = window.open('../php/mod_monitorCapabilities_read_single.php?wmsid=".$wms_id[$k]."','wms','width=500,height=700,scrollbars');newWindow.href.location='test.php'\"></td></tr>";
- $cnt++;
-}
-$str .= "\n\t</table>\n\t<br/><input type=hidden name=cbs value='".$cnt."'>\n</form>";
-echo $str;
-
-?>
-</body></html>
\ No newline at end of file
Deleted: trunk/mapbender/http/php/mod_monitorCapabilities_read_single.php
===================================================================
--- trunk/mapbender/http/php/mod_monitorCapabilities_read_single.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_monitorCapabilities_read_single.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,102 +0,0 @@
-
-<?php
-# $Id: mod_monitorCapabilities_read_single.php 76 2006-08-15 12:25:34Z heuser $
-# http://www.mapbender.org/index.php/Monitor_Capabilities
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-#require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
-session_start();
-import_request_variables("PG");
-$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">
-<meta http-equiv="pragma" content="no-cache">
-<meta http-equiv="expires" content="0">
-<?php
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
-</head>
-<body>
-<?php
-$admin = new administration();
-
-if ($_GET['wmsid']) {
- $wms_id = intval($_GET['wmsid']);
-}
-else {
- echo "Invalid WMS ID.";
- die;
-}
-
-$sql = "SELECT upload_id, status, status_comment, timestamp_begin, timestamp_end, upload_url, updated FROM mb_monitor ";
-$sql .= "WHERE fkey_wms_id = $1 AND NOT status = '-2' ORDER BY upload_id DESC";
-$v = array($wms_id);
-$t = array('i');
-$res = db_prep_query($sql,$v,$t);
-
-$cnt=0;
-while ($row = db_fetch_array($res)) {
- $upload_id[$cnt] = db_result($res,$cnt,"upload_id");
- $status[$cnt] = intval(db_result($res,$cnt,"status"));
- $comment[$cnt] = db_result($res,$cnt,"status_comment");
- $timestamp_begin = db_result($res,$cnt,"timestamp_begin");
- $timestamp_end = db_result($res,$cnt,"timestamp_end");
- $upload_url[$cnt] = db_result($res,$cnt,"upload_url");
- if ($status[$cnt] == '0' || $status[$cnt] == '1') {
- $response_time[$cnt] = strval($timestamp_end-$timestamp_begin) . " s";
- }
- else {
- $response_time[$cnt] = "n/a";
- }
- $cnt++;
-}
-
-
-$str = "<span style='font-size:30'>monitoring results</span><hr><br>\n";
-$str .= "<b>" . $wms_id . "</b><br>" . $admin->getWmsTitleByWmsId($wms_id) . "<br><br><br>\n";
-$str .= "<table cellpadding=10 cellspacing=0 border=0>";
-$str .= "<tr bgcolor='#dddddd'><th align='left'>date</th><th align='left' colspan = 2>status</th><th align='center'>response time</th></tr>";
-
-for ($k=0; $k<count($upload_id); $k++) {
- $img = "stop.bmp";
- if ($status[$k]==0) $img = "wait.bmp";
- elseif ($status[$k]==1) $img = "go.bmp";
-
- if (fmod($k, 2) == 1) {
- $str .= "\n\t\t<tr bgcolor='#e6e6e6'>";
- }
- else {
- $str .= "\n\t\t<tr bgcolor='#f0f0f0'>";
- }
- $str .= "\n\t\t\t<td>".date("F j, Y, G:i:s", $upload_id[$k])."</td>";
- $str .= "\n\t\t\t<td><a href='".$upload_url[$k]."' target=_blank><img title='Connect to service' border=0 src = '../img/trafficlights/". $img. "'></a></td>";
- $str .= "\n\t\t\t<td>" . $comment[$k] . "</td>";
- $str .= "\n\t\t\t<td align='center'>" . $response_time[$k] . "</td>";
-
-# $str .= "\n\t\t\t<td><a href='output_".$wms_id[$k]."_".$max.".txt' target=_blank>log</a></td>";
-}
-$str .= "\n\t</table>\n\t";
-echo $str;
-
-?>
-</body></html>
\ No newline at end of file
Deleted: trunk/mapbender/http/php/mod_monitorCapabilities_write.php
===================================================================
--- trunk/mapbender/http/php/mod_monitorCapabilities_write.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_monitorCapabilities_write.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,41 +0,0 @@
-<?php
-# $Id: mod_monitorCapabilities_write.php 1235 2007-10-23 15:42:55Z baudson $
-# http://www.mapbender.org/index.php/Monitor_Capabilities
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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__)."/../classes/class_monitor.php");
-
-/*
- * incoming parameters from command line
- */
-if ($_SERVER["argc"] != 4) {
- echo "Insufficient arguments! Monitoring aborted.";
- die();
-}
-
-$wmsId = $_SERVER["argv"][1];
-$uploadId = $_SERVER["argv"][2];
-$autoUpdate = intval($_SERVER["argv"][3]);
-
-$monitor = new Monitor($wmsId, $uploadId, $autoUpdate);
-
-echo $monitor;
-
-$monitor->updateInDB();
-?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_newGui.php
===================================================================
--- trunk/mapbender/http/php/mod_newGui.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_newGui.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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">
@@ -89,7 +85,7 @@
</script>
</head>
<body onload='setFocus()'>
-<form name='form1' action="<?php echo $self ?>" method="POST">
+<form name='form1' action="<?php echo $self; ?>" method="POST">
<table>
<tr><td>Name: </td><td><input type='text' name='newGui'></td></tr>
<tr><td>Description: </td><td><input type='text' name='newDesc'></td></tr>
Modified: trunk/mapbender/http/php/mod_orphanWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_orphanWMS.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_orphanWMS.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
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 +53,6 @@
</head>
<body>
<?php
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
$admin = new administration();
$error_msg='';
Modified: trunk/mapbender/http/php/mod_owsproxy_conf.php
===================================================================
--- trunk/mapbender/http/php/mod_owsproxy_conf.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_owsproxy_conf.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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.
-include(dirname(__FILE__)."/../php/mb_validateSession.php");
-include(dirname(__FILE__)."/../classes/class_administration.php");
+require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
$admin = new administration();
$ownwms = $admin->getWmsByOwner($_SESSION["mb_user_id"]);
if(isset($_REQUEST["wms_id"]) && isset($_REQUEST["status"])){
@@ -39,7 +39,7 @@
</style>
<script language="JavaScript" type="text/javascript">
function set(wms_id, status){
- document.location.href = "mod_owsproxy_conf.php?wms_id="+wms_id+"&status="+status+"&<?php echo SID; ?>";
+ document.location.href = "<?php echo $self; ?>&wms_id="+wms_id+"&status="+status;
}
</script>
Modified: trunk/mapbender/http/php/mod_printView1.php
===================================================================
--- trunk/mapbender/http/php/mod_printView1.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_printView1.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,12 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
-//
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");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -77,7 +76,7 @@
echo "<div style='position: absolute; top:".($printOffset_top+1)."px;left:".($printOffset_left+1)."px; z-index:1;width:".($map_width/2-1)."px; height:".($header_height -2)."px;'>";
echo "<div style='position:relative;left:5px; font-weight:bold; font-size:20px;z-index:3;'>".$printTitle . "</div>";
echo "<div style='position:relative;left:5px;z-index:3;'>Datum: ".$date . "</div>";
-echo "<div style='position:relative;left:5px;z-index:3;'>Maßstab: 1:".$map_scale . "</div>";
+echo "<div style='position:relative;left:5px;z-index:3;'>Ma�stab: 1:".$map_scale . "</div>";
echo"</div>";
echo "<img class='bg_header' style='position: absolute; top:".($printOffset_top+1)."px;left:".($printOffset_left + $map_width/2+2)."px; z-index:1;width:".($map_width/2-1)."px; height:".($header_height -2)."px;' src='../img/white.gif'>";
Modified: trunk/mapbender/http/php/mod_renameGUI.php
===================================================================
--- trunk/mapbender/http/php/mod_renameGUI.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_renameGUI.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
-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");
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-$self = $PHP_SELF . "?".SID."&guiID=".$_REQUEST["guiID"]."&elementID=".$_REQUEST["elementID"];
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -150,7 +145,7 @@
}
</script>
</head>
-<body onLoad='document.form1.newGuiName.focus()'>
+<body>
<?php
require_once(dirname(__FILE__)."/../classes/class_administration.php");
@@ -191,16 +186,16 @@
$res = db_prep_query($sql,$v,$t);
$count=0;
while($row = db_fetch_array($res)){
- $gui_id[$count]=$row["gui_id"];
+ $gui_id_[$count]=$row["gui_id"];
$count++;
}
echo "<select class='guiList' size='20' name='guiList' onchange='document.form1.guiList.value = this.value;submit();'>";
for ($i=0; $i<$count;$i++){
- echo "<option value='".$gui_id[$i]."' ";
- if($guiList && $guiList == $gui_id[$i]){
+ echo "<option value='".$gui_id_[$i]."' ";
+ if($guiList && $guiList == $gui_id_[$i]){
echo "selected";
}
- echo ">".$gui_id[$i]."</option>";
+ echo ">".$gui_id_[$i]."</option>";
}
echo "</select><br><br><br>";
}
@@ -214,7 +209,7 @@
echo "<tr><td class='newName_str'>Name: </td><td><input class='newName' type='text' id='newGuiName' name='newGuiName'></td></tr>\n";
echo "<tr>";
echo " <td><input class='button_rename' type='button' value='rename' onclick='validate_rename()'></td>";
-echo " <td><input class='button_copy' type='button' value='copy' onclick='validate_copy()'><div class='button_copy_checkbox'>(<input name='withUsers' type='checkbox' /> copy users and groups)</div></td>";
+echo " <td><input class='button_copy' type='button' value='copy' onclick='validate_copy()'><div class='button_copy_checkbox'>(<input name='withUsers' type='checkbox' /> copy users)</div></td>";
echo "</tr>\n";
echo "</table>";
}
Modified: trunk/mapbender/http/php/mod_saveWKT.php
===================================================================
--- trunk/mapbender/http/php/mod_saveWKT.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_saveWKT.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<html>
<head>
@@ -68,12 +68,12 @@
</script>
</head>
<!-- <body onload='checkGeom()'>
-//NEW!!! Bei Erstaufruf ist die ausgewählte Tabelle (und deren Geometrie) noch nicht bekannt!
+//NEW!!! Bei Erstaufruf ist die ausgew�hlte Tabelle (und deren Geometrie) noch nicht bekannt!
Deshalb zuvor eine Fehlermeldung. Jetzt als PHP-Code, siehe if($save) -->
<body>
<?php
/*****************************************************************************
-personal postgresql parameters - persönliche Postgresql-Einstellungen */
+personal postgresql parameters - pers�nliche Postgresql-Einstellungen */
$host = "localhost";
$port = "5432";
define("DBname", "databasename");
@@ -92,7 +92,7 @@
//$sql = "SELECT f_table_name, f_geometry_column,type,srid FROM geometry_columns";
$res = pg_query($con,$sql);
$cnt = 0;
-echo "<form action='".$PHP_SELF."' method='POST'>";
+echo "<form action='".$self."' method='POST'>";
#echo "Selektieren: <input name='actionType' type='radio' value='select'>";
#echo "Speichern: <input name='actionType' type='radio' value='create'><br>";
echo "<select name='tablenames' onchange='submit()'>";
@@ -162,12 +162,12 @@
//NEW!!! in Tabellen vom GEOMETRY-Typ lassen sich (datensatzweise) verschiedene Geometrien abspeichern
if ($geometryType != $geoType && $geometryType != 'GEOMETRY') {
echo "<br>";
- echo "Geometrie (".$geoType.") stimmt nicht mit der der Tabelle (".$geometryType.") überein!";
+ echo "Geometrie (".$geoType.") stimmt nicht mit der der Tabelle (".$geometryType.") �berein!";
die;
}
if(count(myX) != count(myY)){
- echo "Geometrie verschlüsselt.....................";
+ echo "Geometrie verschl�sselt.....................";
die;
}
$sql = "INSERT INTO ".$tablenames."(";
@@ -185,7 +185,7 @@
}
if($myColumns[$i] == $myGeometry){
- //NEW!! $geoType anstelle von $geometryType, um a) auch in Tabellen mit Geometrietyp 'Geometry' abspeichern zu können
+ //NEW!! $geoType anstelle von $geometryType, um a) auch in Tabellen mit Geometrietyp 'Geometry' abspeichern zu k�nnen
if ($geoType == "POINT") {
$sql .= "transform(GeometryFromText('".$geoType."("; //$geoType anstelle von $geometryType s. o.
} elseif ($geoType == "LINESTRING") {
@@ -215,7 +215,7 @@
// $sql .= ")))))',".$src_epsg."),".$epsg.")"; // 0.9
$sql .= ")))',".$src_epsg."),".$epsg.")"; // postgis 1.0.0
}
-/* Linestrings lassen sich in MULTILINESTRING, Polygone in MULTIPOLYGON-Tabellen abspeichern, wenn gegen $geoType geprüft wird, ergibt sich kein Problem
+/* Linestrings lassen sich in MULTILINESTRING, Polygone in MULTIPOLYGON-Tabellen abspeichern, wenn gegen $geoType gepr�ft wird, ergibt sich kein Problem
// da sich aber MULTI... nicht in Tabellen vom einfachen Typ LINESTRING bzw. POLYGON abspeichern lassen, wurde dies oben (unelegant) abgefangen
else {
echo "<br>Tabelle vom Typ Linestring, Polygon etc?";
Modified: trunk/mapbender/http/php/mod_setLocale.php
===================================================================
--- trunk/mapbender/http/php/mod_setLocale.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_setLocale.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,9 +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("../classes/class_locale.php");
-require_once("../../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: trunk/mapbender/http/php/mod_showLoggedUser.php
===================================================================
--- trunk/mapbender/http/php/mod_showLoggedUser.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_showLoggedUser.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
-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");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
Modified: trunk/mapbender/http/php/mod_simpleWMSpreferences.php
===================================================================
--- trunk/mapbender/http/php/mod_simpleWMSpreferences.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_simpleWMSpreferences.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,8 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -74,20 +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 = '".$_SESSION["mb_user_gui"]."'";
-$res = db_query($sql);
-$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">
Deleted: trunk/mapbender/http/php/mod_switchLocale.php
===================================================================
--- trunk/mapbender/http/php/mod_switchLocale.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_switchLocale.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,75 +0,0 @@
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/localeSwitch
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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();
-$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");
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta name="author" content="V. Diewald">
-<meta http-equiv="cache-control" content="no-cache">
-<meta http-equiv="pragma" content="no-cache">
-<meta http-equiv="expires" content="0">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="DC.Rights" content="WhereGroup GmbH & Co.KG, Bonn">
-<title>Metadata search</title>
-<?
-include_once("../include/dyn_css.php");
-?>
-<script type="text/javascript">
-<!--
-
-function validate(){
- var index = document.getElementById("language").selectedIndex;
- var lang = document.getElementById("language").options[index].value;
- parent.mb_ajax_post("../php/mod_setLocale.php", {"lang":lang}, function(status,result) {
- parent.window.location.reload();
- });
-}
-
-// -->
-</script>
-</head>
-<body leftmargin="2" topmargin="0" bgcolor="#ffffff">
-<form name='form1' target='parent'>
-<p>
-<select id='language' name='language' onchange='validate()'>
-<?php
-$languageArray = explode(",", $languages);
-for ($i = 0; $i < count($languageArray); $i++) {
- echo "<option";
- if ($_SESSION["mb_lang"] == $languageArray[$i]) {
- echo " selected";
- }
- echo ">" . $languageArray[$i] . "</option>";
-}
-?>
-</select>
-</p>
-</form>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/mapbender/http/php/mod_switchLocale_noreload.php
===================================================================
--- trunk/mapbender/http/php/mod_switchLocale_noreload.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_switchLocale_noreload.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,76 +0,0 @@
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/localeSwitch
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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();
-$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");
-
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta name="author" content="V. Diewald">
-<meta http-equiv="cache-control" content="no-cache">
-<meta http-equiv="pragma" content="no-cache">
-<meta http-equiv="expires" content="0">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="DC.Rights" content="WhereGroup GmbH & Co.KG, Bonn">
-<title>Metadata search</title>
-<?
-include_once("../include/dyn_css.php");
-?>
-<script type="text/javascript">
-<!--
-
-function validate(){
- var index = document.getElementById("language").selectedIndex;
- var lang = document.getElementById("language").options[index].value;
- parent.mb_ajax_post("../php/mod_setLocale.php", {"lang":lang}, function(result, status) {
- parent.mapbender.locale = result;
- parent.localize();
- });
-}
-
-// -->
-</script>
-</head>
-<body leftmargin="2" topmargin="0" bgcolor="#ffffff">
-<form name='form1' target='parent'>
-<p>
-<select id='language' name='language' onchange='validate()'>
-<?php
-$languageArray = explode(",", $languages);
-for ($i = 0; $i < count($languageArray); $i++) {
- echo "<option";
- if ($_SESSION["mb_lang"] == $languageArray[$i]) {
- echo " selected";
- }
- echo ">" . $languageArray[$i] . "</option>";
-}
-?>
-</select>
-</p>
-</form>
-</body>
-</html>
\ No newline at end of file
Copied: trunk/mapbender/http/php/mod_tab_messages.php (from rev 2404, branches/2.5/http/php/mod_tab_messages.php)
===================================================================
--- trunk/mapbender/http/php/mod_tab_messages.php (rev 0)
+++ trunk/mapbender/http/php/mod_tab_messages.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -0,0 +1,46 @@
+<?php
+#$Id$
+#$Header: /cvsroot/mapbender/mapbender/http/javascripts/mod_insertWmcIntoDb.php,v 1.19 2006/03/09 14:02:42 uli_rothstein Exp $
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_json.php");
+require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+
+$buttonObj = array();
+
+$sql = "SELECT e_id, gettext($1, e_title) AS e_title FROM gui_element, " .
+ "(SELECT v.var_value AS current_e_id FROM gui_element AS e, " .
+ "gui_element_vars AS v WHERE e.e_id = v.fkey_e_id AND ".
+ "e.fkey_gui_id = v.fkey_gui_id AND e.e_id = 'tabs' AND ".
+ "v.var_name LIKE 'tab_ids%' AND e.fkey_gui_id = $2) ".
+ "AS gui_element_temp WHERE gui_element_temp.current_e_id = e_id ".
+ "AND fkey_gui_id = $3";
+
+$v = array($_SESSION["mb_lang"], $_SESSION["mb_user_gui"], $_SESSION["mb_user_gui"]);
+$t = array("s", "s", "s");
+$res = db_prep_query($sql, $v, $t);
+while ($row = db_fetch_array($res)) {
+ array_push($buttonObj, array("id" => $row["e_id"], "title" => $row["e_title"]));
+}
+
+$json = new Mapbender_JSON();
+$output = $json->encode($buttonObj);
+
+header("Content-type:text/plain; charset=utf-8");
+echo $output;
+?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_treefolderAdmin.php
===================================================================
--- trunk/mapbender/http/php/mod_treefolderAdmin.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_treefolderAdmin.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -20,9 +20,7 @@
# 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_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
@@ -434,21 +432,28 @@
// this is a multinary tree structure which is easy to
// populate with database data :)
<?php
-$sql = "SELECT id FROM gui_treegde WHERE fkey_gui_id = '".$guiList."'";
-$res = db_query($sql);
+$sql = "SELECT id FROM gui_treegde WHERE fkey_gui_id = $1";
+// $v and $t will be re-used below!
+$v = array($guiList);
+$t = array("s");
+$res = db_prep_query($sql, $v, $t);
if(!db_fetch_row($res)){
- $sql = "INSERT INTO gui_treegde(fkey_gui_id, my_layer_title,lft,rgt,layer) VALUES('".$guiList."', 'new','1','4','')";
- db_query($sql);
- $sql = "INSERT INTO gui_treegde(fkey_gui_id,my_layer_title,lft,rgt,layer) VALUES('".$guiList."','new','2','3','')";
- db_query($sql);
+ $sql = "INSERT INTO gui_treegde(fkey_gui_id, my_layer_title,lft,rgt,layer) VALUES($1, 'new','1','4','')";
+ //using $v and $t fom above
+ db_prep_query($sql, $v, $t);
+ $sql = "INSERT INTO gui_treegde(fkey_gui_id,my_layer_title,lft,rgt,layer) VALUES($1,'new','2','3','')";
+ //using $v and $t fom above
+ db_prep_query($sql, $v, $t);
}
-
+
$sql = "SELECT n.wms_id, n.id, n.my_layer_title, n.lft, n.rgt, n.layer, COUNT(*) AS level1, ((n.rgt - n.lft -1)/2) AS offspring ";
$sql .= "FROM gui_treegde as n, gui_treegde as p WHERE n.lft BETWEEN p.lft AND p.rgt ";
-$sql .= " AND n.fkey_gui_id = '".$guiList."' AND p.fkey_gui_id = '".$guiList."' ";
+$sql .= " AND n.fkey_gui_id = $1 AND p.fkey_gui_id = $2 ";
$sql .= " GROUP BY n.wms_id, n.lft, n.my_layer_title, ((n.rgt - n.lft -1)/2) , n.id, n.rgt, n.layer ORDER BY n.lft;";
#echo $sql;
-$res = db_query($sql);
+$v = array($guiList, $guiList);
+$t = array("s", "s");
+$res = db_prep_query($sql, $v, $t);
echo "function initArray(){";
echo "Note(0,-1,'','');";
$cnt = 0;
Modified: trunk/mapbender/http/php/mod_treefolderClient.php
===================================================================
--- trunk/mapbender/http/php/mod_treefolderClient.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_treefolderClient.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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);
-$guiList = $_SESSION["mb_user_gui"];
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
@@ -78,16 +73,8 @@
// -->
</STYLE>
<?php
-$sql = "SELECT e_target FROM gui_element WHERE e_id = 'treeConfGDE' AND fkey_gui_id = '".$guiList."'";
-$res = db_query($sql);
-$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">
@@ -548,21 +535,27 @@
// this is a multinary tree structure which is easy to
// populate with database data :)
<?php
-$sql = "SELECT id FROM gui_treegde WHERE fkey_gui_id = '".$guiList."'";
-$res = db_query($sql);
+$sql = "SELECT id FROM gui_treegde WHERE fkey_gui_id = $1";
+// $v and $t will be re-used below!
+$v = array($guiList);
+$t = array("s");
+$res = db_prep_query($sql, $v, $t);
if(!db_fetch_row($res)){
- $sql = "INSERT INTO gui_treegde(fkey_gui_id, my_layer_title,lft,rgt,layer) VALUES('".$guiList."', 'new','1','4','')";
- db_query($sql);
- $sql = "INSERT INTO gui_treegde(fkey_gui_id,my_layer_title,lft,rgt,layer) VALUES('".$guiList."','new','2','3','')";
- db_query($sql);
+ $sql = "INSERT INTO gui_treegde(fkey_gui_id, my_layer_title,lft,rgt,layer) VALUES($1, 'new','1','4','')";
+ //using $v and $t fom above
+ db_prep_query($sql, $v, $t);
+ $sql = "INSERT INTO gui_treegde(fkey_gui_id,my_layer_title,lft,rgt,layer) VALUES($1,'new','2','3','')";
+ //using $v and $t fom above
+ db_prep_query($sql, $v, $t);
}
$sql = "SELECT n.wms_id, n.id, n.my_layer_title, n.lft, n.rgt, n.layer, COUNT(*) AS level1, ((n.rgt - n.lft -1)/2) AS offspring ";
$sql .= "FROM gui_treegde as n, gui_treegde as p WHERE n.lft BETWEEN p.lft AND p.rgt ";
-$sql .= " AND n.fkey_gui_id = '".$guiList."' AND p.fkey_gui_id = '".$guiList."' ";
+$sql .= " AND n.fkey_gui_id = $1 AND p.fkey_gui_id = $2 ";
$sql .= " GROUP BY n.wms_id, n.lft, n.my_layer_title, ((n.rgt - n.lft -1)/2) , n.id, n.rgt, n.layer ORDER BY n.lft";
-
-$res = db_query($sql);
+$v = array($guiList, $guiList);
+$t = array("s", "s");
+$res = db_prep_query($sql, $v, $t);
echo "function initArray(){";
echo "Note(0,-1,'','');";
$cnt = 0;
Modified: trunk/mapbender/http/php/mod_updateKmlInDb.php
===================================================================
--- trunk/mapbender/http/php/mod_updateKmlInDb.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_updateKmlInDb.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
mb_internal_encoding("UTF-8");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__) . "/../classes/class_kml_ows.php");
-require_once("../../conf/mapbender.conf");
-require_once("../classes/class_mb_exception.php");
-require_once("../classes/class_kml_ows.php");
-
$kmlId = $_POST["kmlId"];
$placemarkId = $_POST["placemarkId"];
$command = $_POST["command"];
@@ -37,4 +34,4 @@
else {
echo "0";
}
-?>
+?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_updateWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_updateWMS.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_updateWMS.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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);
+import_request_variables("PG");
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>
@@ -55,7 +50,7 @@
</script>
</head>
<body>
-<form name='form1' action='<?php $self ?>' method='POST'>
+<form name='form1' action='<?php echo $self; ?>' method='POST'>
<?php
Modified: trunk/mapbender/http/php/mod_usemap.php
===================================================================
--- trunk/mapbender/http/php/mod_usemap.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_usemap.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -19,13 +19,14 @@
# 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");
+
$url = urldecode($_REQUEST["url"]);
$g = new gml2();
Modified: trunk/mapbender/http/php/mod_user_filteredGroup.php
===================================================================
--- trunk/mapbender/http/php/mod_user_filteredGroup.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_user_filteredGroup.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,11 +18,7 @@
# 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: trunk/mapbender/http/php/mod_user_filteredGui.php
===================================================================
--- trunk/mapbender/http/php/mod_user_filteredGui.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_user_filteredGui.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,15 +18,8 @@
# 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 +114,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: trunk/mapbender/http/php/mod_user_group.php
===================================================================
--- trunk/mapbender/http/php/mod_user_group.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_user_group.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -18,12 +18,7 @@
# 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: trunk/mapbender/http/php/mod_user_gui.php
===================================================================
--- trunk/mapbender/http/php/mod_user_gui.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_user_gui.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -16,16 +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.
-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);
+import_request_variables("PG");
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 +27,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: trunk/mapbender/http/php/mod_wfs.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfs.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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_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: trunk/mapbender/http/php/mod_wfsLayerObj_conf.php
===================================================================
--- trunk/mapbender/http/php/mod_wfsLayerObj_conf.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfsLayerObj_conf.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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__)."/../php/mb_validateSession.php");
require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db($DB,$con);
?>
<html>
<head>
Modified: trunk/mapbender/http/php/mod_wfsSpatialRequest_messages.php
===================================================================
--- trunk/mapbender/http/php/mod_wfsSpatialRequest_messages.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfsSpatialRequest_messages.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,12 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-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__)."/../classes/class_json.php");
-session_start();
-
$e = new mb_notice("locale: " . $_SESSION["mb_locale"] . "; lang: " . $_SESSION["mb_lang"]);
setlocale(LC_ALL, $_SESSION["mb_locale"]);
@@ -30,14 +27,14 @@
// Messages
//
$msg_obj = array();
-$msg_obj["buttonLabelRectangle"] = _("select by rectangle");
-$msg_obj["buttonLabelPolygon"] = _("select by polygon");
-$msg_obj["buttonLabelPoint"] = _("select by point");
-$msg_obj["buttonLabelExtent"] = _("select by extent");
-$msg_obj["buttonLabelDialogue"] = _("open dialogue form");
-$msg_obj["errorMessageInvalidExtent"] = _("Invalid box!");
+$msg_obj["buttonLabelRectangle"] = _mb("select by rectangle");
+$msg_obj["buttonLabelPolygon"] = _mb("select by polygon");
+$msg_obj["buttonLabelPoint"] = _mb("select by point");
+$msg_obj["buttonLabelExtent"] = _mb("select by extent");
+$msg_obj["buttonLabelDialogue"] = _mb("open dialogue form");
+$msg_obj["errorMessageInvalidExtent"] = _mb("Invalid box!");
-$json = new Services_JSON();
+$json = new Mapbender_JSON();
$output = $json->encode($msg_obj);
header("Content-type:application/x-json; charset=utf-8");
Modified: trunk/mapbender/http/php/mod_wfs_conf.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_conf.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfs_conf.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,11 +17,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require(dirname(__FILE__)."/../classes/class_wfs_conf.php");
-require(dirname(__FILE__)."/../../conf/mapbender.conf");
+
$con = db_connect(DBSERVER,OWNER,PW);
db_select_db(DB,$con);
-session_start();
?>
<html>
<head>
@@ -60,54 +60,6 @@
function validate(){
return true;
}
-
-function removeChildNodes(node) {
- while (node.childNodes.length > 0) {
- var childNode = node.firstChild;
- node.removeChild(childNode);
- }
-}
-
-function controlOperators(checkVal,operatorField,valType){
- var opSelect = document.getElementById(operatorField);
- removeChildNodes(opSelect);
- option1 = new Option("-----","0");
- opSelect.options[opSelect.length] = option1;
- if(checkVal==true){
- opSelect.disabled = '';
- if(valType=='string' || valType=='date'){
- option2 = new Option("%...%","bothside");
- opSelect.options[opSelect.length] = option2;
- option3 = new Option("...%","rightside");
- opSelect.options[opSelect.length] = option3;
- option4 = new Option("equal","equal");
- opSelect.options[opSelect.length] = option4;
- }
- else if(valType=='int' || valType=='float'){
- option2 = new Option(">","greater_than");
- opSelect.options[opSelect.length] = option2;
- option3 = new Option("<","less_than");
- opSelect.options[opSelect.length] = option3;
- option4 = new Option("equal","equal");
- opSelect.options[opSelect.length] = option4;
- }
- else{
- option2 = new Option("%...%","bothside");
- opSelect.options[opSelect.length] = option2;
- option3 = new Option("...%","rightside");
- opSelect.options[opSelect.length] = option3;
- option4 = new Option("equal","equal");
- opSelect.options[opSelect.length] = option4;
- option5 = new Option(">","greater_than");
- opSelect.options[opSelect.length] = option5;
- option6 = new Option("<","less_than");
- opSelect.options[opSelect.length] = option6;
- }
- }
- else{
- opSelect.disabled = 'disabled';
- }
-}
</script>
</head>
@@ -115,9 +67,9 @@
<br>
<b>WFS Configuration</b>
<br>
-<form method='POST' onsubmit='return validate()'>
+<form method='POST' action='<?php echo $self;?>'onsubmit='return validate()'>
<br>
-<a href="mod_wfs_edit.php">edit WFS Configuration</a><br><br>
+<a href="mod_wfs_edit.php?<?php echo $urlParameters;?>">edit WFS Configuration</a><br><br>
Select WFS:
<?php
$aWFS = new wfs_conf();
@@ -138,76 +90,77 @@
db_select_db($DB,$con);
- $sql = "INSERT INTO wfs_conf (wfs_conf_abstract,wfs_conf_description,fkey_wfs_id,fkey_featuretype_id,g_label,g_label_id,g_button,g_button_id,g_style,g_buffer,g_res_style,g_use_wzgraphics) VALUES(";
- $sql .= "'".$_REQUEST["wfs_conf_abstract"]."',";
- $sql .= "'".$_REQUEST["wfs_conf_description"]."',";
- $sql .= "'".$_REQUEST["wfs"]."',";
- $sql .= "'".$_REQUEST["featuretype"]."',";
- $sql .= "'".$_REQUEST["g_label"]."',";
- $sql .= "'".$_REQUEST["g_label_id"]."',";
- $sql .= "'".$_REQUEST["g_button"]."',";
- $sql .= "'".$_REQUEST["g_button_id"]."',";
- $sql .= "'".$_REQUEST["g_style"]."',";
- $sql .= "'".$_REQUEST["g_buffer"]."',";
- $sql .= "'".$_REQUEST["g_res_style"]."',";
- if(!empty($_REQUEST["g_use_wzgraphics"])){
+ $sql = "INSERT INTO wfs_conf (";
+ $sql .= "wfs_conf_abstract, fkey_wfs_id, ";
+ $sql .= "fkey_featuretype_id, g_label, g_label_id, g_button, ";
+ $sql .= "g_button_id, g_style, g_buffer, g_res_style, g_use_wzgraphics";
+ $sql .= ") VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, ";
+ if (!empty($_REQUEST["g_use_wzgraphics"])) {
$sql .= "'1'";
- }else{$sql .= "'0'";}
+ }
+ else {
+ $sql .= "'0'";
+ }
$sql .= "); ";
-
- $res = db_query($sql);
+
+ $v = array($_REQUEST["wfs_conf_abstract"], $_REQUEST["wfs"], $_REQUEST["featuretype"], $_REQUEST["g_label"], $_REQUEST["g_label_id"], $_REQUEST["g_button"], $_REQUEST["g_button_id"], $_REQUEST["g_style"], $_REQUEST["g_buffer"], $_REQUEST["g_res_style"]);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "s", "s", "s");
+ $res = db_prep_query($sql, $v, $t);
+
$wfsID = db_insert_id($con,'wfs_conf','wfs_conf_id');
- for($i=0; $i<$_REQUEST["num"]; $i++){
- $sql = "INSERT INTO wfs_conf_element (fkey_wfs_conf_id,f_id,f_search,f_pos,f_style_id,f_toupper,f_label,f_label_id,f_show,f_respos,f_edit,f_form_element_html,f_mandatory,f_auth_varname,f_show_detail,f_operator) VALUES(";
- $sql .= "'".$wfsID."',";
- $sql .= "'".$_REQUEST["f_id".$i]."',";
- if(!empty($_REQUEST["f_search".$i])){
- $sql .= "'1',";
- }else{$sql .= "'0',";}
- $sql .= "'".$_REQUEST["f_pos".$i]."',";
- $sql .= "'".$_REQUEST["f_style_id".$i]."',";
- if(!empty($_REQUEST["f_toupper".$i])){
- $sql .= "'1',";
- }else{$sql .= "'0',";}
- $sql .= "'".$_REQUEST["f_label".$i]."',";
- $sql .= "'".$_REQUEST["f_label_id".$i]."',";
- if(!empty($_REQUEST["f_show".$i])){
- $sql .= "'1',";
- }else{$sql .= "'0',";}
- $sql .= "'".$_REQUEST["f_respos".$i]."'";
- $sql .= ",";
- if(!empty($_REQUEST["f_edit".$i])){
- $sql .= "'1',";
- }else{$sql .= "'0',";}
- $sql .= "'".$_REQUEST["f_form_element_html".$i]."',";
- if(!empty($_REQUEST["f_mandatory".$i])){
+
+ for ($i = 0; $i < $_REQUEST["num"]; $i++){
+ $sql = "INSERT INTO wfs_conf_element (fkey_wfs_conf_id,f_id,f_search,f_pos,f_style_id,f_toupper,f_label,f_label_id,f_show,f_respos,f_edit,f_form_element_html,f_mandatory,f_auth_varname) VALUES(";
+ $sql .= "$1, $2, ";
+ if (!empty($_REQUEST["f_search".$i])) {
$sql .= "'1'";
- }else{$sql .= "'0'";}
- $sql .= ", ";
- $sql .= "'".$_REQUEST["f_auth_varname".$i];
- $sql .= "'";
- $sql .= ", ";
- if(!empty($_REQUEST["f_show_detail".$i])){
- $sql .= "'1'";
- }else{$sql .= "'0'";}
- $sql .= ", ";
- if(empty($_REQUEST["f_operator".$i])){
- $sql .= "0";
- }
- else{
- $sql .= "'".$_REQUEST["f_operator".$i];
- $sql .= "'";
- }
- $sql .= "); ";
+ }
+ else {
+ $sql .= "'0'";
+ }
+ $sql .= ", $3, $4, ";
+ if (!empty($_REQUEST["f_toupper".$i])) {
+ $sql .= "'1'";
+ }
+ else {
+ $sql .= "'0'";
+ }
+ $sql .= ",$5, $6, ";
+ if (!empty($_REQUEST["f_show".$i])) {
+ $sql .= "'1'";
+ }
+ else {
+ $sql .= "'0'";
+ }
+ $sql .= ", $7, ";
+ if (!empty($_REQUEST["f_edit".$i])) {
+ $sql .= "'1'";
+ }
+ else {
+ $sql .= "'0'";
+ }
+ $sql .= ",$8, ";
+ if (!empty($_REQUEST["f_mandatory".$i])) {
+ $sql .= "'1'";
+ }
+ else {
+ $sql .= "'0'";
+ }
+ $sql .= ",$9";
+ $sql .= "); ";
- $res = db_query($sql);
+ $v = array($wfsID, $_REQUEST["f_id".$i], $_REQUEST["f_pos".$i], $_REQUEST["f_style_id".$i], $_REQUEST["f_label".$i], $_REQUEST["f_label_id".$i], $_REQUEST["f_respos".$i], stripslashes($_REQUEST["f_form_element_html".$i]), $_REQUEST["f_auth_varname".$i]);
+ $t = array("i", "s", "s", "s", "s", "s", "i", "s", "s");
+ $res = db_prep_query($sql, $v, $t);
}
if (isset($_REQUEST["f_geom"])) {
- $sql = "UPDATE wfs_conf_element SET ";
- $sql .= "f_geom = 1";
- $sql .= " WHERE fkey_wfs_conf_id = ".$wfsID." AND f_id = ".$_REQUEST["f_geom"].";";
- $res = db_query($sql);
+ $sql = "UPDATE wfs_conf_element SET f_geom = 1 ";
+ $sql .= "WHERE fkey_wfs_conf_id = $1 AND f_id = $2;";
+ $v = array($wfsID, $_REQUEST["f_geom"]);
+ $t = array("i", "i");
+ $res = db_prep_query($sql, $v, $t);
}
+
echo "<script language='javascript'>";
echo "document.location.href = 'mod_wfs_edit.php?gaz=".$wfsID."';";
echo "</script>";
@@ -284,8 +237,7 @@
/* set featuretype options */
echo "<table>";
- echo "<tr><td>Title:</td><td><input type='text' name='wfs_conf_abstract'></td></tr>" ;
- echo "<tr><td>Description:</td><td><input type='text' name='wfs_conf_description'></td></tr>" ;
+ echo "<tr><td>Abstract:</td><td><input type='text' name='wfs_conf_abstract'></td></tr>" ;
echo "<tr><td>Label:</td><td><input type='text' name='g_label'></td></tr>" ;
echo "<tr><td>Label_id:</td><td><input type='text' name='g_label_id'></td></tr>" ;
echo "<tr><td>Button:</td><td><input type='text' name='g_button'></td></tr>" ;
@@ -311,13 +263,11 @@
echo "<td>" . toImage('label') . "</td>";
echo "<td>" . toImage('label_id') . "</td>";
echo "<td>" . toImage('show') . "</td>";
- echo "<td>" . toImage('show_detail') . "</td>";
echo "<td>" . toImage('position') . "</td>";
echo "<td>" . toImage('mandatory') . "</td>";
echo "<td>" . toImage('edit') . "</td>";
echo "<td>" . toImage('html') . "</td>";
- echo "<td>" . toImage('auth') . "</td>";
- echo "<td>" . toImage('operator') . "</td>";
+// echo "<td>" . toImage('auth') . "</td>";
echo "</tr>";
for($i=0; $i<count($aWFS->elements->element_id); $i++){
@@ -325,22 +275,17 @@
echo "<td>".$aWFS->elements->element_id[$i]."<input type='hidden' name='f_id".$i."' value='".$aWFS->elements->element_id[$i]."'></td>";
echo "<td>".$aWFS->elements->element_name[$i]."<br><div style='font-size:10'>".$aWFS->elements->element_type[$i]."</div></td>";
echo "<td><input name='f_geom' type='radio' value='".$aWFS->elements->element_id[$i]."'></td>";
- echo "<td><input name='f_search".$i."' type='checkbox' onclick='controlOperators(document.forms[0].f_search".$i.".checked,\"f_operator".$i."\",\"".$aWFS->elements->element_type[$i]."\");'></td>";
+ echo "<td><input name='f_search".$i."' type='checkbox'></td>";
echo "<td><input name='f_pos".$i."' type='text' size='1' value='0'></td>";
echo "<td><input name='f_style_id".$i."' type='text' size='2' value='0'></td>";
echo "<td><input name='f_toupper".$i."' type='checkbox'></td>";
echo "<td><input name='f_label".$i."' type='text' size='4'></td>";
echo "<td><input name='f_label_id".$i."' type='text' size='2' value='0'></td>";
echo "<td><input name='f_show".$i."' type='checkbox'></td>";
- echo "<td><input name='f_show_detail".$i."' type='checkbox'></td>";
echo "<td><input name='f_respos".$i."' type='text' size='1' value='0'></td>";
echo "<td><input name='f_mandatory".$i."' type='checkbox'></td>";
echo "<td><input name='f_edit".$i."' type='checkbox'></td>";
- echo "<td><textarea name='f_form_element_html".$i."' cols='15' rows='1'></textarea></td>";
- echo "<td><input name='f_auth_varname".$i."' type='text' size='8' value=''></td>";
- echo "<td><select name='f_operator".$i."' id='f_operator".$i."' disabled>";
- echo "<option value='0'>-----</option>";
- echo "</select></td>";
+ echo "<td><textarea name='f_form_element_html".$i."' cols='15' rows='1' ></textarea></td>";
echo "</tr>";
}
echo "</table>";
Modified: trunk/mapbender/http/php/mod_wfs_edit.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_edit.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfs_edit.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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__)."/../../conf/mapbender.conf");
-session_start();
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
?>
<html>
<head>
@@ -41,58 +40,6 @@
function validate(){
return true;
}
-function openwindow(Adresse) {
- Fenster1 = window.open(Adresse, "GeoPortal Rheinland-Pfalz - Metadaten", "width=500,height=500,left=100,top=100,scrollbars=yes,resizable=no");
- Fenster1.focus();
-}
-
-function removeChildNodes(node) {
- while (node.childNodes.length > 0) {
- var childNode = node.firstChild;
- node.removeChild(childNode);
- }
-}
-
-function controlOperators(checkVal,operator,valType,opValue){
- var opSelect = document.getElementById(operator);
- removeChildNodes(opSelect);
- if(checkVal==true){
- opSelect.disabled = '';
- option1 = new Option("-----","0");
- opSelect.options[opSelect.length] = option1;
- if(valType=='string' || valType=='date'){
- option2 = new Option("%...%","bothside");
- opSelect.options[opSelect.length] = option2;
- option3 = new Option("...%","rightside");
- opSelect.options[opSelect.length] = option3;
- option4 = new Option("equal","equal");
- opSelect.options[opSelect.length] = option4;
- }
- else if(valType=='int' || valType=='float'){
- option2 = new Option(">","greater_than");
- opSelect.options[opSelect.length] = option2;
- option3 = new Option("<","less_than");
- opSelect.options[opSelect.length] = option3;
- option4 = new Option("equal","equal");
- opSelect.options[opSelect.length] = option4;
- }
- else{
- option2 = new Option("%...%","bothside");
- opSelect.options[opSelect.length] = option2;
- option3 = new Option("...%","rightside");
- opSelect.options[opSelect.length] = option3;
- option4 = new Option("equal","equal");
- opSelect.options[opSelect.length] = option4;
- option5 = new Option(">","greater_than");
- opSelect.options[opSelect.length] = option5;
- option6 = new Option("<","less_than");
- opSelect.options[opSelect.length] = option6;
- }
- }
- else{
- opSelect.disabled = 'disabled';
- }
-}
</script>
</head>
@@ -100,119 +47,107 @@
<br>
<b>WFS Configuration</b>
<br><br>
-<form name='form1' method='POST' onsubmit='return validate()'>
-<a href="mod_wfs_conf.php">new Configuration</a><br><br>
+<form name='form1' action='<?php echo $self;?>' method='POST' onsubmit='return validate()'>
+<a href="mod_wfs_conf.php?<?php echo $urlParameters;?>">new Configuration</a><br><br>
Select WFS Configuration:<br><br>
<?php
/* save wfs_conf properties */
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db($DB,$con);
if(isset($_REQUEST["save"])){
$sql = "UPDATE wfs_conf SET ";
- $sql .= "wfs_conf_abstract = '".$_REQUEST["wfs_conf_abstract"]."',";
- $sql .= "wfs_conf_description = '".$_REQUEST["wfs_conf_description"]."',";
- $sql .= "g_label = '".$_REQUEST["g_label"]."',";
- $sql .= "g_label_id = '".$_REQUEST["g_label_id"]."',";
- $sql .= "g_button = '".$_REQUEST["g_button"]."',";
- $sql .= "g_button_id = '".$_REQUEST["g_button_id"]."',";
- $sql .= "g_style = '".$_REQUEST["g_style"]."',";
- $sql .= "g_buffer = '".$_REQUEST["g_buffer"]."',";
- $sql .= "g_res_style = '".$_REQUEST["g_res_style"]."',";
- $sql .= "g_use_wzgraphics = ";
- if(!empty($_REQUEST["g_use_wzgraphics"])){
- $sql .= '1';
- }else{$sql .= '0';}
- $sql .= " WHERE wfs_conf_id = ".$_REQUEST["gaz"].";";
+ $sql .= "wfs_conf_abstract = $1, g_label = $2, ";
+ $sql .= "g_label_id = $3, g_button = $4, g_button_id = $5, g_style = $6, ";
+ $sql .= "g_buffer = $7, g_res_style = $8, g_use_wzgraphics = ";
+ if (!empty($_REQUEST["g_use_wzgraphics"])) {
+ $sql .= "1";
+ }
+ else {
+ $sql .= "0";
+ }
+ $sql .= " WHERE wfs_conf_id = $9;";
- $res = db_query($sql);
+ $v = array($_REQUEST["wfs_conf_abstract"], $_REQUEST["g_label"], $_REQUEST["g_label_id"], $_REQUEST["g_button"], $_REQUEST["g_button_id"], $_REQUEST["g_style"], $_REQUEST["g_buffer"], $_REQUEST["g_res_style"], $_REQUEST["gaz"]);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "i", "s");
+ $res = db_prep_query($sql, $v, $t);
if (isset($_REQUEST["f_geom"])) {
- $sql = "UPDATE wfs_conf_element SET ";
- $sql .= "f_geom = 1";
- $sql .= " WHERE fkey_wfs_conf_id = ".$_REQUEST["gaz"]." AND f_id = ".$_REQUEST["f_geom"].";";
- $res = db_query($sql);
+ $sql = "UPDATE wfs_conf_element SET f_geom = 1 ";
+ $sql .= "WHERE fkey_wfs_conf_id = $1 AND f_id = $2;";
+ $v = array($_REQUEST["gaz"], $_REQUEST["f_geom"]);
+ $t = array("i", "s");
+ $res = db_prep_query($sql, $v, $t);
- $sql = "UPDATE wfs_conf_element SET ";
- $sql .= "f_geom = 0";
- $sql .= " WHERE fkey_wfs_conf_id = ".$_REQUEST["gaz"]." AND f_id <> ".$_REQUEST["f_geom"].";";
- $res = db_query($sql);
+ $sql = "UPDATE wfs_conf_element SET f_geom = 0 ";
+ $sql .= "WHERE fkey_wfs_conf_id = $1 AND f_id <> $2;";
+ $v = array($_REQUEST["gaz"], $_REQUEST["f_geom"]);
+ $t = array("i", "s");
+ $res = db_prep_query($sql, $v, $t);
}
else {
- $sql = "UPDATE wfs_conf_element SET ";
- $sql .= "f_geom = 0";
- $sql .= " WHERE fkey_wfs_conf_id = ".$_REQUEST["gaz"].";";
- $res = db_query($sql);
+ $sql = "UPDATE wfs_conf_element SET f_geom = 0 ";
+ $sql .= "WHERE fkey_wfs_conf_id = $1;";
+ $v = array($_REQUEST["gaz"]);
+ $t = array("i");
+ $res = db_prep_query($sql, $v, $t);
}
for($i=0; $i<$_REQUEST["num"]; $i++){
- $sql = "UPDATE wfs_conf_element SET ";
- $sql .= "f_search = '";
- if(!empty($_REQUEST["f_search".$i])){
- $sql .= '1';
- }else{$sql .= '0';}
- $sql .= "',";
- $sql .= "f_pos = '".$_REQUEST["f_pos".$i]."',";
- $sql .= "f_style_id = '".$_REQUEST["f_style_id".$i]."',";
+ $sql = "UPDATE wfs_conf_element SET f_search = '";
+ if (!empty($_REQUEST["f_search".$i])) {
+ $sql .= "1";
+ }
+ else {
+ $sql .= "0";
+ }
+ $sql .= "', f_pos = $1, f_style_id = $2,";
$sql .= "f_toupper = '" ;
- if(!empty($_REQUEST["f_toupper".$i])){
- $sql .= '1';
- }else{$sql .= '0';}
- $sql .= "',";
- $sql .= "f_label = '".$_REQUEST["f_label".$i]."',";
- $sql .= "f_label_id = '".$_REQUEST["f_label_id".$i]."',";
+ if (!empty($_REQUEST["f_toupper".$i])) {
+ $sql .= "1";
+ }
+ else {
+ $sql .= "0";
+ }
+ $sql .= "',f_label = $3, f_label_id = $4,";
$sql .= "f_show = '";
- if(!empty($_REQUEST["f_show".$i])){
- $sql .= '1';
- }else{$sql .= '0';}
- $sql .= "',";
- $sql .= "f_respos = '".$_REQUEST["f_respos".$i]."' ";
- $sql .= ",";
+ if (!empty($_REQUEST["f_show".$i])) {
+ $sql .= "1";
+ }
+ else {
+ $sql .= "0";
+ }
+ $sql .= "',f_respos = $5,";
$sql .= "f_edit = '";
- if(!empty($_REQUEST["f_edit".$i])){
- $sql .= '1';
- }else{$sql .= '0';}
- $sql .= "',";
- $sql .= "f_form_element_html = '".addslashes($_REQUEST["f_form_element_html".$i]);
- $sql .= "',";
+ if (!empty($_REQUEST["f_edit".$i])) {
+ $sql .= "1";
+ }
+ else {
+ $sql .= "0";
+ }
+ $sql .= "', f_form_element_html = $6,";
$sql .= "f_mandatory = '";
- if(!empty($_REQUEST["f_mandatory".$i])){
+ if (!empty($_REQUEST["f_mandatory".$i])) {
$sql .= "1";
- }else{$sql .= "0";}
- $sql .= "'";
- $sql .= ", ";
- $sql .= "f_auth_varname = '".$_REQUEST["f_auth_varname".$i];
- $sql .= "'";
- $sql .= ", ";
- $sql .= "f_show_detail = '";
- if(!empty($_REQUEST["f_show_detail".$i])){
- $sql .= '1';
- }else{$sql .= '0';}
- $sql .= "',";
- $sql .= "f_operator = ";
- if(empty($_REQUEST["f_operator".$i])){
- $sql .= "0";
- }
- else{
- $sql .= "'".$_REQUEST["f_operator".$i];
- $sql .= "'";
- }
- $sql .= " WHERE fkey_wfs_conf_id = ".$_REQUEST["gaz"]." AND f_id = ".$_REQUEST["f_id".$i].";";
-
- $res = db_query($sql);
- }
+ }
+ else {
+ $sql .= "0";
+ }
+ $sql .= "', f_auth_varname = $7";
+ $sql .= " WHERE fkey_wfs_conf_id = $8 AND f_id = $9;";
+
+ $v = array($_REQUEST["f_pos".$i], $_REQUEST["f_style_id".$i], $_REQUEST["f_label".$i], $_REQUEST["f_label_id".$i], $_REQUEST["f_respos".$i], stripslashes($_REQUEST["f_form_element_html".$i]), $_REQUEST["f_auth_varname".$i], $_REQUEST["gaz"], $_REQUEST["f_id".$i]);
+ $t = array("s", "s", "s", "s", "s", "s", "s", "i", "s");
+ $res = db_prep_query($sql, $v, $t);
+ }
}
/* end save wfs_conf properties */
/* select wfs */
-$sql = "SELECT * FROM wfs_conf, wfs WHERE wfs.wfs_owner = $1 AND wfs_conf.fkey_wfs_id = wfs.wfs_id";
-$v = array($_SESSION['mb_user_id']);
-$t = array('i');
-$res = db_prep_query($sql,$v,$t);
+$sql = "SELECT * FROM wfs_conf";
+$res = db_query($sql);
echo "<select size='10' name='gaz' onchange='submit()'>";
$cnt = 0;
while($row = db_fetch_array($res)){
@@ -238,14 +173,15 @@
}
/* configure elements */
-if(isset($_REQUEST["gaz"])){
- $sql = "SELECT * FROM wfs_conf WHERE wfs_conf_id = ".$_REQUEST["gaz"];
- $res = db_query($sql);
+if (isset($_REQUEST["gaz"])) {
+ $sql = "SELECT * FROM wfs_conf WHERE wfs_conf_id = $1";
+ $v = array($_REQUEST["gaz"]);
+ $t = array("i");
+ $res = db_prep_query($sql, $v, $t);
if($row = db_fetch_array($res)){
echo "<table>";
echo "<tr><td>GazetterID:</td><td>".$row["wfs_conf_id"]."</td></tr>" ;
- echo "<tr><td>Title:</td><td><input type='text' name='wfs_conf_abstract' value='".$row["wfs_conf_abstract"]."'></td></tr>" ;
- echo "<tr><td>Description:</td><td><input type='text' name='wfs_conf_description' value='".$row["wfs_conf_description"]."'></td></tr>" ;
+ echo "<tr><td>Abstract:</td><td><input type='text' name='wfs_conf_abstract' value='".$row["wfs_conf_abstract"]."'></td></tr>" ;
echo "<tr><td>Label:</td><td><input type='text' name='g_label' value='".$row["g_label"]."'></td></tr>" ;
echo "<tr><td>Label_id:</td><td><input type='text' name='g_label_id' value='".$row["g_label_id"]."'></td></tr>" ;
echo "<tr><td>Button:</td><td><input type='text' name='g_button' value='".$row["g_button"]."'></td></tr>" ;
@@ -262,9 +198,10 @@
/* set element options */
$sql = "SELECT * FROM wfs_conf_element ";
$sql .= "JOIN wfs_element ON wfs_conf_element.f_id = wfs_element.element_id ";
- $sql .= "WHERE fkey_wfs_conf_id = ".$_REQUEST["gaz"]." ORDER BY f_id";
-
- $res = db_query($sql);
+ $sql .= "WHERE fkey_wfs_conf_id = $1 ORDER BY f_id";
+ $v = array($_REQUEST["gaz"]);
+ $t = array("i");
+ $res = db_prep_query($sql, $v, $t);
echo "<table border='1'>";
echo "<tr valign = bottom>";
@@ -278,13 +215,10 @@
echo "<td>" . toImage('label') . "</td>";
echo "<td>" . toImage('label_id') . "</td>";
echo "<td>" . toImage('show') . "</td>";
- echo "<td>" . toImage('show_detail') . "</td>";
echo "<td>" . toImage('position') . "</td>";
echo "<td>" . toImage('mandatory') . "</td>";
echo "<td>" . toImage('edit') . "</td>";
echo "<td>" . toImage('html') . "</td>";
- echo "<td>" . toImage('auth') . "</td>";
- echo "<td>" . toImage('operator') . "</td>";
echo "</tr>";
$cnt = 0;
while($row = db_fetch_array($res)){
@@ -300,7 +234,7 @@
echo "></td>";
echo "<td><input name='f_search".$cnt."' type='checkbox'";
if($row["f_search"] == 1){ echo " checked"; }
- echo " onclick='controlOperators(document.forms[0].f_search".$cnt.".checked,\"f_operator".$cnt."\",\"".$row["element_type"]."\",\"".$row["f_operator"]."\");'></td>";
+ echo "></td>";
echo "<td><input name='f_pos".$cnt."' type='text' size='1' value='".$row["f_pos"]."'></td>";
echo "<td><input name='f_style_id".$cnt."' type='text' size='2' value='".$row["f_style_id"]."'></td>";
echo "<td><input name='f_toupper".$cnt."' type='checkbox'";
@@ -311,9 +245,6 @@
echo "<td><input name='f_show".$cnt."' type='checkbox'";
if($row["f_show"] == 1){ echo " checked"; }
echo "></td>";
- echo "<td><input name='f_show_detail".$cnt."' type='checkbox'";
- if($row["f_show_detail"] == 1){ echo " checked"; }
- echo "></td>";
echo "<td><input name='f_respos".$cnt."' type='text' size='1' value='".$row["f_respos"]."'></td>";
echo "<td><input name='f_mandatory".$cnt."' type='checkbox'";
if($row["f_mandatory"] == 1){ echo " checked"; }
@@ -321,56 +252,7 @@
echo "<td><input name='f_edit".$cnt."' type='checkbox'";
if($row["f_edit"] == 1){ echo " checked"; }
echo "></td>";
- echo "<td><textarea name='f_form_element_html".$cnt."' cols='15' rows='1' >".stripslashes($row["f_form_element_html"])."</textarea></td>";
- echo "<td><input name='f_auth_varname".$cnt."' type='text' size='8' value='".$row["f_auth_varname"]."'></td>";
- echo "<td><select name='f_operator".$cnt."' id='f_operator".$cnt."' ";
- if($row["f_search"] != 1){
- echo "disabled";
- }
- echo "<option value='0' ";
- if($row["f_operator"] == 0){ echo " selected"; }
- echo ">-----</option>";
- if($row["element_type"]=='string' || $row["element_type"]=='date'){
- echo "<option value='bothside' ";
- if($row["f_operator"] == 'bothside'){ echo " selected"; }
- echo ">%...%</option>";
- echo "<option value='rightside' ";
- if($row["f_operator"] == 'rightside'){ echo " selected"; }
- echo ">...%</option>";
- echo "<option value='equal' ";
- if($row["f_operator"] == 'equal'){ echo " selected"; }
- echo ">equal</option>";
- }
- else if($row["element_type"]=='int' || $row["element_type"]=='float'){
- echo "<option value='greater_than' ";
- if($row["f_operator"] == 'greater_than'){ echo " selected"; }
- echo ">></option>";
- echo "<option value='less_than' ";
- if($row["f_operator"] == 'less_than'){ echo " selected"; }
- echo "><</option>";
- echo "<option value='equal' ";
- if($row["f_operator"] == 'equal'){ echo " selected"; }
- echo ">equal</option>";
- }
- else{
- echo "<option value='bothside' ";
- if($row["f_operator"] == 'bothside'){ echo " selected"; }
- echo ">%...%</option>";
- echo "<option value='rightside' ";
- if($row["f_operator"] == 'rightside'){ echo " selected"; }
- echo ">...%</option>";
- echo "<option value='equal' ";
- if($row["f_operator"] == 'equal'){ echo " selected"; }
- echo ">equal</option>";
- echo "<option value='greater_than' ";
- if($row["f_operator"] == 'greater_than'){ echo " selected"; }
- echo ">></option>";
- echo "<option value='less_than' ";
- if($row["f_operator"] == 'less_than'){ echo " selected"; }
- echo "><</option>";
- }
-
- echo "</select></td>";
+ echo "<td><textarea name='f_form_element_html".$cnt."' cols='15' rows='1' >".$row["f_form_element_html"]."</textarea></td>";
echo "</tr>";
$cnt++;
}
Modified: trunk/mapbender/http/php/mod_wfs_gazetteer_server.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_gazetteer_server.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfs_gazetteer_server.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,18 +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_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");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db($DB,$con);
-
$command = $_REQUEST["command"];
/**
@@ -100,10 +94,7 @@
$obj = new WfsConf();
$obj->load($wfsConfIdArray);
-
- $json = new Services_JSON();
- $output = $json->encode($obj->confArray);
- echo $output;
+ echo $obj;
}
else if ($command == "getSearchResults") {
$wfs_conf_id = $_REQUEST["wfs_conf_id"];
Modified: trunk/mapbender/http/php/mod_wfs_result.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_result.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfs_result.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,20 +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("../../conf/mapbender.conf");
-require_once("../classes/class_stripRequest.php");
-require_once("../classes/class_connector.php");
-
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
function sepNameSpace($s){
$c = mb_strpos($s,":");
if ($c > 0){
Deleted: trunk/mapbender/http/php/mod_wfs_save.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_save.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfs_save.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,153 +0,0 @@
-<html>
-<head>
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/Administration
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
-<title>WFS Save</title>
-<script language='JavaScript' type='text/javascript'>
-var my = window.opener.parent.frames.wfs_conf.wfs_conf;
-var dig = window.opener.parent.frames.digitize;
-var w;
-function sepNameSpace(n){
- var c = n.indexOf(":");
- if(c>0){
- var temp = n.split(":");
- return temp[1];
- }
- else{
- return n;
- }
-}
-function init(){
- for(var i=0; i<my.length; i++){
- N = new Option(my[i]['wfs_conf_abstract'],i,false,false);
- document.forms[0].thema.options[document.forms[0].thema.length] = N;
- }
-}
-function validate(obj){
- var ind = obj.selectedIndex;
- if(ind == 0){return;}
- w = obj[ind].value;
-
- var str = "<table>";
- for(var i=0; i< my[w]['element'].length; i++){
- if(my[w]['element'][i]['f_geom'] != '1'){
- str += "<tr>";
- str += "<td>" + my[w]['element'][i]['element_name'] + "</td>";
- str += "<td><input name='"+my[w]['element'][i]['element_name']+"' type='text'></td>";
- str += "<tr>";
- }
- }
- str += "</table>";
- str += "<input type='submit' value='save'>"
- document.getElementById("a").innerHTML = str;
-}
-function set(){
- document.forms[1].url.value = my[w]['wfs_transaction'];
- var str = '<wfs:Transaction version="1.0.0" service="WFS" xmlns="http://www.someserver.com/myns" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd">';
- str += '<wfs:Insert>';
- str += '<'+ sepNameSpace(my[w]['featuretype_name'])+'>';
- for(var i=0; i<document.forms[0].elements.length; i++){
- if(document.forms[0].elements[i].type == 'text' && document.forms[0].elements[i].value != ''){
- var tmp = sepNameSpace(document.forms[0].elements[i].name);
- str += '<' + tmp + '>';
- str += document.forms[0].elements[i].value;
- str += '</' + tmp + '>';
- }
- }
-
- for(var j=0; j<my[w]['element'].length; j++){
- if(my[w]['element'][j]['f_geom'] == 1){
- var el_geom = my[w]['element'][j]['element_name'];
- }
- }
- str += '<' + el_geom + '>';
-
- if(dig.D[0].type == 'text'){
- str += '<gml:Point srsName="epsg:4326">';
- str += '<gml:coordinates>';
- str += dig.D[0].x[0] + "," + dig.D[0].y[0];
- str += '</gml:coordinates>';
- str += '</gml:Point>';
- }
- if(dig.D[0].type == 'line'){
- str += '<gml:MultiLineString srsName="epsg:4326">';
- str += '<gml:lineStringMember>';
- str += '<gml:LineString>';
-
- str += '<gml:coordinates>';
- for(var k=0; k<dig.D[0].x.length; k++){
- if(k>0){
- str += " ";
- }
- str += dig.D[0].x[k] + "," + dig.D[0].y[k];
- }
- str += '</gml:coordinates>';
- str += '</gml:LineString>';
- str += '</gml:lineStringMember>';
- str += '</gml:MultiLineString>';
- }
- if(dig.D[0].type == 'polygon'){
- str += '<gml:MultiPolygon srsName="epsg:4326">';
- str += '<gml:polygonMember>';
- str += '<gml:Polygon>';
- str += '<gml:outerBoundaryIs>';
- str += '<gml:LinearRing>';
-
- str += '<gml:coordinates>';
- for(var k=0; k<dig.D[0].x.length; k++){
- if(k>0){
- str += " ";
- }
- str += dig.D[0].x[k] + "," + dig.D[0].y[k];
- }
- str += '</gml:coordinates>';
- str += '</gml:LinearRing>';
- str += '</gml:outerBoundaryIs>';
- str += '</gml:Polygon>';
- str += '</gml:polygonMember>';
- str += '</gml:MultiPolygon>';
- }
- str += '</' + el_geom + '>';
- str += '</'+ sepNameSpace(my[w]['featuretype_name'])+'>';
- str += '</wfs:Insert>';
- str += '</wfs:Transaction>';
- document.forms[1].filter.value = str;
- document.forms[1].submit();
- return false;
-}
-</script>
-</head>
-<body onload='init()'>
-<form onsubmit='return set()'>
-<select name='thema' onchange='validate(this)'>
-<option value=''>WFS...</option>
-</select><br>
-<div id='a' name='a'></div>
-</form>
-
-<form action='../extensions/geom2wfst.php' method='POST'>
-<input type='text' name='url'>
-<input type='text' name='filter'>
-</form>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_wfs_server.php
===================================================================
--- trunk/mapbender/http/php/mod_wfs_server.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfs_server.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,16 +1,10 @@
<?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("../extensions/JSON.php");
+require_once(dirname(__FILE__) . "/../classes/class_json.php");
-//db connection
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
-$json = new Services_JSON();
+$json = new Mapbender_JSON();
$obj = $json->decode(stripslashes($_REQUEST['obj']));
//workflow:
@@ -89,8 +83,18 @@
if(count($serviceList) == 0){
return false;
}
- $sql = "SELECT * FROM wfs WHERE wfs_id IN(".join(",",$serviceList).") ORDER BY wfs_title";
- $res = db_query($sql);
+ $sql = "SELECT * FROM wfs WHERE wfs_id IN (";
+ $v = $serviceList;
+ $t = array();
+ for ($i = 1; $i <= count($serviceList); $i++) {
+ if ($i > 1) {
+ $sql .= ", ";
+ }
+ $sql .= "$" . $i;
+ array_push($t, "i");
+ }
+ $sql .= ") ORDER BY wfs_title";
+ $res = db_prep_query($sql, $v, $t);
while($row = db_fetch_array($res)){
array_push($services['id'], $row['wfs_id']);
array_push($services['title'], $row['wfs_title']);
@@ -275,15 +279,21 @@
}
function getOwsproxy($obj){
- $n = new administration();
+ $n = new administration();
+ if($obj->wfs=="gui_confs")
+ return false;
return $n->getWfsOwsproxyString($obj->wfs);
}
function setOwsproxy($obj){
$n = new administration();
+ if($obj->wfs=="gui_confs")
+ return false;
return $n->setWfsOwsproxyString($obj->wfs,true);
}
function removeOwsproxy($obj){
$n = new administration();
+ if($obj->wfs=="gui_confs")
+ return false;
return $n->setWfsOwsproxyString($obj->wfs,false);
}
/*
@@ -297,6 +307,4 @@
header("Content-Type: text/x-json");
echo $output;
}
-
-
?>
\ No newline at end of file
Deleted: trunk/mapbender/http/php/mod_wfsrequest.php
===================================================================
--- trunk/mapbender/http/php/mod_wfsrequest.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_wfsrequest.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -1,132 +0,0 @@
-<?php
-# $Id$
-# $Header: /cvsroot/mapbender/mapbender/http/php/mod_wfsrequest.php,v 1.3 2005/11/04 11:08:57 uli_rothstein Exp $
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-
-# ur # echo urldecode(stripslashes(utf8_decode($_REQUEST["filter"])));
-# ur # die;
-function checkInput($s){
- if(!preg_match('/[^\s\d\w\-\.öüäßÄÖÜ]|--/',$s)){
- return addslashes($s);
- }
- else{
- die('Unzulässige Eingabe');
- }
-}
-require_once("../../conf/mapbender.conf");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db($DB,$con);
-if(isset($_REQUEST["backlink"]) && $_REQUEST["backlink"] == 'parent'){
- $p = 'parent';
-}else{
- $p = "parent.frames[\"".$_REQUEST["frame"]."\"]";
-}
-
-/* wfs_conf */
-$sql = "SELECT * FROM wfs_conf ";
-$sql .= "JOIN wfs ON wfs_conf.fkey_wfs_id = wfs.wfs_id ";
-$sql .= "WHERE wfs_conf.wfs_conf_id = ".$_REQUEST['wfs_conf_id'];
-
-$res = db_query($sql);
-if($row = db_fetch_array($res)){
- $g_res_style = $row["g_res_style"];
-
-}else{die("wfs_conf data not available");}
-
-/* wfs_conf_element */
-$sql = "SELECT * FROM wfs_conf_element ";
-$sql .= "JOIN wfs_element ON wfs_conf_element.f_id = wfs_element.element_id ";
-$sql .= "WHERE wfs_conf_element.fkey_wfs_conf_id = ".$_REQUEST['wfs_conf_id']." ";
-$sql .= "AND wfs_conf_element.f_show = 1 ORDER BY wfs_conf_element.f_respos;";
-
-$res = db_query($sql);
-$col = array();
-$cnt = 0;
-while($row = db_fetch_array($res)){
- $col[$cnt] = $row["element_name"];
- $cnt++;
-}
-if($cnt == 0){die("wfs_conf_element data not available");}
-
-
-$f = '<ogc:Filter xmlns:ogc="http://ogc.org" xmlns:gml="http://www.opengis.net/gml">';
-if($_REQUEST["objekttyp_id"] != '0'){
- $f .= "<And>";
-}
-$f .= "<ogc:PropertyIsLike wildCard='*' singleChar='.' escape='!'>";
-$f .= '<ogc:PropertyName>ud_id</ogc:PropertyName>';
-$f .= '<ogc:Literal>*'.$_REQUEST['AstUdNr'].'</ogc:Literal>';
-$f .= "</ogc:PropertyIsLike>";
-if($_REQUEST["objekttyp_id"] != '0'){
- $f .= "<ogc:PropertyIsEqualTo>";
- $f .= '<ogc:PropertyName>objekttyp_id</ogc:PropertyName>';
- $f .= '<ogc:Literal>'.checkInput($_REQUEST["objekttyp_id"]).'</ogc:Literal>';
- $f .= "</ogc:PropertyIsEqualTo>";
- $f .= "</And>";
-}
-
-$f .= '</ogc:Filter>';
-
-$req = urldecode($_REQUEST["url"]).urlencode($f);
-$gml = 'off';
-if(isset($_REQUEST['gml'])){
- $gml = $_REQUEST['gml'];
-}
-if($gml == 'on'){
-// header("Location: ".$req);
-readfile($req);
-}
-
-else if($_REQUEST["export"] == 'shape'){
- include(dirname(__FILE__)."/../classes/class_gml2.php");
- include(dirname(__FILE__)."/../classes/class_gml2shape.php");
- $my = new gml2();
- $mygml = $my->getGml($req);
- $s = new gml2shape($mygml);
-}
-else{
- echo "<html><head><style type='text/css'>".$g_res_style."</style></head><body>";
- include("../classes/class_gml2.php");
- $mygml = new gml2();
- $mygml->parsegml($req);
- $c = $mygml->getMemberCount();
- for($i=0; $i<$c; $i++){
- echo "<div style='cursor:pointer;' ";
- if(fmod($i,2) == 0){
- echo "class='even'";
- }
- else{
- echo "class='uneven'";
- }
- $mygeom = implode(":",$mygml->getGeometriesFromMember($i));
- $geomtype = $mygml->getGeometryTypeFromMember($i);
- echo " onmouseover='".$p.".setResult(\"".$geomtype."\",\"over\",\"".$mygeom."\")' ";
- echo " onmouseout='".$p.".setResult(\"".$geomtype."\",\"out\",\"false\")' ";
- echo " onclick='".$p.".setResult(\"".$geomtype."\",\"click\",\"".$mygeom."\")'>";
-// for($j=0; $j<count($col); $j++){
- echo $mygml->getValueBySeparatedKey($i,$col[0]);
- if($_REQUEST["objekttyp_id"] == '0'){
- echo " (".$mygml->getValueBySeparatedKey($i,"objekttyp_name").")";
- }
-// }
- echo "</div>";
-
- }
-if($i == 0){ echo "Kein Ergebnis...";}
- echo "</body></html>";
-}
-?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_zoomCoords.php
===================================================================
--- trunk/mapbender/http/php/mod_zoomCoords.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_zoomCoords.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -17,11 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
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 +31,6 @@
?>
<title>Zoom to Coordinate</title>
<?php
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
include '../include/dyn_css.php';
?>
@@ -148,7 +143,7 @@
<?php
# needs intl'!
- echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+ echo "<form name='form1' action='" . $self ."' method='post'>";
echo "<span class='labelx'>Länge:</span>";
echo "<span class='labely'>Breite:</span>";
echo "<input class='textx' type='text' name='X'>";
Modified: trunk/mapbender/http/php/mod_zoomCoords_en.php
===================================================================
--- trunk/mapbender/http/php/mod_zoomCoords_en.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/mod_zoomCoords_en.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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();
-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 +79,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 +104,14 @@
var valid = true;
/* if(parseFloat(coordx) < 5.88 || parseFloat(coordx) > 15){
- alert("Eingabe unzulässig!");
+ alert("Eingabe unzul�ssig!");
document.form1.X.select();
document.form1.X.focus();
valid = false;
return false;
}
if(parseFloat(coordy) < 46.62 || parseFloat(coordy) > 55.71){
- alert("Eingabe unzulässig!");
+ alert("Eingabe unzul�ssig!");
document.form1.Y.select();
document.form1.Y.focus();
valid = false;
@@ -184,7 +163,7 @@
<body bgcolor='#ffffff' onload=''>
<?php
-echo "<form name='form1' action='" . $PHP_SELF . "?".SID."' method='post'>";
+echo "<form name='form1' action='" . $self ."' method='post'>";
#coordinates
#deutsche Version
Modified: trunk/mapbender/http/php/nestedSets.php
===================================================================
--- trunk/mapbender/http/php/nestedSets.php 2008-04-23 16:14:30 UTC (rev 2412)
+++ trunk/mapbender/http/php/nestedSets.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -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");
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>
@@ -58,16 +54,16 @@
if(value == 'insert'){
/*
if(document.forms[0].title.value == ''){alert("Bitte geben Sie einen Titel an."); permission = false; return;}
- if(document.forms[0].left.value == ''){alert("Wählen Sie eine Position."); permission = false; return;}
+ if(document.forms[0].left.value == ''){alert("W�hlen Sie eine Position."); permission = false; return;}
*/
if(document.forms[0].title.value == ''){alert("Please insert a title."); permission = false; return;}
if(document.forms[0].left.value == ''){alert("Please choose a position."); permission = false; return;}
- if(document.forms[0].wmsList.selectedIndex > 0 && document.forms[0].layer.selectedIndex == 0){alert("Wählen Sie einen Layer."); permission = false; return;}
+ if(document.forms[0].wmsList.selectedIndex > 0 && document.forms[0].layer.selectedIndex == 0){alert("W�hlen Sie einen Layer."); permission = false; return;}
if(permission == true){document.forms[0].action.value = "insert"; document.forms[0].submit();}
}
if(value == 'delete'){
- //permission = confirm("Soll das Objekt mit Inhalten gelöscht werden?");
+ //permission = confirm("Soll das Objekt mit Inhalten gel�scht werden?");
permission = confirm("Do you want to delete the object and the content of the object?");
if(permission == true){
document.forms[0].action.value = "delete";
@@ -77,7 +73,7 @@
if(value == 'update'){
/*
if(document.forms[0].title.value == ''){alert("Bitte geben Sie einen Titel an."); permission = false; return;}
- if(document.forms[0].left.value == ''){alert("Bitte wählen Sie eine Position."); permission = false; return;}
+ if(document.forms[0].left.value == ''){alert("Bitte w�hlen Sie eine Position."); permission = false; return;}
*/
if(document.forms[0].title.value == ''){alert("Please fill in a labeling."); permission = false; return;}
@@ -87,10 +83,10 @@
}
if(value == 'add'){
/*
- if(document.forms[0].left.value == ''){alert("Bitte wählen Sie eine Position."); permission = false; return;}
- if(document.forms[0].guiList.selectedIndex == 0){alert("Bitte wählen Sie eine GUI."); permission = false; return;}
- if(document.forms[0].wmsList.selectedIndex == 0){alert("Bitte wählen Sie einen WMS."); permission = false; return;}
- if(document.forms[0].layer.selectedIndex == 0){alert("Bitte wählen Sie eine Ebene."); permission = false; return;}
+ if(document.forms[0].left.value == ''){alert("Bitte w�hlen Sie eine Position."); permission = false; return;}
+ if(document.forms[0].guiList.selectedIndex == 0){alert("Bitte w�hlen Sie eine GUI."); permission = false; return;}
+ if(document.forms[0].wmsList.selectedIndex == 0){alert("Bitte w�hlen Sie einen WMS."); permission = false; return;}
+ if(document.forms[0].layer.selectedIndex == 0){alert("Bitte w�hlen Sie eine Ebene."); permission = false; return;}
*/
if(document.forms[0].left.value == ''){alert("Please fill in a position."); permission = false; return;}
@@ -116,26 +112,31 @@
}
if(isset($action) && $action == "insert"){
$temp = explode("###", $layer);
- $sql = "SELECT rgt FROM gui_treegde WHERE lft = ".$left." AND fkey_gui_id = '".$guiList."'";
- $res = db_query($sql);
+ $sql = "SELECT rgt FROM gui_treegde WHERE lft = $1 AND fkey_gui_id = $1";
+ $v = array($left, $guiList);
+ $t = array("i", "s");
+ $res = db_prep_query($sql, $v, $t);
if($pos == 'in'){$left = $left + 1;}
else if($pos == 'hinter'){$left = db_result($res,0,"rgt") + 1;}
else{ $left = $left + 2;}
- $sql = "UPDATE gui_treegde SET rgt=rgt+2 WHERE rgt >=". $left." AND fkey_gui_id = '".$guiList."'";
- db_query($sql);
- $sql = "UPDATE gui_treegde SET lft=lft+2 WHERE lft >=".$left." AND fkey_gui_id = '".$guiList."'";
- db_query($sql);
- $sql = "INSERT INTO gui_treegde(fkey_gui_id, fkey_layer_id, lft,rgt, my_layer_title, layer, wms_id) VALUES(";
- $sql .= "'".$guiList."', ";
- $sql .= "'".$temp[0]."', ";
- $sql .= $left.", ";
- $sql .= ($left+1).", ";
- $sql .= "'".$name."', ";
- $sql .= "'".$temp[1]."', ";
- $sql .= "'".$wmsList."'";
- $sql .= ")";
- #echo $sql . "<br>";
- db_query($sql);
+
+ $sql = "UPDATE gui_treegde SET rgt=rgt+2 WHERE rgt >= $1 AND fkey_gui_id = $2";
+ $v = array($left, $guiList);
+ $t = array("i", "s");
+ db_prep_query($sql, $v, $t);
+
+ $sql = "UPDATE gui_treegde SET lft=lft+2 WHERE lft >= $1 AND fkey_gui_id = $2";
+ $v = array($left, $guiList);
+ $t = array("i", "s");
+ db_prep_query($sql, $v, $t);
+
+ $sql = "INSERT INTO gui_treegde(fkey_gui_id, fkey_layer_id, lft,rgt, ";
+ $sql .= "my_layer_title, layer, wms_id) VALUES($1, $2, $3, $4, $5, $6, $7)";
+ #echo $sql . "<br>";
+ $v = array($guiList, $temp[0], $left, ($left+1), $name, $temp[1], $wmsList);
+ $t = array("s", "s", "i", "i", "s", "s", "s");
+ db_prep_query($sql, $v, $t);
+
/*
if($layer == ""){
$left = $left + 1;
@@ -152,53 +153,79 @@
}
if(isset($action) && $action == "delete"){
if($left){
- $sql = "SELECT rgt FROM gui_treegde WHERE lft =". $left." AND fkey_gui_id = '".$guiList."'";
- $res = db_query($sql);
+ $sql = "SELECT rgt FROM gui_treegde WHERE lft = $1 AND fkey_gui_id = $2";
+ $v = array($left, $guiList);
+ $t = array("i", "s");
+ $res = db_prep_query($sql, $v, $t);
$right = db_result($res,0,"rgt");
- $sql = "DELETE FROM gui_treegde WHERE lft BETWEEN ".$left." and ".$right." AND fkey_gui_id = '".$guiList."'";
- db_query($sql);
- $sql = "UPDATE gui_treegde SET lft=lft-((".$right."-".$left."+1)) WHERE lft>".$right." AND fkey_gui_id = '".$guiList."'";
- db_query($sql);
- $sql = "UPDATE gui_treegde SET rgt=rgt-((".$right."-".$left."+1)) WHERE rgt>".$right." AND fkey_gui_id = '".$guiList."'";
- db_query($sql);
+
+ $sql = "DELETE FROM gui_treegde WHERE lft BETWEEN $1 and $2 AND fkey_gui_id = $3";
+ $v = array($left, $right, $guiList);
+ $t = array("i", "i", "s");
+ db_prep_query($sql, $v, $t);
+
+ $sql = "UPDATE gui_treegde SET lft=lft-(($1 - $2 + 1)) WHERE lft > $3 AND fkey_gui_id = $4";
+ $v = array($right, $left, $right, $guiList);
+ $t = array("i", "i", "i", "s");
+ db_prep_query($sql, $v, $t);
+
+ $sql = "UPDATE gui_treegde SET rgt=rgt-(($1 - $2 + 1)) WHERE rgt > $3 AND fkey_gui_id = $4";
+ $v = array($right, $left, $right, $guiList);
+ $t = array("i", "i", "i", "s");
+ db_prep_query($sql, $v, $t);
}
}
if(isset($action) && $action == "update"){
$temp = explode("###", $layer);
$sql = "UPDATE gui_treegde SET ";
- $sql .= "my_layer_title = '".$name."', ";
- $sql .= "fkey_layer_id = '".$temp[0]."', ";
- $sql .= "layer = '".$temp[1]."', ";
- $sql .= "wms_id = '" . $wmsList."'";
- $sql .= " WHERE lft = ".$left." AND fkey_gui_id = '".$guiList."'";
- db_query($sql);
+ $sql .= "my_layer_title = $1, ";
+ $sql .= "fkey_layer_id = $2, ";
+ $sql .= "layer = $3, ";
+ $sql .= "wms_id = $4";
+ $sql .= " WHERE lft = $5 AND fkey_gui_id = $6";
+ $v = array($name, $temp[0], $temp[1], $wmsList, $left, $guiList);
+ $t = array("s", "s", "s", "s", "i", "s");
+ db_prep_query($sql, $v, $t);
}
if(isset($action) && $action == "add"){
$temp = explode("###", $layer);
- $sql_val = "SELECT * FROM gui_treegde WHERE lft =". $left." AND fkey_gui_id = '".$guiList."'";
- $res_val = db_query($sql_val);
+ $sql_val = "SELECT * FROM gui_treegde WHERE lft = $1 AND fkey_gui_id = $2";
+ $v = array($left, $guiList);
+ $t = array("i", "s");
+ $res = db_prep_query($sql_val, $v, $t);
$sql = "UPDATE gui_treegde SET ";
+ $sql .= "fkey_layer_id = $1, layer = $2, wms_id = $3 ";
+ $sql .= "WHERE lft = $4 AND fkey_gui_id = $5";
- $sql .= "fkey_layer_id = ";
- $sql .= "'";
- if(db_result($res_val, 0, "fkey_layer_id") != ''){ $sql .= db_result($res_val, 0, "fkey_layer_id") . ","; }
- $sql .= $temp[0] . "', ";
+ $v = array();
+ $t = array("s", "s", "s", "i", "s");
+
+ if (db_result($res_val, 0, "fkey_layer_id") != '') {
+ array_push($v, db_result($res_val, 0, "fkey_layer_id") . "," . $temp[0]);
+ }
+ else {
+ array_push($v, $temp[0]);
+ }
- $sql .= "layer = ";
- $sql .= "'";
- if(db_result($res_val, 0, "layer") != ''){ $sql .= db_result($res_val, 0, "layer") . ","; }
- $sql .= $temp[1] . "', ";
+ if (db_result($res_val, 0, "layer") != '') {
+ array_push($v, db_result($res_val, 0, "layer") . "," . $temp[1]);
+ }
+ else {
+ array_push($v, $temp[1]);
+ }
- $sql .= "wms_id = ";
- $sql .= "'";
- if(db_result($res_val, 0, "wms_id") != ''){ $sql .= db_result($res_val, 0, "wms_id") . ","; }
- $sql .= $wmsList . "' ";
-
- $sql .= " WHERE lft = ".$left." AND fkey_gui_id = '".$guiList."'";
- #echo $sql . "<br>";
- db_query($sql);
+ if (db_result($res_val, 0, "wms_id") != '') {
+ array_push($v, db_result($res_val, 0, "wms_id") . "," . $wmsList);
+ }
+ else {
+ array_push($v, $wmsList);
+ }
+
+ array_push($v, $left);
+ array_push($v, $guiList);
+ db_prep_query($sql, $v, $t);
}
?>
<br />
@@ -219,7 +246,7 @@
?>
<div style='position:absolute;top:50px;left:350px'>
-<form action='<?php $PHP_SELF ?>' method='POST'>
+<form action='<?php $self; ?>' method='POST'>
<br><br>
<table >
<tr><td></td><td></td></tr>
@@ -228,14 +255,19 @@
$admin = new administration();
$ownguis = $admin->getGuisByOwner($_SESSION["mb_user_id"],true);
-$sql = "SELECT * FROM gui WHERE gui_id IN ("; for($i=0;
-$i<count($ownguis); $i++){
- if($i>0){ $sql .= ",";}
- $sql .= "'".$ownguis[$i]."'";
- }
+$sql = "SELECT * FROM gui WHERE gui_id IN (";
+$v = $ownguis;
+$t = array();
+for ($i = 1; $i <= count($ownguis); $i++){
+ if ($i > 1) {
+ $sql .= ",";
+ }
+ $sql .= "$" . $i;
+ array_push($t, "s");
+}
$sql .= ") ORDER BY gui_name";
-$res = db_query($sql);
+$res = db_prep_query($sql, $v, $t);
$cnt = 0;
echo "<select class='guiList' size='10' name='guiList' class='guiList' onchange='document.forms[0].submit()'>";
echo "<option value=''>GUI ...</option>";
@@ -265,9 +297,11 @@
if(isset($guiList) && $guiList != ""){
$sql = "SELECT gui_wms.fkey_wms_id, wms.wms_title FROM gui_wms ";
$sql .= "INNER JOIN wms ON gui_wms.fkey_wms_id = wms.wms_id ";
- $sql .= "WHERE gui_wms.fkey_gui_id = '" . $guiList . "' ";
+ $sql .= "WHERE gui_wms.fkey_gui_id = $1 ";
$sql .= "ORDER BY wms.wms_title";
- $res = db_query($sql);
+ $v = array($guiList);
+ $t = array("s");
+ $res = db_prep_query($sql, $v, $t);
$cnt = 0;
while($row = db_fetch_array($res)){
echo "<option value='".$row["fkey_wms_id"]."' ";
@@ -293,9 +327,11 @@
if(isset($wmsList) && $wmsList != ""){
$sql_l = "SELECT gui_layer.fkey_layer_id, layer.layer_name, layer.layer_title FROM gui_layer ";
$sql_l .= "LEFT JOIN layer ON gui_layer.fkey_layer_id = layer.layer_id ";
- $sql_l .= "WHERE gui_layer.gui_layer_wms_id = " . $wmsList . " AND layer.layer_parent = '0' AND gui_layer.fkey_gui_id = '".$guiList."'";
+ $sql_l .= "WHERE gui_layer.gui_layer_wms_id = $1 AND layer.layer_parent = '0' AND gui_layer.fkey_gui_id = $2";
$sql_l .= " ORDER BY layer.layer_title";
- $res_l = db_query($sql_l);
+ $v = array($wmsList, $guiList);
+ $t = array("i", "s");
+ $res_l = db_prep_query($sql_l, $v, $t);
$cnt = 0;
while($row = db_fetch_array($res_l)){
echo "<option value='".$row["fkey_layer_id"]."###".$row["layer_name"]."'>";
Copied: trunk/mapbender/http/php/system.php (from rev 2404, branches/2.5/http/php/system.php)
===================================================================
--- trunk/mapbender/http/php/system.php (rev 0)
+++ trunk/mapbender/http/php/system.php 2008-04-23 16:21:04 UTC (rev 2413)
@@ -0,0 +1,35 @@
+<?php
+# $Id:$
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+#
+# mapbender version
+#
+define("MB_VERSION_NUMBER", "2.5.0");
+define("MB_VERSION_APPENDIX", "RC2");
+define("MB_RELEASE_DATE", mktime(0,0,0,4,21,2008));//h, min,sec,month,day,year
+
+#
+# constants from map.js
+#
+define("MB_RESOLUTION", "28.35");
+define("MB_FEATURE_COUNT", "100");
+
+#
+# available log levels
+#
+define("LOG_LEVEL_LIST", "off,error,warning,notice,all");
\ No newline at end of file
More information about the Mapbender_commits
mailing list