mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Improve image deletion pages (#138)

Browse Source 
Show correct button for multidelete-form, remove switched_output and doubled state-variables, show formerly lost delete-messages on ML after deletion instead of blank page
This commit is contained in:
onli
2014-05-29 22:26:01 +02:00
parent 1bce7ec7ec
commit 6dd5b4aa6b
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/admin/images.inc.php
View File

@ -58,13 +58,15 @@ switch ($serendipity['GET']['adminAction']) {
} }
$messages = array(); $messages = array();
$data['switched_output'] = true; $data['case_do_delete'] = true;
$data['is_doDelete'] = true;
$messages[] = serendipity_deleteImage($serendipity['GET']['fid']); $messages[] = serendipity_deleteImage($serendipity['GET']['fid']);
$messages[] = sprintf(RIP_ENTRY, $serendipity['GET']['fid']); $messages[] = sprintf(RIP_ENTRY, $serendipity['GET']['fid']);
showMediaLibrary($messages); $data['showML'] = showMediaLibrary();
$data['messages'] = $messages;
unset($messages); unset($messages);
break;
case 'doMultiDelete': case 'doMultiDelete':
if (!serendipity_checkFormToken() || !serendipity_checkPermission('adminImagesDelete')) { if (!serendipity_checkFormToken() || !serendipity_checkPermission('adminImagesDelete')) {
@ -73,8 +75,7 @@ switch ($serendipity['GET']['adminAction']) {
$messages = array(); $messages = array();
$parts = explode(',', $serendipity['GET']['id']); $parts = explode(',', $serendipity['GET']['id']);
$data['switched_output'] = true; $data['case_do_multidelete'] = true;
$data['is_doMultiDelete'] = true;
foreach($parts AS $id) { foreach($parts AS $id) {
$id = (int)$id; $id = (int)$id;
if ($id > 0) { if ($id > 0) {
@ -83,8 +84,10 @@ switch ($serendipity['GET']['adminAction']) {
$messages[] = sprintf(RIP_ENTRY, $image['id'] . ' - ' . htmlspecialchars($image['realname'])); $messages[] = sprintf(RIP_ENTRY, $image['id'] . ' - ' . htmlspecialchars($image['realname']));
} }
} }
showMediaLibrary($messages); $data['showML'] = showMediaLibrary();
$data['messages'] = $messages;
unset($messages); unset($messages);
break;
case 'delete': case 'delete':
$file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']); $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
@ -94,7 +97,6 @@ switch ($serendipity['GET']['adminAction']) {
} }
$data['case_delete'] = true; $data['case_delete'] = true;
$data['is_delete'] = true;
if (!isset($serendipity['adminFile'])) { if (!isset($serendipity['adminFile'])) {
$serendipity['adminFile'] = 'serendipity_admin.php'; $serendipity['adminFile'] = 'serendipity_admin.php';
} }
@ -113,7 +115,6 @@ switch ($serendipity['GET']['adminAction']) {
$ids = ''; $ids = '';
$data['rip_image'] = array(); $data['rip_image'] = array();
$data['case_multidelete'] = true; $data['case_multidelete'] = true;
$data['is_multidelete'] = true;
foreach($serendipity['POST']['multiDelete'] AS $idx => $id) { foreach($serendipity['POST']['multiDelete'] AS $idx => $id) {
$ids .= (int)$id . ','; $ids .= (int)$id . ',';
$image = serendipity_fetchImageFromDatabase($id); $image = serendipity_fetchImageFromDatabase($id);
@ -124,7 +125,7 @@ switch ($serendipity['GET']['adminAction']) {
} }
$abortLoc = $serendipity['serendipityHTTPPath'] . $serendipity['adminFile'] . '?serendipity[adminModule]=images'; $abortLoc = $serendipity['serendipityHTTPPath'] . $serendipity['adminFile'] . '?serendipity[adminModule]=images';
$newLoc = $serendipity['serendipityHTTPPath'] . $serendipity['adminFile'] . '?' . serendipity_setFormToken('url') . '&serendipity[action]=admin&serendipity[adminModule]=images&serendipity[adminAction]=doMultiDelete&serendipity[id]=' . $ids; $newLoc = $serendipity['serendipityHTTPPath'] . $serendipity['adminFile'] . '?' . serendipity_setFormToken('url') . '&serendipity[action]=admin&serendipity[adminModule]=images&serendipity[adminAction]=doMultiDelete&serendipity[id]=' . $ids;
$data['switched_output'] = true; $data['case_confirm_deletion'] = true;
$data['abortLoc'] = $abortLoc; $data['abortLoc'] = $abortLoc;
$data['newLoc'] = $newLoc; $data['newLoc'] = $newLoc;
break; break;
@ -683,7 +684,7 @@ function showMediaLibrary($messages=false, $addvar_check = false, $smarty_vars =
global $serendipity; global $serendipity;
if (!serendipity_checkPermission('adminImagesView')) { if (!serendipity_checkPermission('adminImagesView')) {
return; return;
} }
$output = ""; $output = "";

23
templates/2k11/admin/images.inc.tpl
View File

@ -27,20 +27,21 @@
</div> </div>
</form> </form>
{/if} {/if}
{if $switched_output} {if $case_multidelete}
<form id="delete_image" method="get"> <form id="delete_image" method="get">
{if ( $is_delete || $is_multidelete )} <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.ABOUT_TO_DELETE_FILES}</span>
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.ABOUT_TO_DELETE_FILES}</span> {foreach $rip_image AS $ripimg}
{foreach $rip_image AS $ripimg} <span class="msg_hint"><span class="icon-help-circled"></span> {$ripimg}</span>
<span class="msg_hint"><span class="icon-help-circled"></span> {$ripimg}</span> {/foreach}
{/foreach} <div class="form_buttons">
<div class="form_buttons"> <a class="button_link state_cancel icon_link" href="{$abortLoc}">{$CONST.BACK}</a>
<a class="button_link icon_link" href="{$newLoc}">{$CONST.DUMP_IT}</a> <a class="button_link state_submit icon_link" href="{$newLoc}">{$CONST.DUMP_IT}</a>
<a class="button_link icon_link" href="{$smarty.server.HTTP_REFERER|escape}">{$CONST.NOT_REALLY}</a> </div>
</div>
{/if}
</form> </form>
{/if} {/if}
{if $case_do_multidelete || $case_do_delete}
{if $showML}{$showML}{/if}
{/if}
{if $case_rename} {if $case_rename}
{if $go_back} {if $go_back}
<input class="go_back" type="button" value="{$CONST.BACK}"> <input class="go_back" type="button" value="{$CONST.BACK}">