1 files changed, 67 insertions, 22 deletions
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index 6ce924d2eb..26eb17c265 100644
--- a/phpBB/phpbb/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
@@ -1,17 +1,18 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
 namespace phpbb\avatar;
 
-/**
-* @package avatar
-*/
 class manager
 {
 	/**
@@ -40,8 +41,8 @@ class manager
 	static protected $default_row = array(
 		'avatar'		=> '',
 		'avatar_type'	=> '',
-		'avatar_width'	=> '',
-		'avatar_height'	=> '',
+		'avatar_width'	=> 0,
+		'avatar_height'	=> 0,
 	);
 
 	/**
@@ -245,7 +246,7 @@ class manager
 	*/
 	public function is_enabled($driver)
 	{
-		$config_name = $this->get_driver_config_name($driver);
+		$config_name = $driver->get_config_name();
 
 		return $this->config["allow_avatar_{$config_name}"];
 	}
@@ -259,7 +260,7 @@ class manager
 	*/
 	public function get_avatar_settings($driver)
 	{
-		$config_name = $this->get_driver_config_name($driver);
+		$config_name = $driver->get_config_name();
 
 		return array(
 			'allow_avatar_' . $config_name	=> array('lang' => 'ALLOW_' . strtoupper(str_replace('\\', '_', $config_name)),		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
@@ -267,18 +268,6 @@ class manager
 	}
 
 	/**
-	* 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));
-	}
-
-	/**
 	* Replace "error" strings with their real, localized form
 	*
 	* @param \phpbb\user phpBB User object
@@ -306,4 +295,60 @@ class manager
 
 		return $error;
 	}
+
+	/**
+	* Handle deleting avatars
+	*
+	* @param \phpbb\db\driver\driver_interface $db phpBB dbal
+	* @param \phpbb\user    $user phpBB user object
+	* @param array          $avatar_data Cleaned user data containing the user's
+	*                               avatar data
+	* @param string         $table Database table from which the avatar should be deleted
+	* @param string         $prefix Prefix of user data columns in database
+	* @return null
+	*/
+	public function handle_avatar_delete(\phpbb\db\driver\driver_interface $db, \phpbb\user $user, $avatar_data, $table, $prefix)
+	{
+		if ($driver = $this->get_driver($avatar_data['avatar_type']))
+		{
+			$driver->delete($avatar_data);
+		}
+
+		$result = $this->prefix_avatar_columns($prefix, self::$default_row);
+
+		$sql = 'UPDATE ' . $table . '
+			SET ' . $db->sql_build_array('UPDATE', $result) . '
+			WHERE ' . $prefix . 'id = ' . (int) $avatar_data['id'];
+		$db->sql_query($sql);
+
+		// Make sure we also delete this avatar from the users
+		if ($prefix === 'group_')
+		{
+			$result = $this->prefix_avatar_columns('user_', self::$default_row);
+
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET ' . $db->sql_build_array('UPDATE', $result) . "
+				WHERE user_avatar = '" . $db->sql_escape($avatar_data['avatar']) . "'";
+			$db->sql_query($sql);
+		}
+	}
+
+	/**
+	 * Prefix avatar columns
+	 *
+	 * @param string $prefix Column prefix
+	 * @param array $data Column data
+	 *
+	 * @return array Column data with prefixed column names
+	 */
+	public function prefix_avatar_columns($prefix, $data)
+	{
+		foreach ($data as $key => $value)
+		{
+			$data[$prefix . $key] = $value;
+			unset($data[$key]);
+		}
+
+		return $data;
+	}
 }