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

ML: Add error message when renaming fails.

Browse Source 
Completing 1ed4b9e7eca2a0c371582a454c232c

Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Thomas Hochstein 2020-03-25 00:54:48 +01:00
parent 9155a7b8a4
commit 0562dc0ca6
6 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,11 @@ switch ($serendipity['GET']['adminAction']) {
if (!serendipity_checkFormToken() || !serendipity_checkPermission('adminImagesDelete')) {
return;
}
serendipity_renameFile($serendipity['GET']['fid'], $serendipity['GET']['newname']);
$result = serendipity_renameFile($serendipity['GET']['fid'], $serendipity['GET']['newname']);
if (!empty($result) && $result !== TRUE) {
# serendipity_renameFile returned an error
$data['messages'] = $result;
}
break;
case 'properties':

17
include/functions_images.inc.php
View File

@ -2262,15 +2262,22 @@ function serendipity_renameFile($id, $newName, $path = null) {
$newPath = "{$imgBase}{$path}{$newName}.{$file['extension']}";
if (file_exists($newPath)) {
return false;
return sprintf('<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> ' . ERROR_FILE_EXISTS . "</span>\n", $newName);
}
rename("{$imgBase}{$file['path']}{$file['realname']}", $newPath);
if (rename("{$imgBase}{$file['path']}{$file['realname']}", $newPath)) {
# if renaming was successfull, rename thumbnails and update
# databases and entries
serendipity_renameThumbnails($id, "{$path}$newName");
serendipity_renameThumbnails($id, "{$path}$newName");
serendipity_updateImageInDatabase(array('name' => $newName, 'realname' => basename($newPath)), $id);
serendipity_updateImageInEntries($id, $file);
serendipity_updateImageInDatabase(array('name' => $newName, 'realname' => basename($newPath)), $id);
serendipity_updateImageInEntries($id, $file);
} else {
return '<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> ' . MEDIA_RENAME_FAILED . "</span>\n";
}
return TRUE;
}
/**

3
lang/UTF-8/serendipity_lang_de.inc.php
View File

@ -79,7 +79,7 @@
@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Die Suche nach "%s" ergab %s Treffer:');
@define('IMAGE', 'Bild');
@define('ERROR_FILE_NOT_EXISTS', ' Alte Datei existiert nicht!');
@define('ERROR_FILE_EXISTS', 'Fehler: Neuer Dateiname existiert schon, bitte einen anderen wählen.');
@define('ERROR_FILE_EXISTS', 'Fehler: Neuer Dateiname "%s" existiert schon, bitte einen anderen wählen.');
@define('ERROR_SOMETHING', 'Fehler: Irgend etwas stimmt nicht.');
@define('ADDING_IMAGE', 'Bild hinzufügen ...');
@define('THUMB_CREATED_DONE', 'Vorschau erstellt.<br />Fertig.');
@ -1137,3 +1137,4 @@
@define('SOURCE', 'Quelle');
@define('PLUGIN_SOURCE_BUNDLED', 'mitgeliefertes Plugin');
@define('PLUGIN_SOURCE_LOCAL', 'lokal installiert');
@define('MEDIA_RENAME_FAILED', 'Umbenennen fehlgeschlagen!');

3
lang/UTF-8/serendipity_lang_en.inc.php
View File

@ -80,7 +80,7 @@
@define('SEARCH_TOO_SHORT', 'Your search-query must be longer than 3 characters. You can try to append * to shorter words, like: s9y* to trick the search into using shorter words.');
@define('IMAGE', 'Image');
@define('ERROR_FILE_NOT_EXISTS', 'Error: Old filename does not exist!');
@define('ERROR_FILE_EXISTS', 'Error: New filename already used, pick another!');
@define('ERROR_FILE_EXISTS', 'Error: New filename "%s" already used, pick another!');
@define('ERROR_SOMETHING', 'Error: Something is wrong.');
@define('ADDING_IMAGE', 'Adding image...');
@define('THUMB_CREATED_DONE', 'Thumbnail created.<br/>Done.');
@ -1136,3 +1136,4 @@
@define('SOURCE', 'Source');
@define('PLUGIN_SOURCE_BUNDLED', 'bundled core plugin');
@define('PLUGIN_SOURCE_LOCAL', 'locally installed');
@define('MEDIA_RENAME_FAILED', 'Renaming failed!');

3
lang/serendipity_lang_de.inc.php
View File

@ -79,7 +79,7 @@
@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Die Suche nach "%s" ergab %s Treffer:');
@define('IMAGE', 'Bild');
@define('ERROR_FILE_NOT_EXISTS', ' Alte Datei existiert nicht!');
@define('ERROR_FILE_EXISTS', 'Fehler: Neuer Dateiname existiert schon, bitte einen anderen wählen.');
@define('ERROR_FILE_EXISTS', 'Fehler: Neuer Dateiname "%s" existiert schon, bitte einen anderen wählen.');
@define('ERROR_SOMETHING', 'Fehler: Irgend etwas stimmt nicht.');
@define('ADDING_IMAGE', 'Bild hinzufügen ...');
@define('THUMB_CREATED_DONE', 'Vorschau erstellt.<br />Fertig.');
@ -1137,3 +1137,4 @@
@define('SOURCE', 'Quelle');
@define('PLUGIN_SOURCE_BUNDLED', 'mitgeliefertes Plugin');
@define('PLUGIN_SOURCE_LOCAL', 'lokal installiert');
@define('MEDIA_RENAME_FAILED', 'Umbenennen fehlgeschlagen!');

3
lang/serendipity_lang_en.inc.php
View File

@ -80,7 +80,7 @@
@define('SEARCH_TOO_SHORT', 'Your search-query must be longer than 3 characters. You can try to append * to shorter words, like: s9y* to trick the search into using shorter words.');
@define('IMAGE', 'Image');
@define('ERROR_FILE_NOT_EXISTS', 'Error: Old filename does not exist!');
@define('ERROR_FILE_EXISTS', 'Error: New filename already used, pick another!');
@define('ERROR_FILE_EXISTS', 'Error: New filename "%s" already used, pick another!');
@define('ERROR_SOMETHING', 'Error: Something is wrong.');
@define('ADDING_IMAGE', 'Adding image...');
@define('THUMB_CREATED_DONE', 'Thumbnail created.<br/>Done.');
@ -1136,3 +1136,4 @@
@define('SOURCE', 'Source');
@define('PLUGIN_SOURCE_BUNDLED', 'bundled core plugin');
@define('PLUGIN_SOURCE_LOCAL', 'locally installed');
@define('MEDIA_RENAME_FAILED', 'Renaming failed!');