- [DEV-137] minor fixes (Artem)

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

1 files changed, 7 insertions, 7 deletions

diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 5f795e3c..8f507699 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -453,20 +453,20 @@
 // 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','\-');
+	define('ZBX_EREG_MINUS_SYMB','\-');
 }
 else{
-	define('ZBX_EREG_SPACE_SYMB','-');
+	define('ZBX_EREG_MINUS_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_INTERNAL_NAMES', '([0-9a-zA-Z_.[:space:][.'.ZBX_EREG_MINUS_SYMB.'.]$]+)');
+	define('ZBX_EREG_KEY_NAME', '([0-9a-zA-Z_.,[.:.][:space:][.'.ZBX_EREG_MINUS_SYMB.'.]$]+)');
 	define('ZBX_EREG_PARAMS', '([[:print:]]+){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})');
+	define('ZBX_EREG_SIGN', '([&|><=+*/#[.'.ZBX_EREG_MINUS_SYMB.'.]])');
+	define('ZBX_EREG_NUMBER', '([[.'.ZBX_EREG_MINUS_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\_\.\$[.'.ZBX_EREG_SPACE_SYMB.'.]]+)');
+	define('ZBX_EREG_DNS_FORMAT', '([0-9a-zA-Z\_\.\$[.'.ZBX_EREG_MINUS_SYMB.'.]]+)');
 	define('ZBX_EREG_HOST_FORMAT', ZBX_EREG_INTERNAL_NAMES);
 	
 	define('ZBX_EREG_NODE_FORMAT', ZBX_EREG_INTERNAL_NAMES);