svn commit: r981 - trunk/mapbender/http/javascripts/mod_digitize_tab.php

Mon Dec 11 06:29:53 EST 2006

Author: christoph
Date: 2006-12-11 11:29:53+0000
New Revision: 981

Modified:
   trunk/mapbender/http/javascripts/mod_digitize_tab.php

Log:
* bugfix: alert outside of js tags
* default value for digitize conf file


Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/javascripts/mod_digitize_tab.php?view=diff&rev=981&p1=trunk/mapbender/http/javascripts/mod_digitize_tab.php&p2=trunk/mapbender/http/javascripts/mod_digitize_tab.php&r1=980&r2=981
==============================================================================

--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	(original)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2006-12-11 11:29:53+0000
@@ -38,6 +38,7 @@
 ?>
 <title>Digitize</title>
 <?php
+$digitize_conf_filename = "digitize.conf";
 include '../include/dyn_css.php';
 
 $con = db_connect($DBSERVER,$OWNER,$PW);
@@ -51,17 +52,18 @@
 	$e_src = $row["e_src"];
 	$e_target = explode(",",$row["e_target"]);
 	$cnt++;
-	}
-	if($cnt > 1){
-		echo "alert('digitize_button: ID not unique!');";
-	}
+}
+echo "<script type='text/javascript'><!--\n";
 
-	echo "<script language='JavaScript'>";
-	echo "var mod_digitize_target = '".$e_target[0]."';";
-	echo "var mod_digitize_frame = '".$e_target[1]."';";
-	require_once(dirname(__FILE__)."/mod_geometryArray.js");
-	require_once(dirname(__FILE__)."/mod_highlight.php");
-	require_once(dirname(__FILE__)."/../../conf/" . $digitize_conf_filename);
+if($cnt > 1){
+	echo "alert('digitize_button: ID not unique!');";
+}
+
+echo "var mod_digitize_target = '".$e_target[0]."';\n";
+echo "var mod_digitize_frame = '".$e_target[1]."';\n";
+require_once(dirname(__FILE__)."/mod_geometryArray.js");
+require_once(dirname(__FILE__)."/mod_highlight.php");
+require_once(dirname(__FILE__)."/../../conf/" . $digitize_conf_filename);
 ?>
 
 var wfsWindow;	
@@ -960,7 +962,7 @@
 		document.sendForm.submit();
 	}
 }
-
+// -->
 	</script>
 	</head>
 	<body onload="registerFunctions();displayButtons();">


