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

Merge pull request #179 from nturato/patch-1

Browse Source 
[-] WS: images are only shown as jpg or gif
This commit is contained in:
Vincent Augagneur
2013-04-17 01:56:57 -07:00
parent 6bf1d0c036 1348291415
commit 95500d708d
1 changed files with 12 additions and 4 deletions
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 * @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...) * @var array The type of images (general, categories, manufacturers, suppliers, stores...)
@@ -119,10 +119,18 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage
// display image content if needed // display image content if needed
else if ($this->imgToDisplay) else if ($this->imgToDisplay)
{ {
if(empty($this->imgExtension)){
$imginfo = getimagesize($this->imgToDisplay);
$this->imgExtension = image_type_to_extension($imginfo[2],false);
}
$imageResource = false; $imageResource = false;
$types = array('jpg' => array('function' => 'imagecreatefromjpeg', 'Content-Type' => 'image/jpeg'), $types = array(
'gif' => array('function' => 'imagecreatefromgif', 'Content-Type' => 'image/gif') '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)) if (array_key_exists($this->imgExtension, $types))
$imageResource = @$types[$this->imgExtension]['function']($this->imgToDisplay); $imageResource = @$types[$this->imgExtension]['function']($this->imgToDisplay);