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

[*] BO : Removed size limit for image upload (BL006, CC136)

Browse Source
This commit is contained in:
tDidierjean
2011-09-12 09:14:07 +00:00
parent beea76b0bd
commit 7cd878079c
17 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/autoupgrade/AdminSelfTab.php
+2 -5
View File
@@ -117,9 +117,6 @@ abstract class AdminSelfTab
/** @var string Order way (ASC, DESC) determined by arrows in list header */
protected $_orderWay;
/** @var integer Max image size for upload */
protected $maxImageSize = 2000000;
/** @var array Errors displayed after post processing */
public $_errors = array();
@@ -1140,7 +1137,7 @@ abstract class AdminSelfTab
return false;
// Check image validity
if ($error = checkImage($_FILES[$name], $this->maxImageSize))
if ($error = checkImage($_FILES[$name]))
$this->_errors[] = $error;
elseif (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') OR !move_uploaded_file($_FILES[$name]['tmp_name'], $tmpName))
return false;
@@ -1171,7 +1168,7 @@ abstract class AdminSelfTab
if (isset($_FILES[$name]['tmp_name']) AND !empty($_FILES[$name]['tmp_name']))
{
/* Check ico validity */
if ($error = checkIco($_FILES[$name], $this->maxImageSize))
if ($error = checkIco($_FILES[$name]))
$this->_errors[] = $error;
/* Copy new ico */
modules/blockreinsurance/blockreinsurance.php
+1 -3
View File
@@ -75,8 +75,6 @@ class blockreinsurance extends Module
public function addToDB()
{
$maxImageSize = 3007200;
if(isset($_POST['nbblocks']))
{
for($i = 1; $i <= (int)$_POST['nbblocks']; $i++)
@@ -84,7 +82,7 @@ class blockreinsurance extends Module
$filename = explode('.', $_FILES['info'.$i.'_file']['name']);
if (isset($_FILES['info'.$i.'_file']) AND isset($_FILES['info'.$i.'_file']['tmp_name']) AND !empty($_FILES['info'.$i.'_file']['tmp_name']))
{
if ($error = checkImage($_FILES['info'.$i.'_file'], $maxImageSize))
if ($error = checkImage($_FILES['info'.$i.'_file']))
return false;
elseif (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') OR !move_uploaded_file($_FILES['info'.$i.'_file']['tmp_name'], $tmpName))
return false;
modules/editorial/editorial.php
+1 -4
View File
@@ -30,9 +30,6 @@ if (!defined('_PS_VERSION_'))
class Editorial extends Module
{
/** @var max image size */
protected $maxImageSize = 307200;
public function __construct()
{
$this->name = 'editorial';
@@ -152,7 +149,7 @@ class Editorial extends Module
Configuration::set('PS_IMAGE_GENERATION_METHOD', 1);
if(file_exists(dirname(__FILE__).'/homepage_logo.jpg'))
unlink(dirname(__FILE__).'/homepage_logo.jpg');
if ($error = checkImage($_FILES['body_homepage_logo'], $this->maxImageSize))
if ($error = checkImage($_FILES['body_homepage_logo']))
$errors .= $error;
elseif (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') OR !move_uploaded_file($_FILES['body_homepage_logo']['tmp_name'], $tmpName))
return false;
modules/homeslider/HomeSlide.php
-1
View File
@@ -34,7 +34,6 @@ class HomeSlide extends ObjectModel
public $image;
public $active;
public $position;
public $maxImageSize = 307200;
protected $fieldsValidate = array(
'active' => 'isunsignedInt',
modules/homeslider/homeslider.php
+1 -1
View File
@@ -503,7 +503,7 @@ class HomeSlider extends Module
/* Uploads image and sets slide */
if (isset($_FILES['image_'.$language['id_lang']]) AND isset($_FILES['image_'.$language['id_lang']]['tmp_name']) AND !empty($_FILES['image_'.$language['id_lang']]['tmp_name']))
{
if ($error = checkImage($_FILES['image_'.$language['id_lang']], $slide->maxImageSize))
if ($error = checkImage($_FILES['image_'.$language['id_lang']]))
$errors .= $error;
elseif (!$tmpName = tempnam(_PS_TMP_IMG_DIR_, 'PS') OR !move_uploaded_file($_FILES['image_'.$language['id_lang']]['tmp_name'], $tmpName))
return false;
modules/watermark/watermark.php
+1 -2
View File
@@ -39,7 +39,6 @@ class Watermark extends Module
private $transparency;
private $imageTypes = array();
private $watermarkTypes;
private $maxImageSize = 100000;
public function __construct()
{
@@ -132,7 +131,7 @@ class Watermark extends Module
if (isset($_FILES['PS_WATERMARK']) AND !empty($_FILES['PS_WATERMARK']['tmp_name']))
{
/* Check watermark validity */
if ($error = checkImage($_FILES['PS_WATERMARK'], $this->maxImageSize))
if ($error = checkImage($_FILES['PS_WATERMARK']))
$this->_errors[] = $error;
/* Copy new watermark */
elseif(!copy($_FILES['PS_WATERMARK']['tmp_name'], dirname(__FILE__).'/watermark.gif'))