mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-06-02 04:15:05 +02:00
64ba898944
is created before the start of the upload. The ergonomy is now simpler, the page is smaller and cleaner. bug 2373 fixed: now that album is created before upload, uploadify.php gets the category_id and the level: as soon as it is uploaded (function add_uploaded_file) the photo gets its final privacy level and is directly associated to the album. This way, we can have an error on a photo without making orphan all photos of the same upload group. feature 2405 added: as soon as a photo is uploaded, its thumbnail is displayed in the "Uploaded Photos" fieldset, without waiting for other photos to be uploaded. The latest photos comes first. I have slighlty changed the integration of colorbox in core. Now we have 2 styles available and by default, we use style2 (overlay in black, title and control icons outside the popup). It is also used for zooming on bulk manager in unit mode. display change: on each uploading photos, instead of showing the transfer speed, we display the transfer progression in % bug fixed: the color of the "Start Upload" button was not correct because the button was not a submit button but a simple type=button. language: "Upload" button becomes "Start Upload" button. git-svn-id: http://piwigo.org/svn/trunk@11962 68402e56-0260-453c-a942-63ccdbb3a9ee
266 lines
8.2 KiB
PHP
266 lines
8.2 KiB
PHP
<?php
|
|
// +-----------------------------------------------------------------------+
|
|
// | Piwigo - a PHP based photo gallery |
|
|
// +-----------------------------------------------------------------------+
|
|
// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org |
|
|
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
|
|
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
|
|
// +-----------------------------------------------------------------------+
|
|
// | 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 |
|
|
// | |
|
|
// | 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, write to the Free Software |
|
|
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
|
|
// | USA. |
|
|
// +-----------------------------------------------------------------------+
|
|
|
|
|
|
if (isset($_GET['processed']))
|
|
{
|
|
// echo '<pre>POST'."\n"; print_r($_POST); echo '</pre>';
|
|
// echo '<pre>FILES'."\n"; print_r($_FILES); echo '</pre>';
|
|
// echo '<pre>SESSION'."\n"; print_r($_SESSION); echo '</pre>';
|
|
// exit();
|
|
|
|
// sometimes, you have submitted the form but you have nothing in $_POST
|
|
// and $_FILES. This may happen when you have an HTML upload and you
|
|
// exceeded the post_max_size (but not the upload_max_size)
|
|
if (!isset($_POST['submit_upload']))
|
|
{
|
|
array_push(
|
|
$page['errors'],
|
|
sprintf(
|
|
l10n('The uploaded files exceed the post_max_size directive in php.ini: %sB'),
|
|
ini_get('post_max_size')
|
|
)
|
|
);
|
|
}
|
|
|
|
$category_id = $_POST['category'];
|
|
|
|
$image_ids = array();
|
|
|
|
if (isset($_FILES) and !empty($_FILES['image_upload']))
|
|
{
|
|
$starttime = get_moment();
|
|
|
|
foreach ($_FILES['image_upload']['error'] as $idx => $error)
|
|
{
|
|
if (UPLOAD_ERR_OK == $error)
|
|
{
|
|
$images_to_add = array();
|
|
|
|
$extension = pathinfo($_FILES['image_upload']['name'][$idx], PATHINFO_EXTENSION);
|
|
if ('zip' == strtolower($extension))
|
|
{
|
|
$upload_dir = $conf['upload_dir'].'/buffer';
|
|
prepare_directory($upload_dir);
|
|
|
|
$temporary_archive_name = date('YmdHis').'-'.generate_key(10);
|
|
$archive_path = $upload_dir.'/'.$temporary_archive_name.'.zip';
|
|
|
|
move_uploaded_file(
|
|
$_FILES['image_upload']['tmp_name'][$idx],
|
|
$archive_path
|
|
);
|
|
|
|
define('PCLZIP_TEMPORARY_DIR', $upload_dir.'/');
|
|
include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
|
|
$zip = new PclZip($archive_path);
|
|
if ($list = $zip->listContent())
|
|
{
|
|
$indexes_to_extract = array();
|
|
|
|
foreach ($list as $node)
|
|
{
|
|
if (1 == $node['folder'])
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (is_valid_image_extension(pathinfo($node['filename'], PATHINFO_EXTENSION)))
|
|
{
|
|
array_push($indexes_to_extract, $node['index']);
|
|
|
|
array_push(
|
|
$images_to_add,
|
|
array(
|
|
'source_filepath' => $upload_dir.'/'.$temporary_archive_name.'/'.$node['filename'],
|
|
'original_filename' => basename($node['filename']),
|
|
)
|
|
);
|
|
}
|
|
}
|
|
|
|
if (count($indexes_to_extract) > 0)
|
|
{
|
|
$zip->extract(
|
|
PCLZIP_OPT_PATH, $upload_dir.'/'.$temporary_archive_name,
|
|
PCLZIP_OPT_BY_INDEX, $indexes_to_extract,
|
|
PCLZIP_OPT_ADD_TEMP_FILE_ON
|
|
);
|
|
}
|
|
}
|
|
}
|
|
elseif (is_valid_image_extension($extension))
|
|
{
|
|
array_push(
|
|
$images_to_add,
|
|
array(
|
|
'source_filepath' => $_FILES['image_upload']['tmp_name'][$idx],
|
|
'original_filename' => $_FILES['image_upload']['name'][$idx],
|
|
)
|
|
);
|
|
}
|
|
|
|
foreach ($images_to_add as $image_to_add)
|
|
{
|
|
$image_id = add_uploaded_file(
|
|
$image_to_add['source_filepath'],
|
|
$image_to_add['original_filename'],
|
|
array($category_id),
|
|
$_POST['level']
|
|
);
|
|
|
|
array_push($image_ids, $image_id);
|
|
|
|
// TODO: if $image_id is not an integer, something went wrong
|
|
}
|
|
}
|
|
else
|
|
{
|
|
$error_message = file_upload_error_message($error);
|
|
|
|
array_push(
|
|
$page['errors'],
|
|
sprintf(
|
|
l10n('Error on file "%s" : %s'),
|
|
$_FILES['image_upload']['name'][$idx],
|
|
$error_message
|
|
)
|
|
);
|
|
}
|
|
}
|
|
|
|
$endtime = get_moment();
|
|
$elapsed = ($endtime - $starttime) * 1000;
|
|
// printf('%.2f ms', $elapsed);
|
|
|
|
} // if (!empty($_FILES))
|
|
|
|
if (isset($_POST['upload_id']))
|
|
{
|
|
// we're on a multiple upload, with uploadify and so on
|
|
if (isset($_SESSION['uploads_error'][ $_POST['upload_id'] ]))
|
|
{
|
|
foreach ($_SESSION['uploads_error'][ $_POST['upload_id'] ] as $error)
|
|
{
|
|
array_push($page['errors'], $error);
|
|
}
|
|
}
|
|
|
|
if (isset($_SESSION['uploads'][ $_POST['upload_id'] ]))
|
|
{
|
|
$image_ids = $_SESSION['uploads'][ $_POST['upload_id'] ];
|
|
}
|
|
}
|
|
|
|
$page['thumbnails'] = array();
|
|
foreach ($image_ids as $image_id)
|
|
{
|
|
// we could return the list of properties from the add_uploaded_file
|
|
// function, but I like the "double check". And it costs nothing
|
|
// compared to the upload process.
|
|
$thumbnail = array();
|
|
|
|
$query = '
|
|
SELECT
|
|
file,
|
|
path,
|
|
tn_ext
|
|
FROM '.IMAGES_TABLE.'
|
|
WHERE id = '.$image_id.'
|
|
;';
|
|
$image_infos = pwg_db_fetch_assoc(pwg_query($query));
|
|
|
|
$thumbnail['file'] = $image_infos['file'];
|
|
|
|
$thumbnail['src'] = get_thumbnail_location(
|
|
array(
|
|
'path' => $image_infos['path'],
|
|
'tn_ext' => $image_infos['tn_ext'],
|
|
)
|
|
);
|
|
|
|
// TODO: when implementing this plugin in Piwigo core, we should have
|
|
// a function get_image_name($name, $file) (if name is null, then
|
|
// compute a temporary name from filename) that would be also used in
|
|
// picture.php. UPDATE: in fact, "get_name_from_file($file)" already
|
|
// exists and is used twice (batch_manager_unit + comments, but not in
|
|
// picture.php I don't know why) with the same pattern if
|
|
// (empty($name)) {$name = get_name_from_file($file)}, a clean
|
|
// function get_image_name($name, $file) would be better
|
|
$thumbnail['title'] = get_name_from_file($image_infos['file']);
|
|
|
|
$thumbnail['link'] = PHPWG_ROOT_PATH.'admin.php?page=picture_modify'
|
|
.'&image_id='.$image_id
|
|
.'&cat_id='.$category_id
|
|
;
|
|
|
|
array_push($page['thumbnails'], $thumbnail);
|
|
}
|
|
|
|
if (!empty($page['thumbnails']))
|
|
{
|
|
array_push(
|
|
$page['infos'],
|
|
sprintf(
|
|
l10n('%d photos uploaded'),
|
|
count($page['thumbnails'])
|
|
)
|
|
);
|
|
|
|
if (0 != $_POST['level'])
|
|
{
|
|
array_push(
|
|
$page['infos'],
|
|
sprintf(
|
|
l10n('Privacy level set to "%s"'),
|
|
l10n(
|
|
sprintf('Level %d', $_POST['level'])
|
|
)
|
|
)
|
|
);
|
|
}
|
|
|
|
$query = '
|
|
SELECT
|
|
COUNT(*)
|
|
FROM '.IMAGE_CATEGORY_TABLE.'
|
|
WHERE category_id = '.$category_id.'
|
|
;';
|
|
list($count) = pwg_db_fetch_row(pwg_query($query));
|
|
$category_name = get_cat_display_name_from_id($category_id, 'admin.php?page=cat_modify&cat_id=');
|
|
|
|
// information
|
|
array_push(
|
|
$page['infos'],
|
|
sprintf(
|
|
l10n('Album "%s" now contains %d photos'),
|
|
'<em>'.$category_name.'</em>',
|
|
$count
|
|
)
|
|
);
|
|
|
|
$page['batch_link'] = PHOTOS_ADD_BASE_URL.'&batch='.implode(',', $image_ids);
|
|
}
|
|
}
|
|
|
|
?>
|