From 227a2a35d64db87d889f7a44101f11a117b8e06a Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Sat, 18 Jan 2020 16:35:20 +0100
Subject: refactoring medialist

---
 app/fn/fn.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'app/fn/fn.php')

diff --git a/app/fn/fn.php b/app/fn/fn.php
index ccccfb9..af02202 100644
--- a/app/fn/fn.php
+++ b/app/fn/fn.php
@@ -1,5 +1,7 @@
 <?php
 
+use Wcms\Medialist;
+
 function readablesize($bytes)
 {
 	$format = ' %d %s';
@@ -207,6 +209,28 @@ function array_diff_assoc_recursive($array1, $array2) {
 }
 
 
+/**
+ * Generate a folder tree based on reccurive array
+ */
+function treecount(array $dir, string $dirname, int $deepness, string $path, string $currentdir, Medialist $mediaopt)
+{
+	if ($path === $currentdir) {
+		$folder = '├─📂<strong>' . $dirname . '<strong>';
+	} else {
+		$folder = '├─📁' . $dirname;
+	}
+	echo '<tr>';
+	echo '<td><a href="' . $mediaopt->getpathadress($path) . '">' . str_repeat('&nbsp;&nbsp;', $deepness) . $folder . '</a></td>';
+	echo '<td>' . $dir['dirfilecount'] . '</td>';
+	echo '</tr>';
+	foreach ($dir as $key => $value) {
+		if (is_array($value)) {
+			treecount($value, $key, $deepness + 1, $path . DIRECTORY_SEPARATOR . $key, $currentdir, $mediaopt);
+		}
+	}
+}
+
+
 
 
 
-- 
cgit v1.2.3


From 49273cba81ea86639a23dfd5a43bda2f6b01f075 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Mon, 20 Jan 2020 01:56:57 +0100
Subject: fix media little problems

---
 app/fn/fn.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/fn/fn.php')

diff --git a/app/fn/fn.php b/app/fn/fn.php
index af02202..583227a 100644
--- a/app/fn/fn.php
+++ b/app/fn/fn.php
@@ -214,8 +214,8 @@ function array_diff_assoc_recursive($array1, $array2) {
  */
 function treecount(array $dir, string $dirname, int $deepness, string $path, string $currentdir, Medialist $mediaopt)
 {
-	if ($path === $currentdir) {
-		$folder = '├─📂<strong>' . $dirname . '<strong>';
+	if ($path . '/' === $currentdir) {
+		$folder = '├─📂<span id="currentdir">' . $dirname . '<span>';
 	} else {
 		$folder = '├─📁' . $dirname;
 	}
-- 
cgit v1.2.3