improved filebrowser and uploads

Author: patkon

acp/core/uploads/data-reader.php

@@ -5,6 +5,47 @@
 $reader_uri = '/admin/uploads/read/';
 
 
+if($_REQUEST['action'] == 'list_active_searches') {
+
+    if(isset($_SESSION['uploads_text_filter']) AND $_SESSION['uploads_text_filter'] != "") {
+        unset($all_filter);
+        $all_filter = explode(" ", $_SESSION['uploads_text_filter']);
+
+        foreach($all_filter as $f) {
+            if($_REQUEST['rm_keyword'] == "$f") { continue; }
+            if($f == "") { continue; }
+            $btn_remove_keyword .= '<button class="btn btn-sm btn-default" name="rmkey" value="'.$f.'" hx-post="/admin/uploads/write/" hx-swap="none" hx-include="[name=\'csrf_token\']">'.$icon['x'].' '.$f.'</button> ';
+        }
+    }
+
+    if(isset($btn_remove_keyword)) {
+        echo '<div class="d-inline">';
+        echo '<p style="padding-top:5px;">' . $btn_remove_keyword . '</p>';
+        echo '</div><hr>';
+    }
+}
+
+if($_REQUEST['action'] == 'show_stats') {
+
+    $media_cnt_images = $db_content->count("se_media",[
+        "media_file[~]" => "../images/"
+    ]);
+
+    $media_cnt_files = $db_content->count("se_media",[
+        "media_file[~]" => "../files/"
+    ]);
+
+    echo '<table class="table">';
+    echo '<tr>';
+    echo '<td>Images</td><td>'.$media_cnt_images.'</td>';
+    echo '</tr>';
+    echo '<tr>';
+    echo '<td>Files</td><td>'.$media_cnt_files.'</td>';
+    echo '</tr>';
+    echo '</table>';
+}
+
+
 if($_REQUEST['action'] == 'list') {
 
     // defaults
@@ -113,4 +154,13 @@
 
     echo '</div>';
 
+    if($_SESSION['disk'] != 'assets/images' AND $_SESSION['disk'] != 'assets/files' AND $_SESSION['disk'] != '') {
+        $delete_dir_btn = '<form hx-post="/admin/uploads/write/" hx-confirm="' . $lang['msg_confirm_delete_directory'] . '" hx-target="#response" class="mt-3 text-end">';
+        $delete_dir_btn .= '<button name="delete_dir" value="' . $_SESSION['disk'] . '" class="btn btn-danger">';
+        $delete_dir_btn .= $icon['trash_alt'] . ' ' . $_SESSION['disk'];
+        $delete_dir_btn .= '</button>';
+        $delete_dir_btn .= '<input type="hidden" name="csrf_token" value="' . $_SESSION['token'] . '">';
+        $delete_dir_btn .= '</form>';
+        echo $delete_dir_btn;
+    }
 }

acp/core/uploads/data-writer.php

@@ -1,5 +1,6 @@
 <?php
 
+require_once __DIR__.'/functions.php';
 
 /**
  * delete media
@@ -103,20 +104,27 @@
 
 // change directory
 if(isset($_POST['selected_folder'])) {
+    echo 'Swapped folder';
     $_SESSION['disk'] = se_filter_filepath($_POST['selected_folder']);
     header( "HX-Trigger: update_uploads_list");
 }
 
-/**
- * create new folder
- */
+// create new folder
 if((isset($_POST['new_folder'])) && ($_POST['new_folder'] != '')) {
     $folder_name = clean_filename($_POST['new_folder']);
     $create_path = $_SESSION['disk'] . '/' . $folder_name;
     mkdir($create_path, 0777, true);
     header( "HX-Trigger: update_directories");
 }
 
