System create a new file upload system where all files are saved in a central table

CHANGEDB.php

@@ -429,4 +429,6 @@
 INSERT INTO `gibbonSetting` (`scope`, `name`, `nameDisplay`, `description`, `value`) VALUES ('System', 'timeFormatPHP', 'Time Format', 'How should the time of day be displayed?', 'H:i');end
 INSERT INTO `gibbonSetting` (`scope`, `name`, `nameDisplay`, `description`, `value`) VALUES ('Attendance', 'showIncompleteAttendance', 'Show Incomplete Attendance', 'Show class periods where attendance has not been taken (Not Available).', 'N');end
 INSERT INTO `gibbonSetting` (`scope`, `name`, `nameDisplay`, `description`, `value`) VALUES ('Library', 'libraryAPIKey', 'Library API Key', 'Google Books API Key from Google Cloud Console.', '');end
-";
+CREATE TABLE `gibbonFile` (`gibbonFileID` int(12) UNSIGNED ZEROFILL NOT NULL AUTO_INCREMENT, `filePath` varchar(255) NOT NULL, `fileName` varchar(255) NOT NULL, `fileExtension` varchar(10) NOT NULL, `fileSize` int(12) UNSIGNED NOT NULL, `mimeType` varchar(100) NOT NULL, `gibbonPersonIDOwner` int(10) UNSIGNED ZEROFILL DEFAULT NULL, `uploadedAt` TIMESTAMP DEFAULT CURRENT_TIMESTAMP, `checksum` varchar(64) NOT NULL, PRIMARY KEY (`gibbonFileID`), KEY `gibbonPersonIDOwner` (`gibbonPersonIDOwner`), KEY `filePath` (`filePath`), KEY `checksum` (`checksum`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;end
+CREATE TABLE `gibbonFilePointer` (`gibbonFilePointerID` int(12) UNSIGNED ZEROFILL NOT NULL AUTO_INCREMENT, `gibbonFileID` int(12) UNSIGNED ZEROFILL NOT NULL, `foreignTable` varchar(60) DEFAULT NULL, `foreignTableID` int(14) UNSIGNED ZEROFILL DEFAULT NULL, `foreignColumn` varchar(60) DEFAULT NULL, `createdAt` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`gibbonFilePointerID`), KEY `gibbonFileID` (`gibbonFileID`), KEY `foreignTable` (`foreignTable`, `foreignTableID`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;end
+";

CHANGELOG.txt

@@ -27,6 +27,7 @@ v31.0.00
         Smart blocks have been updated with a streamlined appearance and more tools
         Improved text editor with drag-drop image uploads and more formatting options
         Added support for 12-hour and 24-hour time formats
+        Added comprehensive file upload tracking feature to monitor and manage all file uploads across the system
 
     Security
 
@@ -38,6 +39,7 @@ v31.0.00
         System: enabled configuring the time format as 12-hour clock or 24-hour clock in System Settings
         System: added Peruvian Sol as a currency option
         System: ensured Twig cache is turned off for Development installs
+        System: added a new fileHandler class to track and monitor file uploads
         Admissions: added a progress bar for admissions milestones to Manage Applications
         Admissions: added a warning to Accept Application when milestones have not been completed
         Attendance: student attendance history now ordered by timetable period

index_parentPhotoUploadProcess.php

@@ -23,6 +23,7 @@
 
 use Gibbon\Http\Url;
 use Gibbon\Domain\User\PersonPhotoGateway;
+use Gibbon\Contracts\Filesystem\FileHandler;
 
 include './gibbon.php';
 
@@ -50,6 +51,7 @@
         exit();
     } else {
         $attachment1 = null;
+        $fileMetaData = null;
         if (!empty($_FILES['file1']['tmp_name'])) {
             $fileUploader = new Gibbon\FileUploader($pdo, $session);
             $fileUploader->setFileSuffixType(Gibbon\FileUploader::FILE_SUFFIX_INCREMENTAL);
@@ -63,6 +65,9 @@
                 header("Location: {$URL->withReturn('warning1')}");
                 exit();
             }
+
+            // Capture file metadata for tracking
+            $fileMetaData = $fileUploader->getFileMetaData($attachment1);
         }
 
         $path = $session->get('absolutePath');
@@ -92,18 +97,29 @@
                 exit();
             }
 
+
             if (!empty($attachment1)) {
                 $personPhotoGateway = $container->get(PersonPhotoGateway::class);
                 // Update/insert the photo into the backup table
                 $photoUpdated = $personPhotoGateway->insertAndUpdate([
-                    'gibbonPersonID' => $userData['gibbonPersonID'],
+                    'gibbonPersonID' => $gibbonPersonID,
                     'gibbonSchoolYearID' => $session->get('gibbonSchoolYearID'),
-                    'personImage' => $file['relativePath'],
+                    'personImage' => $attachment1,
                     'gibbonPersonIDCreated' => $session->get('gibbonPersonID'),
                 ], [
-                    'personImage' => $file['relativePath'],
+                    'personImage' => $attachment1,
                     'gibbonPersonIDCreated' => $session->get('gibbonPersonID'),
                 ]);
+
+                // Record file tracking 
+                if (!empty($fileMetaData) && !empty($gibbonPersonID)) {
+                    $gibbonFileID = $container->get(FileHandler::class)->recordFileUpload($fileMetaData, 'gibbonPerson', $gibbonPersonID, 'image_240');
+
+                    if (empty($gibbonFileID)) {
+                        header("Location: {$URL->withReturn('warning1')}");
+                        exit();
+                    }
+                }
             }
 
             //Update session variables

modules/Activities/activities_categories_addProcess.php

@@ -20,7 +20,7 @@
 use Gibbon\Data\Validator;
 use Gibbon\Services\Format;
 use Gibbon\Domain\Activities\ActivityCategoryGateway;
-use Gibbon\Domain\Activities\EventDateGateway;
+use Gibbon\Contracts\Filesystem\FileHandler;
 
 require_once '../../gibbon.php';
 
@@ -75,6 +75,7 @@
     }
 
     // Move attached file, if there is one
