From 2863fb82e2fe393c15496ec4664bf510282544a9 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 29 Mar 2016 13:44:57 -0400
Subject: [PATCH] Remove reminder_time column, as the cron job uses SQL to
 calculate the time

---
 cron/calendar_reminders.php              | 21 ++++++++++++++++++---
 install/mods-for-hesk/sql/installSql.php |  1 -
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/cron/calendar_reminders.php b/cron/calendar_reminders.php
index 26a1cd32..5952b087 100644
--- a/cron/calendar_reminders.php
+++ b/cron/calendar_reminders.php
@@ -29,9 +29,24 @@ if ($hesk_settings['debug_mode']) {
 }
 
 // Get all reminders that have a reminder date that is now or earlier, and an email has not been sent for the event yet.
-// The reminder time is calculated by
-$sql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder`
-    WHERE `reminder_time` <= NOW()
+/*
+ * Reminder units:
+ * 0 - minutes
+ * 1 - hours
+ * 2 - days
+ * 3 - weeks
+ */
+$sql = "SELECT `reminder`.`id`, `reminder`.`user_id`, `reminder`.`event_id`,
+    CASE
+      WHEN `unit` = '0' THEN DATE_SUB(`event`.`start`, INTERVAL `reminder`.`amount` MINUTE)
+      WHEN `unit` = '1' THEN DATE_SUB(`event`.`start`, INTERVAL `reminder`.`amount` HOUR)
+      WHEN `unit` = '2' THEN DATE_SUB(`event`.`start`, INTERVAL `reminder`.`amount` DAY)
+      WHEN `unit` = '3' THEN DATE_SUB(`event`.`start`, INTERVAL `reminder`.amount` WEEK)
+    END AS `reminder_date`
+    FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` AS `reminder`
+    INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` AS `event`
+        ON `reminder`.`event_id` = `event`.`id`
+    WHERE `reminder_date` <= NOW()
     AND `email_sent` = '0'";
 
 $rs = hesk_dbQuery($sql);
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index bb3de5b7..965298c1 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -735,7 +735,6 @@ function execute260Scripts()
       `event_id` INT NOT NULL,
       `amount` INT NOT NULL,
       `unit` INT NOT NULL,
-      `reminder_time` DATETIME NOT NULL,
       `email_sent` ENUM('0', '1') NOT NULL DEFAULT '0') ENGINE = MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` ADD COLUMN `due_date` DATETIME");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ADD COLUMN `color` VARCHAR(7)");