From c6c2a23ecb10b4b54e7e9b703d14e8c7cda6ad55 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 5 Mar 2011 22:20:23 +0100
Subject: [ticket/10042] GD CAPTCHA: Round offset to the next pixel.

PHPBB3-10042
---
 phpBB/includes/captcha/captcha_gd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 96e39af85b..7a3f4f46ab 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -77,7 +77,7 @@ class captcha
 		{
 			$denom = ($code_len - $i);
 			$denom = max(1.3, $denom);
-			$offset[$i] = mt_rand(0, (1.5 * $width_avail) / $denom);
+			$offset[$i] = mt_rand(0, (int) round((1.5 * $width_avail) / $denom));
 			$width_avail -= $offset[$i];
 		}
 
-- 
cgit v1.2.1


From 18daf6345f64e59f651c43a3150d9e139ac2a4cc Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 5 Mar 2011 22:21:45 +0100
Subject: [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.

PHPBB3-10042
---
 phpBB/includes/captcha/captcha_gd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 7a3f4f46ab..6d859a4ecc 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -77,7 +77,7 @@ class captcha
 		{
 			$denom = ($code_len - $i);
 			$denom = max(1.3, $denom);
-			$offset[$i] = mt_rand(0, (int) round((1.5 * $width_avail) / $denom));
+			$offset[$i] = phpbb_mt_rand(0, (int) round((1.5 * $width_avail) / $denom));
 			$width_avail -= $offset[$i];
 		}
 
-- 
cgit v1.2.1


From ca981b6d1819560f7722773796ac33407f18cde8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Tue, 10 May 2011 23:31:41 +0200
Subject: [ticket/10170] reCaptcha API has been moved.

The reCaptcha API has been moved from recaptcha.net to
google.com/recaptcha.

PHPBB3-10170
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index ea171dbe2c..f3bc1a859f 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -27,9 +27,9 @@ if (!class_exists('phpbb_default_captcha'))
 */
 class phpbb_recaptcha extends phpbb_default_captcha
 {
-	var $recaptcha_server = 'http://api.recaptcha.net';
-	var $recaptcha_server_secure = 'https://api-secure.recaptcha.net'; // class constants :(
-	var $recaptcha_verify_server = 'api-verify.recaptcha.net';
+	var $recaptcha_server = 'http://www.google.com/recaptcha/api';
+	var $recaptcha_server_secure = 'https://www.google.com/recaptcha/api'; // class constants :(
+	var $recaptcha_verify_server = 'http://www.google.com/recaptcha/api/verify';
 	var $challenge;
 	var $response;
 
-- 
cgit v1.2.1


From eded608a53b3882a7a42bddf6b1c9f479c2b0304 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 11 May 2011 03:23:31 +0200
Subject: [ticket/10170] Fix broken recaptcha verification host.

PHPBB3-10170
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index f3bc1a859f..0b0270f568 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -29,7 +29,12 @@ class phpbb_recaptcha extends phpbb_default_captcha
 {
 	var $recaptcha_server = 'http://www.google.com/recaptcha/api';
 	var $recaptcha_server_secure = 'https://www.google.com/recaptcha/api'; // class constants :(
-	var $recaptcha_verify_server = 'http://www.google.com/recaptcha/api/verify';
+
+	// We are opening a socket to port 80 of this host and send
+	// the POST request asking for verification to the path specified here.
+	var $recaptcha_verify_server = 'www.google.com';
+	var $recaptcha_verify_path = '/recaptcha/api/verify';
+
 	var $challenge;
 	var $response;
 
@@ -296,7 +301,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 			return $user->lang['RECAPTCHA_INCORRECT'];
 		}
 
-		$response = $this->_recaptcha_http_post($this->recaptcha_verify_server, '/verify',
+		$response = $this->_recaptcha_http_post($this->recaptcha_verify_server, $this->recaptcha_verify_path,
 			array(
 				'privatekey'	=> $config['recaptcha_privkey'],
 				'remoteip'		=> $user->ip,
-- 
cgit v1.2.1


From 8a5e3781d53e3df379c55166136abd6e71990af4 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 12 Jun 2011 01:25:15 +0200
Subject: [ticket/9892] Shorten the index names on the q&a captcha

PHPBB3-9892
---
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 49a64b9339..45f76bd676 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -319,7 +319,7 @@ class phpbb_captcha_qa
 					),
 					'PRIMARY_KEY'		=> 'question_id',
 					'KEYS'				=> array(
-						'lang_iso'			=> array('INDEX', 'lang_iso'),
+						'lang'			=> array('INDEX', 'lang_iso'),
 					),
 				),
 				CAPTCHA_ANSWERS_TABLE		=> array (
@@ -328,7 +328,7 @@ class phpbb_captcha_qa
 						'answer_text'	=> array('STEXT_UNI', ''),
 					),
 					'KEYS'				=> array(
-						'question_id'			=> array('INDEX', 'question_id'),
+						'qid'			=> array('INDEX', 'question_id'),
 					),
 				),
 				CAPTCHA_QA_CONFIRM_TABLE		=> array (
-- 
cgit v1.2.1


From 4bdad7125a34e121f7857c34480d0527c1925384 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 13 Jul 2011 11:32:38 +0200
Subject: [ticket/9608] Remove use of references in captcha and other places

References are not really needed in PHP due to copy-on-write. Since
PHP5, objects are always passed around as identifiers, which means they
are mutable. So it is no longer required to pass these by reference
either.

PHPBB3-9608
---
 phpBB/includes/captcha/captcha_factory.php                   | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php   | 4 ++--
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php | 4 ++--
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php   | 4 ++--
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php    | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index a3766f4054..c2ec8c5bda 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -26,7 +26,7 @@ class phpbb_captcha_factory
 	/**
 	* return an instance of class $name in file $name_plugin.php
 	*/
-	function &get_instance($name)
+	function get_instance($name)
 	{
 		global $phpbb_root_path, $phpEx;
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index add8c3959f..bb76a06371 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -50,9 +50,9 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		}
 	}
 
-	function &get_instance()
+	function get_instance()
 	{
-		$instance =& new phpbb_captcha_gd();
+		$instance = new phpbb_captcha_gd();
 		return $instance;
 	}
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 490a0d62ab..3e98c45d2c 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -40,9 +40,9 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 		}
 	}
 
