makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/avatars] Miscellaneous fixes

Browse source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-11-25 01:18:27 +01:00
parent 7945ffa2a1
commit ce5e2f1677
7 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/acp/acp_groups.php
View file

@ -334,7 +334,7 @@ class acp_groups
{ {
// Handle avatar // Handle avatar
$driver = str_replace('_', '.', request_var('avatar_driver', '')); $driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', ''); $avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{ {
@ -534,7 +534,7 @@ class acp_groups
if ($avatar->is_enabled()) if ($avatar->is_enabled())
{ {
$avatars_enabled = true; $avatars_enabled = true;
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$template->set_filenames(array( $template->set_filenames(array(
'avatar' => "acp_avatar_options_$config_name.html", 'avatar' => "acp_avatar_options_$config_name.html",
)); ));
@ -558,8 +558,10 @@ class acp_groups
$avatar = get_group_avatar($group_row, 'GROUP_AVATAR', true); $avatar = get_group_avatar($group_row, 'GROUP_AVATAR', true);
// Merge any avatars errors into the primary error array /*
// Drivers use lang constants, so we need to map to the actual strings * Merge any avatar errors into the primary error array
* Drivers use language constants, so we need to map to the actual strings
*/
foreach ($avatar_error as $e) foreach ($avatar_error as $e)
{ {
if (is_array($e)) if (is_array($e))
@ -569,7 +571,7 @@ class acp_groups
} }
else else
{ {
$error[] = $user->lang((string) $e); $error[] = $user->lang("$e");
} }
} }
@ -615,7 +617,7 @@ class acp_groups
'S_RANK_OPTIONS' => $rank_options, 'S_RANK_OPTIONS' => $rank_options,
'S_GROUP_OPTIONS' => group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)), 'S_GROUP_OPTIONS' => group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)),
'AVATAR' => (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar), 'AVATAR' => empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar,
'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'], 'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'],
'AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '', 'AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',
'AVATAR_HEIGHT' => (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '', 'AVATAR_HEIGHT' => (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '',

10
phpBB/includes/acp/acp_users.php
View file

@ -1745,7 +1745,7 @@ class acp_users
if (check_form_key($form_name)) if (check_form_key($form_name))
{ {
$driver = str_replace('_', '.', request_var('avatar_driver', '')); $driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', ''); $avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{ {
@ -1761,6 +1761,7 @@ class acp_users
'user_avatar_width' => $result['avatar_width'], 'user_avatar_width' => $result['avatar_width'],
'user_avatar_height' => $result['avatar_height'], 'user_avatar_height' => $result['avatar_height'],
); );
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $result) . ' SET ' . $db->sql_build_array('UPDATE', $result) . '
WHERE user_id = ' . $user_id; WHERE user_id = ' . $user_id;
@ -1771,7 +1772,8 @@ class acp_users
} }
else else
{ {
if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type'])) $avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
if ($avatar)
{ {
$avatar->delete($avatar_data); $avatar->delete($avatar_data);
} }
@ -1786,7 +1788,7 @@ class acp_users
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $result) . ' SET ' . $db->sql_build_array('UPDATE', $result) . '
WHERE user_id = ' . $user_id; WHERE user_id = ' . (int) $user_id;
$db->sql_query($sql); $db->sql_query($sql);
trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id)); trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
@ -1807,7 +1809,7 @@ class acp_users
if ($avatar->is_enabled()) if ($avatar->is_enabled())
{ {
$avatars_enabled = true; $avatars_enabled = true;
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$template->set_filenames(array( $template->set_filenames(array(
'avatar' => "acp_avatar_options_$config_name.html", 'avatar' => "acp_avatar_options_$config_name.html",
)); ));

5
phpBB/includes/avatar/driver/gravatar.php
View file

@ -56,11 +56,10 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
*/ */
public function get_custom_html($row, $ignore_config = false, $alt = '') public function get_custom_html($row, $ignore_config = false, $alt = '')
{ {
$html = '<img src="' . $this->get_gravatar_url($row) . '" ' . return '<img src="' . $this->get_gravatar_url($row) . '" ' .
($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') . ($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') . ($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') .
'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />'; 'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
return $html;
} }
/** /**
@ -121,7 +120,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
$row['avatar_width'] = $row['avatar_height'] = min($this->config['avatar_max_width'], $this->config['avatar_max_height']); $row['avatar_width'] = $row['avatar_height'] = min($this->config['avatar_max_width'], $this->config['avatar_max_height']);
$url = $this->get_gravatar_url($row); $url = $this->get_gravatar_url($row);
if (($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0) && (($image_data = @getimagesize($url)) === false)) if (($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0) && (($image_data = getimagesize($url)) === false))
{ {
$error[] = 'UNABLE_GET_IMAGE_SIZE'; $error[] = 'UNABLE_GET_IMAGE_SIZE';
return false; return false;

2
phpBB/includes/avatar/driver/remote.php
View file

@ -106,7 +106,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
// Make sure getimagesize works... // Make sure getimagesize works...
if (function_exists('getimagesize')) if (function_exists('getimagesize'))
{ {
if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false)) if (($width <= 0 || $height <= 0) && (($image_data = getimagesize($url)) === false))
{ {
$error[] = 'UNABLE_GET_IMAGE_SIZE'; $error[] = 'UNABLE_GET_IMAGE_SIZE';
return false; return false;

2
phpBB/includes/ucp/ucp_groups.php
View file

@ -521,7 +521,7 @@ class ucp_groups
{ {
// Handle avatar // Handle avatar
$driver = str_replace('_', '.', request_var('avatar_driver', '')); $driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', ''); $avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{ {

2
phpBB/includes/ucp/ucp_profile.php
View file

@ -564,7 +564,7 @@ class ucp_profile
if (check_form_key('ucp_avatar')) if (check_form_key('ucp_avatar'))
{ {
$driver = str_replace('_', '.', request_var('avatar_driver', '')); $driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', ''); $avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{ {

20
phpBB/install/database_update.php
View file

@ -2722,27 +2722,27 @@ function change_database_data(&$no_updates, $version)
foreach ($avatar_type_map as $old => $new) foreach ($avatar_type_map as $old => $new)
{ {
$sql = 'UPDATE ' . USERS_TABLE . " $sql = 'UPDATE ' . USERS_TABLE . "
SET user_avatar_type = '" . $db->sql_escape($new) . "' SET user_avatar_type = '" . $new . "'
WHERE user_avatar_type = '" . $db->sql_escape($old) . "'"; WHERE user_avatar_type = '" . $old . "'";
_sql($sql, $errored, $error_ary); _sql($sql, $errored, $error_ary);
$sql = 'UPDATE ' . GROUPS_TABLE . " $sql = 'UPDATE ' . GROUPS_TABLE . "
SET group_avatar_type = '" . $db->sql_escape($new) . "' SET group_avatar_type = '" . $new . "'
WHERE group_avatar_type = '" . $db->sql_escape($old) . "'"; WHERE group_avatar_type = '" . $old . "'";
_sql($sql, $errored, $error_ary); _sql($sql, $errored, $error_ary);
} }
// update avatar module_auth // update avatar module_auth
$sql = 'UPDATE ' . MODULES_TABLE . ' $sql = 'UPDATE ' . MODULES_TABLE . "
SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload || cfg_allow_avatar_gravatar)\' SET module_auth = 'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload || cfg_allow_avatar_gravatar)'
WHERE module_class = \'ucp\' WHERE module_class = 'ucp'
AND module_basename = \'ucp_profile\' AND module_basename = 'ucp_profile'
AND module_mode = \'avatar\''; AND module_mode = 'avatar'";
_sql($sql, $errored, $error_ary); _sql($sql, $errored, $error_ary);
if (!isset($config['allow_avatar_gravatar'])) if (!isset($config['allow_avatar_gravatar']))
{ {
$config->set('allow_avatar_gravatar', ''); $config->set('allow_avatar_gravatar', '0');
} }
$no_updates = false; $no_updates = false;