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

fix more issues moving images (!)

Browse Source 
1st - case 'filedir' moving via image properties missed $renameValues['file'] array $pick
2cd - case 'file' moving mixed up rename() of thumbs completely
3rd - added new success message for case 'filedir' image properties move
4th - fixed markup for some more messages
This commit is contained in:
Ian 2015-08-26 11:57:49 +02:00
parent 13616f49f3
commit a3c567e864
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/functions_images.inc.php
View File

@ -3370,29 +3370,30 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
$real_newDir = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $newDir; $real_newDir = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $newDir;
if ($type == 'dir') { if ($type == 'dir') {
if (!is_dir($real_oldDir)) { if (!is_dir($real_oldDir)) {
echo '<span class="msg_error"><span class="icon-attention-circled"></span> '; echo '<span class="msg_error"><span class="icon-attention-circled"></span> ';
printf(ERROR_FILE_NOT_EXISTS, '<span class="block_level">' . $oldDir . '</span>'); printf(ERROR_FILE_NOT_EXISTS, $oldDir);
echo "</span>\n"; echo "</span>\n";
return false; return false;
} }
if (is_dir($real_newDir)) { if (is_dir($real_newDir)) {
echo '<span class="msg_error"><span class="icon-attention-circled"></span> '; echo '<span class="msg_error"><span class="icon-attention-circled"></span> ';
printf(ERROR_FILE_EXISTS, '<span class="block_level">' . $newDir . '</span>'); printf(ERROR_FILE_EXISTS, $newDir);
echo "</span>\n"; echo "</span>\n";
return false; return false;
} }
if (!rename($real_oldDir, $real_newDir)) { if (!rename($real_oldDir, $real_newDir)) {
echo '<span class="msg_error"><span class="icon-attention-circled"></span> '; echo '<span class="msg_error"><span class="icon-attention-circled"></span> ';
printf(MEDIA_DIRECTORY_MOVE_ERROR, '<span class="block_level">' . $newDir . '</span>'); printf(MEDIA_DIRECTORY_MOVE_ERROR, $newDir);
echo "</span>\n"; echo "</span>\n";
return false; return false;
} }
echo '<span class="msg_success"><span class="icon-ok-circled"></span> '; echo '<span class="msg_success"><span class="icon-ok-circled"></span> ';
printf(MEDIA_DIRECTORY_MOVED, '<span class="block_level">' . $newDir . '</span>'); printf(MEDIA_DIRECTORY_MOVED, $newDir);
echo "</span>\n"; echo "</span>\n";
$dirs = serendipity_db_query("SELECT id, path $dirs = serendipity_db_query("SELECT id, path
@ -3428,6 +3429,7 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
} }
if ($type == 'file') { if ($type == 'file') {
if (serendipity_isActiveFile(basename($newDir))) { if (serendipity_isActiveFile(basename($newDir))) {
echo '<span class="msg_error"><span class="icon-attention-circled"></span> '; echo '<span class="msg_error"><span class="icon-attention-circled"></span> ';
printf(ERROR_FILE_FORBIDDEN, serendipity_specialchars($newDir)); printf(ERROR_FILE_FORBIDDEN, serendipity_specialchars($newDir));
@ -3456,7 +3458,7 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
'file' => $file 'file' => $file
)); ));
serendipity_plugin_api::hook_event('backend_media_rename', $renameValues); // eg. for staticpage inner entries path renamings serendipity_plugin_api::hook_event('backend_media_rename', $renameValues); // eg. for staticpage entries path regex replacements
// Rename file // Rename file
rename($renameValues[0]['from'], $renameValues[0]['to']); rename($renameValues[0]['from'], $renameValues[0]['to']);
@ -3464,7 +3466,7 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
foreach($renameValues AS $renameData) { foreach($renameValues AS $renameData) {
// Rename thumbnail // Rename thumbnail
@rename($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . (!empty($renameData['fthumb']) ? '.' . $renameData['fthumb'] : '') . (empty($file['extension']) ? '' : '.' . $file['extension']), @rename($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . (!empty($renameData['fthumb']) ? '.' . $renameData['fthumb'] : '') . (empty($file['extension']) ? '' : '.' . $file['extension']),
$serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $newDir . (!empty($file['thumbnail_name']) ? '.' . $renameData['thumb'] : '') . (empty($file['extension']) ? '' : '.' . $file['extension'])); $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $newDir . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $renameData['thumb'] : '') . (empty($file['extension']) ? '' : '.' . $file['extension']));
} }
serendipity_updateImageInDatabase(array('thumbnail_name' => $renameValues[0]['thumb'], 'realname' => $newDir, 'name' => $newDir), $item_id); serendipity_updateImageInDatabase(array('thumbnail_name' => $renameValues[0]['thumb'], 'realname' => $newDir, 'name' => $newDir), $item_id);
@ -3485,7 +3487,9 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
return false; return false;
} }
} }
} elseif ($type == 'filedir') { } elseif ($type == 'filedir') {
serendipity_db_query("UPDATE {$serendipity['dbPrefix']}images serendipity_db_query("UPDATE {$serendipity['dbPrefix']}images
SET path = '" . serendipity_db_escape_string($newDir) . "' SET path = '" . serendipity_db_escape_string($newDir) . "'
WHERE id = " . (int)$item_id); WHERE id = " . (int)$item_id);
@ -3505,7 +3509,7 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
'newDir' => $newDir, 'newDir' => $newDir,
'type' => $type, 'type' => $type,
'item_id' => $item_id, 'item_id' => $item_id,
'file' => $file, 'file' => $pick,
'name' => $pick['name'] 'name' => $pick['name']
)); ));
@ -3522,7 +3526,16 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
$oldDir .= $pick['name']; $oldDir .= $pick['name'];
$newDir .= $pick['name']; $newDir .= $pick['name'];
$hasExt = isset($pick['extension']) ? '.'.$pick['extension'] : '';
if (file_exists($newfile)) {
echo '<span class="msg_success"><span class="icon-ok-circled"></span> ';
printf(MEDIA_DIRECTORY_MOVED, $newDir . $hasExt);
echo "</span>\n";
}
} elseif ($type == 'dir') { } elseif ($type == 'dir') {
$renameValues = array(array( $renameValues = array(array(
'from' => $oldfile, 'from' => $oldfile,
'to' => $newfile, 'to' => $newfile,
@ -3540,7 +3553,7 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
// Only MySQL supported, since I don't know how to use REGEXPs differently. // Only MySQL supported, since I don't know how to use REGEXPs differently.
if ($serendipity['dbType'] != 'mysql' && $serendipity['dbType'] != 'mysqli') { if ($serendipity['dbType'] != 'mysql' && $serendipity['dbType'] != 'mysqli') {
echo '<span class="block_level">' . MEDIA_DIRECTORY_MOVE_ENTRY . '</span>'; echo '<span class="msg_notice"><span class="icon-info-circled"></span> ' . MEDIA_DIRECTORY_MOVE_ENTRY . "</span>\n";
return true; return true;
} }