From 8608cea5c8dc07444d17d967d439ede0d7d4f97a Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 22 Jan 2008 19:16:52 +0000
Subject: test commit on svn

git-svn-id: file:///svn/phpbb/trunk@8328 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/develop/regex.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/develop/regex.php')

diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php
index 4498204b4a..049fc28755 100644
--- a/phpBB/develop/regex.php
+++ b/phpBB/develop/regex.php
@@ -8,7 +8,6 @@
 //
 die("Please read the first lines of this script for instructions on how to enable it");
 
-
 // IP regular expressions
 
 $dec_octet = '(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])';
@@ -80,4 +79,4 @@ echo 'www.URL: ' . $www_url . "<br />\n";
 $relative_url = "$segment$path_abempty(?:\?$query)?(?:\#$fragment)?";
 echo 'relative URL: ' . $relative_url . "<br />\n";
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From dbcf8a6f31b6d4597f23317c4a7e3204b1ccd852 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 22 Jan 2008 19:38:55 +0000
Subject: poor file being commited without reason

git-svn-id: file:///svn/phpbb/trunk@8330 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/develop/regex.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/develop/regex.php')

diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php
index 049fc28755..9d2d48f653 100644
--- a/phpBB/develop/regex.php
+++ b/phpBB/develop/regex.php
@@ -8,6 +8,7 @@
 //
 die("Please read the first lines of this script for instructions on how to enable it");
 
+
 // IP regular expressions
 
 $dec_octet = '(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])';
-- 
cgit v1.2.1


From bf8ac19eaa8d74f9dfd6d597190f5664e7339382 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 4 Oct 2009 18:13:59 +0000
Subject: Move trunk/phpBB to old_trunk/phpBB

git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/develop/regex.php | 83 -------------------------------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 phpBB/develop/regex.php

(limited to 'phpBB/develop/regex.php')

diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php
deleted file mode 100644
index 9d2d48f653..0000000000
--- a/phpBB/develop/regex.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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
-
-$dec_octet = '(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])';
-$h16 = '[\dA-F]{1,4}';
-$ipv4 = "(?:$dec_octet\.){3}$dec_octet";
-$ls32 = "(?:$h16:$h16|$ipv4)";
-
-$ipv6_construct = array(
-	array(false,	'',		'{6}',	$ls32),
-	array(false,	'::',	'{5}',	$ls32),
-	array('',		':',	'{4}',	$ls32),
-	array('{1,2}',	':',	'{3}',	$ls32),
-	array('{1,3}',	':',	'{2}',	$ls32),
-	array('{1,4}',	':',	'',		$ls32),
-	array('{1,5}',	':',	false,	$ls32),
-	array('{1,6}',	':',	false,	$h16),
-	array('{1,7}',	':',	false,	'')
-);
-
-$ipv6 = '(?:';
-foreach ($ipv6_construct as $ip_type)
-{
-	$ipv6 .= '(?:';
-	if ($ip_type[0] !== false)
-	{
-		$ipv6 .= "(?:$h16:)" . $ip_type[0];
-	}
-	$ipv6 .= $ip_type[1];
-	if ($ip_type[2] !== false)
-	{
-		$ipv6 .= "(?:$h16:)" . $ip_type[2];
-	}
-	$ipv6 .= $ip_type[3] . ')|';
-}
-$ipv6 = substr($ipv6, 0, -1) . ')';
-
-echo 'IPv4: ' . $ipv4 . "<br />\nIPv6: " . $ipv6 . "<br />\n";
-
-// URL regular expressions
-
-$pct_encoded = "%[\dA-F]{2}";
-$unreserved = 'a-z0-9\-._~';
-$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 "@" 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.:]+\]';
-$host = "(?:$reg_name|$ipv4_simple|$ipv6_simple)";
-$port = '\d*';
-//$authority = "(?:$userinfo@)?$host(?::$port)?";
-$authority = "$host(?::$port)?";
-$segment = "$pchar*";
-$path_abempty = "(?:/$segment)*";
-$hier_part = "/{2}$authority$path_abempty";
-$query = "(?:[$unreserved$sub_delims:@/?|]+|$pct_encoded)*"; // pchar | "/" | "?", rfc: no "|"
-$fragment = $query;
-
-$url =  "$scheme:$hier_part(?:\?$query)?(?:\#$fragment)?";
-echo 'URL: ' . $url . "<br />\n";
-
-// no scheme, shortened authority, but host has to start with www.
-$www_url =  "www\.$reg_name(?::$port)?$path_abempty(?:\?$query)?(?:\#$fragment)?";
-echo 'www.URL: ' . $www_url . "<br />\n";
-
-// no schema and no authority
-$relative_url = "$segment$path_abempty(?:\?$query)?(?:\#$fragment)?";
-echo 'relative URL: ' . $relative_url . "<br />\n";
-
-?>
-- 
cgit v1.2.1


