aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop/regex.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:35 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:35 +0100
commitbae824e818fb30260385ed63e6fbea2779a3d19a (patch)
treee5830d6c6ff9eb5ca7903759d4d654289adaeccf /phpBB/develop/regex.php
parent517f25353246f06eec7d1fdef90a04119a45bbbf (diff)
parent19c923cf1bb21bf5fa13b18c0f481c0cf05216e7 (diff)
downloadforums-bae824e818fb30260385ed63e6fbea2779a3d19a.tar
forums-bae824e818fb30260385ed63e6fbea2779a3d19a.tar.gz
forums-bae824e818fb30260385ed63e6fbea2779a3d19a.tar.bz2
forums-bae824e818fb30260385ed63e6fbea2779a3d19a.tar.xz
forums-bae824e818fb30260385ed63e6fbea2779a3d19a.zip
Merge commit 'release-3.0-RC1'
Diffstat (limited to 'phpBB/develop/regex.php')
-rw-r--r--phpBB/develop/regex.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php
index 7abecc9650..4498204b4a 100644
--- a/phpBB/develop/regex.php
+++ b/phpBB/develop/regex.php
@@ -1,4 +1,13 @@
<?php
+//
+// Security message:
+//
+// This script is potentially dangerous.
+// Remove or comment the next line (die(".... ) to enable this script.
+// Do NOT FORGET to either remove this script or disable it after you have used it.
+//
+die("Please read the first lines of this script for instructions on how to enable it");
+
// IP regular expressions
@@ -46,7 +55,7 @@ $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 "|" and no "@" (included instead of userinfo
+$reg_name = "(?:[$unreserved$sub_delims:@|]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" and no ":" (included instead of userinfo)
//$userinfo = "(?:(?:[$unreserved$sub_delims:]+|$pct_encoded))*";
$ipv4_simple = '[0-9.]+';
$ipv6_simple = '\[[a-z0-9.]+:[a-z0-9.]+:[a-z0-9.:]+\]';