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

merge feature-shift-types

This commit is contained in:
Philip Häusler 2014-12-25 22:32:18 +01:00
parent bcd33c02c8 544a51612f
commit e89acc0c1d
29 changed files with 1840 additions and 769 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
db/install.sql
View File

@ -3,7 +3,7 @@
-- http://www.phpmyadmin.net
--
-- Host: localhost
-- Erstellungszeit: 07. Dez 2014 um 20:31
-- Erstellungszeit: 25. Dez 2014 um 22:28
-- Server Version: 5.6.12
-- PHP-Version: 5.5.3
@ -11,6 +11,12 @@ SET FOREIGN_KEY_CHECKS=0;
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
SET time_zone = "+00:00";
--
-- Datenbank: `engelsystem`
--
CREATE DATABASE IF NOT EXISTS `engelsystem` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
USE `engelsystem`;
-- --------------------------------------------------------
--
@ -47,6 +53,14 @@ CREATE TABLE IF NOT EXISTS `Counter` (
PRIMARY KEY (`URL`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Counter der Seiten';
--
-- Daten für Tabelle `Counter`
--
INSERT INTO `Counter` (`URL`, `Anz`) VALUES
('login', 2),
('news', 1);
-- --------------------------------------------------------
--
@ -61,7 +75,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` (
PRIMARY KEY (`id`),
KEY `group_id` (`group_id`,`privilege_id`),
KEY `privilege_id` (`privilege_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=257 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=258 ;
--
-- Daten für Tabelle `GroupPrivileges`
@ -82,6 +96,7 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES
(213, -5, 28),
(206, -5, 31),
(215, -5, 33),
(257, -5, 38),
(219, -4, 14),
(221, -4, 25),
(220, -4, 33),
@ -240,7 +255,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` (
`desc` varchar(1024) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=38 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=39 ;
--
-- Daten für Tabelle `Privileges`
@ -282,7 +297,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES
(34, 'atom', ' Atom news export'),
(35, 'shifts_json_export', 'Export shifts in JSON format'),
(36, 'angeltypes', 'View angeltypes'),
(37, 'user_angeltypes', 'Join angeltypes.');
(37, 'user_angeltypes', 'Join angeltypes.'),
(38, 'shifttypes', 'Administrate shift types');
-- --------------------------------------------------------
@ -351,19 +367,37 @@ CREATE TABLE IF NOT EXISTS `ShiftEntry` (
DROP TABLE IF EXISTS `Shifts`;
CREATE TABLE IF NOT EXISTS `Shifts` (
`SID` int(11) NOT NULL AUTO_INCREMENT,
`title` text,
`shifttype_id` int(11) NOT NULL,
`start` int(11) NOT NULL,
`end` int(11) NOT NULL,
`RID` int(11) NOT NULL DEFAULT '0',
`name` varchar(1024) DEFAULT NULL,
`URL` text,
`PSID` int(11) DEFAULT NULL,
PRIMARY KEY (`SID`),
UNIQUE KEY `PSID` (`PSID`),
KEY `RID` (`RID`)
KEY `RID` (`RID`),
KEY `shifttype_id` (`shifttype_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=191 ;
-- --------------------------------------------------------
--
-- Tabellenstruktur für Tabelle `ShiftTypes`
--
DROP TABLE IF EXISTS `ShiftTypes`;
CREATE TABLE IF NOT EXISTS `ShiftTypes` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) NOT NULL,
`angeltype_id` int(11) DEFAULT NULL,
`description` text NOT NULL,
PRIMARY KEY (`id`),
KEY `angeltype_id` (`angeltype_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
--
-- Tabellenstruktur für Tabelle `User`
--
@ -410,7 +444,7 @@ CREATE TABLE IF NOT EXISTS `User` (
--
INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `email_shiftinfo`, `jabber`, `Size`, `Passwort`, `password_recovery_token`, `Gekommen`, `Aktiv`, `force_active`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`, `api_key`) VALUES
(1, 'admin', 'Gates', 'Bill', 42, '', '-', '', 'admin@example.com', 0, '', 'XL', '$6$rounds=5000$hjXbIhoRTH3vKiRa$Wl2P2iI5T9iRR.HHu/YFHswBW0WVn0yxCfCiX0Keco9OdIoDK6bIAADswP6KvMCJSwTGdV8PgA8g8Xfw5l8BD1', NULL, 1, 0, 1, 0, 2, 'de_DE.UTF-8', 115, 'L', 1417980341, '0000-00-00 00:00:00', '', '', '', '038850abdd1feb264406be3ffa746235');
(1, 'admin', 'Gates', 'Bill', 42, '', '-', '', 'admin@example.com', 0, '', 'XL', '$6$rounds=5000$hjXbIhoRTH3vKiRa$Wl2P2iI5T9iRR.HHu/YFHswBW0WVn0yxCfCiX0Keco9OdIoDK6bIAADswP6KvMCJSwTGdV8PgA8g8Xfw5l8BD1', NULL, 1, 0, 1, 0, 2, 'de_DE.UTF-8', 115, 'L', 1419542882, '0000-00-00 00:00:00', '', '', '', '038850abdd1feb264406be3ffa746235');
-- --------------------------------------------------------
@ -524,7 +558,14 @@ ALTER TABLE `ShiftEntry`
-- Constraints der Tabelle `Shifts`
--
ALTER TABLE `Shifts`
ADD CONSTRAINT `shifts_ibfk_1` FOREIGN KEY (`RID`) REFERENCES `Room` (`RID`) ON DELETE CASCADE ON UPDATE CASCADE;
ADD CONSTRAINT `shifts_ibfk_1` FOREIGN KEY (`RID`) REFERENCES `Room` (`RID`) ON DELETE CASCADE ON UPDATE CASCADE,
ADD CONSTRAINT `shifts_ibfk_2` FOREIGN KEY (`shifttype_id`) REFERENCES `ShiftTypes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
--
-- Constraints der Tabelle `ShiftTypes`
--
ALTER TABLE `ShiftTypes`
ADD CONSTRAINT `shifttypes_ibfk_1` FOREIGN KEY (`angeltype_id`) REFERENCES `AngelTypes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
--
-- Constraints der Tabelle `UserAngelTypes`

21
db/update.sql
View File

@ -1,3 +1,24 @@
/* introduce shift types */
CREATE TABLE IF NOT EXISTS `ShiftTypes` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) NOT NULL,
`angeltype_id` int(11) DEFAULT NULL,
`description` text NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
ALTER TABLE `ShiftTypes` ADD INDEX ( `angeltype_id` );
ALTER TABLE `ShiftTypes` ADD FOREIGN KEY ( `angeltype_id` ) REFERENCES `engelsystem`.`AngelTypes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
INSERT INTO `engelsystem`.`Privileges` (`id`, `name`, `desc`) VALUES (NULL , 'shifttypes', 'Administrate shift types');
INSERT INTO `GroupPrivileges` SET `group_id`=-5, `privilege_id`=(SELECT `id` FROM `Privileges` WHERE `name`='shifttypes');
ALTER TABLE `Shifts` ADD `shifttype_id` INT NOT NULL AFTER `SID`, ADD INDEX ( `shifttype_id` );
UPDATE `Shifts` SET `name`='' WHERE `name` IS NULL;
INSERT INTO `ShiftTypes` SELECT DISTINCT NULL , `name` , NULL , '' FROM `Shifts`;
UPDATE `Shifts` SET `shifttype_id`=(SELECT `id` FROM `ShiftTypes` WHERE `ShiftTypes`.`name`=`Shifts`.`name`);
ALTER TABLE `Shifts` ADD `title` TEXT NULL AFTER `SID`;
ALTER TABLE `Shifts` ADD FOREIGN KEY ( `shifttype_id` ) REFERENCES `engelsystem`.`ShiftTypes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE `Shifts` DROP `name`;
/* cleanup */
ALTER TABLE `User` DROP `ICQ` ;

7
includes/controller/rooms_controller.php Normal file
View File

@ -0,0 +1,7 @@
<?php
function room_link($room) {
return page_link_to('admin_rooms') . '&show=edit&id=' . $room['RID'];
}
?>

100
includes/controller/shifts_controller.php
View File