From 2e17e448deed073f8614bb555a8ef20c57291c2a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 4 Oct 2009 18:14:59 +0000
Subject: Copy 3.0.x branch to trunk

git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/develop/regex.php | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 phpBB/develop/regex.php

(limited to 'phpBB/develop/regex.php')

diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php
new file mode 100644
index 0000000000..4498204b4a
--- /dev/null
+++ b/phpBB/develop/regex.php
@@ -0,0 +1,83 @@
+<?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
+
+$dec_octet = '(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])';
+$h16 = '[\dA-F]{1,4}';
+$ipv4 = "(?:$dec_octet\.){3}$dec_octet";
+$ls32 = "(?:$h16:$h16|$ipv4)";
+
+$ipv6_construct = array(
+	array(false,	'',		'{6}',	$ls32),
+	array(false,	'::',	'{5}',	$ls32),
+	array('',		':',	'{4}',	$ls32),
+	array('{1,2}',	':',	'{3}',	$ls32),
+	array('{1,3}',	':',	'{2}',	$ls32),
+	array('{1,4}',	':',	'',		$ls32),
+	array('{1,5}',	':',	false,	$ls32),
+	array('{1,6}',	':',	false,	$h16),
+	array('{1,7}',	':',	false,	'')
+);
+
+$ipv6 = '(?:';
+foreach ($ipv6_construct as $ip_type)
+{
+	$ipv6 .= '(?:';
+	if ($ip_type[0] !== false)
+	{
+		$ipv6 .= "(?:$h16:)" . $ip_type[0];
+	}
+	$ipv6 .= $ip_type[1];
+	if ($ip_type[2] !== false)
+	{
+		$ipv6 .= "(?:$h16:)" . $ip_type[2];
+	}
+	$ipv6 .= $ip_type[3] . ')|';
+}
+$ipv6 = substr($ipv6, 0, -1) . ')';
+
+echo 'IPv4: ' . $ipv4 . "<br />\nIPv6: " . $ipv6 . "<br />\n";
+
+// URL regular expressions
+
+$pct_encoded = "%[\dA-F]{2}";
+$unreserved = 'a-z0-9\-._~';
+$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 "@" 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.:]+\]';
+$host = "(?:$reg_name|$ipv4_simple|$ipv6_simple)";
+$port = '\d*';
+//$authority = "(?:$userinfo@)?$host(?::$port)?";
+$authority = "$host(?::$port)?";
+$segment = "$pchar*";
+$path_abempty = "(?:/$segment)*";
+$hier_part = "/{2}$authority$path_abempty";
+$query = "(?:[$unreserved$sub_delims:@/?|]+|$pct_encoded)*"; // pchar | "/" | "?", rfc: no "|"
+$fragment = $query;
+
+$url =  "$scheme:$hier_part(?:\?$query)?(?:\#$fragment)?";
+echo 'URL: ' . $url . "<br />\n";
+
+// no scheme, shortened authority, but host has to start with www.
+$www_url =  "www\.$reg_name(?::$port)?$path_abempty(?:\?$query)?(?:\#$fragment)?";
+echo 'www.URL: ' . $www_url . "<br />\n";
+
+// no schema and no authority
+$relative_url = "$segment$path_abempty(?:\?$query)?(?:\#$fragment)?";
+echo 'relative URL: ' . $relative_url . "<br />\n";
+
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From af5b9a96409d788733fcb1ff367e0c7fb0583702 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 9 Nov 2010 08:59:25 +0100
Subject: [ticket/9556] Drop php closing tags, add trailing newline

Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
---
 phpBB/develop/regex.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/develop/regex.php')

diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php
index 8165ba1f21..46b6fff701 100644
--- a/phpBB/develop/regex.php
+++ b/phpBB/develop/regex.php
@@ -80,5 +80,3 @@ echo 'www.URL: ' . $www_url . "<br />\n";
 // no schema and no authority
 $relative_url = "$segment$path_abempty(?:\?$query)?(?:\#$fragment)?";
 echo 'relative URL: ' . $relative_url . "<br />\n";
-
-?>
\ No newline at end of file
-- 
cgit v1.2.1