-	function &get_instance()
+	function get_instance()
 	{
-		$instance =& new phpbb_captcha_nogd();
+		$instance = new phpbb_captcha_nogd();
 		return $instance;
 	}
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 3bc727da41..272c0cd4d2 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -99,9 +99,9 @@ class phpbb_captcha_qa
 	/**
 	*  API function
 	*/
-	function &get_instance()
+	function get_instance()
 	{
-		$instance =& new phpbb_captcha_qa();
+		$instance = new phpbb_captcha_qa();
 
 		return $instance;
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index c0db41d5a5..0c36456886 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -54,9 +54,9 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$this->response = request_var('recaptcha_response_field', '');
 	}
 
-	function &get_instance()
+	function get_instance()
 	{
-		$instance =& new phpbb_recaptcha();
+		$instance = new phpbb_recaptcha();
 		return $instance;
 	}
 
-- 
cgit v1.2.1


From 0bf6966c5228d446c4f0d3862619db0f619c7369 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 13 Jul 2011 19:20:16 +0200
Subject: [feature/request-class] Add server(), header() and is_ajax() to
 request

Extend the request class with helpers for reading server vars (server())
and HTTP request headers (header()). Refactor the existing code base
to make use of these helpers, make $_SERVER a deactivated super global.

Also introduce an is_ajax() method, which checks the X-Requested-With
header for the value 'XMLHttpRequest', which is sent by JavaScript
libraries, such as jQuery.

PHPBB3-9716
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index c0db41d5a5..2272b10841 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -41,7 +41,8 @@ class phpbb_recaptcha extends phpbb_default_captcha
 	// PHP4 Constructor
 	function phpbb_recaptcha()
 	{
-		$this->recaptcha_server = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? $this->recaptcha_server_secure : $this->recaptcha_server;
+		global $request;
+		$this->recaptcha_server = $request->server('HTTPS') == 'on' ? $this->recaptcha_server_secure : $this->recaptcha_server;
 	}
 
 	function init($type)
-- 
cgit v1.2.1


From f84460c710f528724fac68278361af7fe18e458c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 18 Aug 2011 22:25:17 +0200
Subject: [feature/request-class] Make use of the is_secure() method

PHPBB3-9716
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 2272b10841..9e677f8223 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -42,7 +42,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 	function phpbb_recaptcha()
 	{
 		global $request;
-		$this->recaptcha_server = $request->server('HTTPS') == 'on' ? $this->recaptcha_server_secure : $this->recaptcha_server;
+		$this->recaptcha_server = $request->is_secure() ? $this->recaptcha_server_secure : $this->recaptcha_server;
 	}
 
 	function init($type)
