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

multi delete/move - submit by name

Browse Source 
fixes notice messages on POST
This commit is contained in:
Ian 2015-10-16 11:22:25 +02:00
parent 7801b33e35
commit 0d7f8d474f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,11 +116,11 @@ switch ($serendipity['GET']['adminAction']) {
if (!serendipity_checkFormToken()) {
return; // blank content page, but default token check parameter is presenting a XSRF message when false
}
if (!is_array($serendipity['POST']['multiDelete'])) {
if (!is_array($serendipity['POST']['multiDelete']) && isset($_POST['toggle_move'])) {
echo '<div class="msg_notice"><span class="icon-attention-circled"></span> ' . sprintf(MULTICHECK_NO_ITEM, $_SERVER['HTTP_REFERER']) . '</div>'."\n";
break;
}
if (is_array($serendipity['POST']['multiDelete']) && isset($serendipity['POST']['oldDir']) && empty($serendipity['POST']['newDir'])) {
if (is_array($serendipity['POST']['multiDelete']) && isset($serendipity['POST']['oldDir']) && empty($serendipity['POST']['newDir']) && isset($_POST['toggle_move'])) {
echo '<div class="msg_notice"><span class="icon-attention-circled"></span> ' . sprintf(MULTICHECK_NO_DIR, $_SERVER['HTTP_REFERER']) . '</div>'."\n";
break;
}
@ -153,6 +153,7 @@ switch ($serendipity['GET']['adminAction']) {
break;
}
// case bulk multidelete
$ids = '';
$data['rip_image'] = array();
$data['case_multidelete'] = true;

4
templates/2k11/admin/media_pane.tpl
View File

@ -227,7 +227,7 @@
<div class="form_buttons">
<input class="invert_selection" name="toggle" type="button" value="{$CONST.INVERT_SELECTIONS}">
<input class="state_cancel" name="toggle" type="submit" value="{$CONST.DELETE}">
<input class="state_cancel" name="toggle_delete" type="submit" value="{$CONST.DELETE}">
</div>
<hr>
<div class="form_select">
@ -244,7 +244,7 @@
</select>
</div>
<div class="form_buttons">
<input class="state_submit" name="toggle" type="submit" value="{$CONST.MOVE}">
<input class="state_submit" name="toggle_move" type="submit" value="{$CONST.MOVE}">
<span class="media_file_actions actions"><a class="media_show_info button_link" href="#media_file_bulkmove" title="{$CONST.BULKMOVE}"><span class="icon-info-circled"></span><span class="visuallyhidden"> {$CONST.BULKMOVE}</span></a></span>
</div>