+    $fileMetaData = null;
     if (!empty($_FILES['backgroundImageFile']['tmp_name'])) {
         $fileUploader = new Gibbon\FileUploader($pdo, $session);
         $fileUploader->getFileExtensions('Graphics/Design');
@@ -83,15 +84,26 @@
 
         // Upload the file, return the /uploads relative path
         $data['backgroundImage'] = $fileUploader->uploadFromPost($file, $data['name']);
-
+        
         if (empty($data['backgroundImage'])) {
             $partialFail = true;
+        } else {
+            $fileMetaData = $fileUploader->getFileMetaData($data['backgroundImage']);
         }
     }
 
     // Create the record
     $gibbonActivityCategoryID = $categoryGateway->insert($data);
 
+    // Record file tracking
+    if (!empty($fileMetaData) && !empty($gibbonActivityCategoryID)) {
+        $gibbonFileID = $container->get(FileHandler::class)->recordFileUpload($fileMetaData, 'gibbonActivityCategory', $gibbonActivityCategoryID, 'backgroundImage');
+
+        if (empty($gibbonFileID)) {
+            $partialFail = true;
+        }
+    }
+
     $URL .= !$gibbonActivityCategoryID
         ? "&return=error2"
         : "&return=success0&editID=$gibbonActivityCategoryID";

modules/Activities/activities_categories_editProcess.php

@@ -20,6 +20,7 @@
 use Gibbon\Data\Validator;
 use Gibbon\Services\Format;
 use Gibbon\Domain\Activities\ActivityCategoryGateway;
+use Gibbon\Contracts\Filesystem\FileHandler;
 
 require_once '../../gibbon.php';
 
@@ -85,6 +86,7 @@
     }
 
     // Move attached file, if there is one
