diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-19 16:19:59 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-19 16:19:59 +0000 |
| commit | c0a013053a127270a1b9498d847b63ae3a6a25c9 (patch) | |
| tree | 7619d776a02ada3c4b99c4c4deec9e9e7688a72a /phpBB/includes/functions_user.php | |
| parent | eb6c2c54dfaafa5705d11fce82a70859684fb2f2 (diff) | |
| download | forums-c0a013053a127270a1b9498d847b63ae3a6a25c9.tar forums-c0a013053a127270a1b9498d847b63ae3a6a25c9.tar.gz forums-c0a013053a127270a1b9498d847b63ae3a6a25c9.tar.bz2 forums-c0a013053a127270a1b9498d847b63ae3a6a25c9.tar.xz forums-c0a013053a127270a1b9498d847b63ae3a6a25c9.zip | |
Yet more updates, topic marking works again ... still intend (optional) checking of "forum read" status on return to index (rather than just the current fudge of visiting the forum), obtain_ranks as a function (used in at least three scripts), removed jabber method that was needed, oops
git-svn-id: file:///svn/phpbb/trunk@4147 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index d8616db231..8fa26793b2 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -365,7 +365,7 @@ class ucp extends user function avatar_remote(&$data) { - global $config, $db, $user; + global $config, $db, $user, $phpbb_root_path; if (!preg_match('#^(http[s]*?)|(ftp)://#i', $data['remotelink'])) { @@ -474,7 +474,7 @@ class ucp extends user } unset($url_ary); - $tmp_path = (!@ini_get('safe_mode')) ? false : './' . $config['avatar_path'] . '/tmp'; + $tmp_path = (!@ini_get('safe_mode')) ? false : $phpbb_root_path . 'cache/tmp'; $filename = tempnam($tmp_path, uniqid(rand()) . '-'); if (!($fp = @fopen($filename, 'wb'))) @@ -498,9 +498,9 @@ class ucp extends user list($width, $height) = getimagesize($filename); - if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height'] || !$width || !$height) + if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height'] || $width < $config['avatar_min_width'] || $height < $config['avatar_min_height'] || !$width || !$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_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height']); return true; } |