Fixed deletion of notices at expiry

Author: Shaswat975

Diff for: resources/lib/UnitySQL.php

@@ -126,14 +126,15 @@ public function deleteRequestsByUser($user)
         $stmt->execute();
     }
 
-    public function addNotice($title, $date, $content, $operator)
+    public function addNotice($title, $date, $content, $expiry, $operator)
     {
         $stmt = $this->conn->prepare(
-            "INSERT INTO " . self::TABLE_NOTICES . " (date, title, message) VALUES (:date, :title, :message)"
+            "INSERT INTO " . self::TABLE_NOTICES . " (date, title, message, expiry) VALUES (:date, :title, :message, :expiry)"
         );
         $stmt->bindParam(":date", $date);
         $stmt->bindParam(":title", $title);
         $stmt->bindParam(":message", $content);
+        $stmt->bindParam(":expiry", $expiry); 
 
         $stmt->execute();
 
@@ -147,14 +148,15 @@ public function addNotice($title, $date, $content, $operator)
         );
     }
 
-    public function editNotice($id, $title, $date, $content)
+    public function editNotice($id, $title, $date, $content, $expiry)
     {
         $stmt = $this->conn->prepare(
-            "UPDATE " . self::TABLE_NOTICES . " SET date=:date, title=:title, message=:message WHERE id=:id"
+            "UPDATE " . self::TABLE_NOTICES . " SET date=:date, title=:title, message=:message, expiry=:expiry WHERE id=:id"
         );
         $stmt->bindParam(":date", $date);
         $stmt->bindParam(":title", $title);
         $stmt->bindParam(":message", $content);
+        $stmt->bindParam(":expiry", $expiry);
         $stmt->bindParam(":id", $id);
 
         $stmt->execute();

Diff for: tools/docker-dev/sql/bootstrap.sql

@@ -148,16 +148,16 @@ CREATE TABLE `notices` (
   `date` timestamp NOT NULL DEFAULT current_timestamp(),
   `title` varchar(300) NOT NULL,
   `message` longtext NOT NULL,
-  `expiry` timestamp NOT NULL DEFAULT DATE_ADD(CURDATE(), INTERVAL 7 DAY)
+  `expiry` timestamp NOT NULL DEFAULT DATE_ADD(current_timestamp(), INTERVAL 14 DAY)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 --
 -- Dumping data for table `notices`
 --
 
-INSERT INTO `notices` (`id`, `date`, `title`, `message`) VALUES
-(9, '2022-09-19 15:49:10', 'Example Notice 1', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>'),
-(10, '2022-09-14 11:48:39', 'Example Notice 2', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '2024-05-29');
+INSERT INTO `notices` (`id`, `date`, `title`, `message`, `expiry`) VALUES
+(9, '2022-09-19 15:49:10', 'Example Notice 1', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '2025-05-29 01:02:03'),
+(10, '2024-03-02 00:00:00', 'Example Notice 2', '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>', '2024-03-02 00:00:00');
 
 -- --------------------------------------------------------
 

Diff for: webroot/admin/notices.php

@@ -9,11 +9,11 @@
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     switch ($_POST["form_type"]) {
         case "newNotice":
-            $SQL->addNotice($_POST["title"], $_POST["date"], $_POST["content"], $USER);
+            $SQL->addNotice($_POST["title"], $_POST["date"], $_POST["content"], $_POST["expiry"], $USER);
 
             break;
         case "editNotice":
-            $SQL->editNotice($_POST["id"], $_POST["title"], $_POST["date"], $_POST["content"]);
+            $SQL->editNotice($_POST["id"], $_POST["title"], $_POST["date"], $_POST["content"], $_POST["expiry"]);
 
             break;
         case "delNotice":

Diff for: webroot/index.php

@@ -17,6 +17,10 @@
 
 $notices = $SQL->getNotices();
 foreach ($notices as $notice) {
+    if ($notice["expiry"] < date('Y-m-d')) {
+        $SQL->deleteNotice($notice["id"]);
+        continue;
+    }
     echo "<div class='notice'>";
     echo "<span class='noticeTitle'>" . $notice["title"] . "</span>";
     echo "<span class='noticeDate'>" . date('m-d-Y', strtotime($notice["date"])) . "</span>";