Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix SQL for public end

Browse Source
This commit is contained in:
Mike Koch 2016-03-10 22:04:08 -05:00
parent 5ada01e09d
commit 7155e18903
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal-api/dao/calendar_dao.php
View File

@ -1,11 +1,16 @@
<?php <?php
function get_events($start, $end, $hesk_settings, $staff = true) { function get_events($start, $end, $hesk_settings, $staff = true) {
$sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color`, $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` 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` INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` AS `categories`
ON `events`.`category` = `categories`.`id` "; ON `events`.`category` = `categories`.`id` ";
if ($staff) { if ($staff) {
$sql .= "LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` AS `reminders` ON $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`"; `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['categoryId'] = $row['category'];
$event['categoryName'] = $row['category_name']; $event['categoryName'] = $row['category_name'];
$event['categoryColor'] = $row['category_color']; $event['categoryColor'] = $row['category_color'];
if ($staff) {
$event['reminderValue'] = $row['reminder_value']; $event['reminderValue'] = $row['reminder_value'];
$event['reminderUnit'] = $row['reminder_unit']; $event['reminderUnit'] = $row['reminder_unit'];
}
$events[] = $event; $events[] = $event;
} }