+    $fileMetaData = null;
     if (!empty($_FILES['backgroundImageFile']['tmp_name'])) {
         $fileUploader = new Gibbon\FileUploader($pdo, $session);
         $fileUploader->getFileExtensions('Graphics/Design');
@@ -93,18 +95,37 @@
 
         // Upload the file, return the /uploads relative path
         $data['backgroundImage'] = $fileUploader->uploadFromPost($file, $data['name']);
-
+        
         if (empty($data['backgroundImage'])) {
             $partialFail = true;
+        } else {
+            $fileMetaData = $fileUploader->getFileMetaData($data['backgroundImage']);
         }
 
     } else {
         // $data['backgroundImage'] = $_POST['backgroundImage'] ?? '';
     }
 
+    // Get the old record to check for file deletion
+    $oldRecord = $categoryGateway->getByID($gibbonActivityCategoryID);
+
     // Update the record
     $updated = $categoryGateway->update($gibbonActivityCategoryID, $data);
 
+    // Record file tracking
+    if (!empty($fileMetaData)) {
+        $gibbonFileID = $container->get(FileHandler::class)->recordFileUpload($fileMetaData, 'gibbonActivityCategory', $gibbonActivityCategoryID, 'backgroundImage');
+
+        if (empty($gibbonFileID)) {
+            $partialFail = true;
+        }
+    }
+
+    // Handle file deletion when user removes attachment
+    if (empty($data['backgroundImage']) && !empty($oldRecord['backgroundImage'])) {
+        $deleted = $container->get(FileHandler::class)->deleteFile('gibbonActivityCategory', $gibbonActivityCategoryID, 'backgroundImage');
+    }
+
     if (!$updated) {
       $URL .= "&return=error2";
     } else if ($partialFail) {

modules/Activities/activities_manage_editProcess.php

@@ -26,6 +26,7 @@
 use Gibbon\Domain\Activities\ActivitySlotGateway;
 use Gibbon\Domain\Activities\ActivityStaffGateway;
 use Gibbon\Domain\Activities\ActivityPhotoGateway;
+use Gibbon\Contracts\Filesystem\FileHandler;
 use Gibbon\FileUploader;
 
 require_once '../../gibbon.php';
@@ -178,6 +179,7 @@
                     'sequenceNumber'     => array_search($index, $photoOrder) ?? false,
                 ];
 
