Author:   Lars Michelsen <[email protected]>
Date:     Tue Jan 29 21:38:41 2013 +0100
Committer:   Lars Michelsen <[email protected]>
Commit-Date: Tue Jan 29 21:38:41 2013 +0100

Allowing rgba(255,255,255,0.6) like definitions in e.g. label_style
attributes in map configuration files

---

 ChangeLog                             |    4 ++++
 share/server/core/defines/matches.php |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a360657..8f3f34b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 1.7.5
+Core:
+  * Allowing rgba(255,255,255,0.6) like definitions in e.g. label_style
+  attributes in map configuration files
+
 Frontend:
   * Hiding all kind of javascript error messages automatically on next
     successful processing
diff --git a/share/server/core/defines/matches.php 
b/share/server/core/defines/matches.php
index f765ca4..8823ef4 100644
--- a/share/server/core/defines/matches.php
+++ b/share/server/core/defines/matches.php
@@ -38,7 +38,7 @@ define('MATCH_STRING_PATH', '/^[0-9a-z\s\_\.\-\/\\\]+$/i');
 define('MATCH_STRING_URL', 
'/^[0-9a-z\s:;|\+\[\]\(\)\=\%\?\&\_\,\.\-\#\@\=\/\\\]+$/i');
 define('MATCH_STRING_URL_EMPTY', 
'/^[0-9a-z\s:;|\+\[\]\(\)\=\%\?\&\_\,\.\-\#\@\=\/\\\]*$/i');
 define('MATCH_GADGET_OPT', 
'/^[0-9a-z\s\:\+\[\]\(\)\_\.\,\-\&\?\!\#\@\=\/\\\%]+$/i');
-define('MATCH_STRING_STYLE', '/^[0-9a-z\:\;\-\+\%\#]*$/i');
+define('MATCH_STRING_STYLE', '/^[0-9a-z\:\;\-\+\%\#\(\)\,\.]*$/i');
 define('MATCH_COORDS',       '/^(?:(?:[0-9]+)|([a-z0-9]+(?:%[+-][0-9]+)?))$/');
 define('MATCH_COORDS_MULTI', 
'/^(?:(?:(?:[0-9]+)|([a-z0-9]+(?:%[+-][0-9]+)?))[\.\,]?)+$/');
 define('MATCH_COORDS_MULTI_EMPTY', 
'/^(?:(?:(?:[0-9]+)|([a-z0-9]+(?:%[+-][0-9]+)?))[\.\,]?)*$/');


------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins

Reply via email to