From 9c96ad0f1c713bde45751aa97348df0f9b559795 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 24 Dec 2021 18:07:49 +0100
Subject: [PATCH 1/9] Fixed "$dir" encoding

---
 plugins/dynamix/Browse.page        | 4 ++--
 plugins/dynamix/include/Browse.php | 6 +++---
 plugins/dynamix/template.php       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/dynamix/Browse.page b/plugins/dynamix/Browse.page
index 47e4d226e..b59d8fb4e 100644
--- a/plugins/dynamix/Browse.page
+++ b/plugins/dynamix/Browse.page
@@ -15,7 +15,7 @@ Markdown="false"
  */
 ?>
 <?
-[$root,$main,$rest] = my_explode('/',substr($dir,1),3);
+[$root,$main,$rest] = my_explode('/',mb_substr($dir,1),3);
 $user = ($root=='mnt' && ($main=='user'|| $main=='user0')) ? 1 : 0;
 ?>
 <style>
@@ -25,7 +25,7 @@ $user = ($root=='mnt' && ($main=='user'|| $main=='user0')) ? 1 : 0;
 <script>
 $(function(){
   timers.browse = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
-  $.get('/webGui/include/Browse.php',{dir:encodeURIComponent("<?=$dir?>"),path:"<?=$path?>",user:<?=$user?>},function(data){
+  $.get('/webGui/include/Browse.php',{dir:encodeURIComponent("<?=htmlspecialchars(str_replace('\\','\\\\',$dir),ENT_COMPAT)?>"),path:"<?=$path?>",user:<?=$user?>},function(data){
     clearTimeout(timers.browse);
     var table = $('table.indexer');
     var col = $.cookie('col')||1;
diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php
index ede38c0c5..c71145425 100644
--- a/plugins/dynamix/include/Browse.php
+++ b/plugins/dynamix/include/Browse.php
@@ -42,7 +42,7 @@ function my_devs(&$devs) {
 }
 extract(parse_plugin_cfg('dynamix',true));
 $disks = parse_ini_file('state/disks.ini',true);
-$dir   = urldecode($_GET['dir']??'');
+$dir   = preg_replace('://+:','/',htmlspecialchars_decode(rawurldecode($_GET['dir']??''),ENT_QUOTES));
 $path  = unscript($_GET['path']??'');
 $user  = unscript($_GET['user']??'');
 $all   = $docroot.preg_replace('/([\'" &()[\]\\\\])/','\\\\$1',$dir).'/*';
@@ -74,7 +74,7 @@ foreach ($dirs as $row) {
   $devs = explode(',',$set);
   echo "<tr>";
   echo "<td data=''><div class='icon-dir'></div></td>";
-  echo "<td><a href=\"/$path?dir=".rawurlencode($full)."\">".htmlspecialchars($name)."</a></td>";
+  echo "<td><a href=\"/$path?dir=".rawurlencode(htmlspecialchars($full,ENT_COMPAT))."\">".htmlspecialchars($name,ENT_COMPAT)."</a></td>";
   echo "<td data='0'>&lt;FOLDER&gt;</td>";
   echo "<td data='$time'>".my_time($time,$fmt)."</td>";
   echo "<td class='loc'>".my_devs($devs)."</td>";
@@ -91,7 +91,7 @@ foreach ($files as $row) {
   $tag  = strpos($set,',')===false ? '' : 'warning';
   echo "<tr>";
   echo "<td data='$ext'><div class='icon-file icon-$ext'></div></td>";
-  echo "<td><a href=\"".htmlspecialchars($full)."\" download target=\"_blank\" class=\"".($tag?:'none')."\">".htmlspecialchars($name)."</a></td>";
+  echo "<td><a href=\"".htmlspecialchars($full,ENT_COMPAT)."\" download target=\"_blank\" class=\"".($tag?:'none')."\">".htmlspecialchars($name,ENT_COMPAT)."</a></td>";
   echo "<td data='$size' class='$tag'>".my_scale($size,$unit)." $unit</td>";
   echo "<td data='$time' class='$tag'>".my_time($time,$fmt)."</td>";
   echo "<td class='loc $tag'>".my_devs($devs)."</td>";
diff --git a/plugins/dynamix/template.php b/plugins/dynamix/template.php
index 3781e02ef..febff244c 100644
--- a/plugins/dynamix/template.php
+++ b/plugins/dynamix/template.php
@@ -64,7 +64,7 @@ foreach (glob('plugins/*', GLOB_ONLYDIR) as $plugin) {
 
 // Get general variables
 $name = unscript($_GET['name']??'');
-$dir  = rawurldecode($_GET['dir']??'');
+$dir  = htmlspecialchars_decode(rawurldecode($_GET['dir']??''),ENT_QUOTES);
 $path = substr(strtok($_SERVER['REQUEST_URI'],'?'),1);
 
 // The current "task" is the first element of the path

From bc9e11e99c97ed60e387d62a3fd248e36a57ba8e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 24 Dec 2021 21:50:05 +0100
Subject: [PATCH 2/9] Fixed "$dir" encoding

---
 plugins/dynamix/include/Browse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php
index c71145425..01ad8d142 100644
--- a/plugins/dynamix/include/Browse.php
+++ b/plugins/dynamix/include/Browse.php
@@ -45,7 +45,7 @@ $disks = parse_ini_file('state/disks.ini',true);
 $dir   = preg_replace('://+:','/',htmlspecialchars_decode(rawurldecode($_GET['dir']??''),ENT_QUOTES));
 $path  = unscript($_GET['path']??'');
 $user  = unscript($_GET['user']??'');
-$all   = $docroot.preg_replace('/([\'" &()[\]\\\\])/','\\\\$1',$dir).'/*';
+$all   = $docroot.preg_replace('/([\\\\\'" @^&=;:(){}[\]])/','\\\\$1',$dir).'/*';
 $fix   = substr($dir,0,4)=='/mnt' ? (explode('/',trim_slash($dir))[2] ?: '---') : _('flash');
 $fmt   = "%F {$display['time']}";
 $dirs  = $files = [];

From 1288fd780300c3bfd959bdc93a0e14484142a5f8 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 24 Dec 2021 21:57:43 +0100
Subject: [PATCH 3/9] Fixed "$dir" encoding

---
 plugins/dynamix/include/Browse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php
index 01ad8d142..8310c9371 100644
--- a/plugins/dynamix/include/Browse.php
+++ b/plugins/dynamix/include/Browse.php
@@ -45,7 +45,7 @@ $disks = parse_ini_file('state/disks.ini',true);
 $dir   = preg_replace('://+:','/',htmlspecialchars_decode(rawurldecode($_GET['dir']??''),ENT_QUOTES));
 $path  = unscript($_GET['path']??'');
 $user  = unscript($_GET['user']??'');
-$all   = $docroot.preg_replace('/([\\\\\'" @^&=;:(){}[\]])/','\\\\$1',$dir).'/*';
+$all   = $docroot.preg_replace('/([\\\\\'" @^&=;:<>(){}[\]])/','\\\\$1',$dir).'/*';
 $fix   = substr($dir,0,4)=='/mnt' ? (explode('/',trim_slash($dir))[2] ?: '---') : _('flash');
 $fmt   = "%F {$display['time']}";
 $dirs  = $files = [];

From 56bb80c9ff9d7f48359c1d05d1c442fa904d64da Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 24 Dec 2021 22:53:39 +0100
Subject: [PATCH 4/9] Fixed "$dir" encoding

---
 plugins/dynamix/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/template.php b/plugins/dynamix/template.php
index febff244c..3781e02ef 100644
--- a/plugins/dynamix/template.php
+++ b/plugins/dynamix/template.php
@@ -64,7 +64,7 @@ foreach (glob('plugins/*', GLOB_ONLYDIR) as $plugin) {
 
 // Get general variables
 $name = unscript($_GET['name']??'');
-$dir  = htmlspecialchars_decode(rawurldecode($_GET['dir']??''),ENT_QUOTES);
+$dir  = rawurldecode($_GET['dir']??'');
 $path = substr(strtok($_SERVER['REQUEST_URI'],'?'),1);
 
 // The current "task" is the first element of the path

From cd58e8f9b6f7739d2411ddcedf1e3c4c713ab294 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 24 Dec 2021 22:56:37 +0100
Subject: [PATCH 5/9] Fixed "$dir" encoding

---
 plugins/dynamix/Browse.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/Browse.page b/plugins/dynamix/Browse.page
index b59d8fb4e..70bc2e9d1 100644
--- a/plugins/dynamix/Browse.page
+++ b/plugins/dynamix/Browse.page
@@ -25,7 +25,7 @@ $user = ($root=='mnt' && ($main=='user'|| $main=='user0')) ? 1 : 0;
 <script>
 $(function(){
   timers.browse = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
-  $.get('/webGui/include/Browse.php',{dir:encodeURIComponent("<?=htmlspecialchars(str_replace('\\','\\\\',$dir),ENT_COMPAT)?>"),path:"<?=$path?>",user:<?=$user?>},function(data){
+  $.get('/webGui/include/Browse.php',{dir:encodeURIComponent("<?=str_replace('\\','\\\\',$dir)?>"),path:"<?=$path?>",user:<?=$user?>},function(data){
     clearTimeout(timers.browse);
     var table = $('table.indexer');
     var col = $.cookie('col')||1;

From 282f11c9d3912c3cee19d08b8326e0631b829b59 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 24 Dec 2021 23:05:30 +0100
Subject: [PATCH 6/9] Fixed "$dir" encoding

---
 plugins/dynamix/include/Browse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php
index 8310c9371..87cddc28a 100644
--- a/plugins/dynamix/include/Browse.php
+++ b/plugins/dynamix/include/Browse.php
@@ -103,7 +103,7 @@ echo "</tbody>";
 $dirs  = count($dirs);
 $files = count($files);
 $objs  = $dirs + $files;
-if ($objs==0 && !exec("find \"$dir\" -maxdepth 0 -empty -exec echo 1 \;")) {
+if ($objs==0 && !exec("find ".escapeshellarg($dir)." -maxdepth 0 -empty -exec echo 1 \;")) {
   echo "<tfoot><tr><td></td><td colspan='4'>"._('No listing: Too many files')."</td></tr></tfoot>";
 } else {
   $total = ' ('.my_scale($total,$unit).' '.$unit.' '._('total').')';

From 00eb8fa539dceb4118d53e27cfb85d391dd4892a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 25 Dec 2021 13:45:16 +0100
Subject: [PATCH 7/9] Fixed "$dir" encoding

---
 plugins/dynamix/Browse.page        |  3 ++-
 plugins/dynamix/include/Browse.php | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/dynamix/Browse.page b/plugins/dynamix/Browse.page
index 70bc2e9d1..ad842a998 100644
--- a/plugins/dynamix/Browse.page
+++ b/plugins/dynamix/Browse.page
@@ -17,6 +17,7 @@ Markdown="false"
 <?
 [$root,$main,$rest] = my_explode('/',mb_substr($dir,1),3);
 $user = ($root=='mnt' && ($main=='user'|| $main=='user0')) ? 1 : 0;
+$dir = htmlspecialchars(str_replace('\\','\\\\',$dir),ENT_QUOTES);
 ?>
 <style>
 .loc{text-align:left!important;padding-left:0!important}
@@ -25,7 +26,7 @@ $user = ($root=='mnt' && ($main=='user'|| $main=='user0')) ? 1 : 0;
 <script>
 $(function(){
   timers.browse = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
-  $.get('/webGui/include/Browse.php',{dir:encodeURIComponent("<?=str_replace('\\','\\\\',$dir)?>"),path:"<?=$path?>",user:<?=$user?>},function(data){
+  $.get('/webGui/include/Browse.php',{dir:encodeURIComponent("<?=$dir?>"),path:"<?=$path?>",user:<?=$user?>},function(data){
     clearTimeout(timers.browse);
     var table = $('table.indexer');
     var col = $.cookie('col')||1;
diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php
index 87cddc28a..f981e486c 100644
--- a/plugins/dynamix/include/Browse.php
+++ b/plugins/dynamix/include/Browse.php
@@ -42,9 +42,9 @@ function my_devs(&$devs) {
 }
 extract(parse_plugin_cfg('dynamix',true));
 $disks = parse_ini_file('state/disks.ini',true);
-$dir   = preg_replace('://+:','/',htmlspecialchars_decode(rawurldecode($_GET['dir']??''),ENT_QUOTES));
-$path  = unscript($_GET['path']??'');
-$user  = unscript($_GET['user']??'');
+$dir   = preg_replace('://+:','/',htmlspecialchars_decode(rawurldecode($_GET['dir']),ENT_QUOTES));
+$path  = unscript($_GET['path']);
+$user  = unscript($_GET['user']);
 $all   = $docroot.preg_replace('/([\\\\\'" @^&=;:<>(){}[\]])/','\\\\$1',$dir).'/*';
 $fix   = substr($dir,0,4)=='/mnt' ? (explode('/',trim_slash($dir))[2] ?: '---') : _('flash');
 $fmt   = "%F {$display['time']}";
@@ -74,7 +74,7 @@ foreach ($dirs as $row) {
   $devs = explode(',',$set);
   echo "<tr>";
   echo "<td data=''><div class='icon-dir'></div></td>";
-  echo "<td><a href=\"/$path?dir=".rawurlencode(htmlspecialchars($full,ENT_COMPAT))."\">".htmlspecialchars($name,ENT_COMPAT)."</a></td>";
+  echo "<td><a href=\"/$path?dir=".rawurlencode(htmlspecialchars($full,ENT_QUOTES))."\">".htmlspecialchars($name)."</a></td>";
   echo "<td data='0'>&lt;FOLDER&gt;</td>";
   echo "<td data='$time'>".my_time($time,$fmt)."</td>";
   echo "<td class='loc'>".my_devs($devs)."</td>";
@@ -91,7 +91,7 @@ foreach ($files as $row) {
   $tag  = strpos($set,',')===false ? '' : 'warning';
   echo "<tr>";
   echo "<td data='$ext'><div class='icon-file icon-$ext'></div></td>";
-  echo "<td><a href=\"".htmlspecialchars($full,ENT_COMPAT)."\" download target=\"_blank\" class=\"".($tag?:'none')."\">".htmlspecialchars($name,ENT_COMPAT)."</a></td>";
+  echo "<td><a href=\"".htmlspecialchars($full,ENT_QUOTES)."\" download target=\"_blank\" class=\"".($tag?:'none')."\">".htmlspecialchars($name)."</a></td>";
   echo "<td data='$size' class='$tag'>".my_scale($size,$unit)." $unit</td>";
   echo "<td data='$time' class='$tag'>".my_time($time,$fmt)."</td>";
   echo "<td class='loc $tag'>".my_devs($devs)."</td>";

From 1c07def3e36e0737dee8172ea279a06d6de12a77 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sun, 26 Dec 2021 12:16:15 +0100
Subject: [PATCH 8/9] Fixed: speed calculation of parity check

---
 plugins/dynamix/nchan/parity_list | 2 +-
 plugins/dynamix/scripts/monitor   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/nchan/parity_list b/plugins/dynamix/nchan/parity_list
index 3e19380a9..b90207650 100755
--- a/plugins/dynamix/nchan/parity_list
+++ b/plugins/dynamix/nchan/parity_list
@@ -94,7 +94,7 @@ while (true) {
         $idle = []; while (count($synced)>1) $idle[] = array_pop($synced) - array_pop($synced);
         $duration = $var['sbSynced2'] - ($sbSynced?:$var['sbSynced']);
         $status   = $var['sbSyncExit'];
-        $speed    = $status==0 ? my_scale($var['mdResyncSize']*1024/($duration+array_sum($idle)),$unit,1)." $unit/s" : 0;
+        $speed    = $status==0 ? my_scale($var['mdResyncSize']*1024/($duration-array_sum($idle)),$unit,1)." $unit/s" : 0;
         $error    = $var['sbSyncErrs'];
         $year     = date('Y',$var['sbSynced2']);
         if ($status==0||file_exists($log)) file_put_contents($log,"$year $timestamp|$duration|$speed|$status|$error\n",FILE_APPEND);
diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor
index 3a44dd170..5bd0b304c 100755
--- a/plugins/dynamix/scripts/monitor
+++ b/plugins/dynamix/scripts/monitor
@@ -281,7 +281,7 @@ if ($var['mdResyncPos']) {
     $idle = []; while (count($synced)>1) $idle[] = array_pop($synced) - array_pop($synced);
     $duration = $var['sbSynced2'] - ($sbSynced?:$var['sbSynced']);
     $status   = $var['sbSyncExit'];
-    $speed    = $status==0 ? my_scale($var['mdResyncSize']*1024/($duration+array_sum($idle)),$unit,1)." $unit/s" : 0;
+    $speed    = $status==0 ? my_scale($var['mdResyncSize']*1024/($duration-array_sum($idle)),$unit,1)." $unit/s" : 0;
     [$entry,$duration,$speed,$status,$error] = explode('|', read_write_parity_log($var['sbSynced2'],$duration,$speed,$status,$var['sbSyncErrs']));
     $info = $status==0 ? "Duration: ".my_check($duration, $speed) : ($status==-4 ? "Canceled" : "Error code: $status");
     $level = ($status==0 && $var['sbSyncErrs']==0) ? "normal" : "warning";

From 7ef6db0a0d467d1a28956925aa619ea959b9dd51 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 27 Dec 2021 13:32:50 +0100
Subject: [PATCH 9/9] Fixes and enhancements in Browse function

---
 plugins/dynamix/Browse.page        | 19 +++++++++++++++----
 plugins/dynamix/include/Browse.php | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/plugins/dynamix/Browse.page b/plugins/dynamix/Browse.page
index ad842a998..59934e3a9 100644
--- a/plugins/dynamix/Browse.page
+++ b/plugins/dynamix/Browse.page
@@ -15,9 +15,20 @@ Markdown="false"
  */
 ?>
 <?
-[$root,$main,$rest] = my_explode('/',mb_substr($dir,1),3);
-$user = ($root=='mnt' && ($main=='user'|| $main=='user0')) ? 1 : 0;
-$dir = htmlspecialchars(str_replace('\\','\\\\',$dir),ENT_QUOTES);
+function cap($dir,$p) {
+  return mb_substr($dir,$p,1)=='/' ? '/' : '';
+}
+function truepath($dir) {
+  $dir  = preg_replace('://+:','/',htmlspecialchars_decode($dir));
+  $bits = array_filter(explode('/',$dir),'mb_strlen');
+  $path = [];
+  foreach ($bits as $bit) {
+    if ($bit=='.') continue;
+    if ($bit=='..') array_pop($path); else $path[] = $bit;
+  }
+  return cap($dir,0).implode('/',$path);
+}
+$dir = htmlspecialchars(str_replace('\\','\\\\',truepath($dir)));
 ?>
 <style>
 .loc{text-align:left!important;padding-left:0!important}
@@ -26,7 +37,7 @@ $dir = htmlspecialchars(str_replace('\\','\\\\',$dir),ENT_QUOTES);
 <script>
 $(function(){
   timers.browse = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
-  $.get('/webGui/include/Browse.php',{dir:encodeURIComponent("<?=$dir?>"),path:"<?=$path?>",user:<?=$user?>},function(data){
+  $.get('/webGui/include/Browse.php',{dir:encodeURIComponent("<?=$dir?>"),path:"<?=$path?>"},function(data){
     clearTimeout(timers.browse);
     var table = $('table.indexer');
     var col = $.cookie('col')||1;
diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php
index f981e486c..3f6da043b 100644
--- a/plugins/dynamix/include/Browse.php
+++ b/plugins/dynamix/include/Browse.php
@@ -42,23 +42,23 @@ function my_devs(&$devs) {
 }
 extract(parse_plugin_cfg('dynamix',true));
 $disks = parse_ini_file('state/disks.ini',true);
-$dir   = preg_replace('://+:','/',htmlspecialchars_decode(rawurldecode($_GET['dir']),ENT_QUOTES));
+$dir   = realpath(htmlspecialchars_decode(rawurldecode($_GET['dir'])));
 $path  = unscript($_GET['path']);
-$user  = unscript($_GET['user']);
-$all   = $docroot.preg_replace('/([\\\\\'" @^&=;:<>(){}[\]])/','\\\\$1',$dir).'/*';
-$fix   = substr($dir,0,4)=='/mnt' ? (explode('/',trim_slash($dir))[2] ?: '---') : _('flash');
+[$root,$main,$rest] = my_explode('/',mb_substr($dir,1),3);
+$fix   = $root=='mnt' ? ($main ?: '---') : ($root=='boot' ? _('flash') : '---');
+$user  = $root=='mnt' && in_array($main,['user','user0']);
 $fmt   = "%F {$display['time']}";
 $dirs  = $files = [];
 $total = $i = 0;
 
 if ($user) {
   $tag = implode('|',array_merge(['disk'],pools_filter($disks)));
-  $set = explode(';',str_replace(',;',',',preg_replace("/($tag)/",';$1',exec("shopt -s dotglob; getfattr --no-dereference --absolute-names --only-values -n system.LOCATIONS $all 2>/dev/null"))));
+  $set = explode(';',str_replace(',;',',',preg_replace("/($tag)/",';$1',exec("shopt -s dotglob; getfattr --no-dereference --absolute-names --only-values -n system.LOCATIONS ".escapeshellarg($dir)."/* 2>/dev/null"))));
 }
-$stat = popen("shopt -s dotglob; stat -L -c'%F|%n|%s|%Y' $all",'r');
+$stat = popen("shopt -s dotglob; stat -L -c'%F|%n|%s|%Y' ".escapeshellarg($dir)."/* 2>/dev/null",'r');
 while (($row = fgets($stat))!==false) {
   $row .= $user ? "|{$set[++$i]}" : "|$fix";
-  if (substr($row,0,3)=='dir') $dirs[] = $row; else $files[] = $row;
+  if ($row[0]=='d') $dirs[] = $row; else $files[] = $row;
 }
 pclose($stat);
 
@@ -74,8 +74,8 @@ foreach ($dirs as $row) {
   $devs = explode(',',$set);
   echo "<tr>";
   echo "<td data=''><div class='icon-dir'></div></td>";
-  echo "<td><a href=\"/$path?dir=".rawurlencode(htmlspecialchars($full,ENT_QUOTES))."\">".htmlspecialchars($name)."</a></td>";
-  echo "<td data='0'>&lt;FOLDER&gt;</td>";
+  echo "<td><a href=\"/$path?dir=".rawurlencode(htmlspecialchars($full))."\">".htmlspecialchars($name)."</a></td>";
+  echo "<td data='0'>&lt;"._('FOLDER')."&gt;</td>";
   echo "<td data='$time'>".my_time($time,$fmt)."</td>";
   echo "<td class='loc'>".my_devs($devs)."</td>";
   echo "</tr>";
@@ -91,7 +91,7 @@ foreach ($files as $row) {
   $tag  = strpos($set,',')===false ? '' : 'warning';
   echo "<tr>";
   echo "<td data='$ext'><div class='icon-file icon-$ext'></div></td>";
-  echo "<td><a href=\"".htmlspecialchars($full,ENT_QUOTES)."\" download target=\"_blank\" class=\"".($tag?:'none')."\">".htmlspecialchars($name)."</a></td>";
+  echo "<td><a href=\"".htmlspecialchars($full)."\" download target=\"_blank\" class=\"".($tag?:'none')."\">".htmlspecialchars($name)."</a></td>";
   echo "<td data='$size' class='$tag'>".my_scale($size,$unit)." $unit</td>";
   echo "<td data='$time' class='$tag'>".my_time($time,$fmt)."</td>";
   echo "<td class='loc $tag'>".my_devs($devs)."</td>";