diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-21 16:27:20 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-21 16:27:20 +0100 |
| commit | 9b61204a17386742d3d3ec579ee8dcfe50cbf5a4 (patch) | |
| tree | 71805ffd35842996a899cbb6bec966228b7ef924 /phpBB/includes/avatar/driver | |
| parent | b7b14f9a056190c6a01c98f6eec9e60ad73d7564 (diff) | |
| download | forums-9b61204a17386742d3d3ec579ee8dcfe50cbf5a4.tar forums-9b61204a17386742d3d3ec579ee8dcfe50cbf5a4.tar.gz forums-9b61204a17386742d3d3ec579ee8dcfe50cbf5a4.tar.bz2 forums-9b61204a17386742d3d3ec579ee8dcfe50cbf5a4.tar.xz forums-9b61204a17386742d3d3ec579ee8dcfe50cbf5a4.zip | |
[feature/avatars] Check if gravatar is within min/max width/height
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver')
| -rw-r--r-- | phpBB/includes/avatar/driver/gravatar.php | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php index a73a28a234..f0ab2ab548 100644 --- a/phpBB/includes/avatar/driver/gravatar.php +++ b/phpBB/includes/avatar/driver/gravatar.php @@ -132,6 +132,24 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver $error[] = 'AVATAR_NO_SIZE'; return false; } + + if ($this->config['avatar_max_width'] || $this->config['avatar_max_height']) + { + if ($row['avatar_width'] > $this->config['avatar_max_width'] || $row['avatar_height'] > $this->config['avatar_max_height']) + { + $error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $row['avatar_width'], $row['avatar_height']); + return false; + } + } + + if ($this->config['avatar_min_width'] || $this->config['avatar_min_height']) + { + if ($row['avatar_width'] < $this->config['avatar_min_width'] || $row['avatar_height'] < $this->config['avatar_min_height']) + { + $error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $row['avatar_width'], $row['avatar_height']); + return false; + } + } return array( 'avatar' => $row['avatar'], |