archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 1062 added: ability to delete a single photo from its administration

Browse source 
screen


git-svn-id: http://piwigo.org/svn/trunk@8764 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-01-19 14:51:03 +00:00
commit 0a44acdd8a
4 changed files with 62 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

63
admin/picture_modify.php
View file

@ -36,6 +36,58 @@ check_status(ACCESS_ADMINISTRATOR);
check_input_parameter('image_id', $_GET, false, PATTERN_ID);
check_input_parameter('cat_id', $_GET, false, PATTERN_ID);
// +-----------------------------------------------------------------------+
// | delete photo |
// +-----------------------------------------------------------------------+
if (isset($_GET['delete']))
{
check_pwg_token();
delete_elements(array($_GET['image_id']), true);
// where to redirect the user now?
//
// 1. if a category is available in the URL, use it
// 2. else use the first reachable linked category
// 3. redirect to gallery root
if (isset($_GET['cat_id']))
{
redirect(
make_index_url(
array(
'category' => get_cat_info($_GET['cat_id'])
)
)
);
}
$query = '
SELECT category_id
FROM '.IMAGE_CATEGORY_TABLE.'
WHERE image_id = '.$_GET['image_id'].'
;';
$authorizeds = array_diff(
array_from_query($query, 'category_id'),
explode(',', calculate_permissions($user['id'], $user['status']))
);
foreach ($authorizeds as $category_id)
{
redirect(
make_index_url(
array(
'category' => get_cat_info($category_id)
)
)
);
}
redirect(make_index_url());
}
// +-----------------------------------------------------------------------+
// | synchronize metadata |
// +-----------------------------------------------------------------------+
@ -209,14 +261,15 @@ $template->set_filenames(
)
);
$admin_url_start = get_root_url().'admin.php?page=picture_modify';
$admin_url_start.= '&image_id='.$_GET['image_id'];
$admin_url_start.= isset($_GET['cat_id']) ? '&cat_id='.$_GET['cat_id'] : '';
$template->assign(
array(
'tags' => $tags,
'U_SYNC' =>
get_root_url().'admin.php?page=picture_modify'.
'&image_id='.$_GET['image_id'].
(isset($_GET['cat_id']) ? '&cat_id='.$_GET['cat_id'] : '').
'&sync_metadata=1',
'U_SYNC' => $admin_url_start.'&sync_metadata=1',
'U_DELETE' => $admin_url_start.'&delete=1&pwg_token='.get_pwg_token(),
'PATH'=>$row['path'],

2
admin/themes/default/template/picture_modify.tpl
View file

@ -32,6 +32,8 @@ pwg_initialization_datepicker("#date_creation_day", "#date_creation_month", "#da
{/if}
{if !url_is_remote($PATH)}
<li><a href="{$U_SYNC}" title="{'synchronize'|@translate}"><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}"></a></li>
<li><a href="{$U_DELETE}" title="{'delete photo'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete photo'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"></a></li>
{/if}
</ul>

1
language/en_UK/admin.lang.php
View file

@ -215,6 +215,7 @@ $lang['default values'] = "default values";
$lang['default'] = "default";
$lang['delete album'] = "delete album";
$lang['Delete orphan tags'] = 'Delete orphan tags';
$lang['delete photo'] = 'delete photo';
$lang['Delete Representant'] = "Delete Representant";
$lang['Delete selected photos'] = "Delete selected photos";
$lang['Delete selected tags'] = "Delete selected tags";

1
language/fr_FR/admin.lang.php
View file

@ -784,4 +784,5 @@ $lang['with no tag'] = 'sans tag';
$lang['Week starts on'] = 'La semaine commence le';
$lang['You have %d orphan tags: %s.'] = 'Vous avez %d tags orphelins: %s.';
$lang['Delete orphan tags'] = 'Supprimer les tags orphelins';
$lang['delete photo'] = 'supprimer la photo';
?>