From 227a2a35d64db87d889f7a44101f11a117b8e06a Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Sat, 18 Jan 2020 16:35:20 +0100 Subject: refactoring medialist --- app/class/Controllermedia.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'app/class/Controllermedia.php') diff --git a/app/class/Controllermedia.php b/app/class/Controllermedia.php index b6b90c0..6a84028 100644 --- a/app/class/Controllermedia.php +++ b/app/class/Controllermedia.php @@ -33,26 +33,18 @@ class Controllermedia extends Controller throw new Exception("Media error : Cant create /media/thumbnail folder"); } + $mediaopt = new Medialist($_GET); - $dir = rtrim($_GET['path'] ?? Model::MEDIA_DIR, DIRECTORY_SEPARATOR); - $sortby = isset($_GET['sortby']) ? $_GET['sortby'] : 'id'; - $order = isset($_GET['order']) ? $_GET['order'] : '1'; - $type = $_GET['type'] ?? ['image', 'video', 'sound', 'other']; - $opt = ['dir' => $dir, 'sortby' => $sortby, 'order' => $order, 'type' => $type]; - - if(is_dir($dir)) { - $medialist = $this->mediamanager->getlistermedia($dir . DIRECTORY_SEPARATOR); - $faviconlist = $this->mediamanager->getlistermedia(Model::FAVICON_DIR); + if(is_dir($mediaopt->dir())) { + $medialist = $this->mediamanager->medialistopt($mediaopt); $dirlist = $this->mediamanager->listdir(Model::MEDIA_DIR); $pathlist = []; - $this->mediamanager->listpath($dirlist, '', $pathlist); - $this->mediamanager->medialistsort($medialist, $sortby, $order); - $this->showtemplate('media', ['medialist' => $medialist, 'faviconlist' => $faviconlist, 'dirlist' => $dirlist, 'pathlist' =>$pathlist, 'dir' => $dir, 'opt' => $opt]); + $this->showtemplate('media', ['medialist' => $medialist, 'dirlist' => $dirlist, 'pathlist' =>$pathlist, 'mediaopt' => $mediaopt]); } else { $this->routedirect('media'); } -- cgit v1.2.3