Merge branch 'master' of github.com:engelsystem/engelsystem

Conflicts:
	includes/model/ShiftEntry_model.php

1 files changed, 22 insertions, 1 deletions

diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php
index e3046152..0cf5c040 100644
--- a/includes/model/ShiftEntry_model.php
+++ b/includes/model/ShiftEntry_model.php
@@ -7,9 +7,12 @@ function ShiftEntries_freeleaded_count() {
   return sql_select_single_cell("SELECT COUNT(*) FROM `ShiftEntry` WHERE `freeloaded` = 1");
 }
 
+/**
+ * List users subsribed to a given shift.
+ */
 function ShiftEntries_by_shift($shift_id) {
   return sql_select("
-      SELECT `User`.`email`, `User`.`email_shiftinfo`, `User`.`Nick`, `User`.`Sprache`, `ShiftEntry`.`UID`, `ShiftEntry`.`TID`, `ShiftEntry`.`SID`, `AngelTypes`.`name` as `angel_type_name`, `ShiftEntry`.`Comment`, `ShiftEntry`.`freeloaded`
+      SELECT `User`.`Nick`, `User`.`email`, `User`.`email_shiftinfo`, `User`.`Sprache`, `ShiftEntry`.`UID`, `ShiftEntry`.`TID`, `ShiftEntry`.`SID`, `AngelTypes`.`name` as `angel_type_name`, `ShiftEntry`.`Comment`, `ShiftEntry`.`freeloaded`
       FROM `ShiftEntry`
       JOIN `User` ON `ShiftEntry`.`UID`=`User`.`UID`
       JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id`
@@ -32,6 +35,24 @@ function ShiftEntry_create($shift_entry) {
 }
 
 /**
+ * Update a shift entry.
+ */
+function ShiftEntry_update($shift_entry) {
+  return sql_query("UPDATE `ShiftEntry` SET
+      `Comment`='" . sql_escape($shift_entry['Comment']) . "',
+      `freeload_comment`='" . sql_escape($shift_entry['freeload_comment']) . "',
+      `freeloaded`=" . sql_escape($shift_entry['freeloaded'] ? 'TRUE' : 'FALSE') . "
+      WHERE `id`=" . sql_escape($shift_entry['id']));
+}
+
+/**
+ * Delete a shift entry.
+ */
+function ShiftEntry_delete($shift_entry_id) {
+  return sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($shift_entry_id));
+}
+
+/**
  * Returns next (or current) shifts of given user.
  *
  * @param User $user