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

Add different error messages for ML rename.

Browse Source 
Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Thomas Hochstein 2020-03-25 11:07:21 +01:00
parent 837c58cf6d
commit fd49846aa1
6 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,8 +181,10 @@ switch ($serendipity['GET']['adminAction']) {
if (!serendipity_checkFormToken() || !serendipity_checkPermission('adminImagesDelete')) { if (!serendipity_checkFormToken() || !serendipity_checkPermission('adminImagesDelete')) {
return; return;
} }
if (!serendipity_renameFile($serendipity['GET']['fid'], $serendipity['GET']['newname'])) { $result = serendipity_renameFile($serendipity['GET']['fid'], $serendipity['GET']['newname']);
$data['messages'] = sprintf('<span class="msg_error"><span class="icon-attention-circled" aria-hidden="true"></span> ' . ERROR_FILE_EXISTS . "</span>\n", $serendipity['GET']['newname']); if (!empty($result) && $result !== TRUE) {
# serendipity_renameFile returned an error
$data['messages'] = $result;
} }
break; break;

11
include/functions_images.inc.php
View File

@ -2262,15 +2262,22 @@ function serendipity_renameFile($id, $newName, $path = null) {
$newPath = "{$imgBase}{$path}{$newName}.{$file['extension']}"; $newPath = "{$imgBase}{$path}{$newName}.{$file['extension']}";
if (file_exists($newPath)) { 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_updateImageInDatabase(array('name' => $newName, 'realname' => basename($newPath)), $id);
serendipity_updateImageInEntries($id, $file); 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;
} }
/** /**

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

@ -1132,3 +1132,4 @@
@define('SOURCE', 'Quelle'); @define('SOURCE', 'Quelle');
@define('PLUGIN_SOURCE_BUNDLED', 'mitgeliefertes Plugin'); @define('PLUGIN_SOURCE_BUNDLED', 'mitgeliefertes Plugin');
@define('PLUGIN_SOURCE_LOCAL', 'lokal installiert'); @define('PLUGIN_SOURCE_LOCAL', 'lokal installiert');
@define('MEDIA_RENAME_FAILED', 'Umbenennen fehlgeschlagen!');

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

@ -1134,3 +1134,4 @@
@define('SOURCE', 'Source'); @define('SOURCE', 'Source');
@define('PLUGIN_SOURCE_BUNDLED', 'bundled core plugin'); @define('PLUGIN_SOURCE_BUNDLED', 'bundled core plugin');
@define('PLUGIN_SOURCE_LOCAL', 'locally installed'); @define('PLUGIN_SOURCE_LOCAL', 'locally installed');
@define('MEDIA_RENAME_FAILED', 'Renaming failed!');

1
lang/serendipity_lang_de.inc.php
View File

@ -1132,3 +1132,4 @@
@define('SOURCE', 'Quelle'); @define('SOURCE', 'Quelle');
@define('PLUGIN_SOURCE_BUNDLED', 'mitgeliefertes Plugin'); @define('PLUGIN_SOURCE_BUNDLED', 'mitgeliefertes Plugin');
@define('PLUGIN_SOURCE_LOCAL', 'lokal installiert'); @define('PLUGIN_SOURCE_LOCAL', 'lokal installiert');
@define('MEDIA_RENAME_FAILED', 'Umbenennen fehlgeschlagen!');

1
lang/serendipity_lang_en.inc.php
View File

@ -1134,3 +1134,4 @@
@define('SOURCE', 'Source'); @define('SOURCE', 'Source');
@define('PLUGIN_SOURCE_BUNDLED', 'bundled core plugin'); @define('PLUGIN_SOURCE_BUNDLED', 'bundled core plugin');
@define('PLUGIN_SOURCE_LOCAL', 'locally installed'); @define('PLUGIN_SOURCE_LOCAL', 'locally installed');
@define('MEDIA_RENAME_FAILED', 'Renaming failed!');