diff options
| -rw-r--r-- | admin/include/photos_add_direct_prepare.inc.php | 3 | ||||
| -rw-r--r-- | admin/themes/default/template/photos_add_direct.tpl | 2 | ||||
| -rw-r--r-- | include/config_default.inc.php | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/admin/include/photos_add_direct_prepare.inc.php b/admin/include/photos_add_direct_prepare.inc.php index 34b025f13..6204fe841 100644 --- a/admin/include/photos_add_direct_prepare.inc.php +++ b/admin/include/photos_add_direct_prepare.inc.php @@ -44,6 +44,7 @@ $template->assign( 'F_ADD_ACTION'=> PHOTOS_ADD_BASE_URL, 'upload_max_filesize' => $upload_max_filesize, 'upload_max_filesize_shorthand' => $upload_max_filesize_shorthand, + 'chunk_size' => $conf['upload_form_chunk_size'], ) ); @@ -229,4 +230,4 @@ if (!isset($_SESSION['upload_hide_warnings'])) ); } -?>
\ No newline at end of file +?> diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index ad9e80b07..71663fc20 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -86,7 +86,7 @@ jQuery(document).ready(function(){ // url : '../upload.php', url : 'ws.php?method=pwg.images.upload&format=json', - chunk_size: '500kb', + chunk_size: '{/literal}{$chunk_size}{literal}kb', filters : { // Maximum file size diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 09d11132e..60a3da323 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -800,6 +800,10 @@ $conf['tiff_representative_ext'] = 'png'; // (TIFF, videos, PDF) $conf['upload_form_all_types'] = false; +// Size of chunks, in kilobytes. Fast connections will have better +// performances with high values, such as 5000. +$conf['upload_form_chunk_size'] = 500; + // If we try to generate a pwg_representative for a video we use ffmpeg. If // "ffmpeg" is not visible by the web user, you can define the full path of // the directory where "ffmpeg" executable is. @@ -817,4 +821,4 @@ $conf['log_level'] = 'DEBUG'; // Keep logs file during X days $conf['log_archive_days'] = 30; -?>
\ No newline at end of file +?> |