From 75682cb2bab634df22f219f12b564b7f6e53b20b Mon Sep 17 00:00:00 2001
From: Stefan Brand <seiichiro@seiichiro0185.org>
Date: Tue, 11 Jan 2022 16:25:49 +0100
Subject: [PATCH] Add directory Support

---
 conf/config.php  |   2 +-
 img/folder.png   | Bin 0 -> 2229 bytes
 index.php        |   9 +++++++--
 tpl/gallery.html |   7 +++++++
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 img/folder.png

diff --git a/conf/config.php b/conf/config.php
index eb6ab64..2d56c2d 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -22,6 +22,6 @@ $conf['defpage']  = 1;
 // Images per Page if not specified
 $conf['defslice'] = 34;
 // Default Subdirectory if none given
-$conf['defdir']   = 'r34';
+$conf['defdir']   = '';
 
 ?>
\ No newline at end of file
diff --git a/img/folder.png b/img/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..29757b85a9fa32acb213187dfcfa92bc7c29affd
GIT binary patch
literal 2229
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
Oed+3S3|)29|K@Lz56pJ}

literal 0
HcmV?d00001

diff --git a/index.php b/index.php
index ba9e8c1..4f584f7 100644
--- a/index.php
+++ b/index.php
@@ -36,7 +36,11 @@ if (isset($_SESSION['files'])
 {
   $files = $_SESSION['files'];
 } else {
-  $files = array_diff(scandir($imagedir.$dir, SCANDIR_SORT_DESCENDING), array('..', '.'));
+  $dirs = glob($imagedir.$dir.'/*' , GLOB_ONLYDIR);
+  $rmdirs = $dirs;
+  $rmdirs[] = '.';
+  $rmdirs[] = '..';
+  $files = array_diff(scandir($imagedir.$dir, SCANDIR_SORT_DESCENDING), $rmdirs);
   $_SESSION['files'] = $files;
   $_SESSION['dir'] = $dir;
   $_SESSION['cachetime'] = time();
@@ -60,7 +64,7 @@ $files = array_reverse($files);
 // Get Files for current Page
 $curfiles = array_slice($files, ($page-1)*$slice ,$slice, true);
 
-if (count($curfiles) > 0) {
+if (count($curfiles) > 0 | count($dirs) > 0) {
   // Prepare Generic Data for Template
   $data['galleryname'] = $galleryname;
   $data['startpage'] = $_SERVER['PHP_SELF'];
@@ -83,6 +87,7 @@ if (count($curfiles) > 0) {
       $tmp['i'] = $index+1;
       $tmp['t'] = $thumburl.$t->get_thumb($image);
       $data['images'][] = $tmp;
+      $data['dirs'] = $dirs;
     }
     Template::view('tpl/gallery.html', $data);
   } else {
diff --git a/tpl/gallery.html b/tpl/gallery.html
index 071109a..2b8b785 100644
--- a/tpl/gallery.html
+++ b/tpl/gallery.html
@@ -16,6 +16,13 @@
     </div>
   </div>
   <div class="content">
+  {% foreach($dirs as $d): %}
+    <div class="multi-image">
+      <a href="index.php?d={{ $d }}&s=1&gs={{ $slice }}&p=1">
+        <img src="./img/folder.png" alt="{{ $d }}"/>
+      </a>
+    </div>      
+  {% endforeach %}
   {% foreach($images as $image): %}
     <div class="multi-image">
       <a href="index.php?d={{ $dir }}&s=1&gs={{ $slice }}&p={{ $image['i'] }}{{ $filter }}">