iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove exit code from shifts controller

This commit is contained in:
msquare 2016-08-22 19:03:18 +02:00
parent de917bc543
commit d4bba0d468
2 changed files with 70 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
includes/controller/shifts_controller.php
View File

@ -15,42 +15,50 @@ function shift_edit_link($shift) {
function shift_controller() {
global $user, $privileges;
if (! in_array('user_shifts', $privileges))
if (! in_array('user_shifts', $privileges)) {
redirect(page_link_to('?'));
}
if (! isset($_REQUEST['shift_id']))
if (! isset($_REQUEST['shift_id'])) {
redirect(page_link_to('user_shifts'));
}
$shift = Shift($_REQUEST['shift_id']);
if ($shift === false)
if ($shift === false) {
engelsystem_error('Unable to load shift.');
}
if ($shift == null) {
error(_('Shift could not be found.'));
redirect(page_link_to('user_shifts'));
}
$shifttype = ShiftType($shift['shifttype_id']);
if ($shifttype === false || $shifttype == null)
if ($shifttype === false || $shifttype == null) {
engelsystem_error('Unable to load shift type.');
}
$room = Room($shift['RID']);
if ($room === false || $room == null)
if ($room === false || $room == null) {
engelsystem_error('Unable to load room.');
}
$angeltypes = AngelTypes();
if ($angeltypes === false)
if ($angeltypes === false) {
engelsystem_error('Unable to load angeltypes.');
}
$user_shifts = Shifts_by_user($user);
if ($user_shifts === false)
if ($user_shifts === false) {
engelsystem_error('Unable to load users shifts.');
}
$signed_up = false;
foreach ($user_shifts as $user_shift)
foreach ($user_shifts as $user_shift) {
if ($user_shift['SID'] == $shift['SID']) {
$signed_up = true;
break;
}
}
return [
$shift['name'],
@ -59,8 +67,9 @@ function shift_controller() {
}
function shifts_controller() {
if (! isset($_REQUEST['action']))
if (! isset($_REQUEST['action'])) {
redirect(page_link_to('user_shifts'));
}
switch ($_REQUEST['action']) {
default:
@ -78,15 +87,18 @@ function shifts_controller() {
function shift_next_controller() {
global $user, $privileges;
if (! in_array('user_shifts', $privileges))
if (! in_array('user_shifts', $privileges)) {
redirect(page_link_to('?'));
}
$upcoming_shifts = ShiftEntries_upcoming_for_user($user);
if ($upcoming_shifts === false)
if ($upcoming_shifts === false) {
return false;
}
if (count($upcoming_shifts) > 0)
if (count($upcoming_shifts) > 0) {
redirect(shift_link($upcoming_shifts[0]));
}
redirect(page_link_to('user_shifts'));
}
@ -97,22 +109,25 @@ function shift_next_controller() {
function shifts_json_export_all_controller() {
global $api_key;
if ($api_key == "")
die("Config contains empty apikey.");
if ($api_key == "") {
engelsystem_error("Config contains empty apikey.");
}
if (! isset($_REQUEST['api_key']))
die("Missing parameter api_key.");
if (! isset($_REQUEST['api_key'])) {
engelsystem_error("Missing parameter api_key.");
}
if ($_REQUEST['api_key'] != $api_key)
die("Invalid api_key.");
if ($_REQUEST['api_key'] != $api_key) {
engelsystem_error("Invalid api_key.");
}
$shifts_source = Shifts();
if ($shifts_source === false)
die("Unable to load shifts.");
if ($shifts_source === false) {
engelsystem_error("Unable to load shifts.");
}
header("Content-Type: application/json; charset=utf-8");
echo json_encode($shifts_source);
die();
raw_output(json_encode($shifts_source));
}
/**
@ -122,36 +137,44 @@ function shifts_json_export_all_controller() {
function shifts_json_export_controller() {
global $ical_shifts, $user;
if (isset($_REQUEST['key']) && preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key']))
if (isset($_REQUEST['key']) && preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) {
$key = $_REQUEST['key'];
else
die("Missing key.");
$user = User_by_api_key($key);
if ($user === false)
die("Unable to find user.");
if ($user == null)
die("Key invalid.");
if (! in_array('shifts_json_export', privileges_for_user($user['UID'])))
die("No privilege for shifts_json_export.");
if (isset($_REQUEST['export']) && $_REQUEST['export'] == 'user_shifts') {
require_once realpath(__DIR__ . '/../pages/user_shifts.php');
view_user_shifts();
} else {
$ical_shifts = sql_select("
SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.`Name` as `room_name`
FROM `ShiftEntry`
INNER JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`)
INNER JOIN `ShiftTypes` ON (`Shifts`.`shifttype_id`=`ShiftTypes`.`id`)
INNER JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`)
WHERE `UID`='" . sql_escape($user['UID']) . "'
ORDER BY `start`");
engelsystem_error("Missing key.");
}
$user = User_by_api_key($key);
if ($user === false) {
engelsystem_error("Unable to find user.");
}
if ($user == null) {
engelsystem_error("Key invalid.");
}
if (! in_array('shifts_json_export', privileges_for_user($user['UID']))) {
engelsystem_error("No privilege for shifts_json_export.");
}
$ical_shifts = load_ical_shifts();
header("Content-Type: application/json; charset=utf-8");
echo json_encode($ical_shifts);
die();
raw_output(json_encode($ical_shifts));
}
/**
* Returns shifts to export.
* Users shifts or user_shifts filter based shifts if export=user_shifts is given as param.
*/
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;
}
return Shifts_by_user($user);
}
?>

17
includes/pages/user_ical.php
View File

@ -27,23 +27,6 @@ function user_ical() {
send_ical_from_shifts($ical_shifts);
}
/**
* Returns shifts to export.
* Users shifts or user_shifts filter based shifts if export=user_shifts is given as param.
*/
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;
}
return Shifts_by_user($user);
}
/**
* Renders an ical calender from given shifts array.
*