From 8aaa3e055fdc50faeea6f590408a7bcbb03a8d92 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 4 Dec 2012 15:11:14 +0100
Subject: [PATCH] [feature/avatars] Use seperate function for retrieving the
 config name

PHPBB3-10018
---
 phpBB/includes/acp/acp_users.php  |  2 +-
 phpBB/includes/avatar/manager.php | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 5c485b5996..b3cfd81949 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -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",
 						));
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 279278b71c..81a135b46f 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -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));
+	}
 }