2
0
forked from Wavyzz/dolibarr

Fix: more clean code for new version of jQuery fileupload

This commit is contained in:
Regis Houssin
2012-05-31 21:08:14 +02:00
parent 274734b828
commit 2ad1cf0665
5 changed files with 613 additions and 391 deletions

View File

@@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2011 Regis Houssin <regis@dolibarr.fr> /* Copyright (C) 2011-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -34,8 +34,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/fileupload.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
error_reporting(E_ALL | E_STRICT); error_reporting(E_ALL | E_STRICT);
@@ -47,380 +46,29 @@ $fk_element = GETPOST('fk_element','int');
$element = GETPOST('element','alpha'); $element = GETPOST('element','alpha');
/** $upload_handler = new FileUpload(null,$fk_element,$element);
* \file htdocs/core/ajax/fileupload.php
* \brief This class is used to manage file upload using ajax
*/
class UploadHandler
{
private $_options;
private $_fk_element;
private $_element;
private $_element_ref;
/**
* Constructor
*
* @param array $options Options array
* @param int $fk_element fk_element
* @param string $element element
* @param string $element_ref element ref
*/
function __construct($options=null,$fk_element=null,$element=null)
{
global $db, $conf;
global $object;
$this->_fk_element=$fk_element;
$this->_element=$element;
$pathname=$filename=$element;
if (preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
{
$pathname = $regs[1];
$filename = $regs[2];
}
// For compatibility
if ($element == 'propal') {
$pathname = 'comm/propal'; $filename = 'propal';
}
if ($element == 'commande') {
$pathname = $filename = 'commande';
}
if ($element == 'facture') {
$pathname = 'compta/facture'; $filename = 'facture';
}
dol_include_once('/'.$pathname.'/class/'.$filename.'.class.php');
$classname = ucfirst($filename);
$object = new $classname($db);
$object->fetch($fk_element);
$object->fetch_thirdparty();
$this->_options = array(
'script_url' => $_SERVER['PHP_SELF'],
'upload_dir' => $conf->$element->dir_output . '/' . $object->ref . '/',
'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object->ref.'/',
'param_name' => 'files',
// The php.ini settings upload_max_filesize and post_max_size
// take precedence over the following max_file_size setting:
'max_file_size' => null,
'min_file_size' => 1,
'accept_file_types' => '/.+$/i',
'max_number_of_files' => null,
'discard_aborted_uploads' => true,
'image_versions' => array(
// Uncomment the following version to restrict the size of
// uploaded images. You can also add additional versions with
// their own upload directories:
/*
'small' => array(
'upload_dir' => dirname(__FILE__).'/files/',
'upload_url' => dirname($_SERVER['PHP_SELF']).'/files/'
),
*/
'thumbs' => array(
'upload_dir' => $conf->$element->dir_output . '/' . $object->ref . '/thumbs/',
'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object->ref.'/thumbs/'
)
)
);
if ($options) {
$this->_options = array_merge_recursive($this->_options, $options);
}
}
/**
* Enter description here ...
*
* @param string $file_name Filename
* @return stdClass|NULL
*/
private function get_file_object($file_name)
{
$file_path = $this->_options['upload_dir'].$file_name;
if (is_file($file_path) && $file_name[0] !== '.')
{
$file = new stdClass();
$file->name = $file_name;
$file->mime = dol_mimetype($file_name,'',2);
$file->size = filesize($file_path);
$file->url = $this->_options['upload_url'].rawurlencode($file->name);
foreach($this->_options['image_versions'] as $version => $options) {
if (is_file($options['upload_dir'].$file_name)) {
$tmp=explode('.',$file->name);
$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
}
}
$file->delete_url = $this->_options['script_url']
.'?file='.rawurlencode($file->name).'&fk_element='.$this->_fk_element.'&element='.$this->_element;
$file->delete_type = 'DELETE';
return $file;
}
return null;
}
/**
* Enter description here ...
*
* @return void
*/
private function get_file_objects()
{
return array_values(array_filter(array_map(array($this, 'get_file_object'), scandir($this->_options['upload_dir']))));
}
/**
* Create thumbs
*
* @param string $file_name Filename
* @param string $options is array('max_width', 'max_height')
* @return void
*/
private function create_scaled_image($file_name, $options)
{
global $maxwidthmini, $maxheightmini;
$file_path = $this->_options['upload_dir'].$file_name;
$new_file_path = $options['upload_dir'].$file_name;
if (dol_mkdir($options['upload_dir']) >= 0)
{
list($img_width, $img_height) = @getimagesize($file_path);
if (!$img_width || !$img_height) {
return false;
}
$res=vignette($file_path,$maxwidthmini,$maxheightmini,'_mini');
//return $success;
if (preg_match('/error/i',$res)) return false;
return true;
}
else
{
return false;
}
}
/**
* Enter description here ...
*
* @param string $uploaded_file Uploade file
* @param string $file File
* @param string $error Error
* @return unknown|string
*/
private function has_error($uploaded_file, $file, $error)
{
if ($error) {
return $error;
}
if (!preg_match($this->_options['accept_file_types'], $file->name)) {
return 'acceptFileTypes';
}
if ($uploaded_file && is_uploaded_file($uploaded_file)) {
$file_size = filesize($uploaded_file);
} else {
$file_size = $_SERVER['CONTENT_LENGTH'];
}
if ($this->_options['max_file_size'] && (
$file_size > $this->_options['max_file_size'] ||
$file->size > $this->_options['max_file_size'])
) {
return 'maxFileSize';
}
if ($this->_options['min_file_size'] &&
$file_size < $this->_options['min_file_size']) {
return 'minFileSize';
}
if (is_int($this->_options['max_number_of_files']) && (
count($this->get_file_objects()) >= $this->_options['max_number_of_files'])
) {
return 'maxNumberOfFiles';
}
return $error;
}
/**
* Enter description here ...
*
* @param string $uploaded_file Uploade file
* @param string $name Name
* @param int $size Size
* @param string $type Type
* @param string $error Error
* @return stdClass
*/
private function handle_file_upload($uploaded_file, $name, $size, $type, $error)
{
$file = new stdClass();
$file->name = basename(stripslashes($name));
$file->mime = dol_mimetype($file->name,'',2);
$file->size = intval($size);
$file->type = $type;
$error = $this->has_error($uploaded_file, $file, $error);
if (!$error && $file->name && dol_mkdir($this->_options['upload_dir']) >= 0) {
if ($file->name[0] === '.') {
$file->name = substr($file->name, 1);
}
$file_path = $this->_options['upload_dir'].$file->name;
$append_file = is_file($file_path) && $file->size > filesize($file_path);
clearstatcache();
if ($uploaded_file && is_uploaded_file($uploaded_file)) {
// multipart/formdata uploads (POST method uploads)
if ($append_file) {
file_put_contents(
$file_path,
fopen($uploaded_file, 'r'),
FILE_APPEND
);
} else {
dol_move_uploaded_file($uploaded_file, $file_path, 1);
}
} else {
// Non-multipart uploads (PUT method support)
file_put_contents(
$file_path,
fopen('php://input', 'r'),
$append_file ? FILE_APPEND : 0
);
}
$file_size = filesize($file_path);
if ($file_size === $file->size) {
$file->url = $this->_options['upload_url'].rawurlencode($file->name);
foreach($this->_options['image_versions'] as $version => $options)
{
if ($this->create_scaled_image($file->name, $options))
{
$tmp=explode('.',$file->name);
$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
}
}
} else if ($this->_options['discard_aborted_uploads']) {
unlink($file_path);
$file->error = 'abort';
}
$file->size = $file_size;
$file->delete_url = $this->_options['script_url']
.'?file='.rawurlencode($file->name).'&fk_element='.$this->_fk_element.'&element='.$this->_element;
$file->delete_type = 'DELETE';
} else {
$file->error = $error;
}
return $file;
}
/**
* Output data
*
* @return void
*/
public function get()
{
$file_name = isset($_REQUEST['file']) ?
basename(stripslashes($_REQUEST['file'])) : null;
if ($file_name) {
$info = $this->get_file_object($file_name);
} else {
$info = $this->get_file_objects();
}
header('Content-type: application/json');
echo json_encode($info);
}
/**
* Output data
*
* @return void
*/
public function post()
{
$upload = isset($_FILES[$this->_options['param_name']]) ?
$_FILES[$this->_options['param_name']] : array(
'tmp_name' => null,
'name' => null,
'size' => null,
'type' => null,
'error' => null
);
$info = array();
if (is_array($upload['tmp_name'])) {
foreach ($upload['tmp_name'] as $index => $value) {
$info[] = $this->handle_file_upload(
$upload['tmp_name'][$index],
isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],
isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],
isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],
$upload['error'][$index]
);
}
} else {
$info[] = $this->handle_file_upload(
$upload['tmp_name'],
isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'],
isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'],
isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'],
$upload['error']
);
}
header('Vary: Accept');
if (isset($_SERVER['HTTP_ACCEPT']) &&
(strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) {
header('Content-type: application/json');
} else {
header('Content-type: text/plain');
}
echo json_encode($info);
}
/**
* Delete uploaded file
*
* @return void
*/
public function delete()
{
$file_name = isset($_REQUEST['file']) ?
basename(stripslashes($_REQUEST['file'])) : null;
$file_path = $this->_options['upload_dir'].$file_name;
$success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
if ($success) {
foreach($this->_options['image_versions'] as $version => $options) {
$file = $options['upload_dir'].$file_name;
if (is_file($file)) {
unlink($file);
}
}
}
header('Content-type: application/json');
echo json_encode($success);
}
}
/*
* View
*/
$upload_handler = new UploadHandler(null,$fk_element,$element);
header('Pragma: no-cache'); header('Pragma: no-cache');
header('Cache-Control: private, no-cache'); header('Cache-Control: no-store, no-cache, must-revalidate');
header('Content-Disposition: inline; filename="files.json"'); header('Content-Disposition: inline; filename="files.json"');
header('X-Content-Type-Options: nosniff');
header('Access-Control-Allow-Origin: *');
header('Access-Control-Allow-Methods: OPTIONS, HEAD, GET, POST, PUT, DELETE');
header('Access-Control-Allow-Headers: X-File-Name, X-File-Type, X-File-Size');
switch ($_SERVER['REQUEST_METHOD']) { switch ($_SERVER['REQUEST_METHOD']) {
case 'OPTIONS':
break;
case 'HEAD': case 'HEAD':
case 'GET': case 'GET':
$upload_handler->get(); $upload_handler->get();
break; break;
case 'POST': case 'POST':
$upload_handler->post(); if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
$upload_handler->delete();
} else {
$upload_handler->post();
}
break; break;
case 'DELETE': case 'DELETE':
$upload_handler->delete(); $upload_handler->delete();
@@ -430,7 +78,6 @@ switch ($_SERVER['REQUEST_METHOD']) {
exit; exit;
} }
$db->close(); $db->close();
?> ?>

