From f02f6216867db63f6ad2659b0b702b81b07a875c Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Mon, 18 Apr 2011 23:34:56 -0700
Subject: [PATCH] [feature/avatars] Fixing remote avatars size checks

Remote avatars size checks were broken. It assumed getimagesize() was
available and used the wrong template values.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php        |  9 +++++-
 phpBB/includes/avatar/driver/remote.php       | 29 ++++++++++---------
 .../template/ucp_avatar_options_remote.html   |  4 +--
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index c00f65a81d..4c15b5de2e 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -73,7 +73,14 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 							// Match all images in the gallery folder
 							if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
 							{
-								$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
+								if (function_exists('getimagesize'))
+								{
+									$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
+								}
+								else
+								{
+									$dims = array(0, 0);
+								}
 								$avatar_list[$cat][$image] = array(
 									'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
 									'filename'  => rawurlencode($image),
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index ebaf3cf5c4..48f86cac3f 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -80,22 +80,25 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			}
 
 			// Make sure getimagesize works...
-			if (($image_data = getimagesize($url)) === false && ($width <= 0 || $height <= 0))
+			if (function_exists('getimagesize'))
 			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-				return false;
+				if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
+				{
+					$error[] = 'UNABLE_GET_IMAGE_SIZE';
+					return false;
+				}
+
+				if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
+				{
+					$error[] = 'AVATAR_NO_SIZE';
+					return false;
+				}
+
+				$width = ($width && $height) ? $width : $image_data[0];
+				$height = ($width && $height) ? $height : $image_data[1];
 			}
 
-			if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2))
-			{
-				$error[] = 'AVATAR_NO_SIZE';
-				return false;
-			}
-
-			$width = ($width && $height) ? $width : $image_data[0];
-			$height = ($width && $height) ? $height : $image_data[1];
-
-			if ($width < 2 || $height < 2)
+			if ($width <= 0 || $height <= 0)
 			{
 				$error[] = 'AVATAR_NO_SIZE';
 				return false;
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
index 4e62e96d9d..02704c5be8 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
@@ -5,7 +5,7 @@
 <dl>
 	<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
 	<dd>
-		<label for="width"><input type="text" name="width" id="width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
-		<label for="height"><input type="text" name="height" id="height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
+		<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; 
+		<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
 	</dd>
 </dl>