5 files changed, 34 insertions, 3 deletions
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/core/local.php
index a0ef912eae..ca82b9c175 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/core/local.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Handles avatars selected from the board gallery
 * @package avatars
 */
-class phpbb_avatar_driver_local extends phpbb_avatar_driver
+class phpbb_avatar_driver_core_local extends phpbb_avatar_driver
 {
 	/**
 	* @inheritdoc
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/core/remote.php
index cd0a756428..9f5a58e75a 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/core/remote.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Handles avatars hosted remotely
 * @package avatars
 */
-class phpbb_avatar_driver_remote extends phpbb_avatar_driver
+class phpbb_avatar_driver_core_remote extends phpbb_avatar_driver
 {
 	/**
 	* @inheritdoc
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/core/upload.php
index d9504c04a0..d0ce856dbe 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/core/upload.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Handles avatars uploaded to the board
 * @package avatars
 */
-class phpbb_avatar_driver_upload extends phpbb_avatar_driver
+class phpbb_avatar_driver_core_upload extends phpbb_avatar_driver
 {
 	/**
 	* @inheritdoc
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 4ac6762140..5cebd1533d 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -119,4 +119,25 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	{
 		return true;
 	}
+
+	/**
+	* @inheritdoc
+	**/
+	public function is_enabled()
+	{
+		$driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this));
+
+		return $this->config["allow_avatar_$driver"];
+	}
+
+	/**
+	* @inheritdoc
+	**/
+	public function get_template_name()
+	{
+		$driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this));
+		$template = "ucp_avatar_options_$driver.html";
+
+		return $template;
+	}
 }
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index d3b764e275..4f1c1f73cf 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -57,4 +57,14 @@ interface phpbb_avatar_driver_interface
 	* @TODO
 	**/
 	public function delete($row);
+
+	/**
+	* @TODO
+	**/
+	public function is_enabled();
+
+	/**
+	* @TODO
+	**/
+	public function get_template_name();
 }