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

[ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions

Browse source 
PHPBB3-10345
This commit is contained in:
Joas Schilling 2011-11-30 21:03:29 +01:00
parent 6472a270e0
commit b790d2e283
5 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -371,7 +371,7 @@ class acp_groups
{ {
if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height']) if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height'])
{ {
$error[] = avatar_error_wrong_size($data['width'], $data['height']); $error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
} }
} }
@ -381,7 +381,7 @@ class acp_groups
{ {
if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height']) if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height'])
{ {
$error[] = avatar_error_wrong_size($data['width'], $data['height']); $error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
} }
} }
} }
@ -627,7 +627,7 @@ class acp_groups
'U_BACK' => $u_back, 'U_BACK' => $u_back,
'U_SWATCH' => append_sid("{$phpbb_admin_path}swatch.$phpEx", 'form=settings&amp;name=group_colour'), 'U_SWATCH' => append_sid("{$phpbb_admin_path}swatch.$phpEx", 'form=settings&amp;name=group_colour'),
'U_ACTION' => "{$this->u_action}&amp;action=$action&amp;g=$group_id", 'U_ACTION' => "{$this->u_action}&amp;action=$action&amp;g=$group_id",
'L_AVATAR_EXPLAIN' => avatar_explanation_string(), 'L_AVATAR_EXPLAIN' => phpbb_avatar_explanation_string(),
)); ));
return; return;

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

@ -1748,7 +1748,7 @@ class acp_users
'USER_AVATAR_WIDTH' => $user_row['user_avatar_width'], 'USER_AVATAR_WIDTH' => $user_row['user_avatar_width'],
'USER_AVATAR_HEIGHT' => $user_row['user_avatar_height'], 'USER_AVATAR_HEIGHT' => $user_row['user_avatar_height'],
'L_AVATAR_EXPLAIN' => avatar_explanation_string() 'L_AVATAR_EXPLAIN' => phpbb_avatar_explanation_string(),
)); ));
break; break;

24
phpBB/includes/functions_user.php
View file

@ -2039,7 +2039,7 @@ function avatar_remote($data, &$error)
{ {
if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height']) if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height'])
{ {
$error[] = avatar_error_wrong_size($width, $height); $error[] = phpbb_avatar_error_wrong_size($width, $height);
return false; return false;
} }
} }
@ -2048,7 +2048,7 @@ function avatar_remote($data, &$error)
{ {
if ($width < $config['avatar_min_width'] || $height < $config['avatar_min_height']) if ($width < $config['avatar_min_width'] || $height < $config['avatar_min_height'])
{ {
$error[] = avatar_error_wrong_size($width, $height); $error[] = phpbb_avatar_error_wrong_size($width, $height);
return false; return false;
} }
} }
@ -2388,7 +2388,7 @@ function avatar_process_user(&$error, $custom_userdata = false, $can_upload = nu
{ {
if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height']) if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height'])
{ {
$error[] = avatar_error_wrong_size($data['width'], $data['height']); $error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
} }
} }
@ -2398,7 +2398,7 @@ function avatar_process_user(&$error, $custom_userdata = false, $can_upload = nu
{ {
if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height']) if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height'])
{ {
$error[] = avatar_error_wrong_size($data['width'], $data['height']); $error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
} }
} }
} }
@ -2444,7 +2444,14 @@ function avatar_process_user(&$error, $custom_userdata = false, $can_upload = nu
return (sizeof($error)) ? false : true; return (sizeof($error)) ? false : true;
} }
function avatar_error_wrong_size($width, $height) /**
* Returns a language string with the avatar size of the new avatar and the allowed maximum and minimum
*
* @param $width int The width of the new uploaded/selected avatar
* @param $height int The height of the new uploaded/selected avatar
* @return string
*/
function phpbb_avatar_error_wrong_size($width, $height)
{ {
global $config, $user; global $config, $user;
@ -2457,7 +2464,12 @@ function avatar_error_wrong_size($width, $height)
$user->lang('PIXELS', (int) $height)); $user->lang('PIXELS', (int) $height));
} }
function avatar_explanation_string() /**
* Returns an explanation string with maximum avatar settings
*
* @return string
*/
function phpbb_avatar_explanation_string()
{ {
global $config, $user; global $config, $user;

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

@ -561,7 +561,7 @@ class ucp_groups
{ {
if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height']) if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height'])
{ {
$error[] = avatar_error_wrong_size($data['width'], $data['height']); $error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
} }
} }
@ -571,7 +571,7 @@ class ucp_groups
{ {
if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height']) if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height'])
{ {
$error[] = avatar_error_wrong_size($data['width'], $data['height']); $error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
} }
} }
} }
@ -732,7 +732,7 @@ class ucp_groups
'U_SWATCH' => append_sid("{$phpbb_root_path}adm/swatch.$phpEx", 'form=ucp&amp;name=group_colour'), 'U_SWATCH' => append_sid("{$phpbb_root_path}adm/swatch.$phpEx", 'form=ucp&amp;name=group_colour'),
'S_UCP_ACTION' => $this->u_action . "&amp;action=$action&amp;g=$group_id", 'S_UCP_ACTION' => $this->u_action . "&amp;action=$action&amp;g=$group_id",
'L_AVATAR_EXPLAIN' => avatar_explanation_string(), 'L_AVATAR_EXPLAIN' => phpbb_avatar_explanation_string(),
)); ));
break; break;

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

@ -602,7 +602,7 @@ class ucp_profile
'S_FORM_ENCTYPE' => ($can_upload && ($config['allow_avatar_upload'] || $config['allow_avatar_remote_upload'])) ? ' enctype="multipart/form-data"' : '', 'S_FORM_ENCTYPE' => ($can_upload && ($config['allow_avatar_upload'] || $config['allow_avatar_remote_upload'])) ? ' enctype="multipart/form-data"' : '',
'L_AVATAR_EXPLAIN' => avatar_explanation_string(), 'L_AVATAR_EXPLAIN' => phpbb_avatar_explanation_string(),
)); ));
if ($config['allow_avatar'] && $display_gallery && $auth->acl_get('u_chgavatar') && $config['allow_avatar_local']) if ($config['allow_avatar'] && $display_gallery && $auth->acl_get('u_chgavatar') && $config['allow_avatar_local'])