@ -1,5 +1,96 @@
<?php
function shift_link($shift) {
return page_link_to('shifts') . '&action=view&shift_id=' . $shift['SID'];
}
function shift_delete_link($shift) {
return page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'];
}
function shift_edit_link($shift) {
return page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'];
}
function shift_controller() {
global $user, $privileges;
if (! in_array('user_shifts', $privileges))
redirect(page_link_to('?'));
if (! isset($_REQUEST['shift_id']))
redirect(page_link_to('user_shifts'));
$shift = Shift($_REQUEST['shift_id']);
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)
engelsystem_error('Unable to load shift type.');
$room = Room($shift['RID']);
if ($room === false || $room == null)
engelsystem_error('Unable to load room.');
$angeltypes = AngelTypes();
if ($angeltypes === false)
engelsystem_error('Unable to load angeltypes.');
$user_shifts = Shifts_by_user($user);
if ($user_shifts === false)
engelsystem_error('Unable to load users shifts.');
$signed_up = false;
foreach ($user_shifts as $user_shift)
if ($user_shift['SID'] == $shift['SID']) {
$signed_up = true;
break;
}
return [
$shift['name'],
Shift_view($shift, $shifttype, $room, in_array('admin_shifts', $privileges), $angeltypes, in_array('user_shifts_admin', $privileges), in_array('admin_rooms', $privileges), in_array('shifttypes', $privileges), $user_shifts, $signed_up)
];
}
function shifts_controller() {
if (! isset($_REQUEST['action']))
redirect(page_link_to('user_shifts'));
switch ($_REQUEST['action']) {
default:
redirect(page_link_to('?'));
case 'view':
return shift_controller();
case 'next':
return shift_next_controller();
}
}
/**
* Redirects the user to his next shift.
*/
function shift_next_controller() {
global $user, $privileges;
if (! in_array('user_shifts', $privileges))
redirect(page_link_to('?'));
$upcoming_shifts = ShiftEntries_upcoming_for_user($user);
if ($upcoming_shifts === false)
return false;
if (count($upcoming_shifts) > 0)
redirect(shift_link($upcoming_shifts[0]));
redirect(page_link_to('user_shifts'));
}
/**
* Export all shifts using api-key.
*/
@ -48,7 +139,14 @@ function shifts_json_export_controller() {
require_once realpath(__DIR__ . '/../pages/user_shifts.php');
view_user_shifts();
} else {
$ical_shifts = sql_select("SELECT `Shifts`.*, `Room`.`Name` as `room_name` FROM `ShiftEntry` INNER JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) INNER JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `UID`=" . sql_escape($user['UID']) . " ORDER BY `start`");
$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`");
}
header("Content-Type: application/json; charset=utf-8");

167
includes/controller/shifttypes_controller.php Normal file
View File

@ -0,0 +1,167 @@
<?php
function shifttype_link($shifttype) {
return page_link_to('shifttypes') . '&action=view&shifttype_id=' . $shifttype['id'];
}
/**
* Delete a shifttype.
*/
function shifttype_delete_controller() {
if (! isset($_REQUEST['shifttype_id']))
redirect(page_link_to('shifttypes'));
$shifttype = ShiftType($_REQUEST['shifttype_id']);
if ($shifttype === false)
engelsystem_error('Unable to load shifttype.');
if ($shifttype == null)
redirect(page_link_to('shifttypes'));
if (isset($_REQUEST['confirmed'])) {
$result = ShiftType_delete($shifttype['id']);
if ($result === false)
engelsystem_error('Unable to delete shifttype.');
engelsystem_log('Deleted shifttype ' . $shifttype['name']);
success(sprintf(_('Shifttype %s deleted.'), $shifttype['name']));
redirect(page_link_to('shifttypes'));
}
return array(
sprintf(_("Delete shifttype %s"), $shifttype['name']),
ShiftType_delete_view($shifttype)
);
}
/**
* Edit or create shift type.
*/
function shifttype_edit_controller() {
$shifttype_id = null;
$name = "";
$angeltype_id = null;
$description = "";
$angeltypes = AngelTypes();
if ($angeltypes === false)
engelsystem_error("Unable to load angel types.");
if (isset($_REQUEST['shifttype_id'])) {
$shifttype = ShiftType($_REQUEST['shifttype_id']);
if ($shifttype === false)
engelsystem_error('Unable to load shifttype.');
if ($shifttype == null) {
error(_('Shifttype not found.'));
redirect(page_link_to('shifttypes'));
}
$shifttype_id = $shifttype['id'];
$name = $shifttype['name'];
$angeltype_id = $shifttype['angeltype_id'];
$description = $shifttype['description'];
}
if (isset($_REQUEST['submit'])) {
$ok = true;
if (isset($_REQUEST['name']) && $_REQUEST['name'] != '')
$name = strip_request_item('name');
else {
$ok = false;
error(_('Please enter a name.'));
}
if (isset($_REQUEST['angeltype_id']) && preg_match("/^[0-9]+$/", $_REQUEST['angeltype_id']))
$angeltype_id = $_REQUEST['angeltype_id'];
else
$angeltype_id = null;
if (isset($_REQUEST['description']))
$description = strip_request_item_nl('description');
if ($ok) {
if ($shifttype_id) {
$result = ShiftType_update($shifttype_id, $name, $angeltype_id, $description);
if ($result === false)
engelsystem_error('Unable to update shifttype.');
engelsystem_log('Updated shifttype ' . $name);
success(_('Updated shifttype.'));
} else {
$shifttype_id = ShiftType_create($name, $angeltype_id, $description);
if ($shifttype_id === false)
engelsystem_error('Unable to create shifttype.');
engelsystem_log('Created shifttype ' . $name);
success(_('Created shifttype.'));
}
redirect(page_link_to('shifttypes') . '&action=view&shifttype_id=' . $shifttype_id);
}
}
return [
shifttypes_title(),
ShiftType_edit_view($name, $angeltype_id, $angeltypes, $description, $shifttype_id)
];
}
function shifttype_controller() {
if (! isset($_REQUEST['shifttype_id']))
redirect(page_link_to('shifttypes'));
$shifttype = ShiftType($_REQUEST['shifttype_id']);
if ($shifttype === false)
engelsystem_error('Unable to load shifttype.');
if ($shifttype == null)
redirect(page_link_to('shifttypes'));
$angeltype = null;
if ($shifttype['angeltype_id'] != null) {
$angeltype = AngelType($shifttype['angeltype_id']);
if ($angeltype === false)
engelsystem_error('Unable to load angeltype.');
}
return [
$shifttype['name'],
ShiftType_view($shifttype, $angeltype)
];
}
/**
* List all shift types.
*/
function shifttypes_list_controller() {
$shifttypes = ShiftTypes();
if ($shifttypes === false)
engelsystem_error("Unable to load shifttypes.");
return [
shifttypes_title(),
ShiftTypes_list_view($shifttypes)
];
}
/**
* Text for shift type related links.
*/
function shifttypes_title() {
return _("Shifttypes");
}
/**
* Route shift type actions
*/
function shifttypes_controller() {
if (! isset($_REQUEST['action']))
$_REQUEST['action'] = 'list';
switch ($_REQUEST['action']) {
default:
case 'list':
return shifttypes_list_controller();
case 'view':
return shifttype_controller();
case 'edit':
return shifttype_edit_controller();
case 'delete':
return shifttype_delete_controller();
}
}
?>

1
includes/controller/users_controller.php
View File

@ -37,6 +37,7 @@ function user_controller() {
$shifts = Shifts_by_user($user_source);
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`");
foreach ($shift['needed_angeltypes'] as &$needed_angeltype) {
$needed_angeltype['users'] = sql_select("

11
includes/mailer/shifts_mailer.php
View File

@ -11,7 +11,12 @@ function mail_shift_change($old_shift, $new_shift) {
$message .= "\n";
if ($old_shift["name"] != $new_shift["name"]) {
$message .= sprintf(_("* Shift Name changed from %s to %s"), $old_shift["name"], $new_shift["name"]) . "\n";
$message .= sprintf(_("* Shift type changed from %s to %s"), $old_shift["name"], $new_shift["name"]) . "\n";
$noticable_changes = true;
}
if ($old_shift["title"] != $new_shift["title"]) {
$message .= sprintf(_("* Shift title changed from %s to %s"), $old_shift["title"], $new_shift["title"]) . "\n";
$noticable_changes = true;
}
@ -39,6 +44,7 @@ function mail_shift_change($old_shift, $new_shift) {
$message .= _("The updated Shift:") . "\n";
$message .= $new_shift["name"] . "\n";
$message .= $new_shift["title"] . "\n";
$message .= date("y-m-d H:i", $new_shift["start"]) . " - " . date("H:i", $new_shift["end"]) . "\n";
$message .= $new_room["Name"] . "\n";
@ -54,6 +60,7 @@ function mail_shift_delete($shift) {
$message = _("A Shift you are registered on was deleted:") . "\n";
$message .= $shift["name"] . "\n";
$message .= $new_shift["title"] . "\n";
$message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
$message .= $room["Name"] . "\n";
@ -68,6 +75,7 @@ function mail_shift_assign($user, $shift) {
$message = _("You have been assigned to a Shift:") . "\n";
$message .= $shift["name"] . "\n";
$message .= $shift["title"] . "\n";
$message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
$message .= $room["Name"] . "\n";
@ -81,6 +89,7 @@ function mail_shift_removed($user, $shift) {
$message = _("You have been removed from a Shift:") . "\n";
$message .= $shift["name"] . "\n";
$message .= $shift["title"] . "\n";
$message .= date("y-m-d H:i", $shift["start"]) . " - " . date("H:i", $shift["end"]) . "\n";
$message .= $room["Name"] . "\n";

3
includes/model/ShiftEntry_model.php
View File

@ -76,7 +76,8 @@ function ShiftEntries_upcoming_for_user($user) {
return sql_select("
SELECT *
FROM `ShiftEntry`
JOIN `Shifts` ON `Shifts`.`SID`=`ShiftEntry`.`SID`
JOIN `Shifts` ON (`Shifts`.`SID` = `ShiftEntry`.`SID`)
JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id`
WHERE `ShiftEntry`.`UID`=" . sql_escape($user['UID']) . "
AND `Shifts`.`end` > " . sql_escape(time()) . "
ORDER BY `Shifts`.`end`

66
includes/model/ShiftTypes_model.php Normal file
View File

@ -0,0 +1,66 @@
<?php
/**
* Delete a shift type.
* @param int $shifttype_id
*/
function ShiftType_delete($shifttype_id) {
return sql_query("DELETE FROM `ShiftTypes` WHERE `id`=" . sql_escape($shifttype_id));
}
/**
* Update a shift type.
*
* @param int $shifttype_id
* @param string $name
* @param int $angeltype_id
* @param string $description
*/
function ShiftType_update($shifttype_id, $name, $angeltype_id, $description) {
return sql_query("UPDATE `ShiftTypes` SET
`name`='" . sql_escape($name) . "',
`angeltype_id`=" . sql_null($angeltype_id) . ",
`description`='" . sql_escape($description) . "'
WHERE `id`=" . sql_escape($shifttype_id));
}
/**
* Create a shift type.
*
* @param string $name
* @param int $angeltype_id
* @param string $description
* @return new shifttype id
*/
function ShiftType_create($name, $angeltype_id, $description) {
$result = sql_query("INSERT INTO `ShiftTypes` SET
`name`='" . sql_escape($name) . "',
`angeltype_id`=" . sql_null($angeltype_id) . ",
`description`='" . sql_escape($description) . "'");
if ($result === false)
return false;
return sql_id();
}
/**
* Get a shift type by id.
*
* @param int $shifttype_id
*/
function ShiftType($shifttype_id) {
$shifttype = sql_select("SELECT * FROM `ShiftTypes` WHERE `id`=" . sql_escape($shifttype_id));
if ($shifttype === false)
return false;
if ($shifttype == null)
return null;
return $shifttype[0];
}
/**
* Get all shift types.
*/
function ShiftTypes() {
return sql_select("SELECT * FROM `ShiftTypes` ORDER BY `name`");
}
?>

94
includes/model/Shifts_model.php
View File

@ -1,5 +1,74 @@
<?php
/**
* Check if a shift collides with other shifts (in time).
* @param Shift $shift
* @param array<Shift> $shifts
*/
function Shift_collides($shift, $shifts) {
foreach ($shifts as $other_shift)
if ($shift['SID'] != $other_shift['SID'])
if (! ($shift['start'] >= $other_shift['end'] || $shift['end'] <= $other_shift['start']))
return true;
return false;
}
/**
* Check if an angel can sign up for given shift.
*
* @param Shift $shift
* @param AngelType $angeltype
* @param array<Shift> $user_shifts
*/
function Shift_signup_allowed($shift, $angeltype, $user_angeltype = null, $user_shifts = null) {
global $user, $privileges;
if ($user_shifts == null) {
$user_shifts = Shifts_by_user($user);
if ($user_shifts === false)
engelsystem_error('Unable to load users shifts.');
}
$collides = Shift_collides($shift, $user_shifts);
if ($user_angeltype == null) {
$user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype);
if ($user_angeltype === false)
engelsystem_error('Unable to load user angeltype.');
}
$signed_up = false;
foreach ($user_shifts as $user_shift)
if ($user_shift['SID'] == $shift['SID']) {
$signed_up = true;
break;
}
// is the shift still running or alternatively is the user shift admin?
$user_may_join_shift = true;
// you cannot join if user alread joined a parallel or this shift
$user_may_join_shift &= ! $collides;
// you cannot join if you already singed up for this shift
$user_may_join_shift &= ! $signed_up;
// you cannot join if user is not of this angel type
$user_may_join_shift &= $user_angeltype != null;
// you cannot join if you are not confirmed
if ($angeltype['restricted'] == 1 && $user_angeltype != null)
$user_may_join_shift &= isset($user_angeltype['confirm_user_id']);
// you can only join if the shift is in future
$user_may_join_shift &= time() < $shift['start'];
// User shift admins may join anybody in every shift
$user_may_join_shift |= in_array('user_shifts_admin', $privileges);
return $user_may_join_shift;
}
/**
* Delete a shift by its external id.
*/
@ -20,14 +89,15 @@ function Shift_delete($shift_id) {
* Update a shift.
*/
function Shift_update($shift) {
$old_shift = Shift($shift['SID']);
$shift['name'] = ShiftType($shift['shifttype_id'])['name'];
mail_shift_change(Shift($shift['SID']), $shift);
return sql_query("UPDATE `Shifts` SET
`shifttype_id`=" . sql_escape($shift['shifttype_id']) . ",
`start`=" . sql_escape($shift['start']) . ",
`end`=" . sql_escape($shift['end']) . ",
`RID`=" . sql_escape($shift['RID']) . ",
`name`=" . sql_null($shift['name']) . ",
`title`=" . sql_null($shift['title']) . ",
`URL`=" . sql_null($shift['URL']) . ",
`PSID`=" . sql_null($shift['PSID']) . "
WHERE `SID`=" . sql_escape($shift['SID']));
@ -42,7 +112,7 @@ function Shift_update_by_psid($shift) {
return false;
if (count($shift_source) == 0)
return null;
$shift['SID'] = $shift_source['SID'];
$shift['SID'] = $shift_source[0]['SID'];
return Shift_update($shift);
}
@ -53,10 +123,11 @@ function Shift_update_by_psid($shift) {
*/
function Shift_create($shift) {
$result = sql_query("INSERT INTO `Shifts` SET
`shifttype_id`=" . sql_escape($shift['shifttype_id']) . ",
`start`=" . sql_escape($shift['start']) . ",
`end`=" . sql_escape($shift['end']) . ",
`RID`=" . sql_escape($shift['RID']) . ",
`name`=" . sql_null($shift['name']) . ",
`title`=" . sql_null($shift['title']) . ",
`URL`=" . sql_null($shift['URL']) . ",
`PSID`=" . sql_null($shift['PSID']));
if ($result === false)
@ -69,9 +140,10 @@ function Shift_create($shift) {
*/
function Shifts_by_user($user) {
return sql_select("
SELECT *
SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`, `ShiftEntry`.*, `Shifts`.*, `Room`.*
FROM `ShiftEntry`
JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`)
JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`)
WHERE `UID`=" . sql_escape($user['UID']) . "
ORDER BY `start`
@ -130,8 +202,12 @@ function Shifts_filtered() {
* ID
*/
function Shift($id) {
$shifts_source = sql_select("SELECT * FROM `Shifts` WHERE `SID`=" . sql_escape($id) . " LIMIT 1");
$shiftsEntry_source = sql_select("SELECT `TID` , `UID` , `freeloaded` FROM `ShiftEntry` WHERE `SID`=" . sql_escape($id));
$shifts_source = sql_select("
SELECT `Shifts`.*, `ShiftTypes`.`name`
FROM `Shifts`
JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
WHERE `SID`=" . sql_escape($id));
$shiftsEntry_source = sql_select("SELECT `id`, `TID` , `UID` , `freeloaded` FROM `ShiftEntry` WHERE `SID`=" . sql_escape($id));
if ($shifts_source === false)
return false;
@ -139,6 +215,7 @@ function Shift($id) {
$result = $shifts_source[0];
$result['ShiftEntry'] = $shiftsEntry_source;
$result['NeedAngels'] = [];
$temp = NeededAngelTypes_by_shift($id);
foreach ($temp as $e) {
@ -160,8 +237,9 @@ function Shift($id) {
*/
function Shifts() {
$shifts_source = sql_select("
SELECT `Shifts`.*, `Room`.`RID`, `Room`.`Name` as `room_name`
SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.`RID`, `Room`.`Name` as `room_name`
FROM `Shifts`
JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
JOIN `Room` ON `Room`.`RID` = `Shifts`.`RID`
");
if ($shifts_source === false)

17
includes/pages/admin_active.php
View File

@ -32,7 +32,14 @@ function admin_active() {
$limit = " LIMIT " . $count;
if (isset($_REQUEST['ack'])) {
sql_query("UPDATE `User` SET `Aktiv` = 0 WHERE `Tshirt` = 0");
$users = sql_select("SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 AND `User`.`force_active`=0 GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC" . $limit);
$users = sql_select("
SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length`
FROM `User`
LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID`
LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID`
WHERE `User`.`Gekommen` = 1 AND `User`.`force_active`=0
GROUP BY `User`.`UID`
ORDER BY `force_active` DESC, `shift_length` DESC" . $limit);
$user_nicks = array();
foreach ($users as $usr) {
sql_query("UPDATE `User` SET `Aktiv` = 1 WHERE `UID`=" . sql_escape($usr['UID']));
@ -85,7 +92,13 @@ function admin_active() {
$msg = error(_("Angel not found."), true);
}
$users = sql_select("SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC" . $limit);
$users = sql_select("
SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length`
FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID`
LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID`
WHERE `User`.`Gekommen` = 1
GROUP BY `User`.`UID`
ORDER BY `force_active` DESC, `shift_length` DESC" . $limit);
$matched_users = array();
if ($search == "")

10
includes/pages/admin_free.php
View File

@ -27,7 +27,15 @@ function admin_free() {
foreach ($angel_types_source as $angel_type)
$angel_types[$angel_type['id']] = $angel_type['name'];
$users = sql_select("SELECT `User`.* FROM `User` ${angeltypesearch} LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID` AND `Shifts`.`start` < " . sql_escape(time()) . " AND `Shifts`.`end` > " . sql_escape(time()) . ") WHERE `User`.`Gekommen` = 1 AND `Shifts`.`SID` IS NULL GROUP BY `User`.`UID` ORDER BY `Nick`");
$users = sql_select("
SELECT `User`.*
FROM `User`
${angeltypesearch}
LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID`
LEFT JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID` AND `Shifts`.`start` < " . sql_escape(time()) . " AND `Shifts`.`end` > " . sql_escape(time()) . ")
WHERE `User`.`Gekommen` = 1 AND `Shifts`.`SID` IS NULL
GROUP BY `User`.`UID`
ORDER BY `Nick`");
$free_users_table = array();
if ($search == "")

156
includes/pages/admin_import.php
View File

@ -10,104 +10,156 @@ function admin_import() {
$html = "";
$step = "input";
if (isset($_REQUEST['step']))
if (isset($_REQUEST['step']) && in_array($step, [
'input',
'check',
'import'
]))
$step = $_REQUEST['step'];
$html .= '<p>';
$html .= $step == "input" ? '<b>1. Input</b>' : '1. Input';
$html .= ' &raquo; ';
$html .= $step == "check" ? '<b>2. Validate</b>' : '2. Validate';
$html .= ' &raquo; ';
$html .= $step == "import" ? '<b>3. Import</b>' : '3. Import';
$html .= '</p>';
$import_file = '../import/import_' . $user['UID'] . '.xml';
switch ($step) {
case "input":
$ok = false;
if ($test_handle = fopen('../import/tmp', 'w')) {
fclose($test_handle);
unlink('../import/tmp');
} else {
error("Webserver has no write-permission on import directory.");
error(_('Webserver has no write-permission on import directory.'));
}
$import_file = '../import/import_' . $user['UID'] . '.xml';
$shifttype_id = null;
$shifttypes_source = ShiftTypes();
if ($shifttypes_source === false)
engelsystem_error('Unable to load shifttypes.');
$shifttypes = [];
foreach ($shifttypes_source as $shifttype)
$shifttypes[$shifttype['id']] = $shifttype['name'];
switch ($step) {
case 'input':
$ok = false;
if (isset($_REQUEST['submit'])) {
$ok = true;
if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']]))
$shifttype_id = $_REQUEST['shifttype_id'];
else {
$ok = false;
error(_('Please select a shift type.'));
}
if (isset($_FILES['xcal_file']) && ($_FILES['xcal_file']['error'] == 0)) {
if (move_uploaded_file($_FILES['xcal_file']['tmp_name'], $import_file)) {
libxml_use_internal_errors(true);
if (simplexml_load_file($import_file) === false) {
$ok = false;
error("No valid xml/xcal file provided.");
error(_('No valid xml/xcal file provided.'));
unlink($import_file);
}
} else {
$ok = false;
error("File upload went wrong.");
error(_('File upload went wrong.'));
}
} else {
$ok = false;
error("Please provide some data.");
error(_('Please provide some data.'));
}
}
if ($ok)
redirect(page_link_to('admin_import') . "&step=check");
else {
$html .= form(array(
if ($ok) {
redirect(page_link_to('admin_import') . "&step=check&shifttype_id=" . $shifttype_id);
} else {
$html .= div('well well-sm text-center', [
_('File Upload') . mute(glyph('arrow-right')) . mute(_('Validation')) . mute(glyph('arrow-right')) . mute(_('Import'))
]) . div('row', [
div('col-md-offset-3 col-md-6', [
form(array(
form_info('', _("This import will create/update/delete rooms and shifts by given FRAB-export file. The needed file format is xcal.")),
form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id),
form_file('xcal_file', _("xcal-File (.xcal)")),
form_submit('submit', _("Import"))
));
))
])
]);
}
break;
case "check":
if (! file_exists($import_file))
case 'check':
if (! file_exists($import_file)) {
error(_('Missing import file.'));
redirect(page_link_to('admin_import'));
}
if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']]))
$shifttype_id = $_REQUEST['shifttype_id'];
else {
error(_('Please select a shift type.'));
redirect(page_link_to('admin_import'));
}
list($rooms_new, $rooms_deleted) = prepare_rooms($import_file);
list($events_new, $events_updated, $events_deleted) = prepare_events($import_file);
list($events_new, $events_updated, $events_deleted) = prepare_events($import_file, $shifttype_id);
$html .= form(array(
$html .= div('well well-sm text-center', [
'<span class="text-success">' . _('File Upload') . glyph('ok-circle') . '</span>' . mute(glyph('arrow-right')) . _('Validation') . mute(glyph('arrow-right')) . mute(_('Import'))
]) . form([
div('row', [
div('col-sm-6', [
'<h3>' . _("Rooms to create") . '</h3>',
table(_("Name"), $rooms_new),
table(_("Name"), $rooms_new)
]),
div('col-sm-6', [
'<h3>' . _("Rooms to delete") . '</h3>',
table(_("Name"), $rooms_deleted),
table(_("Name"), $rooms_deleted)
])
]),
'<h3>' . _("Shifts to create") . '</h3>',
table(array(
'day' => _("Day"),
'start' => _("Start"),
'end' => _("End"),
'name' => _("Name"),
'shifttype' => _('Shift type'),
'title' => _("Title"),
'room' => _("Room")
), shifts_printable($events_new)),
), shifts_printable($events_new, $shifttypes)),
'<h3>' . _("Shifts to update") . '</h3>',
table(array(
'day' => _("Day"),
'start' => _("Start"),
'end' => _("End"),
'name' => _("Name"),
'shifttype' => _('Shift type'),
'title' => _("Title"),
'room' => _("Room")
), shifts_printable($events_updated)),
), shifts_printable($events_updated, $shifttypes)),
'<h3>' . _("Shifts to delete") . '</h3>',
table(array(
'day' => _("Day"),
'start' => _("Start"),
'end' => _("End"),
'name' => _("Name"),
'shifttype' => _('Shift type'),
'title' => _("Title"),
'room' => _("Room")
), shifts_printable($events_deleted)),
), shifts_printable($events_deleted, $shifttypes)),
form_submit('submit', _("Import"))
), page_link_to('admin_import') . '&step=import');
], page_link_to('admin_import') . '&step=import&shifttype_id=' . $shifttype_id);
break;
case "import":
case 'import':
if (! file_exists($import_file)) {
error(_('Missing import file.'));
redirect(page_link_to('admin_import'));
}
if (! file_exists($import_file))
redirect(page_link_to('admin_import'));
if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']]))
$shifttype_id = $_REQUEST['shifttype_id'];
else {
error(_('Please select a shift type.'));
redirect(page_link_to('admin_import'));
}
list($rooms_new, $rooms_deleted) = prepare_rooms($import_file);
foreach ($rooms_new as $room) {
sql_query("INSERT INTO `Room` SET `Name`='" . sql_escape($room) . "', `FromPentabarf`='Y', `Show`='Y'");
@ -116,7 +168,7 @@ function admin_import() {
foreach ($rooms_deleted as $room)
sql_query("DELETE FROM `Room` WHERE `Name`='" . sql_escape($room) . "' LIMIT 1");
list($events_new, $events_updated, $events_deleted) = prepare_events($import_file);
list($events_new, $events_updated, $events_deleted) = prepare_events($import_file, $shifttype_id);
foreach ($events_new as $event) {
$result = Shift_create($event);
if ($result === false)
@ -139,13 +191,18 @@ function admin_import() {
unlink($import_file);
$html .= success(_("It's done!"), true);
$html .= div('well well-sm text-center', [
'<span class="text-success">' . _('File Upload') . glyph('ok-circle') . '</span>' . mute(glyph('arrow-right')) . '<span class="text-success">' . _('Validation') . glyph('ok-circle') . '</span>' . mute(glyph('arrow-right')) . '<span class="text-success">' . _('Import') . glyph('ok-circle') . '</span>'
]) . success(_("It's done!"), true);
break;
default:
redirect(page_link_to('admin_import'));
}
return $html;
return page_with_title(admin_import_title(), [
msg(),
$html
]);
}
function prepare_rooms($file) {
@ -179,7 +236,7 @@ function prepare_rooms($file) {
);
}
function prepare_events($file) {
function prepare_events($file, $shifttype_id) {
global $rooms_import;
$data = read_xml($file);
@ -195,10 +252,11 @@ function prepare_events($file) {
$event_id = trim($event_pb->{
'event-id' });
$shifts_pb[$event_id] = array(
'shifttype_id' => $shifttype_id,
'start' => DateTime::createFromFormat("Ymd\THis", $event->dtstart)->getTimestamp(),
'end' => DateTime::createFromFormat("Ymd\THis", $event->dtend)->getTimestamp(),
'RID' => $rooms_import[trim($event->location)],
'name' => trim($event->summary),
'title' => trim($event->summary),
'URL' => trim($event->url),
'PSID' => $event_id
);
@ -209,14 +267,14 @@ function prepare_events($file) {
foreach ($shifts as $shift)
$shifts_db[$shift['PSID']] = $shift;
$shifts_new = array();
$shifts_updated = array();
$shifts_new = [];
$shifts_updated = [];
foreach ($shifts_pb as $shift)
if (! isset($shifts_db[$shift['PSID']]))
$shifts_new[] = $shift;
else {
$tmp = $shifts_db[$shift['PSID']];
if ($shift['name'] != $tmp['name'] || $shift['start'] != $tmp['start'] || $shift['end'] != $tmp['end'] || $shift['RID'] != $tmp['RID'] || $shift['URL'] != $tmp['URL'])
if ($shift['shifttype_id'] != $tmp['shifttype_id'] || $shift['title'] != $tmp['title'] || $shift['start'] != $tmp['start'] || $shift['end'] != $tmp['end'] || $shift['RID'] != $tmp['RID'] || $shift['URL'] != $tmp['URL'])
$shifts_updated[] = $shift;
}
@ -239,7 +297,7 @@ function read_xml($file) {
return $xml_import;
}
function shifts_printable($shifts) {
function shifts_printable($shifts, $shifttypes) {
global $rooms_import;
$rooms = array_flip($rooms_import);
@ -250,7 +308,11 @@ function shifts_printable($shifts) {
$shifts_printable[] = array(
'day' => date("l, Y-m-d", $shift['start']),
'start' => date("H:i", $shift['start']),
'name' => shorten($shift['name']),
'shifttype' => ShiftType_name_render([
'id' => $shift['shifttype_id'],
'name' => $shifttypes[$shift['shifttype_id']]
]),
'title' => shorten($shift['title']),
'end' => date("H:i", $shift['end']),
'room' => $rooms[$shift['RID']]
);

4
includes/pages/admin_log.php
View File

@ -22,8 +22,8 @@ function admin_log() {
return page_with_title(admin_log_title(), array(
msg(),
form(array(
form_text('keyword', _("Suche"), $filter),
form_submit(_("Suche"), "Go")
form_text('keyword', _("Search"), $filter),
form_submit(_("Search"), "Go")
)),
table(array(
'date' => "Time",

90
includes/pages/admin_shifts.php
View File

@ -6,7 +6,6 @@ function admin_shifts_title() {
// Assistent zum Anlegen mehrerer neuer Schichten
function admin_shifts() {
$msg = "";
$ok = true;
$rid = 0;
@ -16,7 +15,8 @@ function admin_shifts() {
$angelmode = 'manually';
$length = '';
$change_hours = array();
$name = "";
$title = "";
$shifttype_id = null;
// Locations laden (auch unsichtbare - fuer Erzengel ist das ok)
$rooms = sql_select("SELECT * FROM `Room` ORDER BY `Name`");
@ -30,9 +30,31 @@ function admin_shifts() {
foreach ($types as $type)
$needed_angel_types[$type['id']] = 0;
// Load shift types
$shifttypes_source = ShiftTypes();
if ($shifttypes_source === false)
engelsystem_error('Unable to load shift types.');
$shifttypes = [];
foreach ($shifttypes_source as $shifttype)
$shifttypes[$shifttype['id']] = $shifttype['name'];
if (isset($_REQUEST['preview']) || isset($_REQUEST['back'])) {
if (isset($_REQUEST['shifttype_id'])) {
$shifttype = ShiftType($_REQUEST['shifttype_id']);
if ($shifttype === false)
engelsystem_error('Unable to load shift type.');
if ($shifttype == null) {
$ok = false;
error(_('Please select a shift type.'));
} else
$shifttype_id = $_REQUEST['shifttype_id'];
} else {
$ok = false;
error(_('Please select a shift type.'));
}
// Name/Bezeichnung der Schicht, darf leer sein
$name = strip_request_item('name');
$title = strip_request_item('title');
// Auswahl der sichtbaren Locations für die Schichten
if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']]))
@ -40,26 +62,26 @@ function admin_shifts() {
else {
$ok = false;
$rid = $rooms[0]['RID'];
$msg .= error("Wähle bitte einen Raum aus.", true);
error(_('Please select a location.'));
}
if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start'])))
$start = $tmp->getTimestamp();
else {
$ok = false;
$msg .= error("Bitte gib einen Startzeitpunkt für die Schichten an.", true);
error(_('Please select a start time.'));
}
if (isset($_REQUEST['end']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['end'])))
$end = $tmp->getTimestamp();
else {
$ok = false;
$msg .= error("Bitte gib einen Endzeitpunkt für die Schichten an.", true);
error(_('Please select an end time.'));
}
if ($start >= $end) {
$ok = false;
$msg .= error("Das Ende muss nach dem Startzeitpunkt liegen!", true);
error(_('The shifts end has to be after its start.'));
}
if (isset($_REQUEST['mode'])) {
@ -71,7 +93,7 @@ function admin_shifts() {
$length = trim($_REQUEST['length']);
} else {
$ok = false;
$msg .= error("Bitte gib eine Schichtlänge in Minuten an.", true);
error(_('Please enter a shift duration in minutes.'));
}
} elseif ($_REQUEST['mode'] == 'variable') {
if (isset($_REQUEST['change_hours']) && preg_match("/^([0-9]{2}(,|$))/", trim(str_replace(" ", "", $_REQUEST['change_hours'])))) {
@ -79,12 +101,12 @@ function admin_shifts() {
$change_hours = array_map('trim', explode(",", $_REQUEST['change_hours']));
} else {
$ok = false;
$msg .= error("Bitte gib die Schichtwechsel-Stunden kommagetrennt ein.", true);
error(_('Please split the shift-change hours by colons.'));
}
}
} else {
$ok = false;
$msg .= error("Bitte wähle einen Modus.", true);
error(_('Please select a mode.'));
}
if (isset($_REQUEST['angelmode'])) {
@ -97,20 +119,20 @@ function admin_shifts() {
$needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]);
} else {
$ok = false;
$msg .= error("Bitte überprüfe die Eingaben für die benötigten Engel des Typs " . $type['name'] . ".", true);
error(sprintf(_('Please check the needed angels for team %s.'), $type['name']));
}
}
if (array_sum($needed_angel_types) == 0) {
$ok = false;
$msg .= error("Es werden 0 Engel benötigt. Bitte wähle benötigte Engel.", true);
error(_('There are 0 angels needed. Please enter the amounts of needed angels.'));
}
} else {
$ok = false;
$msg .= error("Bitte Wähle einen Modus für die benötigten Engel.", true);
error(_('Please select a mode for needed angels.'));
}
} else {
$ok = false;
$msg .= error("Bitte wähle benötigte Engel.", true);
error(_('Please select needed angels.'));
}
// Beim Zurück-Knopf das Formular zeigen
@ -131,7 +153,8 @@ function admin_shifts() {
'start' => $start,
'end' => $end,
'RID' => $rid,
'name' => $name
'title' => $title,
'shifttype_id' => $shifttype_id
);
} elseif ($mode == 'multi') {
$shift_start = $start;
@ -147,7 +170,8 @@ function admin_shifts() {
'start' => $shift_start,
'end' => $shift_end,
'RID' => $rid,
'name' => $name
'title' => $title,
'shifttype_id' => $shifttype_id
);
$shift_start = $shift_end;
@ -182,7 +206,8 @@ function admin_shifts() {
'start' => $shift_start,
'end' => $shift_end,
'RID' => $rid,
'name' => $name
'name' => $title,
'shifttype_id' => $shifttype_id
);
$shift_start = $shift_end;
@ -192,14 +217,15 @@ function admin_shifts() {
$shifts_table = array();
foreach ($shifts as $shift) {
$shifts_table_entry = array(
'timeslot' => '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br /><span class="glyphicon glyphicon-map-marker"></span> ' . $room_array[$shift['RID']],
'entries' => $shift['name']
);
foreach ($types as $type) {
$shifts_table_entry = [
'timeslot' => '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br />' . Room_name_render(Room($shift['RID'])),
'title' => ShiftType_name_render(ShiftType($shifttype_id)) . ($shift['title'] ? '<br />' . $shift['title'] : ''),
'needed_angels' => ''
];
foreach ($types as $type)
if (isset($needed_angel_types[$type['id']]) && $needed_angel_types[$type['id']] > 0)
$shifts_table_entry['entries'] .= '<br /><span class="icon-icon_angel"></span> <b>' . $type['name'] . ':</b> ' . $needed_angel_types[$type['id']] . ' missing';
}
$shifts_table_entry['needed_angels'] .= '<b>' . AngelType_name_render($type) . ':</b> ' . $needed_angel_types[$type['id']] . '<br />';
$shifts_table[] = $shifts_table_entry;
}
@ -213,7 +239,8 @@ function admin_shifts() {
return page_with_title(_("Preview"), array(
form(array(
$hidden_types,
form_hidden('name', $name),
form_hidden('shifttype_id', $shifttype_id),
form_hidden('title', $title),
form_hidden('rid', $rid),
form_hidden('start', date("Y-m-d H:i", $start)),
form_hidden('end', date("Y-m-d H:i", $end)),
@ -223,8 +250,9 @@ function admin_shifts() {
form_hidden('angelmode', $angelmode),
form_submit('back', _("back")),
table(array(
'timeslot' => _("Timeslot"),
'entries' => _("Entries")
'timeslot' => _('Time and location'),
'title' => _('Type and title'),
'needed_angels' => _('Needed angels')
), $shifts_table),
form_submit('submit', _("Save"))
))
@ -253,7 +281,8 @@ function admin_shifts() {
}
engelsystem_log("Shift needs following angel types: " . join(", ", $needed_angel_types_info));
$msg = success("Schichten angelegt.", true);
success("Schichten angelegt.");
redirect(page_link_to('admin_shifts'));
} else {
unset($_SESSION['admin_shifts_shifts']);
unset($_SESSION['admin_shifts_types']);
@ -268,10 +297,9 @@ function admin_shifts() {
return page_with_title(admin_shifts_title(), array(
msg(),
$msg,
form(array(
form_text('name', _("Name"), $name),
// TODO: form_textarea('description', _("Description"), ''),
form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id),
form_text('title', _("Title"), $title),
form_select('rid', _("Room"), $room_array, $_REQUEST['rid']),
'<div class="row">',
'<div class="col-md-6">',

4
includes/pages/guest_login.php
View File

@ -293,9 +293,9 @@ function guest_login() {
form_text('nick', _("Nick"), $nick),
form_password('password', _("Password")),
form_submit('submit', _("Login")),
form_info("", buttons(array(
buttons(array(
button(page_link_to('user_password_recovery'), _("I forgot my password"))
))),
)),
info(_("Please note: You have to activate cookies!"), true)
)),
'</div>',

9
includes/pages/user_ical.php
View File

@ -22,7 +22,14 @@ function user_ical() {
require_once realpath(__DIR__ . '/user_shifts.php');
view_user_shifts();
} else {
$ical_shifts = sql_select("SELECT `Shifts`.*, `Room`.`Name` as `room_name` FROM `ShiftEntry` INNER JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) INNER JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `UID`=" . sql_escape($user['UID']) . " ORDER BY `start`");
$ical_shifts = sql_select("
SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.`Name` as `room_name`
FROM `ShiftEntry`
INNER JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`)
JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
INNER JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`)
WHERE `UID`=" . sql_escape($user['UID']) . "
ORDER BY `start`");
}
header("Content-Type: text/calendar; charset=utf-8");

8
includes/pages/user_myshifts.php
View File

@ -35,12 +35,14 @@ function user_myshifts() {
`ShiftEntry`.`freeload_comment`,
`ShiftEntry`.`Comment`,
`ShiftEntry`.`UID`,
`ShiftTypes`.`name`,
`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 `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`)
WHERE `ShiftEntry`.`id`=" . sql_escape($id) . "
AND `UID`=" . sql_escape($shifts_user['UID']) . " LIMIT 1");
@ -76,7 +78,11 @@ function user_myshifts() {
redirect(page_link_to('user_myshifts'));
} elseif (isset($_REQUEST['cancel']) && preg_match("/^[0-9]*$/", $_REQUEST['cancel'])) {
$id = $_REQUEST['cancel'];
$shift = sql_select("SELECT `Shifts`.`start` FROM `Shifts` INNER JOIN `ShiftEntry` USING (`SID`) WHERE `ShiftEntry`.`id`=" . sql_escape($id) . " AND `UID`=" . sql_escape($shifts_user['UID']) . " LIMIT 1");
$shift = sql_select("
SELECT `Shifts`.`start`
FROM `Shifts`
INNER JOIN `ShiftEntry` USING (`SID`)
WHERE `ShiftEntry`.`id`=" . sql_escape($id) . " AND `UID`=" . sql_escape($shifts_user['UID']));
if (count($shift) > 0) {
$shift = $shift[0];
if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) {

101
includes/pages/user_shifts.php
View File

@ -10,6 +10,12 @@ function user_shifts() {
if (User_is_freeloader($user))
redirect(page_link_to('user_myshifts'));
// Locations laden
$rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
$room_array = array();
foreach ($rooms as $room)
$room_array[$room['RID']] = $room['Name'];
// Löschen einzelner Schicht-Einträge (Also Belegung einer Schicht von Engeln) durch Admins
if (isset($_REQUEST['entry_id']) && in_array('user_shifts_admin', $privileges)) {
if (isset($_REQUEST['entry_id']) && test_request_int('entry_id'))
@ -17,7 +23,15 @@ function user_shifts() {
else
redirect(page_link_to('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");
$shift_entry_source = sql_select("
SELECT `User`.`Nick`, `ShiftEntry`.`Comment`, `ShiftEntry`.`UID`, `ShiftTypes`.`name`, `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 `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`)
WHERE `ShiftEntry`.`id`=" . sql_escape($entry_id));
if (count($shift_entry_source) > 0) {
$shift_entry_source = $shift_entry_source[0];
@ -40,21 +54,15 @@ function user_shifts() {
else
redirect(page_link_to('user_shifts'));
/*
* if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1") > 0) { error("Du kannst nur Schichten bearbeiten, bei denen niemand eingetragen ist."); redirect(page_link_to('user_shift')); }
*/
$shift = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1");
$shift = sql_select("
SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.* FROM `Shifts`
JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`)
JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
WHERE `SID`=" . sql_escape($shift_id));
if (count($shift) == 0)
redirect(page_link_to('user_shifts'));
$shift = $shift[0];
// Locations laden
$rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
$room_array = array();
foreach ($rooms as $room)
$room_array[$room['RID']] = $room['Name'];
// Engeltypen laden
$types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
$angel_types = array();
@ -141,7 +149,7 @@ function user_shifts() {
engelsystem_log("Updated shift '" . $name . "' from " . date("y-m-d H:i", $start) . " to " . date("y-m-d H:i", $end) . " with angel types " . join(", ", $needed_angel_types_info));
success(_("Shift updated."));
redirect(page_link_to('user_shifts'));
redirect(shift_link($shift_id));
}
}
@ -171,10 +179,11 @@ function user_shifts() {
else
redirect(page_link_to('user_shifts'));
$shift = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1");
if (count($shift) == 0)
$shift = Shift($shift_id);
if ($shift === false)
engelsystem_error('Unable to load shift.');
if ($shift == null)
redirect(page_link_to('user_shifts'));
$shift = $shift[0];
// Schicht löschen bestätigt
if (isset($_REQUEST['delete'])) {
@ -197,10 +206,13 @@ function user_shifts() {
else
redirect(page_link_to('user_shifts'));
$shift = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1");
if (count($shift) == 0)
$shift = Shift($shift_id);
$room;
$shift['Name'] = $room_array[$shift['RID']];
if ($shift === false)
engelsystem_error('Unable to load shift.');
if ($shift == null)
redirect(page_link_to('user_shifts'));
$shift = $shift[0];
if (isset($_REQUEST['type_id']) && preg_match("/^[0-9]*$/", $_REQUEST['type_id']))
$type_id = $_REQUEST['type_id'];
@ -210,13 +222,17 @@ function user_shifts() {
// Schicht läuft schon, Eintragen für Engel nicht mehr möglich
if (! in_array('user_shifts_admin', $privileges) && time() > $shift['start']) {
error(_("This shift is running now or ended already. Please contact a dispatcher to join the shift."));
redirect(page_link_to('user_shifts'));
redirect(shift_link($shift));
}
// Another shift the user is signed up for collides with this one
if (! in_array('user_shifts_admin', $privileges) && sql_num_query("SELECT `Shifts`.`SID` FROM `Shifts` INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = " . sql_escape($user['UID']) . ") WHERE `start` < '" . sql_escape($shift['end']) . "' AND `end` > '" . sql_escape($shift['start']) . "'") > 0) {
if (! in_array('user_shifts_admin', $privileges) && sql_num_query("
SELECT `Shifts`.`SID`
FROM `Shifts`
INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = " . sql_escape($user['UID']) . ")
WHERE `start` < '" . sql_escape($shift['end']) . "' AND `end` > '" . sql_escape($shift['start']) . "'") > 0) {
error(_("You already subscribed to shift in the same timeslot. Please contact a dispatcher to join the shift."));
redirect(page_link_to('user_shifts'));
redirect(shift_link($shift));
}
if (in_array('user_shifts_admin', $privileges))
@ -272,7 +288,7 @@ function user_shifts() {
$user_source = User($user_id);
engelsystem_log("User " . User_Nick_render($user_source) . " signed up for shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end']));
success(_("You are subscribed. Thank you!") . ' <a href="' . page_link_to('user_myshifts') . '">' . _("My shifts") . ' &raquo;</a>');
redirect(page_link_to('user_shifts'));
redirect(shift_link($shift));
}
if (in_array('user_shifts_admin', $privileges)) {
@ -304,7 +320,10 @@ function view_user_shifts() {
global $ical_shifts;
$ical_shifts = array();
$days = sql_select_single_col("SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name` FROM `Shifts` ORDER BY `start`");
$days = sql_select_single_col("
SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name`
FROM `Shifts`
ORDER BY `start`");
if (count($days) == 0) {
error(_("The administration has not configured any shifts yet."));
@ -409,9 +428,10 @@ function view_user_shifts() {
0
);
$SQL = "SELECT DISTINCT `Shifts`.*, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs'
$SQL = "SELECT DISTINCT `Shifts`.*, `ShiftTypes`.`name`, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs'
FROM `Shifts`
INNER JOIN `Room` USING (`RID`)
INNER JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
LEFT JOIN (SELECT COUNT(*) AS special_needs , nat3.`shift_id` FROM `NeededAngelTypes` AS nat3 WHERE `shift_id` IS NOT NULL GROUP BY nat3.`shift_id`) AS nat2 ON nat2.`shift_id` = `Shifts`.`SID`
INNER JOIN `NeededAngelTypes` AS nat ON nat.`count` != 0 AND nat.`angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") AND ((nat2.`special_needs` > 0 AND nat.`shift_id` = `Shifts`.`SID`) OR ((nat2.`special_needs` = 0 OR nat2.`special_needs` IS NULL) AND nat.`room_id` = `RID`))
LEFT JOIN (SELECT se.`SID`, se.`TID`, COUNT(*) as count FROM `ShiftEntry` AS se GROUP BY se.`SID`, se.`TID`) AS entries ON entries.`SID` = `Shifts`.`SID` AND entries.`TID` = nat.`angel_type_id`
@ -428,8 +448,14 @@ function view_user_shifts() {
}
$SQL .= "
ORDER BY `start`";
$shifts = sql_select($SQL);
$ownshifts_source = sql_select("SELECT `Shifts`.* FROM `Shifts` INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = '" . sql_escape($user['UID']) . "')
$ownshifts_source = sql_select("
SELECT `ShiftTypes`.`name`, `Shifts`.*
FROM `Shifts`
INNER JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = '" . sql_escape($user['UID']) . "')
WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ")
AND `start` BETWEEN " . $starttime . " AND " . $endtime);
$ownshifts = array();
@ -490,8 +516,7 @@ function view_user_shifts() {
if ($thistime % (24 * 60 * 60) == 23 * 60 * 60 && $endtime - $starttime > 24 * 60 * 60) {
$shifts_table .= "<tr class=\"row-day\"><th class=\"row-header\">";
$shifts_table .= date('y-m-d<b\r />H:i', $thistime);
}
elseif ($thistime % (60 * 60) == 0) {
} elseif ($thistime % (60 * 60) == 0) {
$shifts_table .= "<tr class=\"row-hour\"><th>";
$shifts_table .= date("H:i", $thistime);
} else {
@ -510,10 +535,7 @@ function view_user_shifts() {
$collides = in_array($shift['SID'], array_keys($ownshifts));
if (! $collides)
foreach ($ownshifts as $ownshift) {
if ($ownshift['start'] >= $shift['start'] && $ownshift['start'] < $shift['end'] ||
$ownshift['end'] > $shift['start'] && $ownshift['end'] <= $shift['end'] ||
$ownshift['start'] < $shift['start'] && $ownshift['end'] > $shift['end'])
{
if ($ownshift['start'] >= $shift['start'] && $ownshift['start'] < $shift['end'] || $ownshift['end'] > $shift['start'] && $ownshift['end'] <= $shift['end'] || $ownshift['start'] < $shift['start'] && $ownshift['end'] > $shift['end']) {
$collides = true;
break;
}
@ -521,14 +543,16 @@ function view_user_shifts() {
// qqqqqq
$is_free = false;
$shifts_row = date('d.m. H:i', $shift['start']);
$shifts_row = '<a href="' . shift_link($shift) . '">' . date('d.m. H:i', $shift['start']);
$shifts_row .= " &ndash; ";
$shifts_row .= date('H:i', $shift['end']);
$shifts_row .= "<br /><b>";
$shifts_row .= $shift['name'];
$shifts_row .= ShiftType($shift['shifttype_id'])['name'];
$shifts_row .= "</b><br />";
$shifts_row .= $room["name"];
if ($shift['title'] != '') {
$shifts_row .= $shift['title'];
$shifts_row .= "<br />";
}
if (in_array('admin_shifts', $privileges))
$shifts_row .= ' ' . table_buttons(array(
button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'),
@ -650,11 +674,14 @@ function view_user_shifts() {
$info[] = date("Y-m-d", $shift['start']);
$info[] = date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']);
if (count($_SESSION['user_shifts']['rooms']) > 1)
$info[] = $shift['room_name'];
$info[] = Room_name_render([
'Name' => $shift['room_name'],
'RID' => $shift['RID']
]);
$shift_row = array(
'info' => join('<br />', $info),
'entries' => $shift['name']
'entries' => '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>' . ($shift['title'] ? '<br />' . $shift['title'] : '')
);
if (in_array('admin_shifts', $privileges))

5
includes/sys_menu.php
View File

@ -14,12 +14,12 @@ function page_link_to_absolute($page) {
* Renders the header toolbar containing search, login/logout, user and settings links.
*/
function header_toolbar() {
global $p, $privileges, $user, $enable_tshirt_size;
global $p, $privileges, $user, $enable_tshirt_size, $max_freeloadable_shifts;
$toolbar_items = array();
if (isset($user))
$toolbar_items[] = toolbar_item_link(page_link_to('users') . '&amp;action=view', 'time', User_shift_state_render($user));
$toolbar_items[] = toolbar_item_link(page_link_to('shifts') . '&amp;action=next', 'time', User_shift_state_render($user));
if (! isset($user) && in_array('register', $privileges))
$toolbar_items[] = toolbar_item_link(page_link_to('register'), 'plus', register_title(), $p == 'register');
@ -113,6 +113,7 @@ function make_navigation() {
"admin_user" => admin_user_title(),
"admin_free" => admin_free_title(),
"admin_questions" => admin_questions_title(),
"shifttypes" => shifttypes_title(),
"admin_shifts" => admin_shifts_title(),
"admin_rooms" => admin_rooms_title(),
"admin_groups" => admin_groups_title(),

17
includes/sys_template.php
View File

@ -9,6 +9,19 @@ $themes = array(
"2" => "Engelsystem 31c3"
);
/**
* Display muted (grey) text.
*
* @param string $text
*/
function mute($text) {
return '<span class="text-muted">' . $text . '</span>';
}
function progress_bar($valuemin, $valuemax, $valuenow, $class = '', $content = '') {
return '<div class="progress"><div class="progress-bar ' . $class . '" role="progressbar" aria-valuenow="' . $valuenow . '" aria-valuemin="' . $valuemin . '" aria-valuemax="' . $valuemax . '" style="width: ' . (($valuenow - $valuemin) * 100 / ($valuemax - $valuemin)) . '%">' . $content . '</div></div>';
}
/**
* Render glyphicon
*
@ -74,7 +87,7 @@ function toolbar_popover($glyphicon, $label, $content, $class = '') {
return '<li class="dropdown messages ' . $class . '">
<a id="' . $id . '" href="#" tabindex="0">' . ($glyphicon != '' ? '<span class="glyphicon glyphicon-' . $glyphicon . '"></span> ' : '') . $label . ' <span class="caret"></span></a>
<script type="text/javascript">
$(document).ready(function(){$("#' . $id . '").popover({trigger: "focus", html: true, content: "' . addslashes(join('', $content)) . '", placement: "bottom", container: "body"})});
$(document).ready(function(){$("#' . $id . '").popover({trigger: "click focus", html: true, content: "' . addslashes(join('', $content)) . '", placement: "bottom", container: "#navbar-collapse-1"})});
</script></li>';
}
@ -191,7 +204,7 @@ function form_radio($name, $label, $selected, $value) {
*/
function form_info($label, $text = "") {
if ($label == "")
return '<span class="help-block">' . $text . '</span>';
return '<span class="help-block">' . glyph('info-sign') . $text . '</span>';
if ($text == "")
return '<h4>' . $label . '</h4>';
return form_element($label, '<p class="form-control-static">' . $text . '</p>', '');

10
includes/view/AngelTypes_view.php
View File

@ -1,8 +1,18 @@
<?php
/**
* AngelTypes
*/
/**
* Renders the angeltypes name as link.
*
* @param AngelType $angeltype
*/
function AngelType_name_render($angeltype) {
return '<a href="' . page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'] . '">' . ($angeltype['restricted'] ? glyph('lock') : '') . $angeltype['name'] . '</a>';
}
/**
* Render angeltype membership state
*

10
includes/view/Rooms_view.php Normal file
View File

@ -0,0 +1,10 @@
<?php
function Room_name_render($room) {
global $privileges;
if (in_array('admin_rooms', $privileges))
return '<a href="' . room_link($room) . '">' . glyph('map-marker') . $room['Name'] . '</a>';
return $room['Name'];
}
?>

80
includes/view/ShiftTypes_view.php Normal file
View File

@ -0,0 +1,80 @@
<?php
function ShiftType_name_render($shifttype) {
global $privileges;
if (in_array('shifttypes', $privileges))
return '<a href="' . shifttype_link($shifttype) . '">' . $shifttype['name'] . '</a>';
return $shifttype['name'];
}
function ShiftType_delete_view($shifttype) {
return page_with_title(sprintf(_("Delete shifttype %s"), $shifttype['name']), array(
info(sprintf(_("Do you want to delete shifttype %s?"), $shifttype['name']), true),
buttons(array(
button(page_link_to('shifttypes'), _("cancel"), 'cancel'),
button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttype['id'] . '&confirmed', _("delete"), 'ok')
))
));
}
function ShiftType_edit_view($name, $angeltype_id, $angeltypes, $description, $shifttype_id) {
$angeltypes_select = [
'' => _('All')
];
foreach ($angeltypes as $angeltype)
$angeltypes_select[$angeltype['id']] = $angeltype['name'];
return page_with_title($shifttype_id ? _('Edit shifttype') : _('Create shifttype'), [
msg(),
buttons([
button(page_link_to('shifttypes'), shifttypes_title(), 'back')
]),
form([
form_text('name', _('Name'), $name),
form_select('angeltype_id', _('Angeltype'), $angeltypes_select, $angeltype_id),
form_textarea('description', _('Description'), $description),
form_info('', _('Please use markdown for the description.')),
form_submit('submit', _('Save'))
])
]);
}
function ShiftType_view($shifttype, $angeltype) {
$parsedown = new Parsedown();
$title = $shifttype['name'];
if ($angeltype)
$title .= ' <small>' . sprintf(_('for team %s'), $angeltype['name']) . '</small>';
return page_with_title($title, [
msg(),
buttons([
button(page_link_to('shifttypes'), shifttypes_title(), 'back'),
$angeltype ? button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], $angeltype['name']) : '',
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')
]),
$parsedown->parse($shifttype['description'])
]);
}
function ShiftTypes_list_view($shifttypes) {
foreach ($shifttypes as &$shifttype) {
$shifttype['name'] = '<a href="' . page_link_to('shifttypes') . '&action=view&shifttype_id=' . $shifttype['id'] . '">' . $shifttype['name'] . '</a>';
$shifttype['actions'] = table_buttons([
button(page_link_to('shifttypes') . '&action=edit&shifttype_id=' . $shifttype['id'], _('edit'), 'btn-xs'),
button(page_link_to('shifttypes') . '&action=delete&shifttype_id=' . $shifttype['id'], _('delete'), 'btn-xs')
]);
}
return page_with_title(shifttypes_title(), [
msg(),
buttons([
button(page_link_to('shifttypes') . '&action=edit', _('New shifttype'), 'add')
]),
table([
'name' => _('Name'),
'actions' => ''
], $shifttypes)
]);
}
?>

110
includes/view/Shifts_view.php
View File

@ -1,6 +1,116 @@
<?php
function Shift_signup_button_render($shift, $angeltype, $user_angeltype = null, $user_shifts = null) {
global $user;
if ($user_angeltype == null) {
$user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype);
if ($user_angeltype === false)
engelsystem_error('Unable to load user angeltype.');
}
if (Shift_signup_allowed($shift, $angeltype, $user_angeltype, $user_shifts))
return button(page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'], _('Sign up'));
elseif ($user_angeltype == null)
return button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], sprintf('Become %s', $angeltype['name']));
else
return '';
}
function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source, $user_shift_admin, $admin_rooms, $admin_shifttypes, $user_shifts, $signed_up) {
$parsedown = new Parsedown();
$angeltypes = [];
foreach ($angeltypes_source as $angeltype)
$angeltypes[$angeltype['id']] = $angeltype;
$needed_angels = '';
foreach ($shift['NeedAngels'] as $needed_angeltype) {
$class = 'progress-bar-warning';
if ($needed_angeltype['taken'] == 0)
$class = 'progress-bar-danger';
if ($needed_angeltype['taken'] >= $needed_angeltype['count'])
$class = 'progress-bar-success';
$needed_angels .= '<div class="list-group-item">';
$needed_angels .= '<div class="pull-right">' . Shift_signup_button_render($shift, $angeltypes[$needed_angeltype['TID']]) . '</div>';
$needed_angels .= '<h3>' . AngelType_name_render($angeltypes[$needed_angeltype['TID']]) . '</h3>';
$needed_angels .= progress_bar(0, $needed_angeltype['count'], $needed_angeltype['taken'], $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']);
$angels = [];
foreach ($shift['ShiftEntry'] as $shift_entry) {
if ($shift_entry['TID'] == $needed_angeltype['TID']) {
$entry = User_Nick_render(User($shift_entry['UID']));
if ($shift_entry['freeloaded'])
$entry = '<strike>' . $entry . '</strike>';
if ($user_shift_admin) {
$entry .= ' <div class="btn-group">';
$entry .= button_glyph(page_link_to('user_myshifts') . '&edit=' . $shift['SID'] . '&id=' . $shift_entry['UID'], 'pencil', 'btn-xs');
$entry .= button_glyph(page_link_to('user_shifts') . '&entry_id=' . $shift_entry['id'], 'trash', 'btn-xs');
$entry .= '</div>';
}
$angels[] = $entry;
}
}
$needed_angels .= join(', ', $angels);
$needed_angels .= '</div>';
}
return page_with_title($shift['name'] . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>', [
msg(),
Shift_collides($shift, $user_shifts) ? info(_('This shift collides with one of your shifts.'), true) : '',
$signed_up ? info(_('You are signed up for this shift.'), true) : '',
($shift_admin || $admin_shifttypes || $admin_rooms) ? buttons([
$shift_admin ? button(shift_edit_link($shift), glyph('pencil') . _('edit')) : '',
$shift_admin ? button(shift_delete_link($shift), glyph('trash') . _('delete')) : '',
$admin_shifttypes ? button(shifttype_link($shifttype), $shifttype['name']) : '',
$admin_rooms ? button(room_link($room), glyph('map-marker') . $room['Name']) : ''
]) : '',
div('row', [
div('col-sm-3 col-xs-6', [
'<h4>' . _('Title') . '</h4>',
'<p class="lead">' . ($shift['URL'] != '' ? '<a href="' . $shift['URL'] . '">' . $shift['title'] . '</a>' : $shift['title']) . '</p>'
]),
div('col-sm-3 col-xs-6', [
'<h4>' . _('Start') . '</h4>',
'<p class="lead' . (time() >= $shift['start'] ? ' text-success' : '') . '">',
glyph('calendar') . date('y-m-d', $shift['start']),
'<br />',
glyph('time') . date('H:i', $shift['start']),
'</p>'
]),
div('col-sm-3 col-xs-6', [
'<h4>' . _('End') . '</h4>',
'<p class="lead' . (time() >= $shift['end'] ? ' text-success' : '') . '">',
glyph('calendar') . date('y-m-d', $shift['end']),
'<br />',
glyph('time') . date('H:i', $shift['end']),
'</p>'
]),
div('col-sm-3 col-xs-6', [
'<h4>' . _('Location') . '</h4>',
'<p class="lead">' . glyph('map-marker') . $room['Name'] . '</p>'
])
]),
div('row', [
div('col-sm-6', [
'<h2>' . _('Needed angels') . '</h2>',
'<div class="list-group">' . $needed_angels . '</div>'
]),
div('col-sm-6', [
'<h2>' . _('Description') . '</h2>',
$parsedown->parse($shifttype['description'])
])
])
]);
}
/**
* Calc shift length in format 12:23h.
*
* @param Shift $shift
*/
function shift_length($shift) {

8
includes/view/User_view.php
View File

@ -98,7 +98,9 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
$html = "";
$timesum = 0;
foreach ($shifts as $shift) {
$shift_info = $shift['name'];
$shift_info = '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>';
if ($shift['title'])
$shift_info .= '<br /><a href="' . shift_link($shift) . '">' . $shift['title'] . '</a>';
foreach ($shift['needed_angeltypes'] as $needed_angel_type) {
$shift_info .= '<br><b>' . $needed_angel_type['name'] . ':</b> ';
@ -131,7 +133,9 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
$myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . '</p>';
}
$myshift['actions'] = array();
$myshift['actions'] = [
button(shift_link($shift), glyph('eye-open') . _('view'), 'btn-xs')
];
if ($its_me || in_array('user_shifts_admin', $privileges))
$myshift['actions'][] = button(page_link_to('user_myshifts') . '&edit=' . $shift['id'] . '&id=' . $user_source['UID'], glyph('edit') . _('edit'), 'btn-xs');
if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges))

BIN
locale/de_DE.UTF-8/LC_MESSAGES/default.mo
View File

Binary file not shown.

850
locale/de_DE.UTF-8/LC_MESSAGES/default.po
View File

File diff suppressed because it is too large Load Diff

11
public/index.php
View File

@ -15,18 +15,24 @@ require_once realpath(__DIR__ . '/../includes/model/NeededAngelTypes_model.php')
require_once realpath(__DIR__ . '/../includes/model/Room_model.php');
require_once realpath(__DIR__ . '/../includes/model/ShiftEntry_model.php');
require_once realpath(__DIR__ . '/../includes/model/Shifts_model.php');
require_once realpath(__DIR__ . '/../includes/model/ShiftTypes_model.php');
require_once realpath(__DIR__ . '/../includes/model/UserAngelTypes_model.php');
require_once realpath(__DIR__ . '/../includes/model/UserGroups_model.php');
require_once realpath(__DIR__ . '/../includes/model/User_model.php');
require_once realpath(__DIR__ . '/../includes/view/AngelTypes_view.php');
require_once realpath(__DIR__ . '/../includes/view/Questions_view.php');
require_once realpath(__DIR__ . '/../includes/view/Rooms_view.php');
require_once realpath(__DIR__ . '/../includes/view/Shifts_view.php');
require_once realpath(__DIR__ . '/../includes/view/ShiftEntry_view.php');
require_once realpath(__DIR__ . '/../includes/view/ShiftTypes_view.php');
require_once realpath(__DIR__ . '/../includes/view/UserAngelTypes_view.php');
require_once realpath(__DIR__ . '/../includes/view/User_view.php');
require_once realpath(__DIR__ . '/../includes/controller/angeltypes_controller.php');
require_once realpath(__DIR__ . '/../includes/controller/rooms_controller.php');
require_once realpath(__DIR__ . '/../includes/controller/shifts_controller.php');
require_once realpath(__DIR__ . '/../includes/controller/shifttypes_controller.php');
require_once realpath(__DIR__ . '/../includes/controller/users_controller.php');
require_once realpath(__DIR__ . '/../includes/controller/user_angeltypes_controller.php');
@ -85,6 +91,7 @@ $free_pages = array(
'users',
'ical',
'shifts_json_export',
'shifts',
'atom'
);
@ -124,10 +131,14 @@ if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (i
$content = user_password_recovery_controller();
} elseif ($p == "angeltypes") {
list($title, $content) = angeltypes_controller();
} elseif ($p == "shifts") {
list($title, $content) = shifts_controller();
} elseif ($p == "users") {
list($title, $content) = users_controller();
} elseif ($p == "user_angeltypes") {
list($title, $content) = user_angeltypes_controller();
} elseif ($p == "shifttypes") {
list($title, $content) = shifttypes_controller();
} elseif ($p == "news") {
$title = news_title();
$content = user_news();