[ticket/12822] Add method for deleting avatars and use confirm_box

The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
author: Marc Alexander <admin@m-a-styles.de> 2014-08-07 17:19:08 +0200
committer: Marc Alexander <admin@m-a-styles.de> 2014-08-07 17:29:33 +0200
commit: e0c2013bb921f04f032744c3bc351c015c759d8d (patch)
tree: dc9f79569e572646a0ec49e3e81119802701119e /phpBB
parent: 4f23bb711ca457efba370d7ac67394e0db59b578 (diff)
download: forums-e0c2013bb921f04f032744c3bc351c015c759d8d.tar
forums-e0c2013bb921f04f032744c3bc351c015c759d8d.tar.gz
forums-e0c2013bb921f04f032744c3bc351c015c759d8d.tar.bz2
forums-e0c2013bb921f04f032744c3bc351c015c759d8d.tar.xz
forums-e0c2013bb921f04f032744c3bc351c015c759d8d.zip
7 files changed, 124 insertions, 79 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index f10f0b1015..edfada1bf1 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -331,6 +331,28 @@ class acp_groups
 					}
 				}
 
+				if ($request->is_set_post('avatar_delete'))
+				{
+					if (confirm_box(true))
+					{
+						$avatar_data['id'] = substr($avatar_data['id'], 1);
+						$phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, GROUPS_TABLE, 'group_');
+
+						$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
+						trigger_error($user->lang[$message] . adm_back_link($this->u_action));
+					}
+					else
+					{
+						confirm_box(false, $user->lang('CONFIRM_AVATAR_DELETE'), build_hidden_fields(array(
+								'avatar_delete'     => true,
+								'i'                 => $id,
+								'mode'              => $mode,
+								'g'			        => $group_id,
+								'action'            => $action))
+						);
+					}
+				}
+
 				// Did we submit?
 				if ($update)
 				{
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 71880c2267..58f9643dc9 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -465,25 +465,9 @@ class acp_users
 								trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
 							}
 
-							$sql_ary = array(
-								'user_avatar'			=> '',
-								'user_avatar_type'		=> '',
-								'user_avatar_width'		=> 0,
-								'user_avatar_height'	=> 0,
-							);
-
-							$sql = 'UPDATE ' . USERS_TABLE . '
-								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
-								WHERE user_id = $user_id";
-							$db->sql_query($sql);
-
 							// Delete old avatar if present
 							$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-							$driver = $phpbb_avatar_manager->get_driver($user_row['user_avatar_type']);
-							if ($driver)
-							{
-								$driver->delete($user_row);
-							}
+							$phpbb_avatar_manager->handle_avatar_delete($db, $user, $phpbb_avatar_manager->clean_row($user_row, 'user'), USERS_TABLE, 'user_');
 
 							add_log('admin', 'LOG_USER_DEL_AVATAR', $user_row['username']);
 							add_log('user', $user_id, 'LOG_USER_DEL_AVATAR_USER');
@@ -1779,29 +1763,6 @@ class acp_users
 									trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
 								}
 							}
-							else
-							{
-								$driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']);
-								if ($driver)
-								{
-									$driver->delete($avatar_data);
-								}
-
-								// Removing the avatar
-								$result = array(
-									'user_avatar' => '',
-									'user_avatar_type' => '',
-									'user_avatar_width' => 0,
-									'user_avatar_height' => 0,
-								);
-
-								$sql = 'UPDATE ' . USERS_TABLE . '
-									SET ' . $db->sql_build_array('UPDATE', $result) . '
-									WHERE user_id = ' . (int) $user_id;
-
-								$db->sql_query($sql);
-								trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-							}
 						}
 						else
 						{
@@ -1809,6 +1770,23 @@ class acp_users
 						}
 					}
 
+					// Handle deletion of avatars
+					if ($request->is_set_post('avatar_delete'))
+					{
+						if (!confirm_box(true))
+						{
+							confirm_box(false, $user->lang('CONFIRM_AVATAR_DELETE'), build_hidden_fields(array(
+									'avatar_delete'     => true))
+							);
+						}
+						else
+						{
+							$phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, USERS_TABLE, 'user_');
+
+							trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
+						}
+					}
+
 					$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
 
 					foreach ($avatar_drivers as $current_driver)
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index e4931fbe23..b9606945b4 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -471,6 +471,29 @@ class ucp_groups
 							$avatar_data = \phpbb\avatar\manager::clean_row($group_row, 'group');
 						}
 
+						// Handle deletion of avatars
+						if ($request->is_set_post('avatar_delete'))
+						{
+							if (confirm_box(true))
+							{
+								$phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, GROUPS_TABLE, 'group_');
+								$cache->destroy('sql', GROUPS_TABLE);
+
+								$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
+								trigger_error($user->lang[$message] . $return_page);
+							}
+							else
+							{
+								confirm_box(false, $user->lang('CONFIRM_AVATAR_DELETE'), build_hidden_fields(array(
+										'avatar_delete'     => true,
+										'i'                 => $id,
+										'mode'              => $mode,
+										'g'			        => $group_id,
+										'action'            => $action))
+								);
+							}
+						}
+
 						// Did we submit?
 						if ($update)
 						{
@@ -510,19 +533,6 @@ class ucp_groups
 										$submit_ary = array_merge($submit_ary, $result);
 									}
 								}