-- 
cgit v1.2.1


From 61df8a87d19c062f5284f06047c1a9093c664cdf Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 22 Aug 2011 03:51:03 -0400
Subject: [feature/extension-manager] Allow extensions to define captcha
 plugins.

The base class for captcha plugins has been renamed, but the old name continues
to exist as an empty subclass of it for backwards compatability.

PHPBB3-10323
---
 phpBB/includes/captcha/captcha_factory.php         | 43 +++++++++++-----------
 .../includes/captcha/plugins/captcha_abstract.php  |  9 ++++-
 2 files changed, 30 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index c2ec8c5bda..2779a23d34 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -59,38 +59,39 @@ class phpbb_captcha_factory
 	*/
 	function get_captcha_types()
 	{
-		global $phpbb_root_path, $phpEx;
+		global $phpbb_root_path, $phpEx, $phpbb_extension_manager;
 
 		$captchas = array(
 			'available'		=> array(),
 			'unavailable'	=> array(),
 		);
 
-		$dp = @opendir($phpbb_root_path . 'includes/captcha/plugins');
+		$finder = $phpbb_extension_manager->get_finder();
+		$captcha_plugin_classes = $finder
+			->directory('/captcha')
+			->suffix('_plugin')
+			->default_path('includes/captcha/plugins/')
+			->default_directory('')
+			->get_classes();
 
-		if ($dp)
+		foreach ($captcha_plugin_classes as $class)
 		{
-			while (($file = readdir($dp)) !== false)
+			// check if this class needs to be loaded in legacy mode
+			$old_class = preg_replace('/^phpbb_captcha_plugins_/', '', $class);
+			if (file_exists($phpbb_root_path . "includes/captcha/plugins/$old_class.$phpEx") && !class_exists($old_class))
 			{
-				if ((preg_match('#_plugin\.' . $phpEx . '$#', $file)))
-				{
-					$name = preg_replace('#^(.*?)_plugin\.' . $phpEx . '$#', '\1', $file);
-					if (!class_exists($name))
-					{
-						include($phpbb_root_path . "includes/captcha/plugins/$file");
-					}
+				include($phpbb_root_path . "includes/captcha/plugins/$old_class.$phpEx");
+				$class = preg_replace('/_plugin$/', '', $old_class);
+			}
 
-					if (call_user_func(array($name, 'is_available')))
-					{
-						$captchas['available'][$name] = call_user_func(array($name, 'get_name'));
-					}
-					else
-					{
-						$captchas['unavailable'][$name] = call_user_func(array($name, 'get_name'));
-					}
-				}
+			if (call_user_func(array($class, 'is_available')))
+			{
+				$captchas['available'][$class] = call_user_func(array($class, 'get_name'));
+			}
+			else
+			{
+				$captchas['unavailable'][$class] = call_user_func(array($class, 'get_name'));
 			}
-			closedir($dp);
 		}
 
 		return $captchas;
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index aea39b3123..07a0ea1279 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -22,7 +22,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package VC
 */
-class phpbb_default_captcha
+class phpbb_captcha_plugins_captcha_abstract
 {
 	var $confirm_id;
 	var $confirm_code;
@@ -364,3 +364,10 @@ class phpbb_default_captcha
 	}
 
 }
+
+/**
+* Old class name for legacy use. The new class name is auto loadable.
+*/
+class phpbb_default_captcha extends phpbb_captcha_plugins_captcha_abstract
+{
+}
-- 
cgit v1.2.1


From 0d296785b2364f894f34171d054341cc4979223f Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 18 Nov 2011 16:42:53 +0100
Subject: [feature/extension-manager] Rename default methods to core methods on
 finder.

There are now extension_ and core_ methods for all finder settings as well as
a generic method which overwrites both.

PHPBB3-10323
---
 phpBB/includes/captcha/captcha_factory.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index 2779a23d34..e039e92054 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -68,10 +68,9 @@ class phpbb_captcha_factory
 
 		$finder = $phpbb_extension_manager->get_finder();
 		$captcha_plugin_classes = $finder
-			->directory('/captcha')
+			->extension_directory('/captcha')
 			->suffix('_plugin')
-			->default_path('includes/captcha/plugins/')
-			->default_directory('')
+			->core_path('includes/captcha/plugins/')
 			->get_classes();
 
 		foreach ($captcha_plugin_classes as $class)
-- 
cgit v1.2.1


