From 07aca0fd6bd5262f0fc43e9a2e6d4c320ceeae7b Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 17 Feb 2019 19:49:47 +0300 Subject: [PATCH] Admin Panel: Entries Manager - cleanup and refactoring --- site/plugins/admin/classes/EntriesManager.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php index ef41fce2..6293b43a 100644 --- a/site/plugins/admin/classes/EntriesManager.php +++ b/site/plugins/admin/classes/EntriesManager.php @@ -391,14 +391,18 @@ class EntriesManager if (isset($move_entry)) { if (Token::check((Http::post('token')))) { - if (!Filesystem::has(realpath(PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Http::post('name_current')))) { - if (rename( - PATH['entries'] . '/' . Http::post('entry_path_current'), - PATH['entries'] . '/' . Http::post('parent_entry') . '/' . Text::safeString(Http::post('name_current'), '-', true) + if (!Entries::has(Http::post('parent_entry') . '/' . Http::post('name_current'))) { + if (Entries::rename( + Http::post('entry_path_current'), + Http::post('parent_entry') . '/' . Text::safeString(Http::post('name_current'), '-', true) )) { Notification::set('success', __('admin_message_entry_moved')); - Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); + } else { + Notification::set('error', __('admin_message_entry_was_not_moved')); } + + Http::redirect(Http::getBaseUrl() . '/admin/entries/?entry=' . Http::post('parent_entry')); + } } else { throw new \RuntimeException("Request was denied because it contained an invalid security token. Please refresh the page and try again.");