From f4ad60e2cf18771200d99bc953449d6229a74818 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 29 Nov 2012 23:50:17 +0100
Subject: [feature/avatars] Get list of enabled drivers from avatar manager

This shouldn't be done in the avatar drivers. We need to force the
display all avatar drivers in the ACP or it won't be possible to enable
avatars after they have been disabled.

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/avatar/manager.php')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index ae628f0ce2..8953557acb 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -101,15 +101,20 @@ class phpbb_avatar_manager
 	/**
 	* Load the list of valid drivers
 	* This is executed once and fills self::$valid_drivers
+	*
+	* @param bool $force_all Force showing all avatar drivers
 	*/
-	protected function load_valid_drivers()
+	protected function load_valid_drivers($force_all = false)
 	{
 		if (!empty($this->avatar_drivers))
 		{
 			self::$valid_drivers = array();
 			foreach ($this->avatar_drivers as $driver)
 			{
-				self::$valid_drivers[$driver->get_name()] = $driver->get_name();
+				if ($force_all || $this->is_enabled($driver))
+				{
+					self::$valid_drivers[$driver->get_name()] = $driver->get_name();
+				}
 			}
 		}
 	}
@@ -117,13 +122,15 @@ class phpbb_avatar_manager
 	/**
 	* Get a list of valid avatar drivers
 	*
+	* @param bool $force_all Force showing all avatar drivers
+	*
 	* @return array Array containing a list of the valid avatar drivers
 	*/
-	public function get_valid_drivers()
+	public function get_valid_drivers($force_all = false)
 	{
 		if (self::$valid_drivers === false)
 		{
-			$this->load_valid_drivers();
+			$this->load_valid_drivers($force_all);
 		}
 
 		return self::$valid_drivers;
@@ -178,4 +185,18 @@ class phpbb_avatar_manager
 	{
 		return str_replace('.', '_', $name);
 	}
+
+	/**
+	* Check if avatar is enabled
+	*
+	* @param object $driver Avatar driver object
+	*
+	* @return bool True if avatar is enabled, false if it's disabled
+	*/
+	public function is_enabled($driver)
+	{
+		$config_name = preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
+
+		return $this->config["allow_avatar_{$config_name}"];
+	}
 }
-- 
cgit v1.2.1