[Mapbender-commits] r10385 - in trunk/mapbender/http: javascripts plugins

[svn_mapbender at osgeo.org]

Author: hollsandre
Date: 2020-01-13 22:34:52 -0800 (Mon, 13 Jan 2020)
New Revision: 10385

Modified:
   trunk/mapbender/http/javascripts/mod_savewmc.js
   trunk/mapbender/http/plugins/kmlTree.php
Log:
changed regex


Modified: trunk/mapbender/http/javascripts/mod_savewmc.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_savewmc.js	2020-01-13 13:38:44 UTC (rev 10384)
+++ trunk/mapbender/http/javascripts/mod_savewmc.js	2020-01-14 06:34:52 UTC (rev 10385)
@@ -362,8 +362,8 @@
 			attributes.isoTopicCat = isoTopicCat;
 
 			if(attributes.title != ""){
-				if(!attributes.title.match(/^[a-zA-Z0-9äöüÄÖÜß_\- \"§&()?:,=/\s\\r\\n\\t]+$/)){
-                               		alert("Allowed characters for title are: A-Z, a-z, 0-9, -, _, äA, öO, üU, ß, \", , , =, /, &, §, (), : ");
+				if(!attributes.title.match(/^[a-zA-Z0-9äöüÄÖÜß_\- \"]+$/)){
+                               		alert("Allowed characters for title are: A-Z, a-z, 0-9, -, _, äA, öO, üU, ß, \"");
                                		return;
                         	}
 			}else{
@@ -372,8 +372,8 @@
 			}
 
 			if(attributes.abstract != ""){
-				if(!attributes.abstract.match(/^[a-zA-Z0-9äöüÄÖÜß_\- \"§&()?:,=/\s\\r\\n\\t]+$/)){
-                               		alert("Allowed characters for abstract are: A-Z, a-z, 0-9, -, _, äA, öO, üU, ß, \", , , =, /, &, §, (), : ");
+				if(!attributes.abstract.match(/^[a-zA-Z0-9äöüÄÖÜß_\- \"§&()?:,=./\s\\r\\n\\t]+$/)){
+                               		alert("Allowed characters for abstract are: A-Z, a-z, 0-9, -, _, äA, öO, üU, ß, \", , , =, /, &, §, (), : , .");
                                		return;
 				}
 			}
@@ -380,8 +380,8 @@
 
 
 			if(attributes.keywords != ""){
-				if(!attributes.keywords.match(/^[a-zA-Z0-9äöüÄÖÜß_\- \"§&()?:,=/\s\\r\\n\\t]+$/)){
-                               		alert("Allowed characters for keywords are: A-Z, a-z, 0-9, -, _, äA, öO, üU, ß, \", , , =, /, &, §, (), : ");
+				if(!attributes.keywords.match(/^[a-zA-Z0-9äöüÄÖÜß_\- \"]+$/)){
+                               		alert("Allowed characters for keywords are: A-Z, a-z, 0-9, -, _, äA, öO, üU, ß, \"");
                                		return;
 				}
 			}

Modified: trunk/mapbender/http/plugins/kmlTree.php
===================================================================
--- trunk/mapbender/http/plugins/kmlTree.php	2020-01-13 13:38:44 UTC (rev 10384)
+++ trunk/mapbender/http/plugins/kmlTree.php	2020-01-14 06:34:52 UTC (rev 10385)
@@ -569,8 +569,8 @@
                 var version = 'v1'
                 if (title == '') {
                     return;
-                } else if (!title.match(/^[a-zA-Z0-9äöüÄÖÜß_\- \"§&()?:,=/\s\\r\\n\\t]+$/)){
-			alert("Allowed characters for title are: A-Z, a-z, 0-9, -, _, äA, öO, üU, ß, \", , , =, /, &, §, (), : ");
+                } else if (!title.match(/^[a-zA-Z0-9äöüÄÖÜß_\- .\"]+$/)){
+			alert("Allowed characters for title are: A-Z, a-z, 0-9, -, _, äA, öO, üU, ß, \"");
 			return;
 		}
                 kml.addLayer(title, {