From e9bbd967ff734b0d6ecded5ff86c26c1eeccfc60 Mon Sep 17 00:00:00 2001
From: Felix Favre <gnomus@gnomus.de>
Date: Fri, 12 Dec 2014 23:40:13 +0100
Subject: add freeload info to shiftentry update log issue #28

---
 includes/pages/user_myshifts.php | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index d74475d2..6fe9afa2 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -9,15 +9,15 @@ function user_myshifts() {
   global $LETZTES_AUSTRAGEN;
   global $user, $privileges;
   $msg = "";
-  
+
   if (isset($_REQUEST['id']) && in_array("user_shifts_admin", $privileges) && preg_match("/^[0-9]{1,}$/", $_REQUEST['id']) && sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($_REQUEST['id'])) > 0) {
     $id = $_REQUEST['id'];
   } else {
     $id = $user['UID'];
   }
-  
+
   list($shifts_user) = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1");
-  
+
   if (isset($_REQUEST['reset'])) {
     if ($_REQUEST['reset'] == "ack") {
       User_reset_api_key($user);
@@ -26,27 +26,27 @@ function user_myshifts() {
     }
     return page_with_title(_("Reset API key"), array(
         error(_("If you reset the key, the url to your iCal- and JSON-export and your atom feed changes! You have to update it in every application using one of these exports."), true),
-        button(page_link_to('user_myshifts') . '&reset=ack', _("Continue"), 'btn-danger') 
+        button(page_link_to('user_myshifts') . '&reset=ack', _("Continue"), 'btn-danger')
     ));
   } elseif (isset($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) {
     $id = $_REQUEST['edit'];
-    $shift = sql_select("SELECT 
-        `ShiftEntry`.`freeloaded`, 
-        `ShiftEntry`.`freeload_comment`, 
-        `ShiftEntry`.`Comment`, 
-        `ShiftEntry`.`UID`, 
-        `Shifts`.*, 
-        `Room`.`Name`, 
-        `AngelTypes`.`name` as `angel_type` 
-        FROM `ShiftEntry` 
-        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($id) . " 
+    $shift = sql_select("SELECT
+        `ShiftEntry`.`freeloaded`,
+        `ShiftEntry`.`freeload_comment`,
+        `ShiftEntry`.`Comment`,
+        `ShiftEntry`.`UID`,
+        `Shifts`.*,
+        `Room`.`Name`,
+        `AngelTypes`.`name` as `angel_type`
+        FROM `ShiftEntry`
+        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($id) . "
         AND `UID`=" . sql_escape($shifts_user['UID']) . " LIMIT 1");
     if (count($shift) > 0) {
       $shift = $shift[0];
-      
+
       if (isset($_REQUEST['submit'])) {
         $freeloaded = $shift['freeloaded'];
         $freeload_comment = $shift['freeload_comment'];
@@ -54,23 +54,23 @@ function user_myshifts() {
           $freeloaded = isset($_REQUEST['freeloaded']);
           $freeload_comment = strip_request_item_nl('freeload_comment');
         }
-        
+
         $comment = strip_request_item_nl('comment');
         $user_source = User($shift['UID']);
         $result = ShiftEntry_update(array(
             'id' => $id,
             'Comment' => $comment,
             'freeloaded' => $freeloaded,
-            'freeload_comment' => $freeload_comment 
+            'freeload_comment' => $freeload_comment
         ));
         if ($result === false)
           engelsystem_error('Unable to update shift entr.');
-        
-        engelsystem_log("Updated " . User_Nick_render($user_source) . "'s shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end']) . " with comment " . $comment);
+
+        engelsystem_log("Updated " . User_Nick_render($user_source) . "'s shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end']) . " with comment " . $comment . ". Freeloaded: " . ($freeloaded ? "YES Comment: " . $freeload_comment : "NO"));
         success(_("Shift saved."));
         redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']);
       }
-      
+
       return ShiftEntry_edit_view(User_Nick_render($shifts_user), date("Y-m-d H:i", $shift['start']) . ', ' . shift_length($shift), $shift['Name'], $shift['name'], $shift['angel_type'], $shift['Comment'], $shift['freeloaded'], $shift['freeload_comment'], in_array("user_shifts_admin", $privileges));
     } else
       redirect(page_link_to('user_myshifts'));
@@ -89,7 +89,7 @@ function user_myshifts() {
     } else
       redirect(page_link_to('user_myshifts'));
   }
-  
+
   redirect(page_link_to('users') . '&action=view');
 }
 ?>
-- 
cgit v1.2.3-70-g09d2