mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11854] Use a set_name method instead of overriding get_service_name

Browse Source 
PHPBB3-11854
This commit is contained in:
Tristan Darricau
2014-08-10 15:10:14 +02:00
parent 76633544ee
commit fa2ac1f271
6 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/phpbb/captcha/plugins/captcha_abstract.php
View File

@@ -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

8
phpBB/phpbb/captcha/plugins/gd.php
View File

@@ -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
*/

8
phpBB/phpbb/captcha/plugins/gd_wave.php
View File

@@ -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
*/

19
phpBB/phpbb/captcha/plugins/qa.php
View File

@@ -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;
}
/**

8
phpBB/phpbb/captcha/plugins/recaptcha.php
View File

@@ -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.
*/