';
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+ exit;
}
}
diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index fef19981fdf..a3a525d0d3c 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2011 Laurent Destailleur
+/* Copyright (C) 2011-2012 Regis Houssin
+ * Copyright (C) 2011 Laurent Destailleur
*
* 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
@@ -34,8 +34,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee
require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/fileupload.class.php");
error_reporting(E_ALL | E_STRICT);
@@ -47,380 +46,29 @@ $fk_element = GETPOST('fk_element','int');
$element = GETPOST('element','alpha');
-/**
- * \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);
+$upload_handler = new FileUpload(null,$fk_element,$element);
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('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']) {
+ case 'OPTIONS':
+ break;
case 'HEAD':
case 'GET':
$upload_handler->get();
break;
case 'POST':
- $upload_handler->post();
+ if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
+ $upload_handler->delete();
+ } else {
+ $upload_handler->post();
+ }
break;
case 'DELETE':
$upload_handler->delete();
@@ -430,7 +78,6 @@ switch ($_SERVER['REQUEST_METHOD']) {
exit;
}
-
$db->close();
?>
\ No newline at end of file
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
new file mode 100644
index 00000000000..a4d1f6ad407
--- /dev/null
+++ b/htdocs/core/class/fileupload.class.php
@@ -0,0 +1,545 @@
+
+ * Copyright (C) 2011 Laurent Destailleur
+ *
+ * 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 .
+ */
+
+/**
+ * \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);
+ }
+}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 2cc056c008f..4a4a96adcea 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -804,103 +804,12 @@ class FormFile
$upload_max_filesize = $mul_upload_max_filesize * (int) $upload_max_filesize;
// Max file size
$max_file_size = (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
-
- print '';
-
- print '
';
- print '';
-
- print '
';
-
- print '
';
- print '
';
-
- print '
';
- /*print '
';
- print '
'.$langs->trans("Documents2").'
';
- print '
'.$langs->trans("Preview").'
';
- print '
'.$langs->trans("Size").'
';
- print '
';
- print '
';*/
- print '
';
-
- // We remove this because there is already individual bars.
- //print '';
-
- print '
';
- print '
';
+
+ // Include main
+ include(DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php');
// Include template
- include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxfileupload.tpl.php');
+ include(DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php');
}
diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
new file mode 100644
index 00000000000..1c6b988c368
--- /dev/null
+++ b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
@@ -0,0 +1,92 @@
+
+ *
+ * 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 .
+ *
+ */
+?>
+
+
+
+
\ No newline at end of file
diff --git a/htdocs/core/tpl/ajax/fileupload_view.tpl.php b/htdocs/core/tpl/ajax/fileupload_view.tpl.php
new file mode 100644
index 00000000000..525c57b80d9
--- /dev/null
+++ b/htdocs/core/tpl/ajax/fileupload_view.tpl.php
@@ -0,0 +1,133 @@
+
+ *
+ * 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 .
+ *
+ */
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/htdocs/core/tpl/ajaxfileupload.tpl.php b/htdocs/core/tpl/ajaxfileupload.tpl.php
deleted file mode 100644
index e47092dc00d..00000000000
--- a/htdocs/core/tpl/ajaxfileupload.tpl.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- *
- * 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 .
- *
- */
-?>
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index d5fe4ac022a..07f0f2e354d 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -41,6 +41,13 @@ $langs->load('deliveries');
$langs->load('products');
$langs->load('stocks');
+$mesg='';
+if (isset($_SESSION['DolMessage']))
+{
+ $mesg=$_SESSION['DolMessage'];
+ unset($_SESSION['DolMessage']);
+}
+
// Security check
$id=empty($_GET['id']) ? 0 : intVal($_GET['id']);
$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
@@ -119,7 +126,9 @@ if ($action=='delete')
$upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
$file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file);
- $mesg = '
"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/
+```
+
+Add a script section with type **"text/x-tmpl"**, a unique **id** property and your template definition as content:
+
+```html
+
+```
+
+**"o"** (the lowercase letter) is a reference to the data parameter of the template function (see the API section on how to modify this identifier).
+
+In your application code, create a JavaScript object to use as data for the template:
+
+```js
+var data = {
+ "title": "JavaScript Templates",
+ "license": {
+ "name": "MIT license",
+ "url": "http://www.opensource.org/licenses/MIT"
+ },
+ "features": [
+ "lightweight & fast",
+ "powerful",
+ "zero dependencies"
+ ]
+};
+```
+
+In a real application, this data could be the result of retrieving a [JSON](http://json.org/) resource.
+
+Render the result by calling the **tmpl()** method with the id of the template and the data object as arguments:
+
+```js
+document.getElementById("result").innerHTML = tmpl("tmpl-demo", data);
+```
+
+### Server-side
+
+The following is an example how to use the JavaScript Templates engine on the server-side with [node.js](http://nodejs.org/).
+
+Create a new directory and add the **tmpl.js** file. Or alternatively, install the **blueimp-tmpl** package with [npm](http://npmjs.org/):
+
+```sh
+npm install blueimp-tmpl
+```
+
+Add a file **template.html** with the following content:
+
+```html
+
+{%=o.title%}
+
+```
+
+Add a file **server.js** with the following content:
+
+```js
+require("http").createServer(function (req, res) {
+ var fs = require("fs"),
+ // The tmpl module exports the tmpl() function:
+ tmpl = require("./tmpl").tmpl,
+ // Use the following version if you installed the package with npm:
+ // tmpl = require("blueimp-tmpl").tmpl,
+ // Sample data:
+ data = {
+ "title": "JavaScript Templates",
+ "url": "https://github.com/blueimp/JavaScript-Templates",
+ "features": [
+ "lightweight & fast",
+ "powerful",
+ "zero dependencies"
+ ]
+ };
+ // Override the template loading method:
+ tmpl.load = function (id) {
+ var filename = id + ".html";
+ console.log("Loading " + filename);
+ return fs.readFileSync(filename, "utf8");
+ };
+ res.writeHead(200, {"Content-Type": "text/x-tmpl"});
+ // Render the content:
+ res.end(tmpl("template", data));
+}).listen(8080, "localhost");
+console.log("Server running at http://localhost:8080/");
+```
+
+Run the application with the following command:
+
+```sh
+node server.js
+```
+
+## Requirements
+The JavaScript Templates script has zero dependencies.
+
+## API
+
+### tmpl() function
+The **tmpl()** function is added to the global **window** object and can be called as global function:
+
+```js
+var result = tmpl("tmpl-demo", data);
+```
+
+The **tmpl()** function can be called with the id of a template, or with a template string:
+
+```js
+var result = tmpl("
{%=o.title%}
", data);
+```
+
+If called without second argument, **tmpl()** returns a reusable template function:
+
+```js
+var func = tmpl("
{%=o.title%}
");
+document.getElementById("result").innerHTML = func(data);
+```
+
+### Templates cache
+Templates loaded by id are cached in the map **tmpl.cache**:
+
+```js
+var func = tmpl("tmpl-demo"), // Loads and parses the template
+ cached = typeof tmpl.cache["tmpl-demo"] === "function", // true
+ result = tmpl("tmpl-demo", data); // Uses cached template function
+
+tmpl.cache["tmpl-demo"] = null;
+result = tmpl("tmpl-demo", data); // Loads and parses the template again
+```
+
+### Output encoding
+The method **tmpl.encode** is used to escape HTML special characters in the template output:
+
+```js
+var output = tmpl.encode("<>&\"'\x00"); // Renders "<>&"'"
+```
+
+**tmpl.encode** makes use of the regular expression **tmpl.encReg** and the encoding map **tmpl.encMap** to match and replace special characters, which can be modified to change the behavior of the output encoding.
+Strings matched by the regular expression, but not found in the encoding map are removed from the output. This allows for example to automatically trim input values (removing whitespace from the start and end of the string):
+
+```js
+tmpl.encReg = /(^\s+)|(\s+$)|[<>&"'\x00]/g;
+var output = tmpl.encode(" Banana! "); // Renders "Banana" (without whitespace)
+```
+
+### Local helper variables
+The local variables available inside the templates are the following:
+
+* **o**: The data object given as parameter to the template function (see the next section on how to modify the parameter name).
+* **tmpl**: A reference to the **tmpl** function object.
+* **_s**: The string for the rendered result content.
+* **_e**: A reference to the **tmpl.encode** method.
+* **print**: Helper function to add content to the rendered result string.
+* **include**: Helper function to include the return value of a different template in the result.
+
+To introduce additional local helper variables, the string **tmpl.helper** can be extended. The following adds a convenience function for *console.log* and a streaming function, that streams the template rendering result back to the callback argument (note the comma at the beginning of each variable declaration):
+
+```js
+tmpl.helper += ",log=function(){console.log.apply(console, arguments)}" +
+ ",st='',stream=function(cb){var l=st.length;st=_s;cb( _s.slice(l));}";
+```
+
+Those new helper functions could be used to stream the template contents to the console output:
+
+```html
+
+```
+
+### Template function argument
+The generated template functions accept one argument, which is the data object given to the **tmpl(id, data)** function. This argument is available inside the template definitions as parameter **o** (the lowercase letter).
+
+The argument name can be modified by overriding **tmpl.arg**:
+
+```js
+tmpl.arg = "p";
+
+// Renders "
JavaScript Templates
":
+var result = tmpl("
{%=p.title%}
", {title: "JavaScript Templates"});
+```
+
+### Template parsing
+The template contents are matched and replaced using the regular expression **tmpl.regexp** and the replacement function **tmpl.func**. The replacement function operates based on the [parenthesized submatch strings](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String/replace#Specifying_a_function_as_a_parameter).
+
+To use different tags for the template syntax, override **tmpl.regexp** with a modified regular expression, by exchanging all occurrences of "**\\{%**" and "**%\\}**", e.g. with "**\\[%**" and "**%\\]**":
+
+```js
+tmpl.regexp = /([\s'\\])(?![^%]*%\])|(?:\[%(=|#)([\s\S]+?)%\])|(\[%)|(%\])/g;
+```
+
+By default, the plugin preserves whitespace (newlines, carriage returns, tabs and spaces). To strip unnecessary whitespace, you can override the **tmpl.func** function, e.g. with the following code:
+
+```js
+var originalFunc = tmpl.func;
+tmpl.func = function (s, p1, p2, p3, p4, p5, offset, str) {
+ if (p1 && /\s/.test(p1)) {
+ if (!offset || /\s/.test(str.charAt(offset - 1)) ||
+ /^\s+$/g.test(str.slice(offset))) {
+ return '';
+ }
+ return ' ';
+ }
+ return originalFunc.apply(tmpl, arguments);
+};
+```
+
+## Templates syntax
+
+### Interpolation
+Print variable with HTML special characters escaped:
+
+```html
+
{%=o.title%}
+```
+
+Print variable without escaping:
+
+```html
+
{%#o.user_id%}
+```
+
+Print output of function calls:
+
+```html
+Website
+```
+
+Use dot notation to print nested properties:
+
+```html
+{%=o.author.name%}
+```
+
+Note that the JavaScript Templates engine prints **falsy** values as empty strings.
+That is, **undefined**, **null**, **false**, **0** and **NaN** will all be converted to **''**.
+To be able to print e.g. the number 0, convert it to a String before using it as an output variable:
+
+```html
+
{%=0+''%}
+```
+
+### Evaluation
+Use **print(str)** to add escaped content to the output:
+
+```html
+Year: {% var d=new Date(); print(d.getFullYear()); %}
+```
+
+Use **print(str, true)** to add unescaped content to the output:
+
+```html
+{% print("Fast & powerful", true); %}
+```
+
+Use **include(str, obj)** to include content from a different template:
+
+```html
+
+```
+
+## Compiled templates
+The JavaScript Templates project comes with a compilation script, that allows you to compile your templates into JavaScript code and combine them with a minimal Templates runtime into one minified JavaScript file.
+
+The compilation script is built for [node.js](http://nodejs.org/) and also requires [UglifyJS](https://github.com/mishoo/UglifyJS).
+To use it, first install both the JavaScript Templates project and UglifyJS via [npm](http://npmjs.org/):
+
+```sh
+npm install uglify-js
+npm install blueimp-tmpl
+```
+
+This will put the executables **uglifyjs** and **tmpl.js** into the folder **node_modules/.bin**. It will also make them available on your PATH if you install the packages globally (by adding the **-g** flag to the install command).
+
+The **tmpl.js** executable accepts the paths to one or multiple template files as command line arguments and prints the generated JavaScript code to the console output. The following command line shows you how to store the generated code in a new JavaScript file that can be included in your project:
+
+```sh
+tmpl.js templates/upload.html templates/download.html > tmpl.min.js
+```
+
+The files given as command line arguments to **tmpl.js** can either be pure template files or HTML documents with embedded template script sections. For the pure template files, the file names (without extension) serve as template ids.
+The generated file can be included in your project as a replacement for the original **tmpl.js** runtime. It provides you with the same API and provides a **tmpl(id, data)** function that accepts the id of one of your templates as first and a data object as optional second parameter.
+
+## License
+The JavaScript Templates script is released under the [MIT license](http://www.opensource.org/licenses/MIT).
diff --git a/htdocs/includes/jquery/plugins/template/compile.js b/htdocs/includes/jquery/plugins/template/compile.js
new file mode 100644
index 00000000000..ebca48aab4e
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/template/compile.js
@@ -0,0 +1,82 @@
+#!/usr/bin/env node
+/*
+ * JavaScript Templates Compiler 2.1.0
+ * https://github.com/blueimp/JavaScript-Templates
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+/*jslint nomen: true */
+/*global require, __dirname, process, console */
+
+(function () {
+ "use strict";
+ var tmpl = require("./tmpl.js").tmpl,
+ fs = require("fs"),
+ path = require("path"),
+ jsp = require("uglify-js").parser,
+ pro = require("uglify-js").uglify,
+ // Retrieve the content of the minimal runtime:
+ runtime = fs.readFileSync(__dirname + "/runtime.js", "utf8"),
+ // A regular expression to parse templates from script tags in a HTML page:
+ regexp = /'."\n";
- print ''."\n";
- print ''."\n";
- print ''."\n";
+ print ''."\n";
+ //print ''."\n";
+ print ''."\n";
+ print ''."\n";
+ print ''."\n";
+ print ''."\n";
}
// jQuery DataTables
if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES))
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 39ae5148024..aa70351fdde 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -38,6 +38,13 @@ $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
$id = GETPOST('id','int');
$ref= GETPOST('ref');
+$mesg='';
+if (isset($_SESSION['DolMessage']))
+{
+ $mesg=$_SESSION['DolMessage'];
+ unset($_SESSION['DolMessage']);
+}
+
$project = new Project($db);
if (! $project->fetch($id,$ref) > 0)
{
@@ -115,7 +122,9 @@ if ($action == 'confirm_delete' && $_REQUEST['confirm'] == 'yes' && $user->right
$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($project->ref);
$file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file);
- $mesg = '