svn commit: r129 - trunk/mapbender/http/php
arnulf at osgeo.org
arnulf at osgeo.org
Sun Apr 23 05:55:05 EDT 2006
Author: arnulf
Date: 2006-04-23 09:55:05+0000
New Revision: 129
Modified:
trunk/mapbender/http/php/mb_listWMCs.php (contents, props changed)
trunk/mapbender/http/php/mb_validateInput.php (contents, props changed)
trunk/mapbender/http/php/mb_validateSession.php (contents, props changed)
trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php (contents, props changed)
Log:
cleaned, added SVN headers
Modified: trunk/mapbender/http/php/mb_listWMCs.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mb_listWMCs.php?view=diff&rev=129&p1=trunk/mapbender/http/php/mb_listWMCs.php&p2=trunk/mapbender/http/php/mb_listWMCs.php&r1=128&r2=129
==============================================================================
--- trunk/mapbender/http/php/mb_listWMCs.php (original)
+++ trunk/mapbender/http/php/mb_listWMCs.php 2006-04-23 09:55:05+0000
@@ -1,6 +1,6 @@
<?php
-# $Id: mb_listWMCs.php,v 1.21 2006/03/16 15:26:34 c_baudson Exp $
-# $Header: /cvsroot/mapbender/mapbender/http/php/mb_listWMCs.php,v 1.21 2006/03/16 15:26:34 c_baudson Exp $
+# $Id$
+#
# Copyright (C) 2002 CCGIS
#
# This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,6 @@
echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
?>
<title>Select web map contect document from list</title>
-
</head>
<body>
<?php
@@ -47,45 +46,40 @@
echo "</form>";
function mb_listWMCs($wmcList){
-
- global $DBSERVER,$DB,$OWNER,$PW;
- $con = db_connect($DBSERVER,$OWNER,$PW);
- db_select_db(DB,$con);
-
- $display = "<h2 style='font-family: Arial, Helvetica, sans-serif; color: #808080;background-color: White;'><font align='left' color='#000000'>Ma</font><font color='#0000CE'>p</font><font color='#C00000'>b</font><font color='#000000'>ender WMC list </font> </h2>";
- $display .= "<table width='90%' style='font-family: Arial, Helvetica, sans-serif;font-size : 12px;color: #808080;' border='1' cellpadding='3' rules='rows'><tr style='background-color:#F0F0F0;' width='80px'><td ><b>WMC name</b></td><td><b>last update</b></td><td colspan=5></td></tr>";
-
-
- if(count($wmcList)>0){
- $sql_list_wmcs = "SELECT DISTINCT wmc_id, wmc_title, wmc_timestamp FROM mb_user_wmc ";
- $sql_list_wmcs .= "WHERE wmc_id IN (";
- for($i=0; $i<count($wmcList); $i++){
- if($i>0){$sql_list_wmcs .= ",";}
- $sql_list_wmcs .= "'". $wmcList[$i]."'";
- }
- $sql_list_wmcs .= ") ";
- $sql_list_wmcs .= "ORDER BY wmc_timestamp DESC";
-
- $res_list_wmcs = db_query($sql_list_wmcs);
- $cnt_list_wmcs = 0;
- while($row = db_fetch_array($res_list_wmcs)){
- $display .= "<tr onmouseover='this.style.backgroundColor = \"#F08080\"' onmouseout='this.style.backgroundColor = \"#ffffff\"'";
- if(($cnt_list_wmcs % 2) == 0){ $display .= " ";}
- $display .= ">";
- $display .= "<td>".$row["wmc_title"]."</td>";
- $timestamp = date("M d Y H:i:s", $row["wmc_timestamp"]);
- $this_id = $row["wmc_id"];
- $display .= "<td>".$timestamp. "</td>";
-
- $display .= "<td><a href=\"" . $_SERVER['PHP_SELF'] ."?" . SID . "&action=load&wmc_id=".$this_id."\"><img src=\"../img/button_gray/wmc_load.png\" title=\"load this WMC\" border=0></a></td>";
- $display .= "<td><a href=\"" . $_SERVER['PHP_SELF'] ."?" . SID . "&action=merge&wmc_id=".$this_id."\"><img src=\"../img/button_gray/wmc_merge.png\" title=\"merge WMC\" border=0></a></td>";
- $display .= "<td><a href=\"" . $_SERVER['PHP_SELF'] ."?" . SID . "&action=append&wmc_id=".$this_id."\"><img src=\"../img/button_gray/wmc_append.png\" title=\"append WMC\" border=0></a></td>";
- $display .= "<td><a href='../javascripts/mod_displayWmc.php?wmc_id=".$this_id."' target = '_blank'><img src=\"../img/button_gray/wmc_xml.png\" title=\"display WMC XML\" border=0></a></td>";
-
- $display .= "<td><a href=\"" . $_SERVER['PHP_SELF'] ."?" . SID . "&action=delete&wmc_id=".$this_id."\"><img src=\"../img/button_gray/del.png\" title=\"delete this WMC\" border=0></a></td>";
- $display .= "</tr>";
- $cnt_list_wmcs++;
- }
+ global $DBSERVER,$DB,$OWNER,$PW;
+ $con = db_connect($DBSERVER,$OWNER,$PW);
+ db_select_db(DB,$con);
+ $display = "<h2 style='font-family: Arial, Helvetica, sans-serif; color: #808080;background-color: White;'><font align='left' color='#000000'>Ma</font><font color='#0000CE'>p</font><font color='#C00000'>b</font><font color='#000000'>ender WMC list </font> </h2>";
+ $display .= "<table width='90%' style='font-family: Arial, Helvetica, sans-serif;font-size : 12px;color: #808080;' border='1' cellpadding='3' rules='rows'><tr style='background-color:#F0F0F0;' width='80px'><td ><b>WMC name</b></td><td><b>last update</b></td><td colspan=5></td></tr>";
+ if(count($wmcList)>0){
+ $sql_list_wmcs = "SELECT DISTINCT wmc_id, wmc_title, wmc_timestamp FROM mb_user_wmc ";
+ $sql_list_wmcs .= "WHERE wmc_id IN (";
+ for($i=0; $i<count($wmcList); $i++){
+ if($i>0){$sql_list_wmcs .= ",";}
+ $sql_list_wmcs .= "'". $wmcList[$i]."'";
+ }
+ $sql_list_wmcs .= ") ";
+ $sql_list_wmcs .= "ORDER BY wmc_timestamp DESC";
+ $res_list_wmcs = db_query($sql_list_wmcs);
+ $cnt_list_wmcs = 0;
+ while($row = db_fetch_array($res_list_wmcs)){
+ $display .= "<tr onmouseover='this.style.backgroundColor = \"#F08080\"' onmouseout='this.style.backgroundColor = \"#ffffff\"'";
+ if(($cnt_list_wmcs % 2) == 0){ $display .= " ";}
+ $display .= ">";
+ $display .= "<td>".$row["wmc_title"]."</td>";
+ $timestamp = date("M d Y H:i:s", $row["wmc_timestamp"]);
+ $this_id = $row["wmc_id"];
+ $display .= "<td>".$timestamp. "</td>";
+
+ $display .= "<td><a href=\"" . $_SERVER['PHP_SELF'] ."?" . SID . "&action=load&wmc_id=".$this_id."\"><img src=\"../img/button_gray/wmc_load.png\" title=\"load this WMC\" border=0></a></td>";
+ $display .= "<td><a href=\"" . $_SERVER['PHP_SELF'] ."?" . SID . "&action=merge&wmc_id=".$this_id."\"><img src=\"../img/button_gray/wmc_merge.png\" title=\"merge WMC\" border=0></a></td>";
+ $display .= "<td><a href=\"" . $_SERVER['PHP_SELF'] ."?" . SID . "&action=append&wmc_id=".$this_id."\"><img src=\"../img/button_gray/wmc_append.png\" title=\"append WMC\" border=0></a></td>";
+ $display .= "<td><a href='../javascripts/mod_displayWmc.php?wmc_id=".$this_id."' target = '_blank'><img src=\"../img/button_gray/wmc_xml.png\" title=\"display WMC XML\" border=0></a></td>";
+
+ $display .= "<td><a href=\"" . $_SERVER['PHP_SELF'] ."?" . SID . "&action=delete&wmc_id=".$this_id."\"><img src=\"../img/button_gray/del.png\" title=\"delete this WMC\" border=0></a></td>";
+ $display .= "</tr>";
+ $cnt_list_wmcs++;
+ }
}else{
$display .= "<tr>There are no WMCs availiable</tr>";
}
@@ -94,7 +88,6 @@
return $display;
}
-
require_once("../classes/class_administration.php");
require_once("../classes/class_wmc.php");
$admin = new administration();
@@ -107,42 +100,38 @@
if ($_POST["del_wmc_id"] ) {
$result = $admin->deleteWmc($_POST["del_wmc_id"], $_SESSION["mb_user_id"]);
if (!$result) {
- echo "<script language='javascript'>";
- echo "alert('WMC could not be deleted!');";
- echo "</script>";
+ echo "<script language='javascript'>";
+ echo "alert('WMC could not be deleted!');";
+ echo "</script>";
}
}
-
echo mb_listWMCs($wmcList);
if ($_GET["wmc_id"] && $_GET["action"] == "delete" && in_array($_GET["wmc_id"], $wmcList)){
- echo "<script language='javascript'>";
- echo "value = confirm('Do you really want to delete this document?');";
- echo "if (value == true) {";
- echo "document.delete_wmc.del_wmc_id.value = '" . $_GET["wmc_id"] . "';";
- echo "document.delete_wmc.submit();";
- echo "}";
- echo "</script>";
+ echo "<script language='javascript'>";
+ echo "value = confirm('Do you really want to delete this document?');";
+ echo "if (value == true) {";
+ echo "document.delete_wmc.del_wmc_id.value = '" . $_GET["wmc_id"] . "';";
+ echo "document.delete_wmc.submit();";
+ echo "}";
+ echo "</script>";
}
- if ($_GET["wmc_id"] && ($_GET["action"] == "append" || $_GET["action"] == "merge" || $_GET["action"] == "load") && in_array($_GET["wmc_id"], $wmcList)){
-
+if ($_GET["wmc_id"] && ($_GET["action"] == "append" || $_GET["action"] == "merge" || $_GET["action"] == "load") && in_array($_GET["wmc_id"], $wmcList)){
$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 = '".$_SESSION['mb_user_gui']."'";
$res = db_query($sql);
$cnt = 0;
while($row = db_fetch_array($res)){
- $e_target = $row["e_target"];
- $e_require = $row["e_requires"];
- $cnt++;
+ $e_target = $row["e_target"];
+ $e_require = $row["e_requires"];
+ $cnt++;
}
$target = explode(",", $e_target);
-
$wmc = new wmc();
$wmc->createObjFromWMC($_GET["wmc_id"]);
-
if ($_GET["action"] == "append") {
$js = $wmc->createJsObjFromWMC("window.opener.", trim($target[1]));
}
@@ -154,51 +143,30 @@
$js .= "while(window.opener.mb_mapObj[index].wms.length > 0){window.opener.mb_mapObjremoveWMS(index,0);}";
$js .= "window.opener.deleteWmsObject();\n";
$js .= $wmc->createJsObjFromWMC("window.opener.", trim($target[1]));
- }
-
+ }
// display all JavaScript statements as debugging text
//echo $js;
echo "<script language='javascript'>";
- if($cnt > 1){ echo "alert('addWMS: ID not unique!');\n";}
- echo "var mod_addWMS_data = '".$e_require."';\n";
- echo "var mod_addWMS_target1 = '".trim($target[0])."';\n";
- echo "var mod_addWMS_target2 = '".trim($target[1])."';\n";
-
- echo $js;
-
- // adjust the size of the navFrame
- echo "window.opener.document.getElementById(mod_addWMS_target2).style.width = window.opener.mb_mapObj[ind].width;\n";
- echo "window.opener.document.getElementById(mod_addWMS_target2).style.height = window.opener.mb_mapObj[ind].height;\n";
-
-/*
- // restate layers
- echo "alert(changedWmsIds.length);\n";
- echo "for (var i=0; i<changedWmsIds.length; i++) {\n";
- echo "alert(changedWmsIds[i]);\n";
- echo "window.opener.mb_restateLayers(mod_addWMS_target2, changedWmsIds[i]);\n";
- echo "}\n";
-*/
- // execute functions that need to be run after a wms update
- echo "window.opener.mb_execloadWmsSubFunctions();\n";
-
- // alert: wmc has been loaded
- $title = $wmc->getTitle();
- if ($title) {$title = "'" . $title . "' ";}
- echo "alert(\"WMC " . $title . ": " . $_GET["action"] . " successful.\");\n";
-
- // reload the map
- echo "window.opener.setMapRequest(mod_addWMS_target2);\n";
-
- // close the 'load wmc' window
- echo "window.close();";
-
-
+ if($cnt > 1){ echo "alert('addWMS: ID not unique!');\n";}
+ echo "var mod_addWMS_data = '".$e_require."';\n";
+ echo "var mod_addWMS_target1 = '".trim($target[0])."';\n";
+ echo "var mod_addWMS_target2 = '".trim($target[1])."';\n";
+ echo $js;
+ // adjust the size of the navFrame
+ echo "window.opener.document.getElementById(mod_addWMS_target2).style.width = window.opener.mb_mapObj[ind].width;\n";
+ echo "window.opener.document.getElementById(mod_addWMS_target2).style.height = window.opener.mb_mapObj[ind].height;\n";
+ // execute functions that need to be run after a wms update
+ echo "window.opener.mb_execloadWmsSubFunctions();\n";
+ // alert: wmc has been loaded
+ $title = $wmc->getTitle();
+ if ($title) {$title = "'" . $title . "' ";}
+ echo "alert(\"WMC " . $title . ": " . $_GET["action"] . " successful.\");\n";
+ // reload the map
+ echo "window.opener.setMapRequest(mod_addWMS_target2);\n";
+ // close the 'load wmc' window
+ echo "window.close();";
echo "</script>";
-
}
-
-
?>
-
</body>
</html>
Modified: trunk/mapbender/http/php/mb_validateInput.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mb_validateInput.php?view=diff&rev=129&p1=trunk/mapbender/http/php/mb_validateInput.php&p2=trunk/mapbender/http/php/mb_validateInput.php&r1=128&r2=129
==============================================================================
--- trunk/mapbender/http/php/mb_validateInput.php (original)
+++ trunk/mapbender/http/php/mb_validateInput.php 2006-04-23 09:55:05+0000
@@ -1,6 +1,6 @@
<?php
-# $Id: mb_validateInput.php,v 1.3 2005/09/13 14:48:59 c_baudson Exp $
-# $Header: /cvsroot/mapbender/mapbender/http/php/mb_validateInput.php,v 1.3 2005/09/13 14:48:59 c_baudson Exp $
+# $Id$
+#
# Copyright (C) 2002 CCGIS
#
# This program is free software; you can redistribute it and/or modify
@@ -18,18 +18,18 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
function mb_validateInput($text){
- $match = array(
- 0 => "/drop/i",
- 1 => "/--/"
- );
- for($i=0; $i<count($match);$i++){
- if( preg_match($match[$i], $text) == true){
- return null;
- exit;
- }
- else{
- return $text;
- }
- }
-}
+ $match = array(
+ 0 => "/drop/i",
+ 1 => "/--/"
+ );
+ for($i=0; $i<count($match);$i++){
+ if( preg_match($match[$i], $text) == true){
+ return null;
+ exit;
+ }
+ else{
+ return $text;
+ }
+ }
+}
?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mb_validateSession.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mb_validateSession.php?view=diff&rev=129&p1=trunk/mapbender/http/php/mb_validateSession.php&p2=trunk/mapbender/http/php/mb_validateSession.php&r1=128&r2=129
==============================================================================
--- trunk/mapbender/http/php/mb_validateSession.php (original)
+++ trunk/mapbender/http/php/mb_validateSession.php 2006-04-23 09:55:05+0000
@@ -1,6 +1,6 @@
<?php
-# $Id: mb_validateSession.php,v 1.4 2005/09/13 19:36:58 uli_rothstein Exp $
-# $Header: /cvsroot/mapbender/mapbender/http/php/mb_validateSession.php,v 1.4 2005/09/13 19:36:58 uli_rothstein Exp $
+# $Id$
+#
# Copyright (C) 2002 CCGIS
#
# This program is free software; you can redistribute it and/or modify
@@ -17,19 +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.
-#ob_start();
session_start();
include_once("../../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();
-}
+ header("Location: ".LOGIN);
+ exit;
+ die();
+}
if(isset($_REQUEST["gui_id"])){
- if( !in_array($_REQUEST["gui_id"],$_SESSION["mb_user_guis"])){
- header("Location: ".LOGIN);
- exit;
- die();
- }
+ if( !in_array($_REQUEST["gui_id"],$_SESSION["mb_user_guis"])){
+ header("Location: ".LOGIN);
+ exit;
+ die();
+ }
}
?>
\ No newline at end of file
Modified: trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php?view=diff&rev=129&p1=trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php&p2=trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php&r1=128&r2=129
==============================================================================
--- trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php (original)
+++ trunk/mapbender/http/php/mod_addWmsFromFeatureInfo.php 2006-04-23 09:55:05+0000
@@ -1,6 +1,6 @@
<?php
-# $Id: mod_evalArea.php,v 1.13 2006/03/20 11:47:37 astrid_emde Exp $
-# $Header: /cvsroot/mapbender/mapbender/http/php/mod_evalArea.php,v 1.13 2006/03/20 11:47:37 astrid_emde Exp $
+# $Id$
+#
# Copyright (C) 2002 CCGIS
#
# This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,7 @@
# 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");
require_once("../php/mb_validateSession.php");
require_once("../../conf/mapbender.conf");
@@ -27,54 +28,44 @@
include('../include/dyn_js.php');
$sql = "SELECT e_src, e_target FROM gui_element WHERE e_id = '" . $e_id_css . "' 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 = explode(",",$row["e_target"]);
- $cnt++;
- }
- if($cnt > 1){ echo "alert('digitize_button: ID not unique!');";}
- echo "var mod_target = '".$e_target[0]."';";
-
+$res = db_query($sql);
+$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) {
mb_registerloadWmsSubFunctions("addWmsFromInfo_pos()");
var mywms = pointer_name;
if(mywms.indexOf("?") > -1){pointer_name += "&";}
if(mywms.indexOf("?") == -1){pointer_name += "?";}
-
- if (version == '1.0.0')
- {
+ if (version == '1.0.0'){
var cap = pointer_name + "REQUEST=capabilities&WMTVER=1.0.0";
var load = cap;
}
- else if (version == '1.1.0')
- {
+ else if (version == '1.1.0'){
var cap = pointer_name + "REQUEST=GetCapabilities&SERVICE=WMS&VERSION=1.1.0";
var load = cap;
}
- else if (version == '1.1.1')
- {
+ else if (version == '1.1.1'){
var cap = pointer_name + "REQUEST=GetCapabilities&SERVICE=WMS&VERSION=1.1.1";
var load = cap;
}
-
-
- if(load)
- {
+ if(load){
//if the mapfile WMS ONLINE RESOURCE is set relative, without any host
if(load.charAt(0) == '/' && load.charAt(1) == 'c') {
mod_addWMS_load('http://localhost' + load);
- }
- else {
+ }
+ else{
mod_addWMS_load(load);
- }
+ }
}
}
function addWmsFromInfo_pos(){
mb_wmsMoveByIndex(getMapObjIndexByName(mod_target), mb_mapObj[getMapObjIndexByName(mod_target)].wms.length-1, mod_addWmsFromFeatureInfo_position);
mb_removeFunctionFromArray("mb_loadWmsSubFunctions", "addWmsFromInfo_pos()");
-}
-
-
+}
\ No newline at end of file
More information about the Mapbender_commits
mailing list