Skip to content
Permalink
Browse files

FIX: Allow "*" character to be part of backend dbpass values

Fixes #141
  • Loading branch information...
LarsMichelsen committed Jun 1, 2019
1 parent 8f81473 commit 6bbb6e5332884c1b7d988bf6bc8e1353c5d8cefe
Showing with 7 additions and 4 deletions.
  1. +3 −0 ChangeLog
  2. +4 −4 share/server/core/defines/matches.php
@@ -1,4 +1,7 @@
1.9.12
Core:
* FIX: Allow "*" character to be part of backend dbpass values

Frontend
* FIX: Fixed incompatibility with PHP 7.2 (count(STRING)) when creating roles

@@ -30,10 +30,10 @@
define('MATCH_REGEX', '/^.*$/i');
// These regex allow unicode matching
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', '/^[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_CONDITION', '/^[0-9a-zа-яё\p{L}\s_\-~=]*$/iu');
define('MATCH_STRING_PATH', '/^[0-9a-z\s_.\-\/\\\]+$/i');

0 comments on commit 6bbb6e5

Please sign in to comment.
You can’t perform that action at this time.