summaryrefslogtreecommitdiff
path: root/includes/controller
diff options
context:
space:
mode:
authorleaneb <lea-e@bluewin.ch>2016-11-26 11:39:47 +0100
committerGitHub <noreply@github.com>2016-11-26 11:39:47 +0100
commite1cc80ec411d63a4a309fa76a53776c80c10e6f7 (patch)
tree01753d802435861ebd7c0624bb7050cf24e8c24d /includes/controller
parent67df8da061f74322863354490409666eb87935b0 (diff)
parent561e8ec36c50b2ace9fe7352dfb4e11f57d0e82e (diff)
Merge pull request #2 from engelsystem/master
Merge Changes from esys Master to own Repo
Diffstat (limited to 'includes/controller')
-rw-r--r--includes/controller/shifts_controller.php23
-rw-r--r--includes/controller/users_controller.php2
2 files changed, 7 insertions, 18 deletions
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/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`");