mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00
Code Issues Releases 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
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;
$avatar = explode(':', $user->data['user_avatar']);
$avatar_type = array_shift($avatar);
if ($avatar_type != 'upload')
if (@file_exists('./' . $config['avatar_path'] . '/' . $user->data['user_avatar']))
{
return;
}
$avatar = implode('', $avatar);
if (@file_exists('./' . $config['avatar_path'] . '/' . $avatar))
{
@unlink('./' . $config['avatar_path'] . '/' . $avatar);
@unlink('./' . $config['avatar_path'] . '/' . $user->data['user_avatar']);
}
}
@@ -387,11 +378,16 @@ class ucp extends user
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']);
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']);
return true;
@@ -526,6 +522,7 @@ class ucp extends user
$filesize = filesize('./' . $config['avatar_path'] . '/' . $data['filename']);
if (!$filesize || $filesize > $config['avatar_filesize'])
{
@unlink('./' . $config['avatar_path'] . '/' . $data['filename']);
$this->error[] = sprintf($user->lang['AVATAR_WRONG_FILESIZE'], $config['avatar_filesize']);
return true;
}