View File

@@ -0,0 +1,545 @@
<?php
/* Copyright (C) 2011-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/ajax/fileupload.php
* \brief File to return Ajax response on file upload
*/
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
/**
* \file htdocs/core/class/fileupload.class.php
* \brief This class is used to manage file upload using ajax
*/
class FileUpload
{
protected $_options;
protected $_fk_element;
protected $_element;
/**
* Constructor
*
* @param array $options Options array
* @param int $fk_element fk_element
* @param string $element element
*/
function __construct($options=null,$fk_element=null,$element=null)
{
global $db, $conf;
global $object;
$this->_fk_element=$fk_element;
$this->_element=$element;
$pathname=$filename=$element;
if (preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
{
$pathname = $regs[1];
$filename = $regs[2];
}
// For compatibility
if ($element == 'propal') {
$pathname = 'comm/propal'; $filename = 'propal';
}
if ($element == 'commande') {
$pathname = $filename = 'commande';
}
if ($element == 'facture') {
$pathname = 'compta/facture'; $filename = 'facture';
}
dol_include_once('/'.$pathname.'/class/'.$filename.'.class.php');
$classname = ucfirst($filename);
$object = new $classname($db);
$object->fetch($fk_element);
$object->fetch_thirdparty();
$this->_options = array(
'script_url' => $_SERVER['PHP_SELF'],
'upload_dir' => $conf->$element->dir_output . '/' . $object->ref . '/',
'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object->ref.'/',
'param_name' => 'files',
// Set the following option to 'POST', if your server does not support
// DELETE requests. This is a parameter sent to the client:
'delete_type' => 'DELETE',
// The php.ini settings upload_max_filesize and post_max_size
// take precedence over the following max_file_size setting:
'max_file_size' => null,
'min_file_size' => 1,
'accept_file_types' => '/.+$/i',
// The maximum number of files for the upload directory:
'max_number_of_files' => null,
// Image resolution restrictions:
'max_width' => null,
'max_height' => null,
'min_width' => 1,
'min_height' => 1,
// Set the following option to false to enable resumable uploads:
'discard_aborted_uploads' => true,
'image_versions' => array(
// Uncomment the following version to restrict the size of
// uploaded images. You can also add additional versions with
// their own upload directories:
/*
'large' => array(
'upload_dir' => dirname($_SERVER['SCRIPT_FILENAME']).'/files/',
'upload_url' => $this->getFullUrl().'/files/',
'max_width' => 1920,
'max_height' => 1200,
'jpeg_quality' => 95
),
*/
'thumbnail' => array(
'upload_dir' => $conf->$element->dir_output . '/' . $object->ref . '/thumbs/',
'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object->ref.'/thumbs/',
'max_width' => 80,
'max_height' => 80
)
)
);
if ($options) {
$this->_options = array_replace_recursive($this->_options, $options);
}
}
/**
*
*/
protected function getFullUrl() {
$https = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
return
($https ? 'https://' : 'http://').
(!empty($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : '').
(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME'].
($https && $_SERVER['SERVER_PORT'] === 443 ||
$_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))).
substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
}
/**
* Set delete url
*
* @param unknown_type $file
*/
protected function set_file_delete_url($file) {
$file->delete_url = $this->_options['script_url']
.'?file='.rawurlencode($file->name).'&fk_element='.$this->_fk_element.'&element='.$this->_element;
$file->delete_type = $this->_options['delete_type'];
if ($file->delete_type !== 'DELETE') {
$file->delete_url .= '&_method=DELETE';
}
}
/**
* Enter description here ...
*
* @param string $file_name Filename
* @return stdClass|NULL
*/
protected function get_file_object($file_name)
{
$file_path = $this->_options['upload_dir'].$file_name;
if (is_file($file_path) && $file_name[0] !== '.')
{
$file = new stdClass();
$file->name = $file_name;
$file->mime = dol_mimetype($file_name,'',2);
$file->size = filesize($file_path);
$file->url = $this->_options['upload_url'].rawurlencode($file->name);
foreach($this->_options['image_versions'] as $version => $options) {
if (is_file($options['upload_dir'].$file_name)) {
$tmp=explode('.',$file->name);
$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
}
}
$this->set_file_delete_url($file);
return $file;
}
return null;
}
/**
* Enter description here ...
*
* @return void
*/
protected function get_file_objects()
{
return array_values(array_filter(array_map(array($this, 'get_file_object'), scandir($this->_options['upload_dir']))));
}
/**
* Create thumbs
*
* @param string $file_name Filename
* @param string $options is array('max_width', 'max_height')
* @return void
*/
protected function create_scaled_image($file_name, $options)
{
global $maxwidthmini, $maxheightmini;
$file_path = $this->_options['upload_dir'].$file_name;
$new_file_path = $options['upload_dir'].$file_name;
if (dol_mkdir($options['upload_dir']) >= 0)
{
list($img_width, $img_height) = @getimagesize($file_path);
if (!$img_width || !$img_height) {
return false;
}
$res=vignette($file_path,$maxwidthmini,$maxheightmini,'_mini');
//return $success;
if (preg_match('/error/i',$res)) return false;
return true;
}
else
{
return false;
}
}
/**
* Enter description here ...
*
* @param string $uploaded_file Uploade file
* @param string $file File
* @param string $error Error
* @param string $index Index
* @return unknown|string
*/
protected function validate($uploaded_file, $file, $error, $index)
{
if ($error) {
$file->error = $error;
return false;
}
if (!$file->name) {
$file->error = 'missingFileName';
return false;
}
if (!preg_match($this->_options['accept_file_types'], $file->name)) {
$file->error = 'acceptFileTypes';
return false;
}
if ($uploaded_file && is_uploaded_file($uploaded_file)) {
$file_size = filesize($uploaded_file);
} else {
$file_size = $_SERVER['CONTENT_LENGTH'];
}
if ($this->_options['max_file_size'] && (
$file_size > $this->_options['max_file_size'] ||
$file->size > $this->_options['max_file_size'])
) {
$file->error = 'maxFileSize';
return false;
}
if ($this->_options['min_file_size'] &&
$file_size < $this->_options['min_file_size']) {
$file->error = 'minFileSize';
return false;
}
if (is_int($this->_options['max_number_of_files']) && (
count($this->get_file_objects()) >= $this->_options['max_number_of_files'])
) {
$file->error = 'maxNumberOfFiles';
return false;
}
list($img_width, $img_height) = @getimagesize($uploaded_file);
if (is_int($img_width)) {
if ($this->_options['max_width'] && $img_width > $this->_options['max_width'] ||
$this->_options['max_height'] && $img_height > $this->_options['max_height']) {
$file->error = 'maxResolution';
return false;
}
if ($this->_options['min_width'] && $img_width < $this->_options['min_width'] ||
$this->_options['min_height'] && $img_height < $this->_options['min_height']) {
$file->error = 'minResolution';
return false;
}
}
return true;
}
/**
* Enter description here ...
*
* @param unknown_type $matches
*/
protected function upcount_name_callback($matches) {
$index = isset($matches[1]) ? intval($matches[1]) + 1 : 1;
$ext = isset($matches[2]) ? $matches[2] : '';
return ' ('.$index.')'.$ext;
}
/**
* Enter description here ...
*
* @param unknown_type $name
*/
protected function upcount_name($name) {
return preg_replace_callback(
'/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/',
array($this, 'upcount_name_callback'),
$name,
1
);
}
/**
* Enter description here ...
*
* @param unknown_type $name
* @param unknown_type $type
* @param unknown_type $index
*/
protected function trim_file_name($name, $type, $index) {
// Remove path information and dots around the filename, to prevent uploading
// into different directories or replacing hidden system files.
// Also remove control characters and spaces (\x00..\x20) around the filename:
$file_name = trim(basename(stripslashes($name)), ".\x00..\x20");
// Add missing file extension for known image types:
if (strpos($file_name, '.') === false &&
preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
$file_name .= '.'.$matches[1];
}
if ($this->_options['discard_aborted_uploads']) {
while(is_file($this->_options['upload_dir'].$file_name)) {
$file_name = $this->upcount_name($file_name);
}
}
return $file_name;
}
/**
* Enter description here ...
*
* @param unknown_type $file
* @param unknown_type $index
*/
protected function handle_form_data($file, $index) {
// Handle form data, e.g. $_REQUEST['description'][$index]
}
/**
* Enter description here ...
*
* @param unknown_type $file_path
*/
protected function orient_image($file_path) {
$exif = @exif_read_data($file_path);
if ($exif === false) {
return false;
}
$orientation = intval(@$exif['Orientation']);
if (!in_array($orientation, array(3, 6, 8))) {
return false;
}
$image = @imagecreatefromjpeg($file_path);
switch ($orientation) {
case 3:
$image = @imagerotate($image, 180, 0);
break;
case 6:
$image = @imagerotate($image, 270, 0);
break;
case 8:
$image = @imagerotate($image, 90, 0);
break;
default:
return false;
}
$success = imagejpeg($image, $file_path);
// Free up memory (imagedestroy does not delete files):
@imagedestroy($image);
return $success;
}
/**
* Enter description here ...
*
* @param string $uploaded_file Uploade file
* @param string $name Name
* @param int $size Size
* @param string $type Type
* @param string $error Error
* @param string $index Index
* @return stdClass
*/
protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index)
{
$file = new stdClass();
$file->name = $this->trim_file_name($name, $type, $index);
$file->mime = dol_mimetype($file->name,'',2);
$file->size = intval($size);
$file->type = $type;
if ($this->validate($uploaded_file, $file, $error, $index) && dol_mkdir($this->_options['upload_dir']) >= 0) {
$this->handle_form_data($file, $index);
$file_path = $this->_options['upload_dir'].$file->name;
$append_file = !$this->_options['discard_aborted_uploads'] && is_file($file_path) && $file->size > filesize($file_path);
clearstatcache();
if ($uploaded_file && is_uploaded_file($uploaded_file)) {
// multipart/formdata uploads (POST method uploads)
if ($append_file) {
file_put_contents(
$file_path,
fopen($uploaded_file, 'r'),
FILE_APPEND
);
} else {
dol_move_uploaded_file($uploaded_file, $file_path, 1);
}
} else {
// Non-multipart uploads (PUT method support)
file_put_contents(
$file_path,
fopen('php://input', 'r'),
$append_file ? FILE_APPEND : 0
);
}
$file_size = filesize($file_path);
if ($file_size === $file->size) {
$file->url = $this->_options['upload_url'].rawurlencode($file->name);
foreach($this->_options['image_versions'] as $version => $options)
{
if ($this->create_scaled_image($file->name, $options))
{
$tmp=explode('.',$file->name);
$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
}
}
} else if ($this->_options['discard_aborted_uploads']) {
unlink($file_path);
$file->error = 'abort';
}
$file->size = $file_size;
$this->set_file_delete_url($file);
}
return $file;
}
/**
* Output data
*
* @return void
*/
public function get()
{
$file_name = isset($_REQUEST['file']) ?
basename(stripslashes($_REQUEST['file'])) : null;
if ($file_name) {
$info = $this->get_file_object($file_name);
} else {
$info = $this->get_file_objects();
}
header('Content-type: application/json');
echo json_encode($info);
}
/**
* Output data
*
* @return void
*/
public function post()
{
if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
return $this->delete();
}
$upload = isset($_FILES[$this->_options['param_name']]) ?
$_FILES[$this->_options['param_name']] : null;
$info = array();
if ($upload && is_array($upload['tmp_name'])) {
// param_name is an array identifier like "files[]",
// $_FILES is a multi-dimensional array:
foreach ($upload['tmp_name'] as $index => $value) {
$info[] = $this->handle_file_upload(
$upload['tmp_name'][$index],
isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],
isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],
isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],
$upload['error'][$index],
$index
);
}
} elseif ($upload || isset($_SERVER['HTTP_X_FILE_NAME'])) {
// param_name is a single object identifier like "file",
// $_FILES is a one-dimensional array:
$info[] = $this->handle_file_upload(
isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
isset($_SERVER['HTTP_X_FILE_NAME']) ?
$_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ?
$upload['name'] : null),
isset($_SERVER['HTTP_X_FILE_SIZE']) ?
$_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ?
$upload['size'] : null),
isset($_SERVER['HTTP_X_FILE_TYPE']) ?
$_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ?
$upload['type'] : null),
isset($upload['error']) ? $upload['error'] : null
);
}
header('Vary: Accept');
$json = json_encode($info);
$redirect = isset($_REQUEST['redirect']) ?
stripslashes($_REQUEST['redirect']) : null;
if ($redirect) {
header('Location: '.sprintf($redirect, rawurlencode($json)));
return;
}
if (isset($_SERVER['HTTP_ACCEPT']) &&
(strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) {
header('Content-type: application/json');
} else {
header('Content-type: text/plain');
}
echo $json;
}
/**
* Delete uploaded file
*
* @return void
*/
public function delete()
{
$file_name = isset($_REQUEST['file']) ?
basename(stripslashes($_REQUEST['file'])) : null;
$file_path = $this->_options['upload_dir'].$file_name;
$success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
if ($success) {
foreach($this->_options['image_versions'] as $version => $options) {
$file = $options['upload_dir'].$file_name;
if (is_file($file)) {
unlink($file);
}
}
}
header('Content-type: application/json');
echo json_encode($success);
}
}

