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

Some cleanup ... fixes

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4063 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-05-27 00:37:15 +00:00
parent e1484f522d
commit b6a0ce82d4
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
phpBB/includes/functions_user.php
View file

@ -357,18 +357,9 @@ class ucp extends user
{ {
global $config, $db, $user; global $config, $db, $user;
$avatar = explode(':', $user->data['user_avatar']); if (@file_exists('./' . $config['avatar_path'] . '/' . $user->data['user_avatar']))
$avatar_type = array_shift($avatar);
if ($avatar_type != 'upload')
{ {
return; @unlink('./' . $config['avatar_path'] . '/' . $user->data['user_avatar']);
}
$avatar = implode('', $avatar);
if (@file_exists('./' . $config['avatar_path'] . '/' . $avatar))
{
@unlink('./' . $config['avatar_path'] . '/' . $avatar);
} }
} }
@ -387,11 +378,16 @@ class ucp extends user
return true; return true;
} }
if (!($data['width'] || $data['height']) && ($config['avatar_max_width'] || $config['avatar_max_height'])) if ((!($data['width'] || $data['height']) || $data['remotelink'] != $user->data['user_avatar']) && ($config['avatar_max_width'] || $config['avatar_max_height']))
{ {
list($width, $height) = @getimagesize($data['remotelink']); list($width, $height) = @getimagesize($data['remotelink']);
if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height']) if (!$width || !$height)
{
$this->error[] = $user->lang['AVATAR_NO_SIZE'];
return true;
}
else if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height'])
{ {
$this->error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_max_width'], $config['avatar_max_height']); $this->error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_max_width'], $config['avatar_max_height']);
return true; return true;
@ -526,6 +522,7 @@ class ucp extends user
$filesize = filesize('./' . $config['avatar_path'] . '/' . $data['filename']); $filesize = filesize('./' . $config['avatar_path'] . '/' . $data['filename']);
if (!$filesize || $filesize > $config['avatar_filesize']) if (!$filesize || $filesize > $config['avatar_filesize'])
{ {
@unlink('./' . $config['avatar_path'] . '/' . $data['filename']);
$this->error[] = sprintf($user->lang['AVATAR_WRONG_FILESIZE'], $config['avatar_filesize']); $this->error[] = sprintf($user->lang['AVATAR_WRONG_FILESIZE'], $config['avatar_filesize']);
return true; return true;
} }

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

@ -361,6 +361,7 @@ class ucp_profile extends ucp
) )
); );
$data = $this->normalise_data($_POST, $normalise); $data = $this->normalise_data($_POST, $normalise);
$this->avatar_upload($data); $this->avatar_upload($data);
} }
else if (!empty($_POST['remotelink'])) else if (!empty($_POST['remotelink']))
@ -373,12 +374,12 @@ class ucp_profile extends ucp
) )
); );
$data = $this->normalise_data($_POST, $normalise); $data = $this->normalise_data($_POST, $normalise);
$this->avatar_remote($data); $this->avatar_remote($data);
} }
else if (!empty($_POST['delete'])) else if (!empty($_POST['delete']))
{ {
$data['filename'] = $data['width'] = $data['height'] = ''; $data['filename'] = $data['width'] = $data['height'] = '';
$this->avatar_delete();
} }
if (!sizeof($this->error)) if (!sizeof($this->error))
@ -395,8 +396,11 @@ class ucp_profile extends ucp
WHERE user_id = ' . $user->data['user_id']; WHERE user_id = ' . $user->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
// Delete an existing avatar if present // Delete old avatar if present
if ($user->data['user_avatar'] != '' && $data['filename'] != $user->data['user_avatar'])
{
$this->avatar_delete(); $this->avatar_delete();
}
meta_refresh(3, "ucp.$phpEx$SID&i=$id&mode=$submode"); meta_refresh(3, "ucp.$phpEx$SID&i=$id&mode=$submode");
$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], "<a href=\"ucp.$phpEx$SID&amp;i=$id&amp;mode=$submode\">", '</a>'); $message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], "<a href=\"ucp.$phpEx$SID&amp;i=$id&amp;mode=$submode\">", '</a>');
@ -450,7 +454,7 @@ class ucp_profile extends ucp
'AVATAR' => $avatar_img, 'AVATAR' => $avatar_img,
'AVATAR_SIZE' => $config['avatar_filesize'], 'AVATAR_SIZE' => $config['avatar_filesize'],
'AVATAR_URL' => (isset($uploadurl)) ? $uploadurl : '', 'AVATAR_URL' => (isset($uploadurl)) ? $uploadurl : '',
'AVATAR_REMOTE' => (isset($remotelink)) ? $remotelink : (($user->data['user_avatar_type'] == AVATAR_REMOTE) ? $avatar_img : ''), 'AVATAR_REMOTE' => (isset($remotelink)) ? $remotelink : (($user->data['user_avatar_type'] == AVATAR_REMOTE) ? $user->data['user_avatar'] : ''),
'WIDTH' => (isset($width)) ? $width : $user->data['user_avatar_width'], 'WIDTH' => (isset($width)) ? $width : $user->data['user_avatar_width'],
'HEIGHT' => (isset($height)) ? $height : $user->data['user_avatar_height'], 'HEIGHT' => (isset($height)) ? $height : $user->data['user_avatar_height'],

1
phpBB/language/en/lang_main.php
View file

@ -721,6 +721,7 @@ $lang = array(
'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.', 'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.',
'AVATAR_WRONG_SIZE' => 'The avatar must be at most %1$d pixels wide and %2$d pixels high.', 'AVATAR_WRONG_SIZE' => 'The avatar must be at most %1$d pixels wide and %2$d pixels high.',
'AVATAR_WRONG_FILESIZE' => 'The avatar must be between 0 and %d bytes.', 'AVATAR_WRONG_FILESIZE' => 'The avatar must be between 0 and %d bytes.',
'AVATAR_NO_SIZE' => 'Could not obtain width or height of linked avatar, please enter them manually.',
'PROFILE_UPDATED' => 'Your profile has been updated.', 'PROFILE_UPDATED' => 'Your profile has been updated.',