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

Better fix for obsolete msg wrapper for deleting media db dirs

Browse Source 
Courtesy of @ophian

References #287
This commit is contained in:
Matthias Mees 2015-02-03 14:08:57 +01:00
parent 6064057e26
commit b6380f8a69
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions_images.inc.php
View File

@ -1769,7 +1769,9 @@ function serendipity_killPath($basedir, $directory = '', $forceDelete = false) {
} }
@closedir($handle); @closedir($handle);
echo '<span class="msg_notice"><span class="icon-info-circled"></span> ';
printf(CHECKING_DIRECTORY . "<br />\n", $directory); printf(CHECKING_DIRECTORY . "<br />\n", $directory);
echo "</span>\n";
// No, we just don't kill files the easy way. We sort them out properly from the database // No, we just don't kill files the easy way. We sort them out properly from the database
// and preserve files not entered therein. // and preserve files not entered therein.

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

@ -17,7 +17,7 @@
{/if} {/if}
{if $case_delete} {if $case_delete}
<h2>{$CONST.MEDIA_DELETE}</h2> <h2>{$CONST.MEDIA_DELETE}</h2>
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.ABOUT_TO_DELETE_FILE|sprintf:"$file"}</span> <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.ABOUT_TO_DELETE_FILE|sprintf:"$file"}</span>
<form id="delete_image" method="get"> <form id="delete_image" method="get">
@ -67,7 +67,7 @@
{/if} {/if}
{if $case_directoryDoDelete} {if $case_directoryDoDelete}
{if $print_DIRECTORY_WRITE_ERROR}<span class="msg_error"><span class="icon-attention-circled"></span> {$print_DIRECTORY_WRITE_ERROR}</span>{/if} {if $print_DIRECTORY_WRITE_ERROR}<span class="msg_error"><span class="icon-attention-circled"></span> {$print_DIRECTORY_WRITE_ERROR}</span>{/if}
{if $ob_serendipity_killPath}<span class="msg_notice"><span class="icon-info-circled"></span> {$ob_serendipity_killPath}</span>{/if} {if $ob_serendipity_killPath}{$ob_serendipity_killPath}{/if}
{if $print_ERROR_NO_DIRECTORY}<span class="msg_error"><span class="icon-attention-circled"></span> {$print_ERROR_NO_DIRECTORY}</span>{/if} {if $print_ERROR_NO_DIRECTORY}<span class="msg_error"><span class="icon-attention-circled"></span> {$print_ERROR_NO_DIRECTORY}</span>{/if}
{/if} {/if}
{if $case_directoryEdit} {if $case_directoryEdit}
@ -219,7 +219,7 @@
</ul></li> </ul></li>
{/for} {/for}
</ul> </ul>
<a class="button_link" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryCreate">{$CONST.CREATE_NEW_DIRECTORY}</a> <a class="button_link" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryCreate">{$CONST.CREATE_NEW_DIRECTORY}</a>
{/if} {/if}
@ -251,7 +251,7 @@
{if $case_scaleSelect} {if $case_scaleSelect}
{if $print_RESIZE_BLAHBLAH}<h2>{$print_RESIZE_BLAHBLAH}</h2>{/if} {if $print_RESIZE_BLAHBLAH}<h2>{$print_RESIZE_BLAHBLAH}</h2>{/if}
{if $print_ORIGINAL_SIZE}<span class="block_level standalone">{$print_ORIGINAL_SIZE}</span>{/if} {if $print_ORIGINAL_SIZE}<span class="block_level standalone">{$print_ORIGINAL_SIZE}</span>{/if}
<span class="msg_notice image_resize_hint"><span class="icon-info-circled"></span> {$CONST.HERE_YOU_CAN_ENTER_BLAHBLAH}</span> <span class="msg_notice image_resize_hint"><span class="icon-info-circled"></span> {$CONST.HERE_YOU_CAN_ENTER_BLAHBLAH}</span>
<div class="clearfix"> <div class="clearfix">
@ -279,7 +279,7 @@
<input id="resize_keepprops" name="auto" type="checkbox" checked="checked"> <input id="resize_keepprops" name="auto" type="checkbox" checked="checked">
<label for="resize_keepprops">{$CONST.KEEP_PROPORTIONS}</label> <label for="resize_keepprops">{$CONST.KEEP_PROPORTIONS}</label>
</div> </div>
<div class="form_buttons"> <div class="form_buttons">
<input class="image_scale" name="scale" type="button" value="{$CONST.IMAGE_RESIZE}"> <input class="image_scale" name="scale" type="button" value="{$CONST.IMAGE_RESIZE}">
</div> </div>