From 34d213655386d0b758c0755813c47d774778af2a Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sun, 17 Feb 2019 13:52:45 +0300
Subject: [PATCH] Admin Panel: Entries Manager - cleanup and refactoring

---
 site/plugins/admin/classes/EntriesManager.php | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/site/plugins/admin/classes/EntriesManager.php b/site/plugins/admin/classes/EntriesManager.php
index c89b8d95..63142a2b 100644
--- a/site/plugins/admin/classes/EntriesManager.php
+++ b/site/plugins/admin/classes/EntriesManager.php
@@ -25,11 +25,7 @@ class EntriesManager
     {
         Registry::set('sidebar_menu_item', 'entries');
 
-        if (Http::get('entry') && Http::get('entry') != '') {
-            $query = Http::get('entry');
-        } else {
-            $query = '';
-        }
+        $query = EntriesManager::getEntriesQuery();
 
         switch (Http::getUriSegment(2)) {
             case 'add':
@@ -166,11 +162,9 @@ class EntriesManager
                 }
             break;
             default:
-                if (!Http::get('add')) {
-                    Themes::view('admin/views/templates/content/entries/list')
-                        ->assign('entries_list', Entries::fetchAll($query, 'date', 'DESC'))
-                        ->display();
-                }
+                Themes::view('admin/views/templates/content/entries/list')
+                    ->assign('entries_list', Entries::fetchAll($query, 'date', 'DESC'))
+                    ->display();
             break;
         }
     }
@@ -321,6 +315,17 @@ class EntriesManager
         echo Form::close();
     }
 
+    protected static function getEntriesQuery()
+    {
+        if (Http::get('entry') && Http::get('entry') != '') {
+            $query = Http::get('entry');
+        } else {
+            $query = '';
+        }
+
+        return $query;
+    }
+
     protected static function processFilesManager()
     {
         $files_directory = PATH['entries'] . '/' . Http::get('entry') . '/';
@@ -726,10 +731,8 @@ class EntriesManager
 
                         if (move_uploaded_file($file['tmp_name'], $filename)) {
 
-                            if ($chmod !== false) {
-                                // Set permissions on filename
-                                chmod($filename, $chmod);
-                            }
+                            // Set permissions on filename
+                            chmod($filename, $chmod);
 
                             // Return new file path
                             return $filename;