From 7a04c9048c110f0bd21ea3e9e869e17b408d640e Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 13:32:52 +0000
Subject: [ticket/9916] Updating header license and removing Version $Id$

PHPBB3-9916
---
 phpBB/includes/captcha/captcha_factory.php                      | 3 +--
 phpBB/includes/captcha/captcha_gd.php                           | 3 +--
 phpBB/includes/captcha/captcha_gd_wave.php                      | 3 +--
 phpBB/includes/captcha/captcha_non_gd.php                       | 3 +--
 phpBB/includes/captcha/plugins/captcha_abstract.php             | 3 +--
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php      | 3 +--
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 3 +--
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php    | 3 +--
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php      | 3 +--
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php       | 3 +--
 10 files changed, 10 insertions(+), 20 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index e039e92054..62fb90d3c5 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 5e61d6a47b..f58b590c4b 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/captcha/captcha_gd_wave.php b/phpBB/includes/captcha/captcha_gd_wave.php
index 503283d848..e19f54f777 100644
--- a/phpBB/includes/captcha/captcha_gd_wave.php
+++ b/phpBB/includes/captcha/captcha_gd_wave.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/captcha/captcha_non_gd.php b/phpBB/includes/captcha/captcha_non_gd.php
index 38ff276189..c2b97423e6 100644
--- a/phpBB/includes/captcha/captcha_non_gd.php
+++ b/phpBB/includes/captcha/captcha_non_gd.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index 07a0ea1279..7fd88feeb5 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2006, 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index bb76a06371..a63b0e448f 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2006, 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index 2aed332295..f523cae191 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2006, 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 3e98c45d2c..4a0418146d 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2006, 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 272c0cd4d2..e12ad00d25 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2006, 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 5cfb5df8fc..0ea8b9c6e7 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package VC
-* @version $Id$
 * @copyright (c) 2006, 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-- 
cgit v1.2.1


From c8da69d9c26e0017f13abb2c954e52c4cd593fdc Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 5 Apr 2012 14:14:40 +0100
Subject: [ticket/10575] Fixing non-static access to static functions
 get_instance

These changes should solve the strict standards error about accessing
the non-static get_instance() in a non-static way.
For that, I changed the get_instance methods to static methods.

PHPBB3-10575
---
 phpBB/includes/captcha/captcha_factory.php                      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php    | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index 62fb90d3c5..602c8d130a 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -25,7 +25,7 @@ class phpbb_captcha_factory
 	/**
 	* return an instance of class $name in file $name_plugin.php
 	*/
-	function get_instance($name)
+	static function get_instance($name)
 	{
 		global $phpbb_root_path, $phpEx;
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index a63b0e448f..5b3adee047 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -49,7 +49,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		}
 	}
 
-	function get_instance()
+	static function get_instance()
 	{
 		$instance = new phpbb_captcha_gd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index f523cae191..1d5922a5ca 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 		}
 	}
 
-	function get_instance()
+	static function get_instance()
 	{
 		return new phpbb_captcha_gd_wave();
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 4a0418146d..8814a3cfdd 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 		}
 	}
 
-	function get_instance()
+	static function get_instance()
 	{
 		$instance = new phpbb_captcha_nogd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index e12ad00d25..412b332c3a 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -98,7 +98,7 @@ class phpbb_captcha_qa
 	/**
 	*  API function
 	*/
-	function get_instance()
+	static function get_instance()
 	{
 		$instance = new phpbb_captcha_qa();
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 0ea8b9c6e7..67dc2f3747 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -54,7 +54,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$this->response = request_var('recaptcha_response_field', '');
 	}
 
-	function get_instance()
+	static function get_instance()
 	{
 		$instance = new phpbb_recaptcha();
 		return $instance;
-- 
cgit v1.2.1


From 2bf1c4eb32f1e668a215f1dabb42fe88e8a9cd11 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 5 Apr 2012 14:16:56 +0100
Subject: [ticket/10575] Adding public visibility to the methods.

Added public visibility to the methods

PHPBB3-10575
---
 phpBB/includes/captcha/captcha_factory.php                      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php    | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index 602c8d130a..d57b333c69 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -25,7 +25,7 @@ class phpbb_captcha_factory
 	/**
 	* return an instance of class $name in file $name_plugin.php
 	*/
-	static function get_instance($name)
+	public static function get_instance($name)
 	{
 		global $phpbb_root_path, $phpEx;
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index 5b3adee047..6c1f3bf00b 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -49,7 +49,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		}
 	}
 
-	static function get_instance()
+	public static function get_instance()
 	{
 		$instance = new phpbb_captcha_gd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index 1d5922a5ca..a5588178bb 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 		}
 	}
 
