diff options
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_upload.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 3 |
7 files changed, 11 insertions, 10 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index bcdd8c71d8..994b8ee7f6 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -65,7 +65,7 @@ class acp_icons { foreach ($img_ary as $img) { - $img_size = @getimagesize($phpbb_root_path . $img_path . '/' . $path . $img); + $img_size = getimagesize($phpbb_root_path . $img_path . '/' . $path . $img); if (!$img_size[0] || !$img_size[1] || strlen($img) > 255) { @@ -222,7 +222,7 @@ class acp_icons { if ($image_width[$image] == 0 || $image_height[$image] == 0) { - $img_size = @getimagesize($phpbb_root_path . $img_path . '/' . $image); + $img_size = getimagesize($phpbb_root_path . $img_path . '/' . $image); $image_width[$image] = $img_size[0]; $image_height[$image] = $img_size[1]; } diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4147e87556..7e1a7ac679 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2619,7 +2619,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, { if ($config['img_link_width'] || $config['img_link_height']) { - list($width, $height) = @getimagesize($filename); + list($width, $height) = getimagesize($filename); $display_cat = (!$width && !$height) ? ATTACHMENT_CATEGORY_IMAGE : (($width <= $config['img_link_width'] && $height <= $config['img_link_height']) ? ATTACHMENT_CATEGORY_IMAGE : ATTACHMENT_CATEGORY_NONE); } @@ -2704,7 +2704,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, // Macromedia Flash Files case ATTACHMENT_CATEGORY_FLASH: - list($width, $height) = @getimagesize($filename); + list($width, $height) = getimagesize($filename); $l_downloaded_viewed = $user->lang['VIEWED']; diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index d68aa9f645..f138802e40 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -358,7 +358,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage // If this error occurs a user tried to exploit an IE Bug by renaming extensions // Since the image category is displaying content inline we need to catch this. - trigger_error($user->lang['UNABLE_GET_IMAGE_SIZE']); + trigger_error($user->lang['ATTACHED_IMAGE_NOT_IMAGE']); } // Do we have to create a thumbnail? @@ -552,7 +552,7 @@ function create_thumbnail($source, $destination, $mimetype) return false; } - list($width, $height, $type, ) = @getimagesize($source); + list($width, $height, $type, ) = getimagesize($source); if (!$width || !$height) { diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 489f3e942e..3f40a35bb2 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -313,7 +313,7 @@ class filespec { $this->width = $this->height = 0; - if (($this->image_info = @getimagesize($this->destination_file)) !== false) + if (($this->image_info = getimagesize($this->destination_file)) !== false) { $this->width = $this->image_info[0]; $this->height = $this->image_info[1]; diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 3ef03ece67..c78238b25f 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1394,7 +1394,7 @@ function avatar_remote($data, &$error) } // Make sure getimagesize works... - if (($image_data = @getimagesize($data['remotelink'])) === false) + if (($image_data = getimagesize($data['remotelink'])) === false) { $error[] = $user->lang['UNABLE_GET_IMAGE_SIZE']; return false; diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index e5e2240b6d..e2c0b37fe7 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -273,7 +273,7 @@ class bbcode_firstpass extends bbcode if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width']) { - $stats = @getimagesize($in); + $stats = getimagesize($in); if ($stats === false) { diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 953a5c9644..c765f6d112 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -65,6 +65,7 @@ $lang = array_merge($lang, array( 'ARE_WATCHING_TOPIC' => 'You have subscribed to receive updates on this topic.', 'ASCENDING' => 'Ascending', 'ATTACHMENTS' => 'Attachments', + 'ATTACHED_IMAGE_NOT_IMAGE' => 'You tried to attach an invalid image file.', 'AUTHOR' => 'Author', 'AUTH_NO_PROFILE_CREATED' => 'Creating a user profile failed', 'AVATAR_DISALLOWED_EXTENSION' => 'The extension %s is not allowed', @@ -559,7 +560,7 @@ $lang = array_merge($lang, array( 'TOTAL_USERS_ZERO' => 'Total members <strong>0</strong>', 'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s', - 'UNABLE_GET_IMAGE_SIZE' => 'Accessing the image was impossible or file isn’t a valid image.', + 'UNABLE_GET_IMAGE_SIZE' => 'It was not possible to determine the dimensions of the image.', 'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.', 'UNKNOWN_BROWSER' => 'Unknown browser', 'UNMARK_ALL' => 'Unmark all', |