mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 03:39:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature 2189 added: ability to update a photo (the JPEG/PNG file) with

Browse source 
pwg.images.addSimple, simply by adding an $image_id as argument.


git-svn-id: http://piwigo.org/svn/trunk@9191 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-02-11 22:57:23 +00:00
parent cc88f22111
commit e79538be5c
4 changed files with 233 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

122
admin/include/functions.php
View file

@ -166,6 +166,80 @@ DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.'
trigger_action('delete_categories', $ids);
}
// Deletes all files (on disk) related to given image ids
// @return image ids where files are deleted successfully
function delete_element_files($ids)
{
if (count($ids) == 0)
{
return 0;
}
include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
$new_ids = array();
$query = '
SELECT
id,
path,
tn_ext,
has_high,
representative_ext
FROM '.IMAGES_TABLE.'
WHERE id IN ('.implode(',', $ids).')
;';
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
if (url_is_remote($row['path']))
{
continue;
}
$files = array();
$files[] = get_element_path($row);
if (!empty($row['tn_ext']))
{
$files[] = get_thumbnail_path($row);
}
if (!empty($row['has_high']) and get_boolean($row['has_high']))
{
$files[] = get_high_path($row);
}
if (!empty($row['representative_ext']))
{
$pi = pathinfo($row['path']);
$file_wo_ext = get_filename_wo_extension($pi['basename']);
$files[] = PHPWG_ROOT_PATH.$pi['dirname'].'/pwg_representative/'.$file_wo_ext.'.'.$row['representative_ext'];
}
$ok = true;
foreach ($files as $path)
{
if (is_file($path) and !unlink($path))
{
$ok = false;
trigger_error('"'.$path.'" cannot be removed', E_USER_WARNING);
break;
}
}
if ($ok)
{
$new_ids[] += $row['id'];
}
else
{
break;
}
}
return $new_ids;
}
// The function delete_elements deletes the elements identified by the
// (numeric) values of the array $ids. It also deletes (in the database) :
// - all the comments related to elements
@ -182,53 +256,7 @@ function delete_elements($ids, $physical_deletion=false)
if ($physical_deletion)
{
include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
$new_ids=array();
$query = '
SELECT
id,
path,
tn_ext,
has_high,
representative_ext
FROM '.IMAGES_TABLE.'
WHERE id IN ('.implode(',', $ids).')
;';
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
if (url_is_remote($row['path']))
continue;
$files = array();
$files[] = get_element_path($row);
if (!empty($row['tn_ext']))
$files[] = get_thumbnail_path($row);
if (!empty($row['has_high']) and get_boolean($row['has_high']))
$files[] = get_high_path($row);
if (!empty($row['representative_ext']))
{
$pi = pathinfo($row['path']);
$file_wo_ext = get_filename_wo_extension($pi['basename']);
$files[] = PHPWG_ROOT_PATH.$pi['dirname'].'/pwg_representative/'.$file_wo_ext.'.'.$element_info['representative_ext'];
}
$ok = true;
foreach ($files as $path)
{
if (is_file($path) and !unlink($path))
{
$ok = false;
trigger_error('"'.$path.'" cannot be removed', E_USER_WARNING);
break;
}
}
if ($ok)
$new_ids[] += $row['id'];
else
break;
}
$ids = $new_ids;
$ids = delete_element_files($ids);
if (count($ids)==0)
{
return 0;