-	static function get_instance()
+	public static function get_instance()
 	{
 		return new phpbb_captcha_gd_wave();
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 8814a3cfdd..96f13fbe1b 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 		}
 	}
 
-	static function get_instance()
+	public static function get_instance()
 	{
 		$instance = new phpbb_captcha_nogd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 412b332c3a..99813189d7 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -98,7 +98,7 @@ class phpbb_captcha_qa
 	/**
 	*  API function
 	*/
-	static function get_instance()
+	public static function get_instance()
 	{
 		$instance = new phpbb_captcha_qa();
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 67dc2f3747..70c24a8c30 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -54,7 +54,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$this->response = request_var('recaptcha_response_field', '');
 	}
 
-	static function get_instance()
+	public static function get_instance()
 	{
 		$instance = new phpbb_recaptcha();
 		return $instance;
-- 
cgit v1.2.1


From 14a6e5ec73779d18cc6f09cb3b1cb4fd08f024f8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 29 Oct 2012 09:34:51 -0400
Subject: [ticket/11157] Fix remaining captcha spam.

PHPBB3-11157
---
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php     |  4 ++--
 .../includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php  |  4 ++--
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php   |  4 ++--
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php     | 10 +++++-----
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php      |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index 6c1f3bf00b..e4503cabe4 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -55,7 +55,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		return $instance;
 	}
 
-	function is_available()
+	public static function is_available()
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -80,7 +80,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		return true;
 	}
 
-	function get_name()
+	public static function get_name()
 	{
 		return 'CAPTCHA_GD';
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index a5588178bb..06ad9dbbf6 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -44,7 +44,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 		return new phpbb_captcha_gd_wave();
 	}
 
-	function is_available()
+	public static function is_available()
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -61,7 +61,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 		return can_load_dll('gd');
 	}
 
-	function get_name()
+	public static function get_name()
 	{
 		return 'CAPTCHA_GD_3D';
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 96f13fbe1b..563dbf6660 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -45,12 +45,12 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 		return $instance;
 	}
 
-	function is_available()
+	public static function is_available()
 	{
 		return true;
 	}
 
-	function get_name()
+	public static function get_name()
 	{
 		return 'CAPTCHA_NO_GD';
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 99813189d7..c005d478a2 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -108,7 +108,7 @@ class phpbb_captcha_qa
 	/**
 	* See if the captcha has created its tables.
 	*/
-	function is_installed()
+	public static function is_installed()
 	{
 		global $db, $phpbb_root_path, $phpEx;
 
@@ -124,14 +124,14 @@ class phpbb_captcha_qa
 	/**
 	*  API function - for the captcha to be available, it must have installed itself and there has to be at least one question in the board's default lang
 	*/
-	function is_available()
+	public static function is_available()
 	{
 		global $config, $db, $phpbb_root_path, $phpEx, $user;
 
 		// load language file for pretty display in the ACP dropdown
 		$user->add_lang('captcha_qa');
 
-		if (!phpbb_captcha_qa::is_installed())
+		if (!self::is_installed())
 		{
 			return false;
 		}
@@ -157,7 +157,7 @@ class phpbb_captcha_qa
 	/**
 	*  API function
 	*/
-	function get_name()
+	public static function get_name()
 	{
 		return 'CAPTCHA_QA';
 	}
@@ -612,7 +612,7 @@ class phpbb_captcha_qa
 		$user->add_lang('acp/board');
 		$user->add_lang('captcha_qa');
 
-		if (!$this->is_installed())
+		if (!self::is_installed())
 		{
 			$this->install();
 		}
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 70c24a8c30..55bebf9443 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -60,7 +60,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		return $instance;
 	}
 
-	function is_available()
+	public static function is_available()
 	{
 		global $config, $user;
 		$user->add_lang('captcha_recaptcha');
@@ -75,7 +75,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		return true;
 	}
 
-	function get_name()
+	public static function get_name()
 	{
 		return 'CAPTCHA_RECAPTCHA';
 	}
@@ -163,7 +163,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 				'RECAPTCHA_SERVER'			=> $this->recaptcha_server,
 				'RECAPTCHA_PUBKEY'			=> isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
 				'RECAPTCHA_ERRORGET'		=> '',
-				'S_RECAPTCHA_AVAILABLE'		=> $this->is_available(),
+				'S_RECAPTCHA_AVAILABLE'		=> self::is_available(),
 				'S_CONFIRM_CODE'			=> true,
 				'S_TYPE'					=> $this->type,
 				'L_CONFIRM_EXPLAIN'			=> $explain,
-- 
cgit v1.2.1


From d602f13d7f6ba7ee67a5286befd8afd9f8f0cd15 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 29 Oct 2012 14:54:54 -0400
Subject: [ticket/11157] static public is the currently approved order.

PHPBB3-11157
---
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php      | 4 ++--
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 4 ++--
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php    | 4 ++--
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php      | 6 +++---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php       | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index e4503cabe4..5328e64a86 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -55,7 +55,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		return $instance;
 	}
 
-	public static function is_available()
+	static public function is_available()
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -80,7 +80,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		return true;
 	}
 
