diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-17 00:50:23 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-17 00:50:23 +0100 |
| commit | c70cbfac4339529e196934405d0eb2f9672121d5 (patch) | |
| tree | 38ff2a6f9f27b7837cafa721ef6ea76819094a7f /phpBB/includes | |
| parent | 5d0a20bbb684055143b77a630ab1b02270f7f900 (diff) | |
| download | forums-c70cbfac4339529e196934405d0eb2f9672121d5.tar forums-c70cbfac4339529e196934405d0eb2f9672121d5.tar.gz forums-c70cbfac4339529e196934405d0eb2f9672121d5.tar.bz2 forums-c70cbfac4339529e196934405d0eb2f9672121d5.tar.xz forums-c70cbfac4339529e196934405d0eb2f9672121d5.zip | |
[feature/avatars] Fix acp front-end of user and group avatars
Due to the changes to the avatar manager etc. these had to be updated.
PHPBB3-10018
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 37 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 26 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 2 |
3 files changed, 34 insertions, 31 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 656bf1546e..7be58b6df1 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -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'), )); diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 83c19b3ba6..562353b229 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -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); + $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'), )); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 40b8f5271d..6a1ad33ceb 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -642,7 +642,7 @@ class ucp_profile $driver_u = strtoupper($driver_n); $template->assign_block_vars('avatar_drivers', array( - 'L_TITLE' => $user->lang($driver_u . '_TITLE'), // @TODO add lang values + 'L_TITLE' => $user->lang($driver_u . '_TITLE'), 'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'), 'DRIVER' => $driver_n, |