include all mailers

1 files changed, 34 insertions, 40 deletions

diff --git a/includes/mailer/shifts_mailer.php b/includes/mailer/shifts_mailer.php
index c9d20976..cd34274f 100644
--- a/includes/mailer/shifts_mailer.php
+++ b/includes/mailer/shifts_mailer.php
@@ -1,96 +1,90 @@
 <?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"]);
-
+  
   $noticable_changes = false;
-
+  
   $message = _("A Shift you are registered on has changed:");
-  $message .="\n";
-
-  if($old_shift["name"] != $new_shift["name"]) {
+  $message .= "\n";
+  
+  if ($old_shift["name"] != $new_shift["name"]) {
     $message .= sprintf(_("* Shift Name changed from %s to %s"), $old_shift["name"], $new_shift["name"]) . "\n";
     $noticable_changes = true;
   }
-
-  if($old_shift["start"] != $new_shift["start"]) {
-    $message .= sprintf(_("* Shift Start changed from %s to %s"),date("y-m-d H:i", $old_shift["start"]), date("y-m-d H:i", $new_shift["start"])) . "\n";
+  
+  if ($old_shift["start"] != $new_shift["start"]) {
+    $message .= sprintf(_("* Shift Start changed from %s to %s"), date("y-m-d H:i", $old_shift["start"]), date("y-m-d H:i", $new_shift["start"])) . "\n";
     $noticable_changes = true;
   }
-
-  if($old_shift["end"] != $new_shift["end"]) {
-    $message .= sprintf(_("* Shift End changed from %s to %s"),date("y-m-d H:i", $old_shift["end"]), date("y-m-d H:i", $new_shift["end"])) . "\n";
+  
+  if ($old_shift["end"] != $new_shift["end"]) {
+    $message .= sprintf(_("* Shift End changed from %s to %s"), date("y-m-d H:i", $old_shift["end"]), date("y-m-d H:i", $new_shift["end"])) . "\n";
     $noticable_changes = true;
   }
-
-  if($old_shift["RID"] != $new_shift["RID"]) {
+  
+  if ($old_shift["RID"] != $new_shift["RID"]) {
     $message .= sprintf(_("* Shift Location changed from %s to %s"), $old_room["Name"], $new_room["Name"]) . "\n";
     $noticable_changes = true;
   }
-
-  if (!$noticable_changes) {
-    //There are no changes worth sending an E-Mail
+  
+  if (! $noticable_changes) {
+    // There are no changes worth sending an E-Mail
     return;
   }
-
+  
   $message .= "\n";
   $message .= _("The updated Shift:") . "\n";
-
+  
   $message .= $new_shift["name"] . "\n";
   $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"]);
-
+  
   $message = _("A Shift you are registered on was deleted:") . "\n";
-
+  
   $message .= $shift["name"] . "\n";
   $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) {
   if ($user["email_shiftinfo"]) {
     $room = Room($shift["RID"]);
-
+    
     $message = _("You have been assigned to a Shift:") . "\n";
     $message .= $shift["name"] . "\n";
     $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);
   }
 }
 
 function mail_shift_removed($user, $shift) {
   if ($user["email_shiftinfo"]) {
     $room = Room($shift["RID"]);
-
+    
     $message = _("You have been removed from a Shift:") . "\n";
     $message .= $shift["name"] . "\n";
     $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);
   }
 }