-	public static function get_name()
+	static public function get_name()
 	{
 		return 'CAPTCHA_GD';
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index 06ad9dbbf6..48af287723 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -44,7 +44,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 		return new phpbb_captcha_gd_wave();
 	}
 
-	public static function is_available()
+	static public function is_available()
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -61,7 +61,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 		return can_load_dll('gd');
 	}
 
-	public static function get_name()
+	static public function get_name()
 	{
 		return 'CAPTCHA_GD_3D';
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 563dbf6660..6d6e2c6036 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -45,12 +45,12 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 		return $instance;
 	}
 
-	public static function is_available()
+	static public function is_available()
 	{
 		return true;
 	}
 
-	public static function get_name()
+	static public function get_name()
 	{
 		return 'CAPTCHA_NO_GD';
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index c005d478a2..0eae643d33 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -108,7 +108,7 @@ class phpbb_captcha_qa
 	/**
 	* See if the captcha has created its tables.
 	*/
-	public static function is_installed()
+	static public function is_installed()
 	{
 		global $db, $phpbb_root_path, $phpEx;
 
@@ -124,7 +124,7 @@ class phpbb_captcha_qa
 	/**
 	*  API function - for the captcha to be available, it must have installed itself and there has to be at least one question in the board's default lang
 	*/
-	public static function is_available()
+	static public function is_available()
 	{
 		global $config, $db, $phpbb_root_path, $phpEx, $user;
 
@@ -157,7 +157,7 @@ class phpbb_captcha_qa
 	/**
 	*  API function
 	*/
-	public static function get_name()
+	static public function get_name()
 	{
 		return 'CAPTCHA_QA';
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 55bebf9443..cf14caff54 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -60,7 +60,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		return $instance;
 	}
 
-	public static function is_available()
+	static public function is_available()
 	{
 		global $config, $user;
 		$user->add_lang('captcha_recaptcha');
@@ -75,7 +75,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		return true;
 	}
 
-	public static function get_name()
+	static public function get_name()
 	{
 		return 'CAPTCHA_RECAPTCHA';
 	}
-- 
cgit v1.2.1


From 31781adf0ca9880069c8831177b34d573456f5d4 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 29 Oct 2012 14:57:27 -0400
Subject: [ticket/11159] static public is the currently approved order.

PHPBB3-11159
---
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php    | 2 +-
 phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php      | 2 +-
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/captcha')

diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
index 6c1f3bf00b..1a3523567e 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -49,7 +49,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 		}
 	}
 
-	public static function get_instance()
+	static public function get_instance()
 	{
 		$instance = new phpbb_captcha_gd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
index a5588178bb..bc61397fe6 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 		}
 	}
 
-	public static function get_instance()
+	static public function get_instance()
 	{
 		return new phpbb_captcha_gd_wave();
 	}
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
index 96f13fbe1b..b3764f6f81 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -39,7 +39,7 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 		}
 	}
 
-	public static function get_instance()
+	static public function get_instance()
 	{
 		$instance = new phpbb_captcha_nogd();
 		return $instance;
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index 99813189d7..8fc45db8cb 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -98,7 +98,7 @@ class phpbb_captcha_qa
 	/**
 	*  API function
 	*/
-	public static function get_instance()
+	static public function get_instance()
 	{
 		$instance = new phpbb_captcha_qa();
 
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 70c24a8c30..cdda89eb10 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -54,7 +54,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$this->response = request_var('recaptcha_response_field', '');
 	}
 
-	public static function get_instance()
+	static public function get_instance()
 	{
 		$instance = new phpbb_recaptcha();
 		return $instance;
-- 
cgit v1.2.1