[Mapbender-commits] r2763 - in trunk/mapbender/http: classes frames
javascripts php print
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Aug 11 04:19:21 EDT 2008
Author: christoph
Date: 2008-08-11 04:19:21 -0400 (Mon, 11 Aug 2008)
New Revision: 2763
Modified:
trunk/mapbender/http/classes/class_gml2.php
trunk/mapbender/http/classes/class_keyword.php
trunk/mapbender/http/classes/class_wfs_conf.php
trunk/mapbender/http/frames/index.php
trunk/mapbender/http/javascripts/geometry.js
trunk/mapbender/http/javascripts/mod_savewmc.php
trunk/mapbender/http/javascripts/mod_setBackground.php
trunk/mapbender/http/javascripts/mod_wfs_client.html
trunk/mapbender/http/php/mod_logout.php
trunk/mapbender/http/php/mod_meetingPoint.php
trunk/mapbender/http/print/printPDF.conf
Log:
merged w/ 2.5 branch
Modified: trunk/mapbender/http/classes/class_gml2.php
===================================================================
--- trunk/mapbender/http/classes/class_gml2.php 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/classes/class_gml2.php 2008-08-11 08:19:21 UTC (rev 2763)
@@ -1,5 +1,5 @@
<?php
-# $Id$
+# $Id: class_gml2.php 2655 2008-07-11 15:16:21Z christoph $
# http://www.mapbender.org/index.php/class_gml2.php
# Copyright (C) 2002 CCGIS
#
Modified: trunk/mapbender/http/classes/class_keyword.php
===================================================================
--- trunk/mapbender/http/classes/class_keyword.php 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/classes/class_keyword.php 2008-08-11 08:19:21 UTC (rev 2763)
@@ -291,7 +291,7 @@
global $con;
$sql = "DELETE FROM keyword WHERE NOT EXISTS (SELECT fkey_keyword_id FROM layer_keyword WHERE keyword.keyword_id = layer_keyword.fkey_keyword_id);";
//$sql .= " AND NOT EXISTS (SELECT fkey_keyword_id FROM wms_keyword WHERE keyword.keyword_id = wms_keyword.fkey_keyword_id);";
- $res = db_prep_query($sql);
+ $res = db_query($sql);
if($res!=FALSE){
return true;
}
Modified: trunk/mapbender/http/classes/class_wfs_conf.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs_conf.php 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/classes/class_wfs_conf.php 2008-08-11 08:19:21 UTC (rev 2763)
@@ -148,7 +148,7 @@
"f_respos" => $row["f_respos"],
"f_min_input" => $row["f_min_input"],
"f_form_element_html" => $row["f_form_element_html"],
- "f_show_detail" => $row["f_show_detail"],
+ "f_auth_varname" => $row["f_auth_varname"],
"f_detailpos" => $row["f_detailpos"],
"f_operator" => $row["f_operator"],
"f_show_detail" => $row["f_show_detail"]
Modified: trunk/mapbender/http/frames/index.php
===================================================================
--- trunk/mapbender/http/frames/index.php 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/frames/index.php 2008-08-11 08:19:21 UTC (rev 2763)
@@ -19,7 +19,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
require("../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../classes/class_locale.php");
require_once(dirname(__FILE__)."/../classes/class_gui.php");
$_SESSION["mb_user_gui"] = $gui_id;
Modified: trunk/mapbender/http/javascripts/geometry.js
===================================================================
--- trunk/mapbender/http/javascripts/geometry.js 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/javascripts/geometry.js 2008-08-11 08:19:21 UTC (rev 2763)
@@ -355,8 +355,8 @@
var currentPoint = currentLine[n];
this.getGeometry(-1,-1).addPointByCoordinates(currentPoint[0], currentPoint[1]);
}
+ this.getGeometry(-1,-1).setEpsg(featureEpsg);
}
- this.getGeometry(-1,-1).setEpsg(featureEpsg);
this.close();
break;
@@ -1156,7 +1156,7 @@
* @param {String} col a color
* @private
*/
- this.drawGeometry = function(t,g,col){
+ this.drawGeometry = function(t,g,col){
if(t == geomType.point) {
var poiIcon = g.e.getElementValueByName("Mapbender:icon");
for(var i=0, ilen = g.count(); i < ilen; i++){
@@ -1213,7 +1213,7 @@
*/
this.isTooSmall = function(g){
// TODO switch between dot, original, circle
- return false;
+// return false;
var tmp = g.getBBox();
var min = realToMap(mapframe,tmp[0]);
Modified: trunk/mapbender/http/javascripts/mod_savewmc.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_savewmc.php 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/javascripts/mod_savewmc.php 2008-08-11 08:19:21 UTC (rev 2763)
@@ -22,7 +22,6 @@
echo "mod_savewmc_target = '".$e_target[0]."';";
?>
-
function setOnUnload() {
if (ie) {
document.getElementsByTagName('body')[0].onunload = function() {
@@ -67,6 +66,7 @@
if (currentWmcExtensionData != null) {
extensionDataString = $.toJSON(currentWmcExtensionData);
}
+
if (storeInSession) {
$.ajaxSetup({async:false}); //TODO: find out why async doesn't work onunload
}
Modified: trunk/mapbender/http/javascripts/mod_setBackground.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_setBackground.php 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/javascripts/mod_setBackground.php 2008-08-11 08:19:21 UTC (rev 2763)
@@ -30,20 +30,18 @@
mb_registerInitFunctions("mod_setBackground_init()");
var mod_setBackground_active = false;
function mod_setBackground_init(){
- var ind = document.setBackground.mod_setBackground_list.options[0].value;
+ var setBackgroundSelectBox = document.setBackground.mod_setBackground_list;
+ var ind = setBackgroundSelectBox.options[0].value;
var cnt = 0;
var selInd;
- document.setBackground.mod_setBackground_list.options[document.setBackground.mod_setBackground_list.length - 1] = null;
+ setBackgroundSelectBox.options[setBackgroundSelectBox.length - 1] = null;
for(var i=0; i<wms.length; i++){
if(wms[i].gui_wms_visible == '0'){
- var title = decodeURIComponent(wms[i].wms_title);
- while (title.search(/\+/) != -1) {
- title = title.replace("\+", " ");
- }
+ var title = wms[i].wms_title;
var newO = new Option(title, i, false,false);
- document.setBackground.mod_setBackground_list.options[document.setBackground.mod_setBackground_list.length] = newO;
+ setBackgroundSelectBox.options[setBackgroundSelectBox.length] = newO;
if (ind == i) {
selInd = cnt;
}
@@ -52,7 +50,7 @@
}
if (cnt >0){
wms[ind].gui_wms_visible = 2;
- document.setBackground.mod_setBackground_list.selectedIndex = selInd;
+ setBackgroundSelectBox.selectedIndex = selInd;
}
mod_setBackground_active = ind;
}
Modified: trunk/mapbender/http/javascripts/mod_wfs_client.html
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_client.html 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/javascripts/mod_wfs_client.html 2008-08-11 08:19:21 UTC (rev 2763)
@@ -7,7 +7,7 @@
<script type='text/javascript'>
-/*
+/*
* services['action']: instructs the servercomponent
* services['services']: infos about the services (wfs)
* services['services']['id']: a list of ids
@@ -17,7 +17,7 @@
var services = {};
/*
* wfsConf['action']: instructs the servercomponent
- * wfsConf['wfs']: the ID of the selected wfs
+ * wfsConf['wfs']: the ID of the selected wfs
* wfsConf['wfsConf']: infos about the wfs configurations
* wfsConf['wfsConf']['id']: a list of ids
* wfsConf['wfsConf']['abstract']: a corresponding list of descriptions
@@ -33,31 +33,31 @@
/*
* handleAssignment['action']: instructs the servercomponent
- * handleAssignment['selectedConf']: a list of wfs-conf Ids
+ * handleAssignment['selectedConf']: a list of wfs-conf Ids
* handleAssignment['selectedGui']: the selected Gui
*/
-var handleAssignment = {}
-
-/*
- * vupdateWfs['action']: instructs the servercomponent
- * vupdateWfs['wfs']: id of wfs to update
- * vupdateWfs['url']: capabilities url
- */
-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
- */
-var geturl = {}
+var handleAssignment = {}
+/*
+ * vupdateWfs['action']: instructs the servercomponent
+ * vupdateWfs['wfs']: id of wfs to update
+ * vupdateWfs['url']: capabilities url
+ */
+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
+ */
+var geturl = {}
+
var owsproxy = {}
@@ -80,41 +80,42 @@
var w = document.wfsForm.wfsList;
var ind = w.selectedIndex;
if(ind == -1){
- return false;
- }
- if(ind == w.options.length-1)
+ return false;
+ }
+ if(ind == w.options.length-1)
return "gui_confs";
- return w.options[ind].value;
+ return w.options[ind].value;
}
function getGuiConfs(){
guis['action'] = 'getAssignedConfs';
var g = document.wfsForm.guiList;
var ind = g.selectedIndex;
if(ind == -1){
- return false;
+ return false;
}
guis['selectedGui'] = g.options[ind].value;
- guis['selectedWfs'] = wfsConf['wfs'];
+ guis['selectedWfs'] = wfsConf['wfs'];
getData(guis);
-}
-/**
- * Sends an request to get the url to the capabilities doc of selected wfs
- *
- */
-
-function getUpdateUrl(column){
- geturl['action'] = 'getUpdateUrl';
- var w = document.wfsForm.wfsList;
- var ind = w.selectedIndex;
- if(ind == -1){
- alert("please select an WFS");
- return;
- }
- geturl['wfs'] = w.options[ind].value;
- geturl['column'] = column;
- getData(geturl);
-}
+}
+/**
+ * Sends an request to get the url to the capabilities doc of selected wfs
+ *
+ */
+function getUpdateUrl(column){
+ geturl['action'] = 'getUpdateUrl';
+ var w = document.wfsForm.wfsList;
+ var ind = w.selectedIndex;
+ if(ind == -1){
+ alert("please select an WFS");
+ return;
+ }
+ geturl['wfs'] = w.options[ind].value;
+ geturl['column'] = column;
+ geturl['wfs_version'] = '';
+ getData(geturl);
+}
+
function addConfsToGui(){
handleAssignment['action'] = 'add';
handleAssignment['confs'] = getSelectedConfs();
@@ -126,43 +127,48 @@
handleAssignment['confs'] = getSelectedAssignedConfs();
handleAssignment['gui'] = getSelectedGui();
getData(handleAssignment);
-}
-/**
- * Sends an update request to update the capabilities of selected wfs
- *
- * @return success
- * @type boolean
- */
-
-function updateWfs(){
- vupdateWfs['action'] = 'updateWfs';
- var w = document.wfsForm.wfsList;
- var ind = w.selectedIndex;
- if(ind == -1){
- alert("please select an WFS");
- return false;
- }
- vupdateWfs['wfs'] = w.options[ind].value;
- vupdateWfs['url'] = document.getElementById("updateUrl").value;
- getData(vupdateWfs);
- return true;
-}
-
-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_);
- }
- return true;
- }
- return false;
-}
+}
+/**
+ * Sends an update request to update the capabilities of selected wfs
+ *
+ * @return success
+ * @type boolean
+ */
+function updateWfs(){
+ vupdateWfs['action'] = 'updateWfs';
+ var w = document.wfsForm.wfsList;
+ var ind = w.selectedIndex;
+ if(ind == -1){
+ alert("please select an WFS");
+ return false;
+ }
+ vupdateWfs['wfs'] = w.options[ind].value;
+ if(document.getElementById("updateUrl").value == ''){
+ alert("Please choose the link to the new WFS Capabilities URL.");
+ return false;
+ }
+
+ vupdateWfs['url'] = document.getElementById("updateUrl").value;
+ getData(vupdateWfs);
+ return true;
+}
+
+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_);
+ }
+ return true;
+ }
+ return false;
+}
+
function setIndicator(){
var str = "<img src='../img/indicator_wheel.gif'>";
- document.getElementById("indicator").innerHTML = str;
+ document.getElementById("indicator").innerHTML = str;
}
function removeIndicator(){
document.getElementById("indicator").innerHTML = "";
@@ -202,38 +208,38 @@
break;
case "getWfsConfData":
getOwsproxy();
- appendWfsConfData(dsJson);
+ appendWfsConfData(dsJson);
break;
case "getGuis":
appendGuis(dsJson);
break;
case "getAssignedConfs":
- appendGuiConfs(dsJson);
- break;
- case "getUpdateUrl":
+ appendGuiConfs(dsJson);
+ break;
+ case "getUpdateUrl":
setUpdateUrl(dsJson)
break;
case "add":
getGuiConfs();
break;
case "remove":
- getGuiConfs();
- break;
- case "updateWfs":
- if(dsJson['success'])
- alert("Update performed.");
- else
+ getGuiConfs();
+ break;
+ case "updateWfs":
+ if(dsJson['success'])
+ alert("Update performed.");
+ else
alert("An error occured, see log for details.");
- break;
- case "deleteWfs":
- if(dsJson['success']){
- clearList(document.forms[0].wfsList);
- clearList(document.forms[0].guiList);
- getWfsList();
- getGuis();
- alert("WFS deleted.");
- }
break;
+ case "deleteWfs":
+ if(dsJson['success']){
+ clearList(document.forms[0].wfsList);
+ clearList(document.forms[0].guiList);
+ getWfsList();
+ getGuis();
+ alert("WFS deleted.");
+ }
+ break;
case "setOwsproxy":
displayOwsproxy(dsJson);
break;
@@ -247,23 +253,27 @@
alert("No action specified.....");
break;
}
- }
+ }
else{
alert("An error occured!");
}
removeIndicator();
});
-}
+}
-/**
- * Sets the update url comming from db in the html form
- *
- */
-
-function setUpdateUrl(dsJson){
- document.getElementById("updateUrl").value = dsJson['url'];
-}
+/**
+ * Sets the update url comming from db in the html form
+ *
+ */
+function setUpdateUrl(dsJson){
+ document.getElementById("updateUrl").value = dsJson['url'];
+}
+
+function clearUpdateUrl(){
+ document.getElementById("updateUrl").value = '';
+}
+
/*
*
*/
@@ -274,23 +284,23 @@
else{
document.wfsForm.owsproxy.checked = true;
}
-}
+}
function appendServices(dsJson){
services['services'] = dsJson.services;
- var o = services['services'];
+ var o = services['services'];
for(var i=0; i<o.id.length; i++){
appendOption(document.forms[0].wfsList, o.title[i], o.id[i], false);
- }
- appendOption(document.forms[0].wfsList, "WFS Configurations", "-1", false);
+ }
+ appendOption(document.forms[0].wfsList, "all WFS Configurations", "-1", false);
}
function appendWfsConfData(dsJson){
wfsConf['wfsConf'] = {};
wfsConf['wfsConf'] = dsJson.wfsConf;
- var o = wfsConf['wfsConf'];
- document.forms[0].wfsConfList.innerHTML = '';
- if(typeof(o.id)=="undefined")
+ var o = wfsConf['wfsConf'];
+ 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);
@@ -300,10 +310,10 @@
function appendGuis(dsJson){
guis['id'] = {};
guis['id'] = dsJson.id;
- var o = guis['id'];
+ var o = guis['id'];
for(var i=0; i<o.length; i++){
appendOption(document.forms[0].guiList, o[i], o[i], false);
- }
+ }
}
function appendGuiConfs(dsJson){
var list = document.forms[0].guiConfList;
@@ -311,18 +321,18 @@
for(var i=0; i<dsJson.assignedConfs.length; i++){
var confAbstract = getConfAbstract(dsJson.assignedConfs[i]);
appendOption(list, confAbstract, dsJson.assignedConfs[i], false);
- }
+ }
}
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;
-}
+}
+function clearList(boxObject){
+ boxObject.length = 0;
+}
/*
- * returns id and abstract from a wfs configuration
+ * returns id and abstract from a wfs configuration
*/
function getConfAbstract(confId){
var c = wfsConf['wfsConf'];
@@ -356,6 +366,15 @@
var ind = document.forms[0].guiList.selectedIndex;
return document.forms[0].guiList.options[ind].value;
}
+
+function previewWfsUrl(){
+ var previewUrl = document.forms[0].updateUrl.value;
+ if(previewUrl !=''){
+ capabilitiesWin = window.open(previewUrl);
+ }else{
+ alert("Please select a WFS first");
+ }
+}
</script>
</head>
<body onload='getWfsList();getGuis();'>
@@ -367,43 +386,48 @@
<fieldset class="leftContainer">
<legend>WFS List</legend>
<p>
- <select size='4' name='wfsList' class='wfsList' onchange='getWfsConfData();getGuiConfs();'></select>
+ <select size='10' name='wfsList' class='wfsList' onchange='getWfsConfData();getGuiConfs();clearUpdateUrl();'></select>
</p>
</fieldset>
-
+
<fieldset class="rightContainer">
<legend>Options</legend>
<p>
- <input type='checkbox' name='owsproxy' id='owsproxy' onclick='setOwsproxy(this)' />
- <label for="owsproxy">OWSProxy</label>
+ <input type='checkbox' name='owsproxy' id='owsproxy' onclick='setOwsproxy(this)' />
+ <label for="owsproxy">enable OWSProxy for the selected WFS</label>
+ <br><br>
+ <input type='button' value='Delete WFS' name='delete' id='deleteButton' onclick='deleteWfs()' />
+ </p>
+ </fieldset>
+
+ <fieldset class="rightContainer">
+ <legend>Update WFS</legend>
+ <p>
+ Please choose the Link to the WFS Capabilities URL:
+ <br />
+ <a href='javascript:getUpdateUrl("wfs_getcapabilities")'>wfs_getcapabilities</a> or <a href='javascript:getUpdateUrl("wfs_upload_url")'>wfs_upload_url</a>
+ </label>
+ <input id='updateUrl' type='text' value='' name='updateUrl' class='updateUrl' />
<br />
- <label for="updateUrl">
- Link to new WFS Capabilities URL:
- <br />
- (<a href='javascript:getUpdateUrl("wfs_getcapabilities")'>wfs_getcapabilities</a>, <a href='javascript:getUpdateUrl("wfs_upload_url")'>wfs_upload_url</a>)
- </label>
- <input id='updateUrl' type='text' value='' name='updateUrl' class='updateUrl' />
- <br />
- <input type='button' value='Update WFS' name='update' id='updateButton' onclick='updateWfs()' />
- <input type='button' value='Delete WFS' name='delete' id='deleteButton' onclick='deleteWfs()' />
+ <input type='button' value='Update WFS' name='update' id='updateButton' onclick='updateWfs()' />
+ <input type='button' value='Preview WFS Capabilities' name='preview' id='previewButton' onclick='previewWfsUrl();' />
</p>
</fieldset>
+<hr />
- <hr />
-
<fieldset class="rightContainer">
<legend>GUI List</legend>
<p>
- <select size='4' name='guiList' class='guiList' onchange='getGuiConfs()'></select>
+ <select size='6' name='guiList' class='guiList' onchange='getGuiConfs()'></select>
</p>
</fieldset>
- <hr />
+<hr />
<fieldset class="leftContainer">
<legend>WFS Configuration List</legend>
<p>
- <select size='4' name='wfsConfList' class='wfsConfList' onchange='' multiple="multiple"></select>
+ <select size='6' name='wfsConfList' class='wfsConfList' onchange='' multiple="multiple"></select>
</p>
</fieldset>
@@ -418,11 +442,11 @@
<fieldset class="rightContainer">
<legend>GUI Configuration List</legend>
<p>
- <select size='4' name='guiConfList' class='guiConfList' onchange='' multiple="multiple"></select>
+ <select size='6' name='guiConfList' class='guiConfList' onchange='' multiple="multiple"></select>
</p>
- </fieldset>
-
- <hr />
+ </fieldset>
+
+<hr />
</form>
</body>
Modified: trunk/mapbender/http/php/mod_logout.php
===================================================================
--- trunk/mapbender/http/php/mod_logout.php 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/php/mod_logout.php 2008-08-11 08:19:21 UTC (rev 2763)
@@ -22,22 +22,36 @@
ob_start();
require_once(dirname(__FILE__)."/../include/dyn_php.php");
+
ignore_user_abort();
+
if (isset($_COOKIE[session_name()])) {
setcookie(session_name(), '', time()-42000, '/');
}
+
session_destroy();
+
$dir = preg_replace("/\\\/","/", dirname($_SERVER['PHP_SELF']));
if (isset($logout_location) && $logout_location != ''){
header("Location: ".$logout_location);
}
else {
- if (is_file(dirname($_SERVER['PHP_SELF'])."/login.php")) {
- header("Location: http://".$_SERVER['HTTP_HOST'].$dir."/login.php");
- }
- else {
- header("Location: http://".$_SERVER['HTTP_HOST'].preg_replace("/\/php/","/frames",$dir)."/login.php");
- }
+ if (is_file(dirname($_SERVER['PHP_SELF'])."/login.php")) {
+ if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
+ header("Location: https://".$_SERVER['HTTP_HOST'].$dir."/login.php");
+ }
+ else {
+ header("Location: http://".$_SERVER['HTTP_HOST'].$dir."/login.php");
+ }
+ }
+ else {
+ if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
+ header("Location: https://".$_SERVER['HTTP_HOST'].preg_replace("/\/php/","/frames",$dir)."/login.php");
+ }
+ else {
+ header("Location: http://".$_SERVER['HTTP_HOST'].preg_replace("/\/php/","/frames",$dir)."/login.php");
+ }
+ }
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/php/mod_meetingPoint.php
===================================================================
--- trunk/mapbender/http/php/mod_meetingPoint.php 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/php/mod_meetingPoint.php 2008-08-11 08:19:21 UTC (rev 2763)
@@ -26,6 +26,19 @@
<title>meetingPoint</title>
<?php
include '../include/dyn_css.php';
+
+$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[$cnt] = $row["e_target"];
+ $cnt++;
+}
+
+
?>
<script language='JavaScript'>
<!--
@@ -288,4 +301,4 @@
<br>
</form>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/print/printPDF.conf
===================================================================
--- trunk/mapbender/http/print/printPDF.conf 2008-08-08 20:33:10 UTC (rev 2762)
+++ trunk/mapbender/http/print/printPDF.conf 2008-08-11 08:19:21 UTC (rev 2763)
@@ -22,7 +22,7 @@
* Legend
*/
$legend=true;
-$label_legend = _mb('Print legend');
+$label_legend = _mb('print legend');
$legendFilename = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
$legendFilenameUserPolygon = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
$legendText = _mb("Legend");
@@ -125,8 +125,8 @@
$a4 = true;
$a3 = true;
$a2 = true;
-$a1 = true;
-$a0 = true;
+$a1 = false;
+$a0 = false;
# dimensions of the map:
More information about the Mapbender_commits
mailing list