[Nagvis-checkins] SF.net Git: nagvis: Allowing more unicode signs in e.g. map aliases

[lars]

Author:   Lars Michelsen <l...@larsmichelsen.com>
Date:     Wed Aug 31 12:02:27 2011 +0200
Committer:   Lars Michelsen <l...@larsmichelsen.com>
Commit-Date: Wed Aug 31 12:02:27 2011 +0200

Allowing more unicode signs in e.g. map aliases

---

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

diff --git a/ChangeLog b/ChangeLog
index 56eac61..14f0c1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Core
   * Cleanup: Consolidated code of main handlers ajax_handler and frontend index
   * Cleanup: Recoded message class calls to exceptions
   * omd_install.sh can now be called from other directories
+  * Allowing more unicode signs in e.g. map aliases
 
 Frontend
   * Readded the "edit" action to the maps module. In this mode all object are
diff --git a/share/server/core/defines/matches.php 
b/share/server/core/defines/matches.php
index 162c9ba..c76a2b3 100644
--- a/share/server/core/defines/matches.php
+++ b/share/server/core/defines/matches.php
@@ -29,10 +29,10 @@ define('MATCH_ALL', '/^.*$/i');
 define('MATCH_REGEX', '/^.*$/i');
 
 // These regex allow unicode matching
-define('MATCH_STRING', 
'/^[0-9a-zа-яё\s\:\+\[\]\(\)\_\.\,\-\?\!\#\@\=\/\\\]+$/iu');
-define('MATCH_STRING_EMPTY', 
'/^[[0-9a-zа-яё\s\:\+\[\]\(\)\_\.\,\-\?\!\#\@\=\/\\\]*$/iu');
-define('MATCH_STRING_NO_SPACE', 
'/^[[0-9a-zа-яё\:\+\[\]\(\)\_\.\,\-\?\!\#\@\=\/\\\]+$/iu');
-define('MATCH_STRING_NO_SPACE_EMPTY', 
'/^[[0-9a-zа-яё\:\+\[\]\(\)\_\.\,\-\?\!\#\@\=\/\\\]*$/iu');
+define('MATCH_STRING', 
'/^[0-9a-zа-яё\p{L}\s\:\+\[\]\(\)\_\.\,\-\?\!\#\@\=\/\\\]+$/iu');
+define('MATCH_STRING_EMPTY', 
'/^[[0-9a-zа-яё\p{L}\s\:\+\[\]\(\)\_\.\,\-\?\!\#\@\=\/\\\]*$/iu');
+define('MATCH_STRING_NO_SPACE', 
'/^[[0-9a-zа-яё\p{L}\:\+\[\]\(\)\_\.\,\-\?\!\#\@\=\/\\\]+$/iu');
+define('MATCH_STRING_NO_SPACE_EMPTY', 
'/^[[0-9a-zа-яё\p{L}\:\+\[\]\(\)\_\.\,\-\?\!\#\@\=\/\\\]*$/iu');
 
 define('MATCH_STRING_PATH', '/^[0-9a-z\s\_\.\-\/\\\]+$/i');
 define('MATCH_STRING_URL', 
'/^[0-9a-z\s\:\+\[\]\(\)\=\%\?\&\_\,\.\-\#\@\=\/\\\]+$/i');



------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better 
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Nagvis-checkins mailing list
Nagvis-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins