From 3fd30add3c7f66cef8e40d80183591b6d2126db7 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Wed, 23 Nov 2016 22:31:11 +0100
Subject: fix NPE

---
 includes/controller/shifts_controller.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'includes/controller')

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index f273c097..3086b948 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -1,5 +1,6 @@
 <?php
 
+use Engelsystem\ShiftSignupState;
 function shift_link($shift) {
   return page_link_to('shifts') . '&action=view&shift_id=' . $shift['SID'];
 }
@@ -200,7 +201,7 @@ function shift_controller() {
   $angeltypes = AngelTypes();
   $user_shifts = Shifts_by_user($user);
   
-  $shift_signup_state = null;
+  $shift_signup_state = new ShiftSignupState(ShiftSignupState::OCCUPIED, 0);
   foreach ($angeltypes as $angeltype) {
     $angeltype_signup_state = Shift_signup_allowed($user, $shift, $angeltype, null, $user_shifts);
     if ($shift_signup_state == null) {
-- 
cgit v1.2.3-54-g00ecf


From ff31d0a1c59efc2c6dc3c66a803eac697041f572 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Thu, 24 Nov 2016 09:32:32 +0100
Subject: fix shift signup state being combined to null

---
 includes/controller/shifts_controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes/controller')

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 3086b948..1500b449 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -207,7 +207,7 @@ function shift_controller() {
     if ($shift_signup_state == null) {
       $shift_signup_state = $angeltype_signup_state;
     } else {
-      $shift_signup_state = $shift_signup_state->combineWith($angeltype_signup_state);
+      $shift_signup_state->combineWith($angeltype_signup_state);
     }
   }
   
-- 
cgit v1.2.3-54-g00ecf


From bae3ede662426d362a3b9d33d9124253af7e847b Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 25 Nov 2016 13:38:16 +0100
Subject: fixes #279 fix exporting freeload comment in json export

---
 includes/controller/shifts_controller.php | 23 ++++++-----------------
 includes/model/Shifts_model.php           |  4 +++-
 includes/model/User_model.php             |  2 +-
 includes/pages/user_atom.php              |  3 ---
 includes/pages/user_ical.php              |  3 ---
 includes/view/ShiftTypes_view.php         |  1 +
 6 files changed, 11 insertions(+), 25 deletions(-)

(limited to 'includes/controller')

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 1500b449..1e04c5a8 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -1,6 +1,6 @@
 <?php
-
 use Engelsystem\ShiftSignupState;
+
 function shift_link($shift) {
   return page_link_to('shifts') . '&action=view&shift_id=' . $shift['SID'];
 }
@@ -286,7 +286,7 @@ function shifts_json_export_all_controller() {
  * (Like iCal Export or shifts view)
  */
 function shifts_json_export_controller() {
-  global $ical_shifts, $user;
+  global $user;
   
   if (! isset($_REQUEST['key']) || ! preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) {
     engelsystem_error("Missing key.");
@@ -295,9 +295,6 @@ function shifts_json_export_controller() {
   $key = $_REQUEST['key'];
   
   $user = User_by_api_key($key);
-  if ($user === false) {
-    engelsystem_error("Unable to find user.");
-  }
   if ($user == null) {
     engelsystem_error("Key invalid.");
   }
@@ -305,25 +302,17 @@ function shifts_json_export_controller() {
     engelsystem_error("No privilege for shifts_json_export.");
   }
   
-  $ical_shifts = load_ical_shifts();
+  $shifts = load_ical_shifts();
   
   header("Content-Type: application/json; charset=utf-8");
-  raw_output(json_encode($ical_shifts));
+  raw_output(json_encode($shifts));
 }
 
 /**
- * Returns shifts to export.
- * Users shifts or user_shifts filter based shifts if export=user_shifts is given as param.
+ * Returns users shifts to export.
  */
 function load_ical_shifts() {
-  global $user, $ical_shifts;
-  
-  if (isset($_REQUEST['export']) && $_REQUEST['export'] == 'user_shifts') {
-    require_once realpath(__DIR__ . '/user_shifts.php');
-    view_user_shifts();
-    
-    return $ical_shifts;
-  }
+  global $user;
   
   return Shifts_by_user($user);
 }
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index 2db0a3d3..67580eee 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -263,7 +263,9 @@ function Shift_create($shift) {
  */
 function Shifts_by_user($user) {
   $result = sql_select("
-      SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`, `ShiftEntry`.*, `Shifts`.*, `Room`.* 
+      SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`,
+      `ShiftEntry`.`id`, `ShiftEntry`.`SID`, `ShiftEntry`.`TID`, `ShiftEntry`.`UID`, `ShiftEntry`.`freeloaded`, `ShiftEntry`.`Comment`,
+      `Shifts`.*, `Room`.* 
       FROM `ShiftEntry` 
       JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) 
       JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index 344a3886..3ebd3bf9 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -284,7 +284,7 @@ function User($user_id) {
 function User_by_api_key($api_key) {
   $user = sql_select("SELECT * FROM `User` WHERE `api_key`='" . sql_escape($api_key) . "' LIMIT 1");
   if ($user === false) {
-    return false;
+    engelsystem_error("Unable to find user by api key.");
   }
   if (count($user) == 0) {
     return null;
diff --git a/includes/pages/user_atom.php b/includes/pages/user_atom.php
index 1313d92c..9a765634 100644
--- a/includes/pages/user_atom.php
+++ b/includes/pages/user_atom.php
@@ -10,9 +10,6 @@ function user_atom() {
   $key = $_REQUEST['key'];
   
   $user = User_by_api_key($key);
-  if ($user === false) {
-    engelsystem_error("Unable to find user.");
-  }
   if ($user == null) {
     engelsystem_error("Key invalid.");
   }
diff --git a/includes/pages/user_ical.php b/includes/pages/user_ical.php
index 553b8860..34860b70 100644
--- a/includes/pages/user_ical.php
+++ b/includes/pages/user_ical.php
@@ -12,9 +12,6 @@ function user_ical() {
   $key = $_REQUEST['key'];
   
   $user = User_by_api_key($key);
-  if ($user === false) {
-    engelsystem_error("Unable to find user.");
-  }
   if ($user == null) {
     engelsystem_error("Key invalid.");
   }
diff --git a/includes/view/ShiftTypes_view.php b/includes/view/ShiftTypes_view.php
index 163d6646..3e4cccc6 100644
--- a/includes/view/ShiftTypes_view.php
+++ b/includes/view/ShiftTypes_view.php
@@ -55,6 +55,7 @@ function ShiftType_view($shifttype, $angeltype) {
           button(page_link_to('shifttypes') . '&action=edit&shifttype_id=' . $shifttype['id'], _('edit'), 'edit'),
           button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttype['id'], _('delete'), 'delete') 
       ]),
+      heading(_("Description"), 2),
       $parsedown->parse($shifttype['description']) 
   ]);
 }
-- 
cgit v1.2.3-54-g00ecf


From 34248bb20cb3102fbcff76fcd7e059c12d87a6c3 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 25 Nov 2016 14:27:47 +0100
Subject: show freeload comments to supporters (user shift admin)

---
 includes/controller/users_controller.php | 2 +-
 includes/model/Shifts_model.php          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'includes/controller')

diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index 33abe764..26ca8d00 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -151,7 +151,7 @@ function user_controller() {
     }
   }
   
-  $shifts = Shifts_by_user($user_source);
+  $shifts = Shifts_by_user($user_source, in_array("user_shifts_admin", $privileges));
   foreach ($shifts as &$shift) {
     // TODO: Move queries to model
     $shift['needed_angeltypes'] = sql_select("SELECT DISTINCT `AngelTypes`.* FROM `ShiftEntry` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` WHERE `ShiftEntry`.`SID`='" . sql_escape($shift['SID']) . "'  ORDER BY `AngelTypes`.`name`");
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index 67580eee..b1d4ca5e 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -261,10 +261,11 @@ function Shift_create($shift) {
 /**
  * Return users shifts.
  */
-function Shifts_by_user($user) {
+function Shifts_by_user($user, $include_freeload_comments = false) {
   $result = sql_select("
       SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`,
       `ShiftEntry`.`id`, `ShiftEntry`.`SID`, `ShiftEntry`.`TID`, `ShiftEntry`.`UID`, `ShiftEntry`.`freeloaded`, `ShiftEntry`.`Comment`,
+      " . ($include_freeload_comments ? "`ShiftEntry`.`freeload_comment`, " : "") . "
       `Shifts`.*, `Room`.* 
       FROM `ShiftEntry` 
       JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) 
-- 
cgit v1.2.3-54-g00ecf