View File

@@ -48,29 +48,45 @@ $(function () {
}); });
// Events // Events
$('#fileupload') $('#fileupload').fileupload({
.bind('fileuploaddestroy', function (e, data) { completed: function (e, data) {
var that = $(this).data("fileupload"); location.href='<?php echo $_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"]; ?>';
if ( confirm("Delete this file ?") == true ) { },
if (data.url) { destroy: function (e, data) {
$.ajax(data).success(function () { var that = $(this).data('fileupload');
that._adjustMaxNumberOfFiles(1); $( "#confirm-delete" ).dialog({
$(this).fadeOut(function () { resizable: false,
$(this).remove(); width: 400,
}); modal: true,
}); buttons: {
} else { "<?php echo $langs->trans('Ok'); ?>": function() {
data.context.fadeOut(function () { $( "#confirm-delete" ).dialog( "close" );
$(this).remove(); if (data.url) {
}); $.ajax(data)
} .success(function (data) {
} if (data) {
}) that._adjustMaxNumberOfFiles(1);
.bind('fileuploadcompleted', function (e, data) { $(this).fadeOut(function () {
$.ajax(data).success(function () { $(this).remove();
location.href='<?php echo $_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"]; ?>'; $.jnotify("<?php echo $langs->trans('FileIsDelete'); ?>");
});
} else {
$.jnotify("<?php echo $langs->trans('ErrorFileNotDeleted'); ?>", "error", true);
}
});
} else {
data.context.fadeOut(function () {
$(this).remove();
});
}
},
"<?php echo $langs->trans('Cancel'); ?>": function() {
$( "#confirm-delete" ).dialog( "close" );
}
}
}); });
}); }
});
}); });
</script> </script>
<!-- END TEMPLATE FILE UPLOAD MAIN --> <!-- END TEMPLATE FILE UPLOAD MAIN -->

