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

// Uploader helper part 2

Browse Source
This commit is contained in:
Jerome Nadaud
2013-11-04 18:31:43 +01:00
parent 9f2424db41
commit d78a268730
7 changed files with 297 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/uploader/ajax.tpl
+109 -21
View File
@@ -22,17 +22,17 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{if isset($images) && $images}
<div class="form-group">
<div class="col-lg-12">
{foreach $images as $image}
{if isset($image.image)}
<div class="form-group" style="display: none;">
<div class="col-lg-12" id="{$id}-images-thumbnails">
{if isset($files) && $files|count > 0}
{foreach $files as $file}
{if isset($file.image) && $file.type == 'image'}
<div class="img-thumbnail text-center">
<p>{$image.image}</p>
{if isset($image.size)}<p>{l s='File size'} {$image.size}kb</p>{/if}
{if isset($image.delete_url)}
<p>{$file.image}</p>
{if isset($file.size)}<p>{l s='File size'} {$file.size}kb</p>{/if}
{if isset($file.delete_url)}
<p>
<a class="btn btn-default" href="{$image.delete_url}">
<a class="btn btn-default" href="{$file.delete_url}">
<i class="icon-trash"></i> {l s='Delete'}
</a>
</p>
@@ -40,9 +40,9 @@
</div>
{/if}
{/foreach}
{/if}
</div>
</div>
{/if}
<div class="form-group">
<div class="col-lg-12">
<input id="{$id}" type="file" name="{$name}[]"{if isset($url)} data-url="{$url}"{/if}{if isset($multiple) && $multiple} multiple="multiple"{/if} class="hide" />
@@ -65,16 +65,97 @@
</div>
<script type="text/javascript">
$( document ).ready(function() {
$('#{$id}-add-button').on('click', function() {
$('#{$id}').trigger('click');
$( document ).ready(function() {
{if isset($multiple) && isset($max_files)}
var {$id}_max_files = {$max_files};
{/if}
{if isset($files) && $files}
$('#{$id}-images-thumbnails').parent().show();
{/if}
var {$id}_total_files = 0;
var {$id}_upload_button = Ladda.create( document.querySelector('#{$id}-upload-button' ));
var data = $('#{$id}').fileupload({
dataType: 'json',
autoUpload: false,
singleFileUploads: false,
add: function(e, data) {
if (typeof {$id}_max_files !== 'undefined') {
if ({$id}_total_files >= {$id}_max_files || data.originalFiles.length > {$id}_max_files) {
e.preventDefault();
alert('{l s='You can upload a maximum of %s files'|sprintf:$max_files}');
return;
}
}
{$id}_total_files++;
$('#{$id}-upload-button').show().on('click', function () {
data.submit();
});
},
start: function () {
{$id}_upload_button.start();
},
fail: function (e, data) {
$('#{$id}-errors').html(data.errorThrown.message).parent().show();
},
done: function (e, data) {
if (typeof data.result.{$name} !== 'undefined') {
for (var i=0; i<data.result.{$name}.length; i++) {
if (typeof data.result.{$name}[i].image !== 'undefined') {
var template = '<div class="img-thumbnail text-center">';
template += '<p>'+data.result.{$name}[i].image+'</p>';
if (typeof data.result.{$name}[i].delete_url !== 'undefined') {
template += '<p><a class="btn btn-default" href="'+data.result.{$name}[i].delete_url+'"><i class="icon-trash"></i> {l s='Delete'}</a></p>';
}
template += '</div>';
$('#{$id}-images-thumbnails').html($('#{$id}-images-thumbnails').html()+template);
$('#{$id}-images-thumbnails').parent().show();
}
}
}
},
always: function (e, data) {
{$id}_upload_button.stop();
}
});
$('#{$id}-add-button').on('click', function() {
$('#{$id}').trigger('click');
});
});
var upload_button = Ladda.create( document.querySelector('#{$id}-upload-button' ));
/**/
/*
var total_files = 0;
var total_uploaded_files = 0;
{if isset($multiple) && isset($max_files)}
var {$id}_max_files = {$max_files};
{/if}
$('#{$id}').fileupload({
$('#{$id}').fileupload(
{
dataType: 'json',
autoUpload: false,
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
@@ -87,10 +168,7 @@ $( document ).ready(function() {
previewMaxWidth: 100,
previewMaxHeight: 100,
previewCrop: false,
limitMultiFileUploads: 3,
start: function () {
upload_button.start();
},
done: function (e, data) {
$.each(data.result, function (index, file) {
if (file[0].error)
@@ -106,6 +184,16 @@ $( document ).ready(function() {
upload_button.setProgress(data.loaded / data.total);
},
add: function (e, data) {
console.log(data.originalFiles.length);
if (typeof {$id}_max_files !== 'undefined')
{
if (data.originalFiles.length > {$id}_max_files) {
e.preventDefault();
alert('{l s='You can upload a maximum of %s files'|sprintf:$max_files}');
return;
}
}
data.context = $('#{$id}-files-list');
data.context.parent().show();
@@ -128,6 +216,6 @@ $( document ).ready(function() {
if (total_files == 0)
upload_button.stop();
}
});
});
});*/
</script>
admin-dev/themes/default/template/helpers/uploader/simple.tpl
+23 -9
View File
@@ -22,17 +22,17 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{if isset($images) && $images}
{if isset($files) && $files|count > 0}
<div class="form-group">
<div class="col-lg-12">
{foreach $images as $image}
{if isset($image.image)}
<div class="col-lg-12" id="{$id}-images-thumbnails">
{foreach $files as $file}
{if isset($file.image) && $file.type == 'image'}
<div class="img-thumbnail text-center">
<p>{$image.image}</p>
{if isset($image.size)}<p>{l s='File size'} {$image.size}kb</p>{/if}
{if isset($image.delete_url)}
<p>{$file.image}</p>
{if isset($file.size)}<p>{l s='File size'} {$file.size}kb</p>{/if}
{if isset($file.delete_url)}
<p>
<a class="btn btn-default" href="{$image.delete_url}">
<a class="btn btn-default" href="{$file.delete_url}">
<i class="icon-trash"></i> {l s='Delete'}
</a>
</p>
@@ -60,7 +60,7 @@
<button id="{$id}-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
<i class="icon-folder-open"></i> {if isset($multiple) && $multiple}{l s='Add files'}{else}{l s='Add file'}{/if}
</button>
{if isset($file)}
{if (!isset($multiple) || !$multiple) && isset($file)}
<a href="{$file}">
<button type="button" class="btn btn-default">
<i class="icon-cloud-download"></i>
@@ -74,6 +74,10 @@
</div>
<script type="text/javascript">
{if isset($multiple) && isset($max_files)}
var {$id}_max_files = {$max_files};
{/if}
$(document).ready(function(){
$('#{$id}-selectbutton').click(function(e) {
$('#{$id}').trigger('click');
@@ -101,5 +105,15 @@
$('#{$id}-name').val(name[name.length-1]);
}
});
if (typeof {$id}_max_files !== 'undefined')
{
$('#{$id}').closest('form').on('submit', function(e) {
if ($('#{$id}')[0].files.length > {$id}_max_files) {
e.preventDefault();
alert('{l s='You can upload a maximum of %s files'|sprintf:$max_files}');
}
});
}
});
</script>
classes/Uploader.php
+43 -44
View File
@@ -37,6 +37,7 @@ class UploaderCore
public function __construct($name = null)
{
$this->setName($name);
$this->files = array();
}
public function setAcceptTypes($value)
@@ -53,6 +54,14 @@ class UploaderCore
return $this->_accept_types;
}
public function getFilePath($file_name = null)
{
if (!isset($file_name))
return tempnam($this->getSavePath(), $this->getUniqueFileName());
return $this->getSavePath().$file_name;
}
public function getFiles()
{
if (!isset($this->_files))
@@ -100,50 +109,45 @@ class UploaderCore
return $this->_normalizeDirectory($this->_save_path);
}
public function getUniqueFileName()
public function getUniqueFileName($prefix = 'PS')
{
return uniqid('', true);
return uniqid($prefix, true);
}
public function process()
{
$this->files = array();
$upload = isset($_FILES[$this->getName()]) ? $_FILES[$this->getName()] : null;
if ($upload && is_array($upload['tmp_name']))
{
$tmp = array();
foreach ($upload['tmp_name'] as $index => $value)
$this->files[] = $this->upload(
$upload['tmp_name'][$index],
$upload['name'][$index],
$upload['size'][$index],
$upload['type'][$index],
$upload['error'][$index]
{ $tmp[$index] = array(
'tmp_name' => $upload['tmp_name'][$index],
'name' => $upload['name'][$index],
'size' => $upload['size'][$index],
'type' => $upload['type'][$index],
'error' => $upload['error'][$index]
);
$this->files[] = $this->upload($tmp[$index]);
}
}
else
$this->files[] = $this->upload(
$upload['tmp_name'],
$upload['name'],
isset($upload['size']) ? $upload['size'] : $this->_getServerVars('CONTENT_LENGTH'),
isset($upload['type']) ? $upload['type'] : $this->_getServerVars('CONTENT_TYPE'),
isset($upload['error']) ? $upload['error'] : null
);
$this->files[] = $this->upload($upload);
return $this->files;
}
public function upload($tmp_name, $name, $size, $type, $error)
public function upload($file)
{
$file = new stdClass();
$file->name = $name; //TODO: add unique file name if name is null
$file->size = intval($size);
$file->type = $type;
if ($this->validate($tmp_name, $file, $error))
if ($this->validate($file))
{
$file_path = $this->getSavePath().$file->name;
$file_path = $this->getFilePath($file['name']);
if ($tmp_name && is_uploaded_file($tmp_name)) {
move_uploaded_file($tmp_name, $file_path);
if ($file['tmp_name'] && is_uploaded_file($file['tmp_name'] )) {
move_uploaded_file($file['tmp_name'] , $file_path);
} else {
// Non-multipart uploads (PUT method support)
file_put_contents($file_path, fopen('php://input', 'r'));
@@ -151,60 +155,55 @@ class UploaderCore
$file_size = $this->_getFileSize($file_path);
if ($file_size === $file->size)
if ($file_size === $file['size'])
{
$file['save_path'] = $file_path;
//TODO do image processing
}
else
{
$file->size = $file_size;
$file['size'] = $file_size;
unlink($file_path);
$file->error = 'abort';
$file['error'] = 'abort';
}
}
return $file;
}
protected function validate($tmp_name, $file, $error)
protected function validate($file)
{
if ($error)
{
$file->error = Tools::displayError($error);
return false;
}
$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');
$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))
if (!preg_match($this->getAcceptTypes(), $file['name']))
{
$file->error = Tools::displayError('Filetype not allowed');
$file['error'] = Tools::displayError('Filetype not allowed');
return false;
}
if ($file->size > $this->getMaxSize())
if ($file['size'] > $this->getMaxSize())
{
$file->error = Tools::displayError('File is too big');
$file['error'] = Tools::displayError('File is too big');
return false;
}
return true;
}
private function _getFileSize($file_path, $clear_stat_cache = false) {
protected function _getFileSize($file_path, $clear_stat_cache = false) {
if ($clear_stat_cache)
clearstatcache(true, $file_path);
return filesize($file_path);
}
private function _getPostMaxSizeBytes() {
protected function _getPostMaxSizeBytes() {
$post_max_size = ini_get('post_max_size');
$bytes = trim($post_max_size);
$last = strtolower($post_max_size[strlen($post_max_size) - 1]);
@@ -219,7 +218,7 @@ class UploaderCore
return $bytes;
}
private function _getServerVars($var)
protected function _getServerVars($var)
{
return (isset($_SERVER[$var]) ? $_SERVER[$var] : '');
}
classes/helper/HelperForm.php
+5 -4
View File
@@ -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
+82
View File
@@ -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
+5 -4
View File
@@ -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 -19
View File
@@ -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();