From fa2ac1f27126292a24aa33136b2d3a7f1832ea47 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 10 Aug 2014 15:10:14 +0200
Subject: [ticket/11854] Use a set_name method instead of overriding
 get_service_name

PHPBB3-11854
---
 phpBB/phpbb/captcha/plugins/captcha_abstract.php | 20 +++++++++++++++++++-
 phpBB/phpbb/captcha/plugins/gd.php               |  8 --------
 phpBB/phpbb/captcha/plugins/gd_wave.php          |  8 --------
 phpBB/phpbb/captcha/plugins/qa.php               | 19 +++++++++++++++++--
 phpBB/phpbb/captcha/plugins/recaptcha.php        |  8 --------
 5 files changed, 36 insertions(+), 27 deletions(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/captcha/plugins/captcha_abstract.php b/phpBB/phpbb/captcha/plugins/captcha_abstract.php
index 982798e464..24ed7f939d 100644
--- a/phpBB/phpbb/captcha/plugins/captcha_abstract.php
+++ b/phpBB/phpbb/captcha/plugins/captcha_abstract.php
@@ -27,6 +27,11 @@ abstract class captcha_abstract
 	var $solved = 0;
 	var $captcha_vars = false;
 
+	/**
+	* @var string name of the service.
+	*/
+	protected $service_name;
+
 	function init($type)
 	{
 		global $config, $db, $user;
@@ -363,7 +368,20 @@ abstract class captcha_abstract
 	/**
 	* @return string the name of the service corresponding to the plugin
 	*/
-	abstract function get_service_name();
+	function get_service_name()
+	{
+		return $this->service_name;
+	}
+
+	/**
+	* Set the name of the plugin
+	*
+	* @param string $name
+	*/
+	public function set_name($name)
+	{
+		$this->service_name = $name;
+	}
 
 	/**
 	* @return string the name of the class used to generate the captcha
diff --git a/phpBB/phpbb/captcha/plugins/gd.php b/phpBB/phpbb/captcha/plugins/gd.php
index c1d8c83095..f6200b5b2f 100644
--- a/phpBB/phpbb/captcha/plugins/gd.php
+++ b/phpBB/phpbb/captcha/plugins/gd.php
@@ -30,14 +30,6 @@ class gd extends captcha_abstract
 		return @extension_loaded('gd');
 	}
 
-	/**
-	* @return string the name of the service corresponding to the plugin
-	*/
-	function get_service_name()
-	{
-		return 'core.captcha.plugins.gd';
-	}
-
 	/**
 	* @return string the name of the class used to generate the captcha
 	*/
diff --git a/phpBB/phpbb/captcha/plugins/gd_wave.php b/phpBB/phpbb/captcha/plugins/gd_wave.php
index 2d38ef08dd..e1d44df778 100644
--- a/phpBB/phpbb/captcha/plugins/gd_wave.php
+++ b/phpBB/phpbb/captcha/plugins/gd_wave.php
@@ -25,14 +25,6 @@ class gd_wave extends captcha_abstract
 		return 'CAPTCHA_GD_3D';
 	}
 
-	/**
-	* @return string the name of the service corresponding to the plugin
-	*/
-	function get_service_name()
-	{
-		return 'core.captcha.plugins.gd_wave';
-	}
-
 	/**
 	* @return string the name of the class used to generate the captcha
 	*/
diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php
index 96cd99826d..a7ba994cc3 100644
--- a/phpBB/phpbb/captcha/plugins/qa.php
+++ b/phpBB/phpbb/captcha/plugins/qa.php
@@ -34,6 +34,11 @@ class qa
 	protected $table_captcha_answers;
 	protected $table_qa_confirm;
 
+	/**
+	* @var string name of the service.
+	*/
+	protected $service_name;
+
 	/**
 	* Constructor
 	*
@@ -157,11 +162,21 @@ class qa
 	}
 
 	/**
-	*  API function
+	* @return string the name of the service corresponding to the plugin
 	*/
 	function get_service_name()
 	{
-		return 'core.captcha.plugins.qa';
+		return $this->service_name;
+	}
+
+	/**
+	* Set the name of the plugin
+	*
+	* @param string $name
+	*/
+	public function set_name($name)
+	{
+		$this->service_name = $name;
 	}
 
 	/**
diff --git a/phpBB/phpbb/captcha/plugins/recaptcha.php b/phpBB/phpbb/captcha/plugins/recaptcha.php
index efa93ab72a..928694f6ca 100644
--- a/phpBB/phpbb/captcha/plugins/recaptcha.php
+++ b/phpBB/phpbb/captcha/plugins/recaptcha.php
@@ -63,14 +63,6 @@ class recaptcha extends \phpbb\captcha\plugins\captcha_abstract
 		return 'CAPTCHA_RECAPTCHA';
 	}
 
-	/**
-	* @return string the name of the service corresponding to the plugin
-	*/
-	function get_service_name()
-	{
-		return 'core.captcha.plugins.recaptcha';
-	}
-
 	/**
 	* This function is implemented because required by the upper class, but is never used for reCaptcha.
 	*/
-- 
cgit v1.2.1