+// delete folder
+if(isset($_POST['delete_dir'])) {
+    $del_dir = se_filter_filepath($_POST['delete_dir']);
+    delete_folder($del_dir);
+    header( "HX-Trigger: update_directories, update_uploads_list");
+}
+
+
 /**
  * rebase the database
  * we check if there are files which are not in the database
@@ -138,6 +146,16 @@
         $scan_files = se_scandir_recursive("$files_dir");
         $images_and_files = array_merge($scan_images, $scan_files);
 
+        $cnt_images_on_disk = 0;
+        if(is_array($scan_images)) {
+            $cnt_images_on_disk = count($scan_images);
+        }
+
+        $cnt_files_on_disk = 0;
+        if(is_array($scan_files)) {
+            $cnt_files_on_disk = count($scan_files);
+        }
+
         foreach ($images_and_files as $key => $value) {
             if(str_contains("$value","index.html")) { continue; }
             $all_files[] = str_replace('assets/', '../', $value);
@@ -150,8 +168,7 @@
 
         foreach($all_files as $filename) {
             if(!in_array($filename, $mediaData)) {
-                // filename is not in database, mak an entry
-
+                // filename is not in database, make an entry
                 $file_src = str_replace("../","assets/",$filename);
                 $filesize = filesize($file_src);
                 $filemtime = filemtime($file_src);
@@ -183,9 +200,10 @@
             }
         }
 
-
+        echo '<p>Found <code>'.$cnt_images_on_disk.'</code> images and <code>'.$cnt_files_on_disk.'</code> files.</p>';
         echo '<p><code>'.$stats_files_to_db.'</code> were added to the database<br>';
         echo '<code>'.$stats_files_from_db.'</code> were removed from the database</p>';
+        header( "HX-Trigger: update_uploads_list");
 
     }
 

acp/core/uploads/functions.php

@@ -8,4 +8,25 @@ function show_sort_arrow() {
         $ic = '<span title="'.$lang['descending'].'"><i class="bi bi-caret-down-fill"></i></span>';
     }
     return $ic;
+}
+
+function delete_folder($dir) {
+
+    $dir = se_filter_filepath($dir);
+
+    $delete_folder = SE_PUBLIC.'/'.$dir;
+    $files = array_diff(scandir($delete_folder), array('.','..'));
+    foreach ($files as $file) {
+        if(is_dir("$dir/$file")) {
+            delete_folder("$dir/$file");
+        } else {
+            unlink("$dir/$file");
+            $filename = $dir.'/'.$file;
+            $filename = str_replace(SE_PUBLIC, '', $filename);
+            $filename = str_replace('assets/', '../', $filename);
+            se_delete_media_data("$filename");
+        }
+
+    }
+    return rmdir($delete_folder);
 }

acp/core/uploads/index.php

@@ -3,7 +3,7 @@
 $reader_uri = '/admin/uploads/read/';
 $writer_uri = '/admin/uploads/write/';
 
-include 'functions.php';
+
 
 $q = pathinfo($_REQUEST['query']);
 
@@ -51,22 +51,7 @@
 echo '</div>';
 echo '</form>';
 
-if(isset($_SESSION['uploads_text_filter']) AND $_SESSION['uploads_text_filter'] != "") {
-    unset($all_filter);
-    $all_filter = explode(" ", $_SESSION['uploads_text_filter']);
-
-    foreach($all_filter as $f) {
-        if($_REQUEST['rm_keyword'] == "$f") { continue; }
-        if($f == "") { continue; }
-        $btn_remove_keyword .= '<button class="btn btn-sm btn-default" name="rmkey" value="'.$f.'" hx-post="'.$writer_uri.'" hx-swap="none" hx-include="[name=\'csrf_token\']">'.$icon['x'].' '.$f.'</button> ';
-    }
-}
-
-if(isset($btn_remove_keyword)) {
-    echo '<div class="d-inline">';
-    echo '<p style="padding-top:5px;">' . $btn_remove_keyword . '</p>';
-    echo '</div><hr>';
-}
+echo '<div class="pt-1" hx-get="'.$reader_uri.'?action=list_active_searches" hx-trigger="load, changed, update_uploads_list from:body, updated_global_filter from:body"></div>';
 
 echo '</div>';
 
@@ -89,6 +74,9 @@
 echo '<div class="card mt-2">';
 echo '<div class="card-header">Database</div>';
 echo '<div class="card-body">';
+
+echo '<div class="pt-1" hx-get="'.$reader_uri.'?action=show_stats" hx-trigger="load, changed, update_uploads_list from:body, updated_global_filter from:body"></div>';
+
 echo '<div id="responseRebase"></div>';
 
 echo '<button class="btn btn-default w-100" name="rebase" value="files_to_database" hx-post="'.$writer_uri.'" hx-target="#responseRebase" hx-swap="innerHTML" hx-include="[name=\'csrf_token\']">Rebase DB</button> ';

acp/core/uploads/router.php

@@ -1,5 +1,7 @@
 <?php
 
+require __DIR__.'/functions.php';
+
 $subinc = match (true) {
     str_starts_with($query, 'uploads/edit/') => 'edit',
     default => 'index'

public/assets/themes/administration/src/js/backend.js

@@ -174,15 +174,37 @@ document.addEventListener('DOMContentLoaded', () => {
     const toggleAllButton = document.getElementById('toggle-all');
 
     if (toggleAllButton) {
-    toggleAllButton.addEventListener('click', (event) => {
-        event.preventDefault(); // Prevent form submission
+        toggleAllButton.addEventListener('click', (event) => {
+            event.preventDefault(); // Prevent form submission
 
-        document.querySelectorAll('.toggle-item').forEach(container => {
-            container.classList.toggle('d-none'); // Toggle each container independently
+            document.querySelectorAll('.toggle-item').forEach(container => {
+                container.classList.toggle('d-none'); // Toggle each container independently
+            });
         });
-    });
     }
 
+    // uploads
+    const uppy = new Uppy({
+        debug: false,
+        autoProceed: false,
+    })
+
+    uppy.use(Form, {
+        target: '.dropper-form',
+    })
+
+    uppy.use(Dashboard, {
+        inline: true,
+        target: '.dropper-form',
+    })
+    uppy.use(XHRUpload, {
+        endpoint: '/admin/upload/'
+    })
+
+    uppy.on('complete', (result) => {
+        htmx.trigger("body", "update_uploads_list");
+    });
+
 });
 
 document.addEventListener("keydown", function (event) {
@@ -216,29 +238,6 @@ document.addEventListener("keydown", function (event) {
 
 $(function() {
 
-    // observe "sortable_target" (image picker)
-   // observeContainersForDraggableDivs('.sortable_target');
-
-    const uppy = new Uppy({
-        debug: false,
-        autoProceed: false,
-    })
-
-    uppy.use(Form, {
-        target: '.dropper-form',
-    })
-
-    uppy.use(Dashboard, {
-        inline: true,
-        target: '.dropper-form',
-    })
-    uppy.use(XHRUpload, {
-        endpoint: '/admin/upload/',
-    })
-
-
-    //$('[data-bs-toggle="popover"]').popover();
-    //$('[data-bs-toggle="tooltip"]').tooltip();
 
     setTimeout(function() {
         $(".alert-auto-close").slideUp('slow');