From 55642a6bcdc357f40a4ffc2dd385f582bd2cd2fe Mon Sep 17 00:00:00 2001
From: Joshua Myers <github@myersjj.com>
Date: Wed, 31 Jan 2024 14:18:40 -0600
Subject: [PATCH 1/2] Added 'Overwrite Files' Checkbox to Give Users the Option
 of Overwriting Existing Files During Upload

---
 tinyfilemanager.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tinyfilemanager.php b/tinyfilemanager.php
index ca73f9d..380e187 100644
--- a/tinyfilemanager.php
+++ b/tinyfilemanager.php
@@ -927,6 +927,7 @@ if (!empty($_FILES) && !FM_READONLY) {
     $chunkIndex = $_POST['dzchunkindex'];
     $chunkTotal = $_POST['dztotalchunkcount'];
     $fullPathInput = fm_clean_path($_REQUEST['fullpath']);
+	$overwrite_files = ($_REQUEST['overwrite_files'] ?? 'N');
 
     $f = $_FILES;
     $path = FM_ROOT_PATH;
@@ -1016,7 +1017,15 @@ if (!empty($_FILES) && !FM_READONLY) {
                 if ($chunkIndex == $chunkTotal - 1) {
                     if (file_exists ($fullPath)) {
                         $ext_1 = $ext ? '.'.$ext : '';
-                        $fullPathTarget = $path . '/' . basename($fullPathInput, $ext_1) .'_'. date('ymdHis'). $ext_1;
+
+                        if($overwrite_files == 'Y')
+                        {
+                          $fullPathTarget = $path . '/' . basename($fullPathInput, $ext_1) . $ext_1;
+                        }
+                        else
+                        {
+                          $fullPathTarget = $path . '/' . basename($fullPathInput, $ext_1) .'_'. date('ymdHis'). $ext_1;
+                        }
                     } else {
                         $fullPathTarget = $fullPath;
                     }
@@ -1354,11 +1363,13 @@ if (isset($_GET['upload']) && !FM_READONLY) {
                     <a href="?p=<?php echo FM_PATH ?>" class="float-right"><i class="fa fa-chevron-circle-left go-back"></i> <?php echo lng('Back')?></a>
                     <strong><?php echo lng('DestinationFolder') ?></strong>: <?php echo fm_enc(fm_convert_win(FM_PATH)) ?>
                 </p>
+                <p><label><input type="checkbox" name="overwrite_files" value="Y" onChange="document.getElementById('fileUploader').overwrite_files.value = (this.checked) ? this.value : '';">&nbsp;Overwrite existing files?</label></p>
 
                 <form action="<?php echo htmlspecialchars(FM_SELF_URL) . '?p=' . fm_enc(FM_PATH) ?>" class="dropzone card-tabs-container" id="fileUploader" enctype="multipart/form-data">
                     <input type="hidden" name="p" value="<?php echo fm_enc(FM_PATH) ?>">
                     <input type="hidden" name="fullpath" id="fullpath" value="<?php echo fm_enc(FM_PATH) ?>">
                     <input type="hidden" name="token" value="<?php echo $_SESSION['token']; ?>">
+                    <input type="hidden" name="overwrite_files" value="">
                     <div class="fallback">
                         <input name="file" type="file" multiple/>
                     </div>

From 3f73c1171dd62208f3c4eb7b886d69b114692d07 Mon Sep 17 00:00:00 2001
From: Joshua Myers <github@myersjj.com>
Date: Wed, 31 Jan 2024 15:21:06 -0600
Subject: [PATCH 2/2] Updating Code Formatting

---
 tinyfilemanager.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tinyfilemanager.php b/tinyfilemanager.php
index 380e187..ce8ea0d 100644
--- a/tinyfilemanager.php
+++ b/tinyfilemanager.php
@@ -1018,13 +1018,10 @@ if (!empty($_FILES) && !FM_READONLY) {
                     if (file_exists ($fullPath)) {
                         $ext_1 = $ext ? '.'.$ext : '';
 
-                        if($overwrite_files == 'Y')
-                        {
-                          $fullPathTarget = $path . '/' . basename($fullPathInput, $ext_1) . $ext_1;
-                        }
-                        else
-                        {
-                          $fullPathTarget = $path . '/' . basename($fullPathInput, $ext_1) .'_'. date('ymdHis'). $ext_1;
+                        if ($overwrite_files == 'Y') {
+                            $fullPathTarget = $path . '/' . basename($fullPathInput, $ext_1) . $ext_1;
+                        } else {
+                            $fullPathTarget = $path . '/' . basename($fullPathInput, $ext_1) .'_'. date('ymdHis'). $ext_1;
                         }
                     } else {
                         $fullPathTarget = $fullPath;