makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/avatars] Use seperate function for retrieving the config name

Browse source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-12-04 15:11:14 +01:00
parent fc4069f81d
commit 8aaa3e055f
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_users.php
View file

@ -1808,7 +1808,7 @@ class acp_users
$driver = $phpbb_avatar_manager->get_driver($current_driver);
$avatars_enabled = true;
$config_name = preg_replace('#^avatar\.driver.#', '', $current_driver);
$config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
$template->set_filenames(array(
'avatar' => "acp_avatar_options_$config_name.html",
));

18
phpBB/includes/avatar/manager.php
View file

@ -203,7 +203,7 @@ class phpbb_avatar_manager
*/
public function is_enabled($driver)
{
$config_name = preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
$config_name = $this->get_driver_config_name($driver);
return $this->config["allow_avatar_{$config_name}"];
}
@ -211,16 +211,28 @@ class phpbb_avatar_manager
/**
* Get the settings array for enabling/disabling an avatar driver
*
* @param string $driver Avatar driver object
* @param object $driver Avatar driver object
*
* @return array Array of configuration options as consumed by acp_board
*/
public function get_avatar_settings($driver)
{
$config_name = preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
$config_name = $this->get_driver_config_name($driver);
return array(
'allow_avatar_' . $config_name => array('lang' => 'ALLOW_' . strtoupper($config_name), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
);
}
/**
* Get the config name of an avatar driver
*
* @param object $driver Avatar driver object
*
* @return string Avatar driver config name
*/
public function get_driver_config_name($driver)
{
return preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
}
}