View File

@@ -40,18 +40,22 @@
<i class="icon-ban-circle icon-white"></i> <i class="icon-ban-circle icon-white"></i>
<span><?php echo $langs->trans('CancelUpload'); ?></span> <span><?php echo $langs->trans('CancelUpload'); ?></span>
</button> </button>
<!--
<button type="button" class="btn btn-danger delete"> <button type="button" class="btn btn-danger delete">
<i class="icon-trash icon-white"></i> <i class="icon-trash icon-white"></i>
<span><?php echo $langs->trans('Delete'); ?></span> <span><?php echo $langs->trans('Delete'); ?></span>
</button> </button>
<input type="checkbox" class="toggle"> <input type="checkbox" class="toggle">
-->
</div> </div>
<!-- The global progress information --> <!-- The global progress information -->
<div class="span5 fileupload-progress fade"> <div class="span5 fileupload-progress fade">
<!-- The global progress bar --> <!-- The global progress bar -->
<!--
<div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100"> <div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
<div class="bar" style="width:0%;"></div> <div class="bar" style="width:0%;"></div>
</div> </div>
-->
<!-- The extended global progress information --> <!-- The extended global progress information -->
<div class="progress-extended">&nbsp;</div> <div class="progress-extended">&nbsp;</div>
</div> </div>

View File

@@ -105,3 +105,13 @@
margin-top: 2px; margin-top: 2px;
} }
} }
.span5 {
width: 400px;
float: left;
}
.span7 {
width: 560px ;
float: left;
}