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')

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