Merge branch 'prasathmani:master' into master

Disable excluded extension name from viewing (#1151 )
2024-05-15 12:06:46 +02:00 · 2024-04-15 12:42:30 -04:00 · 2024-03-25 11:09:24 +05:30
1 changed files with 2 additions and 2 deletions
--- a/tinyfilemanager.php
+++ b/tinyfilemanager.php
@ -1664,7 +1664,7 @@ if (isset($_GET['view'])) {
    $file = $_GET['view'];
    $file = fm_clean_path($file, false);
    $file = str_replace('/', '', $file);
-    if ($file == '' || !is_file($path . '/' . $file) || in_array($file, $GLOBALS['exclude_items'])) {
+    if ($file == '' || !is_file($path . '/' . $file) || !fm_is_exclude_items($file)) {
        fm_set_msg(lng('File not found'), 'error');
        $FM_PATH=FM_PATH; fm_redirect(FM_SELF_URL . '?p=' . urlencode($FM_PATH));
    }
@ -1863,7 +1863,7 @@ if (isset($_GET['edit']) && !FM_READONLY) {
    $file = $_GET['edit'];
    $file = fm_clean_path($file, false);
    $file = str_replace('/', '', $file);
-    if ($file == '' || !is_file($path . '/' . $file) || in_array($file, $GLOBALS['exclude_items'])) {
+    if ($file == '' || !is_file($path . '/' . $file) || !fm_is_exclude_items($file)) {
        fm_set_msg(lng('File not found'), 'error');
        $FM_PATH=FM_PATH; fm_redirect(FM_SELF_URL . '?p=' . urlencode($FM_PATH));
    }
Author	SHA1	Message	Date
Harshal Panpaliya	9c8ba292c1	Merge branch 'prasathmani:master' into master	2024-04-15 12:42:30 -04:00
Torusrxxx	ca4b1b1743	Disable excluded extension name from viewing (#1151 )	2024-03-25 11:09:24 +05:30