+                $fileMetaData = null;
                 if (!empty($_FILES['photos']['tmp_name'][$index]['fileUpload'])) {
                     $file = [
                         'name' => $_FILES['photos']['name'][$index]['fileUpload'] ?? '',
@@ -195,6 +197,8 @@
                 if (empty($photoData['filePath'])) {
                     $partialFail = true;
                     continue;
+                } else {
+                    $fileMetaData = $fileUploader->getFileMetaData($photoData['filePath']);
                 }
 
                 if ($photoData['sequenceNumber'] === false) {
@@ -212,17 +216,26 @@
                 }
 
                 $photoIDs[] = str_pad($gibbonActivityPhotoID, 12, '0', STR_PAD_LEFT);
+
+                // Record file tracking
+                if (!empty($fileMetaData) && !empty($gibbonActivityPhotoID)) {
+                    $gibbonFileID = $container->get(FileHandler::class)->recordFileUpload($fileMetaData, 'gibbonActivityPhoto', $gibbonActivityPhotoID, 'filePath');
+
+                    if (empty($gibbonFileID)) {
+                        $partialFail = true;
+                    }
+                }
             }
 
             // Remove photos that have been deleted from the filesystem
             $cleanupPhotos = $activityPhotoGateway->selectPhotosNotInList($gibbonActivityID, $photoIDs)->fetchAll();
             foreach ($cleanupPhotos as $photo) {
-                $activityPhotoGateway->delete($photo['gibbonActivityPhotoID']);
-
                 $photoPath = $session->get('absolutePath').'/'.$photo['filePath'];
                 if (!empty($photo['filePath']) && file_exists($photoPath)) {
-                    unlink($photoPath);
+                    $deleted = $container->get(FileHandler::class)->deleteFile('gibbonActivityPhoto', $photo['gibbonActivityPhotoID'], 'filePath');
                 }
+
+                $activityPhotoGateway->delete($photo['gibbonActivityPhotoID']);
             }
 
             //Write to database

modules/Admissions/studentEnrolment_manage_addProcess.php

@@ -129,6 +129,11 @@
                         //Last insert ID
                         $AI = str_pad($connection2->lastInsertID(), 8, '0', STR_PAD_LEFT);
 
+                        // Manage custom field file uploads
+                        if (!empty($fields) && !empty($AI)) {
+                            $container->get(CustomFieldHandler::class)->manageCustomFieldFileUploads('Student Enrolment', [], $fields, 'gibbonStudentEnrolment', $AI);
+                        }
+
                         // Handle automatic course enrolment if enabled
                         $autoEnrolStudent = $_POST['autoEnrolStudent'] ?? 'N';
                         if ($autoEnrolStudent == 'Y') {

modules/Admissions/studentEnrolment_manage_editProcess.php

@@ -79,6 +79,17 @@
             } else {
                 $row = $result->fetch();
 
+                // Fetch old record for file comparison
+                try {
+                    $dataOld = ['gibbonStudentEnrolmentID' => $gibbonStudentEnrolmentID];
+                    $sqlOld = 'SELECT fields FROM gibbonStudentEnrolment WHERE gibbonStudentEnrolmentID=:gibbonStudentEnrolmentID';
+                    $resultOld = $connection2->prepare($sqlOld);
+                    $resultOld->execute($dataOld);
+                    $oldEnrolmentRecord = $resultOld->fetch();
+                } catch (PDOException $e) {
+                    $oldEnrolmentRecord = null;
+                }
+
                 $gibbonYearGroupID = $_POST['gibbonYearGroupID'] ?? '';
                 $gibbonFormGroupID = $_POST['gibbonFormGroupID'] ?? '';
                 $gibbonFormGroupIDOriginal = $_POST['gibbonFormGroupIDOriginal'] ?? 'N';
@@ -122,6 +133,11 @@
                         exit;
                     }
 
+                    // Manage custom field file uploads
+                    if (!empty($fields)) {
+                        $container->get(CustomFieldHandler::class)->manageCustomFieldFileUploads('Student Enrolment', [], $fields, 'gibbonStudentEnrolment', $gibbonStudentEnrolmentID, $oldEnrolmentRecord['fields'] ?? null);
+                    }
+
                     $partialFail = false;
 
                     // Handle automatic course enrolment if enabled

modules/Behaviour/behaviour_manage_addMultiProcess.php

@@ -103,6 +103,11 @@
 
             if (empty($gibbonBehaviourID)) {
                 $partialFail = true;
+            } else {
+                // Record custom field file uploads
+                if (!empty($fields) ) {
+                    $filesRecorded = $container->get(CustomFieldHandler::class)->manageCustomFieldFileUploads('Behaviour', [], $fields, 'gibbonBehaviour', $gibbonBehaviourID);
+                }
             }
 
             // ALERTS: possible change to Behaviour alert status, recalculate alerts

modules/Behaviour/behaviour_manage_addProcess.php

@@ -103,6 +103,11 @@
                 exit();
             }
 
+            // Record custom field file uploads
+            if (!empty($fields)) {
+                $filesRecorded = $container->get(CustomFieldHandler::class)->manageCustomFieldFileUploads('Behaviour', [], $fields, 'gibbonBehaviour', $gibbonBehaviourID);
+            }
+
             $copyToNotes = $_POST['copyToNotes'] ?? null;
             $followUp = $_POST['followUp'] ?? '';
 

modules/Behaviour/behaviour_manage_editProcess.php

@@ -135,6 +135,11 @@
                             header("Location: {$URL}");
                             exit();
                         }
+
+                        // Manage custom field file uploads and deletions
+                        if (!empty($fields)) {
+                            $filesRecorded = $container->get(CustomFieldHandler::class)->manageCustomFieldFileUploads('Behaviour', [], $fields, 'gibbonBehaviour', $gibbonBehaviourID, $behaviourRecord['fields']);
+                        }
                     }
 
                     // ALERTS: possible change to Behaviour alert status, recalculate alerts