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

[*] Classes : images.inc.php functions are now all deprecated, use the new class ImageManager instead

Browse Source
This commit is contained in:
rMalie
2012-01-23 10:21:51 +00:00
parent 36eb5b4d06
commit f08ce5cb8b
32 changed files with 569 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FileUploader.php
+53 -58
View File
@@ -32,27 +32,27 @@ class FileUploaderCore
private $file;
private $sizeLimit;
function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760)
public function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760)
{
$allowedExtensions = array_map("strtolower", $allowedExtensions);
$allowedExtensions = array_map('strtolower', $allowedExtensions);
$this->allowedExtensions = $allowedExtensions;
$this->sizeLimit = $sizeLimit;
if (isset($_GET['qqfile'])) {
$this->file = new qqUploadedFileXhr();
} elseif (isset($_FILES['qqfile'])) {
$this->file = new qqUploadedFileForm();
} else {
$this->file = false;
}
if (isset($_GET['qqfile']))
$this->file = new QqUploadedFileXhr();
elseif (isset($_FILES['qqfile']))
$this->file = new QqUploadedFileForm();
else
$this->file = false;
}
protected function toBytes($str)
{
$val = trim($str);
$last = strtolower($str[strlen($str)-1]);
switch($last) {
$last = strtolower($str[strlen($str) - 1]);
switch ($last)
{
case 'g': $val *= 1024;
case 'm': $val *= 1024;
case 'k': $val *= 1024;
@@ -63,41 +63,38 @@ class FileUploaderCore
/**
* Returns array('success'=>true) or array('error'=>'error message')
*/
function handleUpload()
public function handleUpload()
{
if (!$this->file){
if (!$this->file)
return array('error' => Tools::displayError('No files were uploaded.'));
}
$size = $this->file->getSize();
if ($size == 0) {
if ($size == 0)
return array('error' => Tools::displayError('File is empty'));
}
if ($size > $this->sizeLimit) {
if ($size > $this->sizeLimit)
return array('error' => Tools::displayError('File is too large'));
}
$pathinfo = pathinfo($this->file->getName());
$filename = $pathinfo['filename'];
$these = implode(', ', $this->allowedExtensions);
if (!isset($pathinfo['extension']))
return array('error' => Tools::displayError('File has an invalid extension, it should be one of '). $these . '.');
return array('error' => Tools::displayError('File has an invalid extension, it should be one of ').$these.'.');
$ext = $pathinfo['extension'];
if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions))
return array('error' => Tools::displayError('File has an invalid extension, it should be one of '). $these . '.');
if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions))
return array('error' => Tools::displayError('File has an invalid extension, it should be one of ').$these.'.');
return $this->file->save();
}
}
class qqUploadedFileForm {
class QqUploadedFileForm
{
/**
* Save the file to the specified path
* @return boolean TRUE on success
*/
function save()
public function save()
{
$product = new Product($_GET['id_product']);
if (!Validate::isLoadedObject($product))
@@ -105,7 +102,7 @@ class qqUploadedFileForm {
else
{
$image = new Image();
$image->id_product = (int)($product->id);
$image->id_product = (int)$product->id;
$image->position = Image::getHighestPosition($product->id) + 1;
if (!Image::getCover($image->id_product))
$image->cover = 1;
@@ -114,66 +111,66 @@ class qqUploadedFileForm {
if (!$image->add())
return array('error' => Tools::displayError('Error while creating additional image'));
else
{
return $this->copyImage($product->id, $image->id);
}
}
}
public function copyImage($id_product, $id_image, $method = 'auto')
{
$image = new Image($id_image);
$p = new Product($id_product);
if (!$new_path = $image->getPathForCreation())
return array('error' => Tools::displayError('An error occurred during new folder creation'));
if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') OR !move_uploaded_file($_FILES['qqfile']['tmp_name'], $tmpName))
if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') || !move_uploaded_file($_FILES['qqfile']['tmp_name'], $tmpName))
return array('error' => Tools::displayError('An error occurred during the image upload'));
elseif (!imageResize($tmpName, $new_path.'.'.$image->image_format))
elseif (!ImageManager::resize($tmpName, $new_path.'.'.$image->image_format))
return array('error' => Tools::displayError('An error occurred while copying image.'));
elseif($method == 'auto')
elseif ($method == 'auto')
{
$imagesTypes = ImageType::getImagesTypes('products');
foreach ($imagesTypes AS $k => $imageType)
foreach ($imagesTypes as $imageType)
{
$theme = (Shop::isFeatureActive() ? '-'.$imageType['id_theme'] : '');
if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).$theme.'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
if (!ImageManager::resize($tmpName, $new_path.'-'.stripslashes($imageType['name']).$theme.'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
return array('error' => Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name']));
}
}
unlink($tmpName);
Hook::exec('actionWatermark', array('id_image' => $id_image, 'id_product' => $id_product));
$lang = Context::getContext()->employee->id_lang;
if (!$image->update())
return array('error' => Tools::displayError('Error while updating status'));
$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName());
return array("success" => $img);
return array('success' => $img);
}
function getName() {
public function getName()
{
return $_FILES['qqfile']['name'];
}
function getSize() {
public function getSize()
{
return $_FILES['qqfile']['size'];
}
}
/**
* Handle file uploads via XMLHttpRequest
*/
class qqUploadedFileXhr
class QqUploadedFileXhr
{
/**
* Save the file to the specified path
* @return boolean TRUE on success
*/
function upload($path)
* Save the file to the specified path
* @return boolean TRUE on success
*/
public function upload($path)
{
$input = fopen("php://input", "r");
$input = fopen('php://input', 'r');
$temp = tmpfile();
$realSize = stream_copy_to_stream($input, $temp);
fclose($input);
if ($realSize != $this->getSize())
return false;
$target = fopen($path, "w");
$target = fopen($path, 'w');
fseek($temp, 0, SEEK_SET);
stream_copy_to_stream($temp, $target);
fclose($target);
@@ -181,7 +178,7 @@ class qqUploadedFileXhr
return true;
}
function save()
public function save()
{
$product = new Product($_GET['id_product']);
if (!Validate::isLoadedObject($product))
@@ -198,9 +195,7 @@ class qqUploadedFileXhr
if (!$image->add())
return array('error' => Tools::displayError('Error while creating additional image'));
else
{
return $this->copyImage($product->id, $image->id);
}
}
}
@@ -210,21 +205,21 @@ class qqUploadedFileXhr
$p = new Product($id_product);
if (!$new_path = $image->getPathForCreation())
return array('error' => Tools::displayError('An error occurred during new folder creation'));
if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') OR !$this->upload($tmpName))
if (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') || !$this->upload($tmpName))
return array('error' => Tools::displayError('An error occurred during the image upload'));
elseif (!imageResize($tmpName, $new_path.'.'.$image->image_format))
elseif (!ImageManager::resize($tmpName, $new_path.'.'.$image->image_format))
return array('error' => Tools::displayError('An error occurred while copying image.'));
elseif($method == 'auto')
elseif ($method == 'auto')
{
$imagesTypes = ImageType::getImagesTypes('products');
foreach ($imagesTypes AS $k => $imageType)
foreach ($imagesTypes as $imageType)
{
/*
$theme = (Shop::isFeatureActive() ? '-'.$imageType['id_theme'] : '');
if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).$theme.'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
if (!ImageManager::resize($tmpName, $new_path.'-'.stripslashes($imageType['name']).$theme.'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
return array('error' => Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name']));
*/
if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
if (!ImageManager::resize($tmpName, $new_path.'-'.stripslashes($imageType['name']).'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
return array('error' => Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name']));
}
}
@@ -234,18 +229,18 @@ class qqUploadedFileXhr
if (!$image->update())
return array('error' => Tools::displayError('Error while updating status'));
$img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover, 'name' => $this->getName());
return array("success" => $img);
return array('success' => $img);
}
function getName()
public function getName()
{
return $_GET['qqfile'];
}
function getSize()
public function getSize()
{
if (isset($_SERVER["CONTENT_LENGTH"]))
return (int)$_SERVER["CONTENT_LENGTH"];
if (isset($_SERVER['CONTENT_LENGTH']))
return (int)$_SERVER['CONTENT_LENGTH'];
else
throw new Exception('Getting content length is not supported.');
}