iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

include all mailers

This commit is contained in:
Philip Häusler 2014-12-07 20:29:01 +01:00
parent f199c1f08a
commit 1f572918ff
3 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
includes/mailer/shifts_mailer.php
View File

@ -1,7 +1,6 @@
<?php
function mail_shift_change($old_shift, $new_shift) {
$users = ShiftEntries_by_shift($old_shift["SID"]);
$old_room = Room($old_shift["RID"]);
$new_room = Room($new_shift["RID"]);
@ -43,15 +42,12 @@ function mail_shift_change($old_shift, $new_shift) {
$message .= date("y-m-d H:i", $new_shift["start"]) . " - " . date("H:i", $new_shift["end"]) . "\n";
$message .= $new_room["Name"] . "\n";
foreach ($users as $user) {
if ($user["email_shiftinfo"]) {
engelsystem_email_to_user($user, _("[Angelsystem] Your Shift has changed"), $message);
}
}
foreach ($users as $user)
if ($user["email_shiftinfo"])
engelsystem_email_to_user($user, '[engelsystem] ' . _("Your Shift has changed"), $message);
}
function mail_shift_delete($shift) {
$users = ShiftEntries_by_shift($shift["SID"]);
$room = Room($shift["RID"]);
@ -61,11 +57,9 @@ function mail_shift_delete($shift) {
$message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
$message .= $room["Name"] . "\n";
foreach ($users as $user) {
if ($user["email_shiftinfo"]) {
engelsystem_email_to_user($user, _("[Angelsystem] Your Shift was deleted"), $message);
}
}
foreach ($users as $user)
if ($user["email_shiftinfo"])
engelsystem_email_to_user($user, '[engelsystem] ' . _("Your Shift was deleted"), $message);
}
function mail_shift_assign($user, $shift) {
@ -77,7 +71,7 @@ function mail_shift_assign($user, $shift) {
$message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
$message .= $room["Name"] . "\n";
engelsystem_email_to_user($user, _("[Angelsystem] Assigned to Shift"), $message);
engelsystem_email_to_user($user, '[engelsystem] ' . _("Assigned to Shift"), $message);
}
}
@ -90,7 +84,7 @@ function mail_shift_removed($user, $shift) {
$message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
$message .= $room["Name"] . "\n";
engelsystem_email_to_user($user, _("[Angelsystem] Assigned to Shift"), $message);
engelsystem_email_to_user($user, '[engelsystem] ' . _("Removed from Shift"), $message);
}
}

15
includes/model/ShiftEntry_model.php
View File

@ -25,6 +25,7 @@ function ShiftEntries_by_shift($shift_id) {
* @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,10 +46,24 @@ 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));
}

2
includes/model/Shifts_model.php
View File

@ -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);