-								else
-								{
-									if ($driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']))
-									{
-										$driver->delete($avatar_data);
-									}
-
-									// Removing the avatar
-									$submit_ary['avatar_type'] = '';
-									$submit_ary['avatar'] = '';
-									$submit_ary['avatar_width'] = 0;
-									$submit_ary['avatar_height'] = 0;
-								}
 
 								// Merge any avatars errors into the primary error array
 								$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index a315b167d7..361dc831aa 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -564,30 +564,6 @@ class ucp_profile
 									trigger_error($message);
 								}
 							}
-							else
-							{
-								if ($driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']))
-								{
-									$driver->delete($avatar_data);
-								}
-
-								$result = array(
-									'user_avatar' => '',
-									'user_avatar_type' => '',
-									'user_avatar_width' => 0,
-									'user_avatar_height' => 0,
-								);
-
-								$sql = 'UPDATE ' . USERS_TABLE . '
-									SET ' . $db->sql_build_array('UPDATE', $result) . '
-									WHERE user_id = ' . (int) $user->data['user_id'];
-
-								$db->sql_query($sql);
-
-								meta_refresh(3, $this->u_action);
-								$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-								trigger_error($message);
-							}
 						}
 						else
 						{
@@ -595,6 +571,27 @@ class ucp_profile
 						}
 					}
 
+					// Handle deletion of avatars
+					if ($request->is_set_post('avatar_delete'))
+					{
+						if (!confirm_box(true))
+						{
+							confirm_box(false, $user->lang('CONFIRM_AVATAR_DELETE'), build_hidden_fields(array(
+									'avatar_delete'     => true,
+									'i'                 => $id,
+									'mode'              => $mode))
+							);
+						}
+						else
+						{
+							$phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, USERS_TABLE, 'user_');
+
+							meta_refresh(3, $this->u_action);
+							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							trigger_error($message);
+						}
+					}
+
 					$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
 
 					foreach ($avatar_drivers as $current_driver)
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 13fc56e0a1..f84ace9f51 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -167,6 +167,7 @@ $lang = array_merge($lang, array(
 	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as it appears. All letters are case insensitive.',
 	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
 	'CONFIRM_OPERATION'		=> 'Are you sure you wish to carry out this operation?',
+	'CONFIRM_AVATAR_DELETE' => 'Are you sure you wish to delete this avatar?',
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed.',
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php
index 455ddebf62..1bd7f6c927 100644
--- a/phpBB/phpbb/avatar/driver/remote.php
+++ b/phpBB/phpbb/avatar/driver/remote.php
@@ -53,6 +53,11 @@ class remote extends \phpbb\avatar\driver\driver
 		$width = $request->variable('avatar_remote_width', 0);
 		$height = $request->variable('avatar_remote_height', 0);
 
+		if (empty($url))
+		{
+			return false;
+		}
+
 		if (!preg_match('#^(http|https|ftp)://#i', $url))
 		{
 			$url = 'http://' . $url;
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index 7cf136be2c..42ae61a9a2 100644
--- a/phpBB/phpbb/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
@@ -41,8 +41,8 @@ class manager
 	static protected $default_row = array(
 		'avatar'		=> '',
 		'avatar_type'	=> '',
-		'avatar_width'	=> '',
-		'avatar_height'	=> '',
+		'avatar_width'	=> 0,
+		'avatar_height'	=> 0,
 	);
 
 	/**
@@ -307,4 +307,36 @@ 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 = self::$default_row;
+
+		foreach ($result as $key => $value)
+		{
+			$result[$prefix . $key] = $value;
+			unset($result[$key]);
+		}
+
+		$sql = 'UPDATE ' . $table . '
+				SET ' . $db->sql_build_array('UPDATE', $result) . '
+				WHERE ' . $prefix . 'id = ' . (int) $avatar_data['id'];
+		$db->sql_query($sql);
+	}
 }
author	Marc Alexander <admin@m-a-styles.de>	2014-08-07 17:19:08 +0200
committer	Marc Alexander <admin@m-a-styles.de>	2014-08-07 17:29:33 +0200
commit	e0c2013bb921f04f032744c3bc351c015c759d8d (patch)
tree	dc9f79569e572646a0ec49e3e81119802701119e /phpBB
parent	4f23bb711ca457efba370d7ac67394e0db59b578 (diff)
download	forums-e0c2013bb921f04f032744c3bc351c015c759d8d.tar forums-e0c2013bb921f04f032744c3bc351c015c759d8d.tar.gz forums-e0c2013bb921f04f032744c3bc351c015c759d8d.tar.bz2 forums-e0c2013bb921f04f032744c3bc351c015c759d8d.tar.xz forums-e0c2013bb921f04f032744c3bc351c015c759d8d.zip