From 0a74ab94a8ebc93a7624e0bef90dfd7d8024deaa Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Sun, 7 Dec 2014 17:07:19 +0100
Subject: add shift entry delete model

---
 includes/pages/user_myshifts.php | 9 +++++----
 includes/pages/user_shifts.php   | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'includes/pages')

diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index d1c60dd6..41ea9381 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -77,15 +77,16 @@ function user_myshifts() {
     if (count($shift) > 0) {
       $shift = $shift[0];
       if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) {
-        sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
-        $msg .= success(_("You have been signed off from the shift."), true);
+        $result = ShiftEntry_delete($id);
+        if ($result === false)
+          engelsystem_error('Unable to delete shift entry.');
+        success(_("You have been signed off from the shift."));
       } else
-        $msg .= error(_("It's too late to sign yourself off the shift. If neccessary, ask the dispatcher to do so."), true);
+        error(_("It's too late to sign yourself off the shift. If neccessary, ask the dispatcher to do so."));
     } else
       redirect(page_link_to('user_myshifts'));
   }
   
-  msg();
   redirect(page_link_to('users') . '&action=view');
 }
 ?>
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index ee8e3b19..07f10ea2 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -20,7 +20,10 @@ function user_shifts() {
     $shift_entry_source = sql_select("SELECT `User`.`Nick`, `ShiftEntry`.`Comment`, `ShiftEntry`.`UID`, `Shifts`.*, `Room`.`Name`, `AngelTypes`.`name` as `angel_type` FROM `ShiftEntry` JOIN `User` ON (`User`.`UID`=`ShiftEntry`.`UID`) JOIN `AngelTypes` ON (`ShiftEntry`.`TID` = `AngelTypes`.`id`) JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `ShiftEntry`.`id`=" . sql_escape($entry_id) . " LIMIT 1");
     if (count($shift_entry_source) > 0) {
       $shift_entry_source = $shift_entry_source[0];
-      sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($entry_id) . " LIMIT 1");
+      
+      $result = ShiftEntry_delete($entry_id);
+      if ($result === false)
+        engelsystem_error('Unable to delete shift entry.');
       
       engelsystem_log("Deleted " . User_Nick_render($shift_entry_source) . "'s shift: " . $shift_entry_source['name'] . " at " . $shift_entry_source['Name'] . " from " . date("y-m-d H:i", $shift_entry_source['start']) . " to " . date("y-m-d H:i", $shift_entry_source['end']) . " as " . $shift_entry_source['angel_type']);
       success(_("Shift entry deleted."));
@@ -169,7 +172,6 @@ function user_shifts() {
     
     // Schicht löschen bestätigt
     if (isset($_REQUEST['delete'])) {
-      sql_query("DELETE FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift_id));
       sql_query("DELETE FROM `NeededAngelTypes` WHERE `shift_id`=" . sql_escape($shift_id));
       sql_query("DELETE FROM `Shifts` WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1");
       
-- 
cgit v1.2.3-54-g00ecf