From 2b1f317ed7a4d402a268f62dd65dc0d648b5ad0c Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Fri, 17 Jan 2020 18:07:27 +0100
Subject: media filter

---
 app/class/Controllermedia.php    |  3 ++-
 app/view/templates/media.php     | 32 +++++++++++++++++++++++-
 app/view/templates/mediamenu.php | 14 ++++++++---
 app/view/templates/navback.php   | 54 ----------------------------------------
 4 files changed, 44 insertions(+), 59 deletions(-)
 delete mode 100644 app/view/templates/navback.php

(limited to 'app')

diff --git a/app/class/Controllermedia.php b/app/class/Controllermedia.php
index 5958289..b6b90c0 100644
--- a/app/class/Controllermedia.php
+++ b/app/class/Controllermedia.php
@@ -37,7 +37,8 @@ class Controllermedia extends Controller
             $dir = rtrim($_GET['path'] ?? Model::MEDIA_DIR, DIRECTORY_SEPARATOR);
             $sortby = isset($_GET['sortby']) ? $_GET['sortby'] : 'id';
             $order = isset($_GET['order']) ? $_GET['order'] : '1';
-            $opt = ['dir' => $dir, 'sortby' => $sortby, 'order' => $order];
+            $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);
diff --git a/app/view/templates/media.php b/app/view/templates/media.php
index f81b507..7b2fbc1 100644
--- a/app/view/templates/media.php
+++ b/app/view/templates/media.php
@@ -45,10 +45,38 @@ treecount($dirlist, 'media', 0, 'media', $dir, $opt);
 
 
 
+
 </table>
+
+
+<h2>filter</h2>
+
+<form action="" method="get">
+                <ul>
+                    <li><input type="checkbox" name="type[]" id="image" value="image" <?= in_array('image', $opt['type']) ? 'checked' : '' ?>><label for="image">image</label></li>
+                    <li><input type="checkbox" name="type[]" id="sound" value="sound" <?= in_array('sound', $opt['type']) ? 'checked' : '' ?>><label for="sound">sound</label></li>
+                    <li><input type="checkbox" name="type[]" id="video" value="video" <?= in_array('video', $opt['type']) ? 'checked' : '' ?>><label for="video">video</label></li>
+                    <li><input type="checkbox" name="type[]" id="other" value="other" <?= in_array('other', $opt['type']) ? 'checked' : '' ?>><label for="other">other</label></li>
+                </ul>
+                <select name="" id="">
+                    <option value="id" <?= $opt['sortby'] === 'id' ? 'selected' : '' ?>>id</option>
+                    <option value="type" <?= $opt['sortby'] === 'type' ? 'selected' : '' ?>>type</option>
+                    <option value="size" <?= $opt['sortby'] === 'size' ? 'selected' : '' ?>>size</option>
+                </select>
+                </br>
+                <input type="radio" name="order" id="asc" value="1" <?= $opt['order'] == 1 ? 'checked' : '' ?>><label for="asc">ascending</label>
+                </br>
+                <input type="radio" name="order" id="desc" value="-1" <?= $opt['order'] == -1 ? 'checked' : '' ?>><label for="desc">descending</label>
+                </br>
+                <input type="hidden" name="path" value="<?= $dir ?>">
+                <input type="submit" value="filter">
+            </form>
+
 </div>
 
 
+
+
 <div id="explorer">
 
 
