- [DEV-102] added support of UTF8 for GUI (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5275 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 15 insertions, 5 deletions

diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 46cfd8d2..7328c677 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -434,15 +434,25 @@
 	define('RARR',	'⇒');
 
 	define('ZBX_EREG_SPACES', '([[:space:]]+){0,1}');
-	define('ZBX_EREG_INTERNAL_NAMES', '([0-9a-zA-Z_.[:space:][.-.]$]+)');
-	define('ZBX_EREG_KEY_NAME', '([0-9a-zA-Z_.,[.:.][:space:][.-.]$]+)');
+
+// affects multibyte strings [in mb_ereg char "-" must be backslashed]!!!
+if((ini_get('mbstring.func_overload') > 5)){
+	define('ZBX_MBSTRINGS_OVERLOADED',1);
+	define('ZBX_EREG_SPACE_SYMB','\-');
+}else{
+	define('ZBX_EREG_SPACE_SYMB','-');
+}
+	define('ZBX_EREG_INTERNAL_NAMES', '([0-9a-zA-Z_.[:space:][.'.ZBX_EREG_SPACE_SYMB.'.]$]+)');
+	define('ZBX_EREG_KEY_NAME', '([0-9a-zA-Z_.,[.:.][:space:][.'.ZBX_EREG_SPACE_SYMB.'.]$]+)');
 	define('ZBX_EREG_PARAMS', '([[:print:]]+){0,1}');
-	define('ZBX_EREG_SIGN', '([&|><=+*/#[.-.]])');
-	define('ZBX_EREG_NUMBER', '([[.-.]+]*[0-9]+[.]{0,1}[0-9]*[A-Z]{0,1})');
+	define('ZBX_EREG_SIGN', '([&|><=+*/#[.'.ZBX_EREG_SPACE_SYMB.'.]])');
+	define('ZBX_EREG_NUMBER', '([[.'.ZBX_EREG_SPACE_SYMB.'.]+]*[0-9]+[.]{0,1}[0-9]*[A-Z]{0,1})');
+//-------
 
 	/* Character '-' must be last in the list of symbols, otherwise it won't be accepted */
-	define('ZBX_EREG_DNS_FORMAT', '([0-9a-zA-Z\_\.\$[.-.]]+)');
+	define('ZBX_EREG_DNS_FORMAT', '([0-9a-zA-Z\_\.\$[.'.ZBX_EREG_SPACE_SYMB.'.]]+)');
 	define('ZBX_EREG_HOST_FORMAT', ZBX_EREG_INTERNAL_NAMES);
+	
 	define('ZBX_EREG_NODE_FORMAT', ZBX_EREG_INTERNAL_NAMES);
 	define('ZBX_EREG_ITEM_KEY_FORMAT', '('.ZBX_EREG_KEY_NAME.'(\['.ZBX_EREG_PARAMS.'\]){0,1})');
 	define('ZBX_KEY_ID', 1);