Moved more code to functions to encapsulate a bit more.

diff --git a/index.php b/index.php
index 4b469a8f1b039b494b9cc206464fadf925e510f4..9429e6f0a4f619e6780e0c4795f1e8cd013ef422 100644 (file)
--- a/index.php
+++ b/index.php
@@ -162,9 +162,7 @@
 
        // Handling file upload
        function uploadFile ($file_data) {
-               global $settings;
-               global $data;
-               global $_SESSION;
+               global $settings, $data;
 
                $file_data['uploaded_file_name'] = basename($file_data['name']);
                $file_data['target_file_name'] = $file_data['uploaded_file_name'];
@@ -197,6 +195,38 @@
                }
        }
 
+       // Delete file
+       function deleteFile ($file) {
+               global $data;
+
+               if (in_array(substr($file, 1), $_SESSION['upload_user_files']) || in_array($file, $_SESSION['upload_user_files'])) {
+                       $fqfn = $data['uploaddir'] . DIRECTORY_SEPARATOR . $file;
+                       if (file_exists($fqfn)) {
+                               unlink($fqfn);
+                               echo 'File has been removed';
+                               exit;
+                       }
+               }
+       }
+
+       // Mark/unmark file as hidden
+       function markUnmarkHidden ($file) {
+               global $data;
+
+               if (in_array(substr($file, 1), $_SESSION['upload_user_files']) || in_array($file, $_SESSION['upload_user_files'])) {
+                       $fqfn = $data['uploaddir'] . DIRECTORY_SEPARATOR . $file;
+                       if (file_exists($fqfn)) {
+                               if (substr($file, 0, 1) === '.') {
+                                       rename($fqfn, substr($fqfn, 1));
+                                       echo 'File has been made visible';
+                               } else {
+                                       rename($fqfn, $data['uploaddir'] . DIRECTORY_SEPARATOR . '.' . $file);
+                                       echo 'File has been hidden';
+                               }
+                               exit;
+                       }
+               }
+       }
 
        // Files are being POSEed. Uploading them one by one.
        if (isset($_FILES['file'])) {
@@ -212,32 +242,11 @@
 
        // Other file functions (delete, private).
        if (isset($_POST)) {
-               if ($settings['allow_deletion'])
-                       if (isset($_POST['action']) && $_POST['action'] === 'delete')
-                               if (in_array(substr($_POST['target'], 1), $_SESSION['upload_user_files']) || in_array($_POST['target'], $_SESSION['upload_user_files'])) {
-                                       $fqfn = $data['uploaddir'] . DIRECTORY_SEPARATOR . $_POST['target'];
-                                       if (file_exists($fqfn)) {
-                                               unlink($fqfn);
-                                               echo 'File has been removed';
-                                               exit;
-                                       }
-                               }
+               if ($settings['allow_deletion'] && (isset($_POST['target'])) && isset($_POST['action']) && $_POST['action'] === 'delete')
+                       deleteFile($_POST['target']);
 
-               if ($settings['allow_private'])
-                       if (isset($_POST['action']) && $_POST['action'] === 'privatetoggle')
-                               if (in_array(substr($_POST['target'], 1), $_SESSION['upload_user_files']) || in_array($_POST['target'], $_SESSION['upload_user_files'])) {
-                                       $fqfn = $data['uploaddir'] . DIRECTORY_SEPARATOR . $_POST['target'];
-                                       if (file_exists($fqfn)) {
-                                               if ($_POST['target'][0] === '.') {
-                                                       rename($fqfn, substr($fqfn, 1));
-                                                       echo 'File has been made visible';
-                                               } else {
-                                                       rename($fqfn, $data['uploaddir'] . DIRECTORY_SEPARATOR . '.' . $_POST['target']);
-                                                       echo 'File has been hidden';
-                                               }
-                                               exit;
-                                       }
-                               }
+               if ($settings['allow_private'] && (isset($_POST['target'])) && isset($_POST['action']) && $_POST['action'] === 'privatetoggle')
+                       markUnmarkHidden($_POST['target']);
        }
 
        // List files in a given directory, excluding certain files
@@ -258,6 +267,7 @@
        // Removes old files
        function removeOldFiles ($dir) {
                global $file_array, $settings;
+
                foreach ($file_array as $file) {
                        $fqfn = $dir . DIRECTORY_SEPARATOR . $file;
                        if ($settings['time_limit'] < time() - filemtime($fqfn))