diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-01-03 18:58:19 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-01-03 18:58:19 +0000 |
| commit | 17a27175fd769db449aef44a82d16747a440d452 (patch) | |
| tree | e21534f2f2f33ed2076271f09add84c197951aef /phpBB/develop/regex.php | |
| parent | 732ad23cd724e60df801a5cc32611e7d7706240d (diff) | |
| download | forums-17a27175fd769db449aef44a82d16747a440d452.tar forums-17a27175fd769db449aef44a82d16747a440d452.tar.gz forums-17a27175fd769db449aef44a82d16747a440d452.tar.bz2 forums-17a27175fd769db449aef44a82d16747a440d452.tar.xz forums-17a27175fd769db449aef44a82d16747a440d452.zip | |
- allow login with redirect parameter
- altered URL regular expression so it won't cause problem with long URLs - PCRE >:( [Bug #6720]
- moderator list on index should have coloured groups in bold as everywhere else too
- correctly handle password requirements in UCP [Bug #6692]
- added soft-hyphen to utf8_clean_string(), if you know any more evil characters (or whitespace characters that are not in ASCII range) then tell me about them (bug report) ;-)
git-svn-id: file:///svn/phpbb/trunk@6832 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/develop/regex.php')
| -rw-r--r-- | phpBB/develop/regex.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php index 2b736afec2..1719fe03e9 100644 --- a/phpBB/develop/regex.php +++ b/phpBB/develop/regex.php @@ -46,13 +46,14 @@ $sub_delims = '!$&\'()*+,;='; $pchar = "(?:[$unreserved$sub_delims:@|]+|$pct_encoded)"; // rfc: no "|" $scheme = '[a-z][a-z\d+\-.]*'; -$reg_name = "(?:[$unreserved$sub_delims|]+|$pct_encoded)+"; // rfc: * instead of + and no "|" -$userinfo = "(?:(?:[$unreserved$sub_delims:]+|$pct_encoded))*"; +$reg_name = "(?:[$unreserved$sub_delims|@]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" (included instead of userinfo +//$userinfo = "(?:(?:[$unreserved$sub_delims:]+|$pct_encoded))*"; $ipv4_simple = '[0-9.]+'; $ipv6_simple = '\[[a-z0-9.:]+\]'; $host = "(?:$reg_name|$ipv4_simple|$ipv6_simple)"; $port = '\d*'; -$authority = "(?:$userinfo@)?$host(?::$port)?"; +//$authority = "(?:$userinfo@)?$host(?::$port)?"; +$authority = "$host(?::$port)?"; $segment = "$pchar*"; $path_abempty = "(?:/$segment)*"; $hier_part = "/{2}$authority$path_abempty"; |