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

[feature/avatars] Add static methods for handling driver names

Browse Source 
PHPBB3-10018
This commit is contained in:
Marc Alexander
2012-11-25 16:04:59 +01:00
parent 6d061304af
commit 06639729ea
5 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/ucp/ucp_groups.php
View File

@@ -521,7 +521,7 @@ class ucp_groups
if ($config['allow_avatar'])
{
// Handle avatar
$driver = str_replace('_', '.', request_var('avatar_driver', ''));
$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
@@ -652,7 +652,7 @@ class ucp_groups
if ($config['allow_avatar'])
{
$avatars_enabled = false;
$focused_driver = str_replace('_', '.', request_var('avatar_driver', $avatar_data['avatar_type']));
$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
foreach ($avatar_drivers as $driver)
{
@@ -667,7 +667,7 @@ class ucp_groups
if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
{
$driver_name = str_replace('.', '_', $driver);
$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
$driver_upper = strtoupper($driver_name);
$template->assign_block_vars('avatar_drivers', array(
'L_TITLE' => $user->lang($driver_upper . '_TITLE'),

6
phpBB/includes/ucp/ucp_profile.php
View File

@@ -564,7 +564,7 @@ class ucp_profile
{
if (check_form_key('ucp_avatar'))
{
$driver = str_replace('_', '.', request_var('avatar_driver', ''));
$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
@@ -624,7 +624,7 @@ class ucp_profile
}
}
$focused_driver = str_replace('_', '.', request_var('avatar_driver', $user->data['user_avatar_type']));
$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
foreach ($avatar_drivers as $driver)
{
@@ -639,7 +639,7 @@ class ucp_profile
if ($avatar->prepare_form($template, $avatar_data, $error))
{
$driver_name = str_replace('.', '_', $driver);
$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
$driver_upper = strtoupper($driver_name);
$template->assign_block_vars('avatar_drivers', array(