From 1f572918ff46c4f1fa9308f423adba3e2a8a29c8 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Sun, 7 Dec 2014 20:29:01 +0100 Subject: include all mailers --- includes/model/ShiftEntry_model.php | 23 +++++++++++++++++++---- includes/model/Shifts_model.php | 2 -- 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'includes/model') diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php index 0cf5c040..e1f0cd2e 100644 --- a/includes/model/ShiftEntry_model.php +++ b/includes/model/ShiftEntry_model.php @@ -22,9 +22,10 @@ function ShiftEntries_by_shift($shift_id) { /** * Create a new shift entry. * - * @param ShiftEntry $shift_entry + * @param ShiftEntry $shift_entry */ function ShiftEntry_create($shift_entry) { + mail_shift_assign(User($shift_entry['UID']), Shift($shift_entry['SID'])); return sql_query("INSERT INTO `ShiftEntry` SET `SID`=" . sql_escape($shift_entry['SID']) . ", `TID`=" . sql_escape($shift_entry['TID']) . ", @@ -45,17 +46,31 @@ function ShiftEntry_update($shift_entry) { WHERE `id`=" . sql_escape($shift_entry['id'])); } +/** + * Get a shift entry. + */ +function ShiftEntry($shift_entry_id) { + $shift_entry = sql_select("SELECT * FROM `ShiftEntry` WHERE `id`=" . sql_escape($shift_entry_id)); + if ($shift_entry === false) + return false; + if (count($shift_entry) == 0) + return null; + return $shift_entry[0]; +} + /** * Delete a shift entry. */ function ShiftEntry_delete($shift_entry_id) { + $shift_entry = ShiftEntry($shift_entry_id); + mail_shift_removed(User($shift_entry['UID']), Shift($shift_entry['SID'])); return sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($shift_entry_id)); } /** * Returns next (or current) shifts of given user. * - * @param User $user + * @param User $user */ function ShiftEntries_upcoming_for_user($user) { return sql_select(" @@ -71,8 +86,8 @@ function ShiftEntries_upcoming_for_user($user) { /** * Returns all shift entries in given shift for given angeltype. * - * @param int $shift_id - * @param int $angeltype_id + * @param int $shift_id + * @param int $angeltype_id */ function ShiftEntries_by_shift_and_angeltype($shift_id, $angeltype_id) { return sql_select(" diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php index 11309e11..8530a0c8 100644 --- a/includes/model/Shifts_model.php +++ b/includes/model/Shifts_model.php @@ -11,7 +11,6 @@ function Shift_delete_by_psid($shift_psid) { * Delete a shift. */ function Shift_delete($shift_id) { - mail_shift_delete(Shift($shift_id)); return sql_query("DELETE FROM `Shifts` WHERE `SID`=" . sql_escape($shift_id)); @@ -21,7 +20,6 @@ function Shift_delete($shift_id) { * Update a shift. */ function Shift_update($shift) { - $old_shift = Shift($shift['SID']); mail_shift_change(Shift($shift['SID']), $shift); -- cgit v1.2.3-70-g09d2