// Uploader helper part 2

classes/helper/HelperForm.php

@@ -119,11 +119,12 @@ class HelperFormCore extends Helper
 							$uploader->setMultiple(isset($params['multiple'])?$params['multiple']:false);
 							$uploader->setUseAjax(isset($params['ajax'])?$params['ajax']:false);
 
-							if (isset($params['images']))
-								$uploader->setImages($params['images']);
-							elseif (isset($params['image'])) // Use for retrocompatibility							
-								$uploader->setImages(array(
+							if (isset($params['files']) && $params['files'])
+								$uploader->setFiles($params['files']);
+							elseif (isset($params['image']) && $params['image']) // Use for retrocompatibility							
+								$uploader->setFiles(array(
 									0 => array(
+									'type'       => HelperUploader::TYPE_IMAGE,
 									'image'      => isset($params['image'])?$params['image']:null,
 									'size'       => isset($params['size'])?$params['size']:null,
 									'delete_url' => isset($params['delete_url'])?$params['delete_url']:null

classes/helper/HelperImageUploader.php

@@ -0,0 +1,82 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+class HelperImageUploaderCore extends HelperUploader
+{
+	private $_temporary_path;
+
+	public function getMaxSize()
+	{
+		return (int)Configuration::get('PS_PRODUCT_PICTURE_MAX_SIZE');
+	}
+
+	public function setTemporaryPath($value)
+	{
+		$this->_temporary_path = $value;
+	}
+
+	public function getTemporaryPath()
+	{
+		if (!isset($this->_temporary_path))
+			$this->_temporary_path = _PS_TMP_IMG_DIR_;
+
+		return $this->_normalizeDirectory($this->_temporary_path);
+	}
+
+	public function getFilePath($file_name = null)
+	{
+		//Force file path
+		return tempnam($this->getTemporaryPath(), $this->getUniqueFileName());
+	}
+
+	protected function validate($file)
+	{
+		$post_max_size = $this->_getPostMaxSizeBytes();
+
+		if ($post_max_size && ($this->_getServerVars('CONTENT_LENGTH') > $post_max_size))
+		{
+			$file['error'] = Tools::displayError('The uploaded file exceeds the post_max_size directive in php.ini');
+			return false;
+		}
+
+		if (!preg_match($this->getAcceptTypes(), $file['name']))
+		{
+			$file['error'] = Tools::displayError('Filetype not allowed');
+			return false;
+		}
+
+		if ($error = ImageManager::validateUpload($file, Tools::getMaxUploadSize($this->getMaxSize())))
+			$file['error'] = $error;
+
+		if ($file['size'] > $this->getMaxSize())
+		{
+			$file['error'] = Tools::displayError('File is too big');
+			return false;
+		}
+
+		return true;
+	}
+}

classes/helper/HelperOptions.php

@@ -105,11 +105,12 @@ class HelperOptionsCore extends Helper
 					$uploader->setMultiple(isset($field['multiple'])?$field['multiple']:false);
 					$uploader->setUseAjax(isset($field['ajax'])?$field['ajax']:false);
 
-					if (isset($field['images']))
-						$uploader->setImages($field['images']);
-					elseif (isset($field['image'])) // Use for retrocompatibility							
-						$uploader->setImages(array(
+					if (isset($field['files']) && $field['files'])
+						$uploader->setFiles($field['files']);
+					elseif (isset($field['image']) && $field['image']) // Use for retrocompatibility							
+						$uploader->setFiles(array(
 							0 => array(
+							'type'       => HelperUploader::TYPE_IMAGE,
 							'image'      => isset($field['image'])?$field['image']:null,
 							'size'       => isset($field['size'])?$field['size']:null,
 							'delete_url' => isset($field['delete_url'])?$field['delete_url']:null

classes/helper/HelperUploader.php

@@ -30,10 +30,13 @@ class HelperUploaderCore extends Uploader
 	const DEFAULT_TEMPLATE           = 'simple.tpl';
 	const DEFAULT_AJAX_TEMPLATE      = 'ajax.tpl';
 
+	const TYPE_IMAGE                 = 'image';
+
 	private   $_context;
 	private   $_id;
-	private   $_images;
+	private   $_files;
 	private   $_name;
+	private   $_max_files;
 	private   $_multiple;
 	private   $_file;
 	protected $_template;
@@ -71,29 +74,29 @@ class HelperUploaderCore extends Uploader
 		return $this->_id;
 	}
 
-	public function setImages($value)
+	public function setFiles($value)
 	{
-		$this->_images = $value;
+		$this->_files = $value;
 		return $this;
 	}
 
-	public function getImages()
+	public function getFiles()
 	{
-		if (!isset($this->_images))
-			$this->_images = array();
+		if (!isset($this->_files))
+			$this->_files = array();
 
-		return $this->_images;
+		return $this->_files;
 	}
 
-	public function setName($value)
+	public function setMaxFiles($value)
 	{
-		$this->_name = (string)$value;
+		$this->_max_files = intval($value);
 		return $this;
 	}
 
-	public function getName()
+	public function getMaxFiles()
 	{
-		return $this->_name;
+		return $this->_max_files;
 	}
 
 	public function setMultiple($value)
@@ -108,6 +111,17 @@ class HelperUploaderCore extends Uploader
 		return $this;
 	}
 
+	public function setName($value)
+	{
+		$this->_name = (string)$value;
+		return $this;
+	}
+
+	public function getName()
+	{
+		return $this->_name;
+	}
+
 	public function getTemplate()
 	{
 		if (!isset($this->_template))
@@ -223,12 +237,6 @@ class HelperUploaderCore extends Uploader
 		return (isset($this->_multiple) && $this->_multiple);
 	}
 
-	public function process()
-	{
-		$files = parent::process();
-		die(Tools::jsonEncode(array($this->getName() => $files)));
-	}
-
 	public function render()
 	{
 		$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
@@ -273,15 +281,18 @@ class HelperUploaderCore extends Uploader
 			$this->getTemplateFile($this->getTemplate()), $this->getContext()->smarty
 		);
 
+		$max_files = $this->getMaxFiles();
+
 		$template->assign(array(
 			'id'            => $this->getId(),
 			'name'          => $this->getName(),
 			'url'           => $this->getUrl(),
 			'multiple'      => $this->isMultiple(),
-			'images'        => $this->getImages(),
+			'files'         => $this->getFiles(),
 			'thumb'         => $this->getThumb(),
 			'file'          => $this->getFile(),
-			'title'         => $this->getTitle()
+			'title'         => $this->getTitle(),
+			'max_files'     => (isset($max_files) && $max_files > 0) ? ($max_files-count($this->getFiles())) : $max_files
 		));
 
 		$html .= $template->fetch();