Module: nagvis Branch: master Commit: 2b8d3fd778b8ce2cb16e999610b5aa0670e1663e URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=2b8d3fd778b8ce2cb16e999610b5aa0670e1663e
Author: Lars Michelsen <[email protected]> Date: Sat Aug 14 23:40:20 2010 +0200 #344 Applied patch from tonyyarusso: Simplifying match regexes - Thanks for the patch --- share/server/core/defines/matches.php | 58 ++++++++++++++++---------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/share/server/core/defines/matches.php b/share/server/core/defines/matches.php index cbda081..462b907 100644 --- a/share/server/core/defines/matches.php +++ b/share/server/core/defines/matches.php @@ -28,37 +28,37 @@ define('MATCH_ALL', '/^.*$/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', '/^[[:print:]\pL]+$/u'); +define('MATCH_STRING_EMPTY', '/^[[:print:]\pL]*$/u'); +define('MATCH_STRING_NO_SPACE', '/^[[:graph:]\pL]+$/u'); +define('MATCH_STRING_NO_SPACE_EMPTY', '/^[[:graph:]\pL]*$/u'); -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_PATH', '/^[[:alnum:][:blank:]_.\/\\-]+$/'); +define('MATCH_STRING_URL', '/^[[:alnum:][:blank:]\:+\[\]()=%?&_,....@=\/\\-]+$/'); +define('MATCH_STRING_URL_EMPTY', '/^[[:alnum:][:blank:]\:+\[\]()=%?&_,....@=\/\\-]*$/'); +define('MATCH_GADGET_OPT', '/^[[:alnum:][:blank:]\:+\[\]()_.,&?...@=\/\\%-]+$/'); +define('MATCH_STRING_STYLE', '/^[[:alnum:]\:;+%-]*$/'); -define('MATCH_INTEGER', '/^[0-9]+$/'); -define('MATCH_INTEGER_EMPTY', '/^[0-9]*$/'); -define('MATCH_FLOAT', '/^[0-9]+[\.\,]*[0-9]*$/'); +define('MATCH_INTEGER', '/^[[:digit:]]+$/'); +define('MATCH_INTEGER_EMPTY', '/^[[:digit:]]*$/'); +define('MATCH_FLOAT', '/^[[:digit:]]+[.,]*[[:digit:]]*$/'); define('MATCH_BOOLEAN', '/^(?:1|0)$/i'); define('MATCH_BOOLEAN_EMPTY', '/^(?:1|0)*$/i'); -define('MATCH_COLOR', '/^(#?[0-9a-f]{3,6}|transparent)$/i'); +define('MATCH_COLOR', '/^(#?[[:xdigit:]]{3,6}|transparent)$/i'); define('MATCH_OBJECTTYPE', '/^(?:global|host|service|hostgroup|servicegroup|map|textbox|shape|line|template)$/i'); define('MATCH_PNGFILE', '/^([^\s]+)\.png$/i'); define('MATCH_PNG_GIF_JPG_FILE', '/^([^\s]+)\.(png|gif|jpg)$/i'); -define('MATCH_PNG_GIF_JPG_FILE_OR_URL_NONE', '/^((.+)\.(png|gif|jpg)|\[[0-9a-z\s\:\+\[\]\(\)\=\%\?\&\_\.\-...@\=\/\\\]+\]|none)$/i'); -define('MATCH_PNG_GIF_JPG_FILE_OR_URL', '/^((.+)\.(png|gif|jpg)|\[[0-9a-z\s\:\+\[\]\(\)\=\%\?\&\_\.\-...@\=\/\\\]+\])$/i'); +define('MATCH_PNG_GIF_JPG_FILE_OR_URL_NONE', '/^((.+)\.(png|gif|jpg)|\[[[:alnum:][:blank:]\:+\[\]()=%?&_...@=\/\\-]+\]|none)$/i'); +define('MATCH_PNG_GIF_JPG_FILE_OR_URL', '/^((.+)\.(png|gif|jpg)|\[[[:alnum:][:blank:]\:+\[\]()=%?&_...@=\/\\-]+\])$/i'); define('MATCH_ROTATION_STEP_TYPES_EMPTY', '/^(?:map|automap|url)?$/'); -define('MATCH_LANGUAGE_EMPTY', '/^[a-zA-Z0-9\-_]*$/'); +define('MATCH_LANGUAGE_EMPTY', '/^[[:alnum:]_-]*$/'); -define('MATCH_MAP_NAME', '/^[0-9A-Za-z_\-]+$/'); -define('MATCH_MAP_NAME_EMPTY', '/^[0-9A-Za-z_\-]*$/'); -define('MATCH_ROTATION_NAME', '/^[0-9A-Za-z_\-]+$/'); -define('MATCH_ROTATION_NAME_EMPTY', '/^[0-9A-Za-z_\-]*$/'); -define('MATCH_BACKGROUND_NAME', '/^[0-9A-Za-z_\-]+$/'); +define('MATCH_MAP_NAME', '/^[[:alnum:]_-]+$/'); +define('MATCH_MAP_NAME_EMPTY', '/^[[:alnum:]_-]*$/'); +define('MATCH_ROTATION_NAME', '/^[[:alnum:]_-]+$/'); +define('MATCH_ROTATION_NAME_EMPTY', '/^[[:alnum:]_-]*$/'); +define('MATCH_BACKGROUND_NAME', '/^[[:alnum:]_-]+$/'); define('MATCH_VIEW_TYPE', '/^(?:icon|line)$/i'); define('MATCH_VIEW_TYPE_SERVICE', '/^(?:icon|line|gadget)$/i'); define('MATCH_VIEW_TYPE_SERVICE_EMPTY', '/^(?:icon|line|gadget)*$/i'); @@ -67,10 +67,10 @@ define('MATCH_OBJECT_TYPES', '/^(host|service|hostgroup|servicegroup|map|automap define('MATCH_AUTOMAP_RENDER_MODE', '/^(directed|undirected|radial|circular|undirected2)?$/'); define('MATCH_LINE_TYPE', '/^(10|11|12|13|14)?$/'); define('MATCH_LINE_ARROW', '/^(none|forward|back|both)?$/'); -define('MATCH_USER_NAME', '/^[0-9a-za-z_\-...@\s]+$/'); -define('MATCH_ROLE_NAME', '/^[0-9a-za-z_\-...@\s]+$/'); +define('MATCH_USER_NAME', '/^[[:alnum:][:space:]...@-]+$/'); +define('MATCH_ROLE_NAME', '/^[[:alnum:][:space:]...@-]+$/'); -define('MATCH_URI_PART', '/^[a-zA-Z0-9\-_]*$/'); +define('MATCH_URI_PART', '/^[[:alnum:]_-]*$/'); define('MATCH_CFG_FILE', '/^(.+)\.cfg$/i'); define('MATCH_MP3_FILE', '/^(.+)\.mp3$/i'); @@ -78,12 +78,12 @@ define('MATCH_HEADER_TEMPLATE_FILE', '/^(.+)\.header\.html$/i'); define('MATCH_HOVER_TEMPLATE_FILE', '/^(.+)\.hover\.html$/i'); define('MATCH_CONTEXT_TEMPLATE_FILE', '/^(.+)\.context\.html$/i'); define('MATCH_PHP_FILE', '/^(.+\.php)$/i'); -define('MATCH_INTEGER_PRESIGN', '/^[\+\-]?[0-9]+$/'); -define('MATCH_INTEGER_PRESIGN_EMPTY', '/^[\+\-]?[0-9]*$/'); +define('MATCH_INTEGER_PRESIGN', '/^[\+\-]?[[:digit:]]+$/'); +define('MATCH_INTEGER_PRESIGN_EMPTY', '/^[\+\-]?[[:digit:]]*$/'); define('MATCH_ORDER', '/^(?:asc|desc)$/'); -define('MATCH_TEXTBOX_WIDTH', '/^([0-9]+|auto)$/'); -define('MATCH_TEXTBOX_HEIGHT', '/^([0-9]+|auto)$/'); -define('MATCH_SOCKET', '/^(unix:[a-zA-Z0-9\-_\.\/]+|tcp:[a-zA-Z0-9\-\.]+:[0-9]{1,5})$/'); +define('MATCH_TEXTBOX_WIDTH', '/^([[:digit:]]+|auto)$/'); +define('MATCH_TEXTBOX_HEIGHT', '/^([[:digit:]]+|auto)$/'); +define('MATCH_SOCKET', '/^(unix:[[:alnum:]_.\/-]+|tcp:[[:alnum:].-]+:[[:digit:]]{1,5})$/'); define('MATCH_WUI_ADDMODIFY_DO', '/^(add|modify)$/'); ?>
------------------------------------------------------------------------------ This SF.net email is sponsored by Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