@@ -71,12 +99,13 @@ treecount($dirlist, 'media', 0, 'media', $dir, $opt);
 
 <?php
 foreach ($medialist as $media) {
+    if(in_array($media->type(), $opt['type'])) {
     ?>
     <tr>
     <td><input type="checkbox" name="id[]" value="<?= $media->getfulldir() ?>" form="mediaedit" id="media_<?= $media->id() ?>"></td>
     <td><label for="media_<?= $media->id() ?>"><?= $media->id() ?></label></td>    
     <td><?= $media->extension() ?></td>
-    <td><a href="<?= $media->getfullpath() ?>" target="_blank"><?= $media->type() == 'image' ? '<span class="thumbnail">image 👁<img src="' . $media->getfullpath() . '"></span>' : $media->type() ?></a></td>
+    <td><a href="<?= $media->getfullpath() ?>" target="_blank"><?= $media->type() == 'image' ? '<span class="thumbnail">image 👁<img src="' . $media->getfullpath() . '"></span>' : '⧉ ' . $media->type() ?></a></td>
     <td><?= $media->size('hr') ?></td>
     <td><?= $media->width() ?></td>
     <td><?= $media->height() ?></td>
@@ -84,6 +113,7 @@ foreach ($medialist as $media) {
     <td class="code"><code><?= $media->getcode() ?></code></td>
     </tr>
     <?php
+    }
 
 }
 
diff --git a/app/view/templates/mediamenu.php b/app/view/templates/mediamenu.php
index c335933..d0f45de 100644
--- a/app/view/templates/mediamenu.php
+++ b/app/view/templates/mediamenu.php
@@ -32,14 +32,16 @@
                 <input type="hidden" name="dir" value="<?= $dir ?>/">
                 <input type="checkbox" name="deletefolder" id="confirmdeletefolder" value="1">
                 <label for="confirmdeletefolder">Delete actual folder and all it's content</label>
+                </br>
                 <input type="submit" value="delete folder" >
             </form>
 
+            
             <h2>Move</h2>
-
             <form action="<?= $this->url('mediaedit') ?>" method="post" id="mediaedit">
                 <input type="hidden" name="path" value="<?= $dir ?>">
-                <label for="moveto">Selected medias :</label>
+                <label for="moveto">Move selected medias to a new directory</label>
+                </br>
                 <select name="dir" id="moveto" >
                     <option selected>---select destination---</option>
                     <option value="<?= Wcms\Model::MEDIA_DIR ?>">/</option>
@@ -47,9 +49,12 @@
                         foreach ($pathlist as $path) {
                             echo '<option value="' . Wcms\Model::MEDIA_DIR . $path . '">' . $path . '</option>';
                         }
-                    ?>
+                        ?>
                 </select>
                 <input type="submit" name="action" value="move" >
+                <h2>Delete</h2>
+                Delete selected medias
+                </br>
                 <input type="submit" name="action" value="delete" >
             </form>
 
@@ -64,6 +69,9 @@
         <summary>Filter</summary>
         <div class="submenu">
             <h2>Print folder content</h2>
+            
+
+
             <p>Use this code to print the content of the actual folder in a page</p>
             <code>%MEDIA?path=<?= substr($dir, 6) ?>&sortby=<?= $opt['sortby'] ?>&order=<?= $opt['order'] ?>%</code>
         </div>
diff --git a/app/view/templates/navback.php b/app/view/templates/navback.php
deleted file mode 100644
index 8218897..0000000
--- a/app/view/templates/navback.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="menu">
-    <?= $user->level() ?>
-    <div id="dropmenu">
-
-    <ul>
-    
-    <li>
-    <a class="button" href="./">home</a>
-    </li>
-
-
-<?php if($user->isvisitor()) { ?>
-
-    <li>
-    <form action="?action=login" method="post">
-    <input type="password" name="pass" id="loginpass" placeholder="password">
-    <input type="submit" value="login">
-    </form>
-    </li>
-
-<?php } else { ?>    
-
-    <li>
-    <form action="?action=logout" method="post">
-    <input type="submit" value="logout">
-    </form>
-    </li>
-
-<?php } ?>
-
-
-
-
-<?php if ($user->iseditor()) { ?>
-
-    <li>
-    <a class="button" href="?aff=media" >Media</a>
-    </li>
-
-<?php } ?>  
-
-<?php if($user->isadmin()) { ?>
-
-    <li>
-    <a class="button" href="?aff=admin" >Admin</a>
-    </li>
-
-<?php } ?>  
-
-
-    </ul>
-
-    </div>
-</div>
\ No newline at end of file
-- 
cgit v1.2.3