dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WS] images are only shown as jpg or gif

Browse Source 
If you enable BO to also use the PNG file you can not use these images in WS because there are no controls on the image type
This commit is contained in:
nturato committed 2013-01-15 10:17:02 +01:00
1 parent 8e43f1e38f
commit de9e75cc0d
1 file changed
+12 -4
Download Patch File Download Diff File Expand all files Collapse all files
classes/webservice/WebserviceSpecificManagementImages.php
+12 -4
View File
@@ -33,7 +33,7 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage
/**
* @var string The extension of the image to display
*/
protected $imgExtension = 'jpg';
protected $imgExtension;
/**
* @var array The type of images (general, categories, manufacturers, suppliers, stores...)
@@ -119,10 +119,18 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage
// display image content if needed
else if ($this->imgToDisplay)
{
if(empty($this->imgExtension)){
$imginfo = getimagesize($this->imgToDisplay);
$this->imgExtension = image_type_to_extension($imginfo[2],false);
}
$imageResource = false;
$types = array('jpg' => array('function' => 'imagecreatefromjpeg', 'Content-Type' => 'image/jpeg'),
'gif' => array('function' => 'imagecreatefromgif', 'Content-Type' => 'image/gif')
);
$types = array(
'jpg' => array('function' => 'imagecreatefromjpeg', 'Content-Type' => 'image/jpeg'),
'jpeg' => array('function' => 'imagecreatefromjpeg', 'Content-Type' => 'image/jpeg'),
'png' => array('function' => 'imagecreatefrompng', 'Content-Type' => 'image/png'),
'gif' => array('function' => 'imagecreatefromgif', 'Content-Type' => 'image/gif')
);
if (array_key_exists($this->imgExtension, $types))
$imageResource = @$types[$this->imgExtension]['function']($this->imgToDisplay);