mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Fix acp front-end of user and group avatars

Browse Source 
Due to the changes to the avatar manager etc. these had to be updated.

PHPBB3-10018
This commit is contained in:
Marc Alexander
2012-11-17 00:50:23 +01:00
parent 5d0a20bbb6
commit c70cbfac43
7 changed files with 52 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
phpBB/includes/acp/acp_groups.php
View File

@@ -333,26 +333,23 @@ class acp_groups
if ($config['allow_avatar'])
{
// Handle avatar
$driver = request_var('avatar_driver', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
$driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver);
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
{
$avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $avatar_error);
if ($result && empty($avatar_error))
{
// Success! Lets save the result
/*
$result = array(
'avatar' => ...,
'avatar_width' => ...,
'avatar_height' => ...,
'avatar_type' => $driver,
'avatar' => $result['avatar'],
'avatar_width' => $result['avatar_width'],
'avatar_height' => $result['avatar_height'],
);
*/
$submit_ary = array_merge($submit_ary, $result);
$submit_ary['avatar_type'] = $driver;
}
}
else
@@ -522,27 +519,29 @@ class acp_groups
if ($config['allow_avatar'])
{
$avatars_enabled = false;
$focused_driver = request_var('avatar_driver', $avatar_data['avatar_type']);
$focused_driver = str_replace('_', '.', request_var('avatar_driver', $avatar_data['avatar_type']));
foreach ($avatar_drivers as $driver)
{
if ($config["allow_avatar_$driver"])
$avatar = $phpbb_avatar_manager->get_driver($driver);
if ($avatar->is_enabled())
{
$avatars_enabled = true;
$config_name = preg_replace('#^avatar.driver.#', '', $driver);
$template->set_filenames(array(
'avatar' => "acp_avatar_options_$driver.html",
'avatar' => "acp_avatar_options_$config_name.html",
));
$avatar = $phpbb_avatar_manager->get_driver($driver);
if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
{
$driver_u = strtoupper($driver);
$driver_n = str_replace('.', '_', $driver);
$driver_u = strtoupper($driver_n);
$template->assign_block_vars('avatar_drivers', array(
'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
'L_TITLE' => $user->lang($driver_u . '_TITLE'),
'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
'DRIVER' => $driver,
'DRIVER' => $driver_n,
'SELECTED' => ($driver == $focused_driver),
'OUTPUT' => $template->assign_display('avatar'),
));

28
phpBB/includes/acp/acp_users.php
View File

@@ -1744,8 +1744,9 @@ class acp_users
{
if (check_form_key($form_name))
{
$driver = request_var('avatar_driver', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
$driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver);
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
{
$avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $error);
@@ -1791,27 +1792,30 @@ class acp_users
}
}
$focused_driver = request_var('avatar_driver', $user_row['user_avatar_type']);
$focused_driver = str_replace('_', '.', request_var('avatar_driver', $user_row['user_avatar_type']));
foreach ($avatar_drivers as $driver)
{
if ($config["allow_avatar_$driver"])
$avatar = $phpbb_avatar_manager->get_driver($driver);
if ($avatar->is_enabled())
{
$avatars_enabled = true;
$config_name = preg_replace('#^avatar.driver.#', '', $driver);
$template->set_filenames(array(
'avatar' => "acp_avatar_options_$driver.html",
'avatar' => "acp_avatar_options_$config_name.html",
));
$avatar = $phpbb_avatar_manager->get_driver($driver);
if ($avatar->prepare_form($template, $avatar_data, $error))
{
$driver_u = strtoupper($driver);
$template->assign_block_vars('avatar_drivers', array(
'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
$driver_n = str_replace('.', '_', $driver);
$driver_u = strtoupper($driver_n);
'DRIVER' => $driver,
$template->assign_block_vars('avatar_drivers', array(
'L_TITLE' => $user->lang($driver_u . '_TITLE'),
'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
'DRIVER' => $driver_n,
'SELECTED' => ($driver == $focused_driver),
'OUTPUT' => $template->assign_display('avatar'),
));