From 7155e189038e62d090af9e74a9cc52921bea0c90 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 10 Mar 2016 22:04:08 -0500
Subject: [PATCH] Fix SQL for public end

---
 internal-api/dao/calendar_dao.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php
index d4ef4da4..a878acb7 100644
--- a/internal-api/dao/calendar_dao.php
+++ b/internal-api/dao/calendar_dao.php
@@ -1,11 +1,16 @@
 <?php
 
 function get_events($start, $end, $hesk_settings, $staff = true) {
-    $sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color`,
-        `reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit`
-        FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` AS `events`
+    $sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color` ";
+
+    if ($staff) {
+        $sql .= ",`reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit` ";
+    }
+
+    $sql .= "FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` AS `events`
         INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` AS `categories`
             ON `events`.`category` = `categories`.`id` ";
+
     if ($staff) {
         $sql .= "LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` AS `reminders` ON
         `reminders`.`user_id` = " . intval($_SESSION['id']) . " AND `reminders`.`event_id` = `events`.`id`";
@@ -32,8 +37,12 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
         $event['categoryId'] = $row['category'];
         $event['categoryName'] = $row['category_name'];
         $event['categoryColor'] = $row['category_color'];
-        $event['reminderValue'] = $row['reminder_value'];
-        $event['reminderUnit'] = $row['reminder_unit'];
+
+        if ($staff) {
+            $event['reminderValue'] = $row['reminder_value'];
+            $event['reminderUnit'] = $row['reminder_unit'];
+        }
+
         $events[] = $event;
     }