summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/pages/guest_credits.php6
-rw-r--r--includes/pages/guest_login.php11
-rw-r--r--includes/pages/user_myshifts.php106
-rw-r--r--includes/pages/user_news.php14
-rw-r--r--includes/pages/user_questions.php48
-rw-r--r--includes/pages/user_settings.php6
-rw-r--r--includes/pages/user_shifts.php856
-rw-r--r--includes/sys_menu.php8
8 files changed, 523 insertions, 532 deletions
diff --git a/includes/pages/guest_credits.php b/includes/pages/guest_credits.php
index 89f68fde..d4be03d9 100644
--- a/includes/pages/guest_credits.php
+++ b/includes/pages/guest_credits.php
@@ -1,5 +1,9 @@
<?php
+function credits_title() {
+ return _("Credits");
+}
+
function guest_credits() {
- return template_render('../templates/guest_credits.html', array ());
+ return template_render('../templates/guest_credits.html', array());
}
?> \ No newline at end of file
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 5b34d2c8..84bf34c2 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -1,4 +1,15 @@
<?php
+function login_title() {
+ return _("Login");
+}
+
+function register_title() {
+ return _("Register");
+}
+
+function logout_title() {
+ return _("Logout");
+}
// Engel registrieren
function guest_register() {
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index 14f3685e..b3f98e6f 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -8,30 +8,29 @@ 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) {
+
+ 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'])) {
+
+ 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);
success("Key geändert.");
redirect(page_link_to('user_myshifts'));
}
- return template_render('../templates/user_myshifts_reset.html', array ());
- }
- elseif (isset ($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) {
+ return template_render('../templates/user_myshifts_reset.html', array());
+ } elseif (isset($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) {
$id = $_REQUEST['edit'];
$shift = sql_select("SELECT `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'])) {
+
+ if (isset($_REQUEST['submit'])) {
$comment = strip_request_item_nl('comment');
$user_source = User($shift['UID']);
sql_query("UPDATE `ShiftEntry` SET `Comment`='" . sql_escape($comment) . "' WHERE `id`=" . sql_escape($id) . " LIMIT 1");
@@ -39,19 +38,11 @@ function user_myshifts() {
success("Schicht gespeichert.");
redirect(page_link_to('user_myshifts'));
}
-
- return template_render('../templates/user_shifts_add.html', array (
- 'angel' => User_Nick_render($shifts_user),
- 'date' => date("Y-m-d H:i", $shift['start']) . ', ' . shift_length($shift),
- 'location' => $shift['Name'],
- 'title' => $shift['name'],
- 'type' => $shift['angel_type'],
- 'comment' => $shift['Comment']
- ));
+
+ 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']);
} else
redirect(page_link_to('user_myshifts'));
- }
- elseif (isset ($_REQUEST['cancel']) && preg_match("/^[0-9]*$/", $_REQUEST['cancel'])) {
+ } 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");
if (count($shift) > 0) {
@@ -65,62 +56,71 @@ function user_myshifts() {
redirect(page_link_to('user_myshifts'));
}
$shifts = sql_select("SELECT * FROM `ShiftEntry` JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `UID`=" . sql_escape($shifts_user['UID']) . " ORDER BY `start`");
-
+
$myshifts_table = array();
$html = "";
$timesum = 0;
foreach ($shifts as $shift) {
$shift_info = $shift['name'];
$needed_angel_types_source = 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($needed_angel_types_source as $needed_angel_type) {
+ foreach ($needed_angel_types_source as $needed_angel_type) {
$shift_info .= '<br><b>' . $needed_angel_type['name'] . ':</b> ';
-
+
$users_source = sql_select("SELECT `User`.* FROM `ShiftEntry` JOIN `User` ON `ShiftEntry`.`UID`=`User`.`UID` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . " AND `ShiftEntry`.`TID`=" . sql_escape($needed_angel_type['id']));
$shift_entries = array();
- foreach($users_source as $user_source) {
- if($user['UID'] == $user_source['UID'])
+ foreach ($users_source as $user_source) {
+ if ($user['UID'] == $user_source['UID'])
$shift_entries[] = '<b>' . $user_source['Nick'] . '</b>';
else
$shift_entries[] = User_Nick_render($user_source);
}
$shift_info .= join(", ", $shift_entries);
}
-
+
$myshift = array(
- 'date' => date("Y-m-d", $shift['start']),
- 'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']),
- 'room' => $shift['Name'],
- 'shift_info' => $shift_info,
- 'comment' => $shift['Comment']
+ 'date' => date("Y-m-d", $shift['start']),
+ 'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']),
+ 'room' => $shift['Name'],
+ 'shift_info' => $shift_info,
+ 'comment' => $shift['Comment']
);
-
+
$myshift['actions'] = "";
if ($id == $user['UID'])
$myshift['actions'] .= img_button(page_link_to('user_myshifts') . '&edit=' . $shift['id'], 'pencil', _("edit"));
if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges))
- $myshift['actions'] .= img_button(page_link_to('user_myshifts') . (($id != $user['UID'])? '&id=' . $id : '') . '&cancel=' . $shift['id'], 'cross', _("sign off"));
-
+ $myshift['actions'] .= img_button(page_link_to('user_myshifts') . (($id != $user['UID']) ? '&id=' . $id : '') . '&cancel=' . $shift['id'], 'cross', _("sign off"));
+
$timesum += $shift['end'] - $shift['start'];
$myshifts_table[] = $myshift;
}
- if(count($myshifts_table) > 0)
- $myshifts_table[] = array('date' => "<b>Summe:</b>", 'time' => "<b>" . round($timesum / (60*60), 1) . " h</b>", 'room' => "", 'shift_info' => "", 'comment' => "", 'actions' => "");
-
+ if (count($myshifts_table) > 0)
+ $myshifts_table[] = array(
+ 'date' => '<b>' . _("Sum:") . '</b>',
+ 'time' => "<b>" . round($timesum / (60 * 60), 1) . " h</b>",
+ 'room' => "",
+ 'shift_info' => "",
+ 'comment' => "",
+ 'actions' => ""
+ );
+
return page(array(
- msg(),
- $id == $user['UID'] ? sprintf(_('These are your shifts.<br/>Please try to appear <b>15 minutes</b> before your shift begins!<br/>You can remove yourself from a shift up to %d hours before it starts.'), $LETZTES_AUSTRAGEN) : '',
- $id != $user['UID'] ? info(sprintf("You are viewing %s's shifts.", $shifts_user['Nick']), true) : '',
- $id != $user['UID'] ? buttons(array(button(page_link_to('admin_user') . '&amp;id=' . $shifts_user['UID'], "Edit " . $shifts_user['Nick'], 'edit'))) : '',
- table(array(
- 'date' => "Tag",
- 'time' => "Zeit",
- 'room' => "Ort",
- 'shift_info' => "Name &amp; Kollegen",
- 'comment' => "Kommentar",
- 'actions' => "Aktion"
- ), $myshifts_table),
- $id == $user['UID'] && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '',
- "<h2>Exports</h2>" . sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $shifts_user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $shifts_user['api_key'], page_link_to('user_myshifts') . '&reset')
+ msg(),
+ $id == $user['UID'] ? sprintf(_('These are your shifts.<br/>Please try to appear <b>15 minutes</b> before your shift begins!<br/>You can remove yourself from a shift up to %d hours before it starts.'), $LETZTES_AUSTRAGEN) : '',
+ $id != $user['UID'] ? info(sprintf("You are viewing %s's shifts.", $shifts_user['Nick']), true) : '',
+ $id != $user['UID'] ? buttons(array(
+ button(page_link_to('admin_user') . '&amp;id=' . $shifts_user['UID'], "Edit " . $shifts_user['Nick'], 'edit')
+ )) : '',
+ table(array(
+ 'date' => _("Day"),
+ 'time' => _("Time"),
+ 'room' => _("Location"),
+ 'shift_info' => _("Name &amp; workmates"),
+ 'comment' => _("Comment"),
+ 'actions' => _("Action")
+ ), $myshifts_table),
+ $id == $user['UID'] && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '',
+ '<h2>' . _("Exports") . '</h2>' . sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $shifts_user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $shifts_user['api_key'], page_link_to('user_myshifts') . '&reset')
));
}
?>
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index aa243ef6..ed4de018 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -1,4 +1,8 @@
<?php
+function user_news_comments_title() {
+ return _("News comments");
+}
+
function news_title() {
return _("News");
}
@@ -72,7 +76,7 @@ function user_news_comments() {
$text = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['text']));
sql_query("INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) VALUES ('" . sql_escape($nid) . "', '" . date("Y-m-d H:i:s") . "', '" . sql_escape($text) . "', '" . sql_escape($user["UID"]) . "')");
engelsystem_log("Created news_comment: " . $text);
- $html .= success("Eintrag wurde gespeichert", true);
+ $html .= success(_("Entry saved."), true);
}
$html .= '<a href="' . page_link_to("news") . '">&laquo; Back</a>';
@@ -100,22 +104,22 @@ function user_news_comments() {
$html .= '
<br />
<hr>
- <h2>Neuer Kommentar:</h2>
+ <h2>' . _("New Comment:") . '</h2>
<a name="Neu">&nbsp;</a>
<form action="' . page_link_to("news_comments") . '" method="post">
<input type="hidden" name="nid" value="' . $_REQUEST["nid"] . '">
<table>
<tr>
- <td align="right" valign="top">Text:</td>
+ <td align="right" valign="top">' . _("Message:") . '</td>
<td><textarea name="text" cols="50" rows="10"></textarea></td>
</tr>
</table>
<br />
- <input type="submit" value="sichern...">
+ <input type="submit" value="' . _("Save") . '">
</form>';
} else {
- $html .= "Fehlerhafter Aufruf!";
+ $html .= _("Fehlerhafter Aufruf!");
}
return $html;
diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php
index e9a9d503..0ed1339c 100644
--- a/includes/pages/user_questions.php
+++ b/includes/pages/user_questions.php
@@ -5,53 +5,41 @@ function questions_title() {
function user_questions() {
global $user;
-
- if (!isset ($_REQUEST['action'])) {
- $open_questions = "";
- $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`=0 AND `UID`=" . sql_escape($user['UID']));
- foreach ($questions as $question)
- $open_questions .= '<tr><td>' . str_replace("\n", '<br />', $question['Question']) . '</td><td><a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a></td><tr>';
-
- $answered_questions = "";
- $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`>0 AND `UID`=" . sql_escape($user['UID']));
- foreach ($questions as $question) {
- $answered_questions .= '<tr><td>' . str_replace("\n", '<br />', $question['Question']) . '</td>';
-
+
+ if (! isset($_REQUEST['action'])) {
+ $open_questions = sql_select("SELECT * FROM `Questions` WHERE `AID`=0 AND `UID`=" . sql_escape($user['UID']));
+
+ $answered_questions = sql_select("SELECT * FROM `Questions` WHERE `AID`>0 AND `UID`=" . sql_escape($user['UID']));
+ foreach ($answered_questions as &$question) {
$answer_user_source = User($question['AID']);
- if($answer_user_source === false)
- engelsystem_error("Unable to load user.");
-
- $answered_questions .= '<td>' . User_Nick_render($answer_user_source) . '</td><td>' . str_replace("\n", '<br />', $question['Answer']) . '</td>';
- $answered_questions .= '<td><a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a></td><tr>';
+ if ($answer_user_source === false)
+ engelsystem_error(_("Unable to load user."));
+ $question['answer_user'] = User_Nick_render($answer_user_source);
}
-
- return template_render('../templates/user_questions.html', array (
- 'link' => page_link_to("user_questions"),
- 'open_questions' => $open_questions,
- 'answered_questions' => $answered_questions
- ));
+
+ return Questions_view($open_questions, $answered_questions, page_link_to("user_questions") . '&action=ask');
} else {
switch ($_REQUEST['action']) {
- case 'ask' :
+ case 'ask':
$question = strip_request_item_nl('question');
if ($question != "") {
sql_query("INSERT INTO `Questions` SET `UID`=" . sql_escape($user['UID']) . ", `Question`='" . sql_escape($question) . "'");
redirect(page_link_to("user_questions"));
} else
- return error("Gib eine Frage ein!", true);
+ return error(_("Please enter a question!"), true);
break;
- case 'delete' :
- if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+ case 'delete':
+ if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
$id = $_REQUEST['id'];
else
- return error("Incomplete call, missing Question ID.", true);
-
+ return error(_("Incomplete call, missing Question ID."), true);
+
$question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1");
if (count($question) > 0 && $question[0]['UID'] == $user['UID']) {
sql_query("DELETE FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1");
redirect(page_link_to("user_questions"));
} else
- return error("No question found.", true);
+ return error(_("No question found."), true);
break;
}
}
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index 5370adaa..334fea45 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -1,4 +1,8 @@
<?php
+function settings_title() {
+ return _("Settings");
+}
+
function user_settings() {
global $enable_tshirt_size, $tshirt_sizes, $themes, $locales;
global $user;
@@ -108,7 +112,7 @@ function user_settings() {
}
engelsystem_log("Own angel types set to: " . join(", ", $user_angel_type_info));
- success("Settings saved.");
+ success(_("Settings saved."));
redirect(page_link_to('user_settings'));
}
} elseif (isset($_REQUEST['submit_password'])) {
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 73afb911..0cd6697d 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -5,122 +5,118 @@ function shifts_title() {
function user_shifts() {
global $user, $privileges;
-
+
// 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'))
+ if (isset($_REQUEST['entry_id']) && in_array('user_shifts_admin', $privileges)) {
+ if (isset($_REQUEST['entry_id']) && test_request_int('entry_id'))
$entry_id = $_REQUEST['entry_id'];
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");
- if(count($shift_entry_source) > 0) {
+ if (count($shift_entry_source) > 0) {
$shift_entry_source = $shift_entry_source[0];
sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($entry_id) . " LIMIT 1");
-
+
engelsystem_log("Deleted " . User_Nick_render($shift_entry_source) . "'s shift: " . $shift_entry_source['name'] . " at " . $shift_entry_source['Name'] . " from " . date("y-m-d H:i", $shift_entry_source['start']) . " to " . date("y-m-d H:i", $shift_entry_source['end']) . " as " . $shift_entry_source['angel_type']);
success("Der Schicht-Eintrag wurde gelöscht.");
- }
- else error("Entry not found.");
+ } else
+ error("Entry not found.");
redirect(page_link_to('user_shifts'));
- }
- // Schicht bearbeiten
- elseif (isset ($_REQUEST['edit_shift']) && in_array('admin_shifts', $privileges)) {
+ } // Schicht bearbeiten
+ elseif (isset($_REQUEST['edit_shift']) && in_array('admin_shifts', $privileges)) {
$msg = "";
$ok = true;
-
- if (isset ($_REQUEST['edit_shift']) && test_request_int('edit_shift'))
+
+ if (isset($_REQUEST['edit_shift']) && test_request_int('edit_shift'))
$shift_id = $_REQUEST['edit_shift'];
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'));
- }
- */
-
+
+ /*
+ * 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");
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 ();
+ $room_array = array();
foreach ($rooms as $room)
$room_array[$room['RID']] = $room['Name'];
-
- // Engeltypen laden
+
+ // Engeltypen laden
$types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
$angel_types = array();
- $needed_angel_types = array ();
+ $needed_angel_types = array();
foreach ($types as $type) {
$angel_types[$type['id']] = $type;
$needed_angel_types[$type['id']] = 0;
}
-
+
// Benötigte Engeltypen vom Raum
$needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`=" . sql_escape($shift['RID']) . ") ORDER BY `AngelTypes`.`name`");
foreach ($needed_angel_types_source as $type) {
- if($type['count'] != "")
- $needed_angel_types[$type['id']] =$type['count'];
+ if ($type['count'] != "")
+ $needed_angel_types[$type['id']] = $type['count'];
}
-
+
// Benötigte Engeltypen von der Schicht
$needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`=" . sql_escape($shift_id) . ") ORDER BY `AngelTypes`.`name`");
- foreach ($needed_angel_types_source as $type){
- if($type['count'] != "")
- $needed_angel_types[$type['id']] =$type['count'];
+ foreach ($needed_angel_types_source as $type) {
+ if ($type['count'] != "")
+ $needed_angel_types[$type['id']] = $type['count'];
}
-
+
$name = $shift['name'];
$rid = $shift['RID'];
$start = $shift['start'];
$end = $shift['end'];
-
- if (isset ($_REQUEST['submit'])) {
+
+ if (isset($_REQUEST['submit'])) {
// Name/Bezeichnung der Schicht, darf leer sein
$name = strip_request_item('name');
-
+
// Auswahl der sichtbaren Locations für die Schichten
- if (isset ($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset ($room_array[$_REQUEST['rid']]))
+ if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']]))
$rid = $_REQUEST['rid'];
else {
$ok = false;
$rid = $rooms[0]['RID'];
$msg .= error("Wähle bitte einen Raum aus.", true);
}
-
- if (isset ($_REQUEST['start']) && $tmp = DateTime :: createFromFormat("Y-m-d H:i", trim($_REQUEST['start'])))
+
+ 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);
}
-
- if (isset ($_REQUEST['end']) && $tmp = DateTime :: createFromFormat("Y-m-d H:i", trim($_REQUEST['end'])))
+
+ 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);
}
-
+
if ($start >= $end) {
$ok = false;
$msg .= error("Das Ende muss nach dem Startzeitpunkt liegen!", true);
}
-
+
foreach ($needed_angel_types_source as $type) {
- if (isset ($_REQUEST['type_' . $type['id']]) && preg_match("/^[0-9]+$/", trim($_REQUEST['type_' . $type['id']]))) {
+ if (isset($_REQUEST['type_' . $type['id']]) && preg_match("/^[0-9]+$/", trim($_REQUEST['type_' . $type['id']]))) {
$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);
}
}
-
+
if ($ok) {
sql_query("UPDATE `Shifts` SET `start`=" . sql_escape($start) . ", `end`=" . sql_escape($end) . ", `RID`=" . sql_escape($rid) . ", `name`='" . sql_escape($name) . "' WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1");
sql_query("DELETE FROM `NeededAngelTypes` WHERE `shift_id`=" . sql_escape($shift_id));
@@ -129,139 +125,137 @@ function user_shifts() {
sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`=" . sql_escape($shift_id) . ", `angel_type_id`=" . sql_escape($type_id) . ", `count`=" . sql_escape($count));
$needed_angel_types_info[] = $angel_types[$type_id]['name'] . ": " . $count;
}
-
+
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("Schicht gespeichert.");
redirect(page_link_to('user_shifts'));
}
}
-
+
$room_select = html_select_key('rid', 'rid', $room_array, $rid);
-
+
$angel_types = "";
foreach ($types as $type) {
- $angel_types .= template_render('../templates/admin_shifts_angel_types.html', array (
- 'id' => $type['id'],
- 'type' => $type['name'],
- 'value' => $needed_angel_types[$type['id']]
+ $angel_types .= template_render('../templates/admin_shifts_angel_types.html', array(
+ 'id' => $type['id'],
+ 'type' => $type['name'],
+ 'value' => $needed_angel_types[$type['id']]
));
}
-
- return template_render('../templates/user_shifts_edit.html', array (
- 'msg' => $msg,
- 'name' => $name,
- 'room_select' => $room_select,
- 'start' => date("Y-m-d H:i", $start),
- 'end' => date("Y-m-d H:i", $end),
- 'angel_types' => $angel_types
+
+ return template_render('../templates/user_shifts_edit.html', array(
+ 'msg' => $msg,
+ 'name' => $name,
+ 'room_select' => $room_select,
+ 'start' => date("Y-m-d H:i", $start),
+ 'end' => date("Y-m-d H:i", $end),
+ 'angel_types' => $angel_types
));
- }
- // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg)
- elseif (isset ($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) {
- if (isset ($_REQUEST['delete_shift']) && preg_match("/^[0-9]*$/", $_REQUEST['delete_shift']))
+ } // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg)
+ elseif (isset($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) {
+ if (isset($_REQUEST['delete_shift']) && preg_match("/^[0-9]*$/", $_REQUEST['delete_shift']))
$shift_id = $_REQUEST['delete_shift'];
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)
redirect(page_link_to('user_shifts'));
$shift = $shift[0];
-
+
// Schicht löschen bestätigt
- if (isset ($_REQUEST['delete'])) {
+ if (isset($_REQUEST['delete'])) {
sql_query("DELETE FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift_id));
sql_query("DELETE FROM `NeededAngelTypes` WHERE `shift_id`=" . sql_escape($shift_id));
sql_query("DELETE FROM `Shifts` WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1");
-
+
engelsystem_log("Deleted shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end']));
success("Die Schicht wurde gelöscht.");
redirect(page_link_to('user_shifts'));
}
-
- return template_render('../templates/user_shifts_admin_delete.html', array (
- 'name' => $shift['name'],
- 'start' => date("Y-m-d H:i", $shift['start']),
- 'end' => date("H:i", $shift['end']),
- 'id' => $shift_id
+
+ return template_render('../templates/user_shifts_admin_delete.html', array(
+ 'name' => $shift['name'],
+ 'start' => date("Y-m-d H:i", $shift['start']),
+ 'end' => date("H:i", $shift['end']),
+ 'id' => $shift_id
));
- }
- elseif (isset ($_REQUEST['shift_id'])) {
- if (isset ($_REQUEST['shift_id']) && preg_match("/^[0-9]*$/", $_REQUEST['shift_id']))
+ } elseif (isset($_REQUEST['shift_id'])) {
+ if (isset($_REQUEST['shift_id']) && preg_match("/^[0-9]*$/", $_REQUEST['shift_id']))
$shift_id = $_REQUEST['shift_id'];
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)
redirect(page_link_to('user_shifts'));
$shift = $shift[0];
-
- if (isset ($_REQUEST['type_id']) && preg_match("/^[0-9]*$/", $_REQUEST['type_id']))
+
+ if (isset($_REQUEST['type_id']) && preg_match("/^[0-9]*$/", $_REQUEST['type_id']))
$type_id = $_REQUEST['type_id'];
else
redirect(page_link_to('user_shifts'));
-
- // Schicht läuft schon, Eintragen für Engel nicht mehr möglich
- if(!in_array('user_shifts_admin', $privileges) && time() > $shift['start']) {
+
+ // Schicht läuft schon, Eintragen für Engel nicht mehr möglich
+ if (! in_array('user_shifts_admin', $privileges) && time() > $shift['start']) {
error("Diese Schicht läuft gerade oder ist bereits vorbei. Bitte kontaktiere den Schichtkoordinator um Dich eintragen zu lassen.");
redirect(page_link_to('user_shifts'));
}
-
+
// 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("Du bist bereits in einer parallelen Schicht eingetragen. Bitte kontaktiere den Schichtkoordinator, um dich eintragen zu lassen.");
redirect(page_link_to('user_shifts'));
}
-
+
if (in_array('user_shifts_admin', $privileges))
$type = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($type_id) . " LIMIT 1");
else
$type = sql_select("SELECT * FROM `UserAngelTypes` JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`) WHERE `AngelTypes`.`id` = " . sql_escape($type_id) . " AND (`AngelTypes`.`restricted` = 0 OR (`UserAngelTypes`.`user_id` = " . sql_escape($user['UID']) . " AND NOT `UserAngelTypes`.`confirm_user_id` IS NULL)) LIMIT 1");
-
+
if (count($type) == 0)
redirect(page_link_to('user_shifts'));
$type = $type[0];
-
- if (isset ($_REQUEST['submit'])) {
+
+ if (isset($_REQUEST['submit'])) {
$selected_type_id = $type_id;
if (in_array('user_shifts_admin', $privileges)) {
- if (isset ($_REQUEST['user_id']) && preg_match("/^[0-9]*$/", $_REQUEST['user_id']))
+ if (isset($_REQUEST['user_id']) && preg_match("/^[0-9]*$/", $_REQUEST['user_id']))
$user_id = $_REQUEST['user_id'];
else
$user_id = $user['UID'];
-
+
if (sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($user_id) . " LIMIT 1") == 0)
redirect(page_link_to('user_shifts'));
-
- if (isset ($_REQUEST['angeltype_id']) && test_request_int('angeltype_id') && sql_num_query("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($_REQUEST['angeltype_id']) . " LIMIT 1") > 0)
+
+ if (isset($_REQUEST['angeltype_id']) && test_request_int('angeltype_id') && sql_num_query("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($_REQUEST['angeltype_id']) . " LIMIT 1") > 0)
$selected_type_id = $_REQUEST['angeltype_id'];
} else
$user_id = $user['UID'];
-
+
if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `UID` = '" . sql_escape($user_id) . "'"))
return error("This angel does already have an entry for this shift.", true);
-
+
$comment = strip_request_item_nl('comment');
sql_query("INSERT INTO `ShiftEntry` SET `Comment`='" . sql_escape($comment) . "', `UID`=" . sql_escape($user_id) . ", `TID`=" . sql_escape($selected_type_id) . ", `SID`=" . sql_escape($shift_id));
if ($type['restricted'] == 0 && sql_num_query("SELECT * FROM `UserAngelTypes` INNER JOIN `AngelTypes` ON `AngelTypes`.`id` = `UserAngelTypes`.`angeltype_id` WHERE `angeltype_id` = '" . sql_escape($selected_type_id) . "' AND `user_id` = '" . sql_escape($user_id) . "' ") == 0)
sql_query("INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`) VALUES ('" . sql_escape($user_id) . "', '" . sql_escape($selected_type_id) . "')");
-
+
$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("Du bist eingetragen. Danke!" . ' <a href="' . page_link_to('user_myshifts') . '">Meine Schichten &raquo;</a>');
redirect(page_link_to('user_shifts'));
}
-
+
if (in_array('user_shifts_admin', $privileges)) {
$users = sql_select("SELECT * FROM `User` ORDER BY `Nick`");
- $users_select = array ();
+ $users_select = array();
foreach ($users as $usr)
$users_select[$usr['UID']] = $usr['Nick'];
$user_text = html_select_key('user_id', 'user_id', $users_select, $user['UID']);
-
+
$angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
- $angeltypes = array ();
+ $angeltypes = array();
foreach ($angeltypes_source as $angeltype)
$angeltypes[$angeltype['id']] = $angeltype['name'];
$angeltyppe_select = html_select_key('angeltype_id', 'angeltype_id', $angeltypes, $type['id']);
@@ -269,15 +263,8 @@ function user_shifts() {
$user_text = User_Nick_render($user);
$angeltyppe_select = $type['name'];
}
-
- return template_render('../templates/user_shifts_add.html', array (
- 'date' => date("Y-m-d H:i", $shift['start']) . ' &ndash; ' . date('Y-m-d H:i', $shift['end']) . ' (' . shift_length($shift) . ')',
- 'title' => $shift['name'],
- 'location' => $shift['Name'],
- 'angel' => $user_text,
- 'type' => $angeltyppe_select,
- 'comment' => ""
- ));
+
+ return ShiftEntry_edit_view(date("Y-m-d H:i", $shift['start']) . ' &ndash; ' . date('Y-m-d H:i', $shift['end']) . ' (' . shift_length($shift) . ')', $shift['name'], $shift['Name'], $user_text, $angeltyppe_select, "");
} else {
return view_user_shifts();
}
@@ -286,85 +273,90 @@ function user_shifts() {
function view_user_shifts() {
global $user, $privileges;
global $ical_shifts;
-
- $ical_shifts = array ();
+
+ $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`");
$rooms = sql_select("SELECT `RID` AS `id`, `Name` AS `name` FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
-
- if(in_array('user_shifts_admin', $privileges))
+
+ if (in_array('user_shifts_admin', $privileges))
$types = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `AngelTypes`.`name`");
else
$types = sql_select("SELECT `AngelTypes`.`id`, `AngelTypes`.`name`, (`AngelTypes`.`restricted`=0 OR (NOT `UserAngelTypes`.`confirm_user_id` IS NULL OR `UserAngelTypes`.`id` IS NULL)) as `enabled` FROM `AngelTypes` LEFT JOIN `UserAngelTypes` ON (`UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id` AND `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . ") ORDER BY `AngelTypes`.`name`");
if (empty($types))
$types = sql_select("SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0");
- $filled = array (
- array (
- 'id' => '1',
- 'name' => _('occupied')
- ),
- array (
- 'id' => '0',
- 'name' => _('free')
- )
+ $filled = array(
+ array(
+ 'id' => '1',
+ 'name' => _('occupied')
+ ),
+ array(
+ 'id' => '0',
+ 'name' => _('free')
+ )
);
-
- if (!isset ($_SESSION['user_shifts']))
- $_SESSION['user_shifts'] = array ();
-
- if (!isset ($_SESSION['user_shifts']['filled'])) {
- $_SESSION['user_shifts']['filled'] = array (
- 0
+
+ if (! isset($_SESSION['user_shifts']))
+ $_SESSION['user_shifts'] = array();
+
+ if (! isset($_SESSION['user_shifts']['filled'])) {
+ $_SESSION['user_shifts']['filled'] = array(
+ 0
);
}
-
- foreach (array (
- 'rooms',
- 'types',
- 'filled'
+
+ foreach (array(
+ 'rooms',
+ 'types',
+ 'filled'
) as $key) {
- if (isset ($_REQUEST[$key])) {
+ if (isset($_REQUEST[$key])) {
$filtered = array_filter($_REQUEST[$key], 'is_numeric');
- if (!empty ($filtered))
+ if (! empty($filtered))
$_SESSION['user_shifts'][$key] = $filtered;
- unset ($filtered);
+ unset($filtered);
}
- if (!isset ($_SESSION['user_shifts'][$key]))
+ if (! isset($_SESSION['user_shifts'][$key]))
$_SESSION['user_shifts'][$key] = array_map('get_ids_from_array', $$key);
}
-
+
if (isset($_REQUEST['rooms'])) {
if (isset($_REQUEST['new_style']))
$_SESSION['user_shifts']['new_style'] = true;
else
$_SESSION['user_shifts']['new_style'] = false;
}
- if (!isset ($_SESSION['user_shifts']['new_style']))
+ if (! isset($_SESSION['user_shifts']['new_style']))
$_SESSION['user_shifts']['new_style'] = true;
- foreach (array ('start', 'end') as $key) {
- if (isset ($_REQUEST[$key . '_day']) && in_array($_REQUEST[$key . '_day'], $days))
+ foreach (array(
+ 'start',
+ 'end'
+ ) as $key) {
+ if (isset($_REQUEST[$key . '_day']) && in_array($_REQUEST[$key . '_day'], $days))
$_SESSION['user_shifts'][$key . '_day'] = $_REQUEST[$key . '_day'];
- if (isset ($_REQUEST[$key . '_time']) && preg_match('#^\d{1,2}:\d\d$#', $_REQUEST[$key . '_time']))
+ if (isset($_REQUEST[$key . '_time']) && preg_match('#^\d{1,2}:\d\d$#', $_REQUEST[$key . '_time']))
$_SESSION['user_shifts'][$key . '_time'] = $_REQUEST[$key . '_time'];
- if (!isset ($_SESSION['user_shifts'][$key . '_day'])) {
- $time = date('Y-m-d', time() + ($key == 'end'? 24*60*60 : 0));
- $_SESSION['user_shifts'][$key . '_day'] = in_array($time, $days)? $time : ($key == 'end'? max($days) : min($days));
+ if (! isset($_SESSION['user_shifts'][$key . '_day'])) {
+ $time = date('Y-m-d', time() + ($key == 'end' ? 24 * 60 * 60 : 0));
+ $_SESSION['user_shifts'][$key . '_day'] = in_array($time, $days) ? $time : ($key == 'end' ? max($days) : min($days));
}
- if (!isset ($_SESSION['user_shifts'][$key . '_time']))
+ if (! isset($_SESSION['user_shifts'][$key . '_time']))
$_SESSION['user_shifts'][$key . '_time'] = date('H:i');
}
if ($_SESSION['user_shifts']['start_day'] > $_SESSION['user_shifts']['end_day'])
$_SESSION['user_shifts']['end_day'] = $_SESSION['user_shifts']['start_day'];
if ($_SESSION['user_shifts']['start_day'] == $_SESSION['user_shifts']['end_day'] && $_SESSION['user_shifts']['start_time'] >= $_SESSION['user_shifts']['end_time'])
$_SESSION['user_shifts']['end_time'] = '23:59';
-
- $starttime = DateTime :: createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['start_day'] . $_SESSION['user_shifts']['start_time']);
+
+ $starttime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['start_day'] . $_SESSION['user_shifts']['start_time']);
$starttime = $starttime->getTimestamp();
- $endtime = DateTime :: createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['end_day'] . $_SESSION['user_shifts']['end_time']);
+ $endtime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['end_day'] . $_SESSION['user_shifts']['end_time']);
$endtime = $endtime->getTimestamp();
-
- if (!isset ($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0)
- $_SESSION['user_shifts']['rooms'] = array(0);
-
+
+ if (! isset($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0)
+ $_SESSION['user_shifts']['rooms'] = array(
+ 0
+ );
+
$SQL = "SELECT DISTINCT `Shifts`.*, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs'
FROM `Shifts`
INNER JOIN `Room` USING (`RID`)
@@ -378,7 +370,7 @@ function view_user_shifts() {
$SQL .= "
AND (nat.`count` > entries.`count` OR entries.`count` IS NULL) ";
elseif ($_SESSION['user_shifts']['filled'][0] == 1)
- $SQL .= "
+ $SQL .= "
AND (nat.`count` <= entries.`count`) ";
}
$SQL .= "
@@ -391,328 +383,316 @@ function view_user_shifts() {
foreach ($ownshifts_source as $ownshift)
$ownshifts[$ownshift['SID']] = $ownshift;
unset($ownshifts_source);
-
+
$shifts_table = "";
- //qqqq
+ // qqqq
/*
- [0] => Array
- (
- [SID] => 1
- [start] => 1355958000
- [end] => 1355961600
- [RID] => 1
- [name] =>
- [URL] =>
- [PSID] =>
- [room_name] => test1
- [has_special_needs] => 1
- [is_full] => 0
- )
- */
- if($_SESSION['user_shifts']['new_style']) {
- $first = 15*60*floor($starttime/(15*60));
- $maxshow = ceil(($endtime - $first) / (60*15));
- $block=array();
- $todo=array();
+ * [0] => Array ( [SID] => 1 [start] => 1355958000 [end] => 1355961600 [RID] => 1 [name] => [URL] => [PSID] => [room_name] => test1 [has_special_needs] => 1 [is_full] => 0 )
+ */
+ if ($_SESSION['user_shifts']['new_style']) {
+ $first = 15 * 60 * floor($starttime / (15 * 60));
+ $maxshow = ceil(($endtime - $first) / (60 * 15));
+ $block = array();
+ $todo = array();
$myrooms = $rooms;
-
+
// delete un-selected rooms from array
- foreach($myrooms as $k => $v) {
- if(array_search($v["id"],$_SESSION['user_shifts']['rooms'])===FALSE)
+ foreach ($myrooms as $k => $v) {
+ if (array_search($v["id"], $_SESSION['user_shifts']['rooms']) === FALSE)
unset($myrooms[$k]);
- // initialize $block array
+ // initialize $block array
$block[$v["id"]] = array_fill(0, $maxshow, 0);
}
-
+
// calculate number of parallel shifts in each timeslot for each room
- foreach($shifts as $k => $shift) {
+ foreach ($shifts as $k => $shift) {
$rid = $shift["RID"];
- $blocks = ($shift["end"]-$shift["start"]) / (15*60);
- $firstblock = floor(($shift["start"]-$first) / (15*60));
- for($i = $firstblock; $i < $blocks + $firstblock && $i < $maxshow; $i++)
- $block[$rid][$i]++;
+ $blocks = ($shift["end"] - $shift["start"]) / (15 * 60);
+ $firstblock = floor(($shift["start"] - $first) / (15 * 60));
+ for ($i = $firstblock; $i < $blocks + $firstblock && $i < $maxshow; $i ++)
+ $block[$rid][$i] ++;
$shifts[$k]['own'] = in_array($shift['SID'], array_keys($ownshifts));
}
-
+
$shifts_table = '<table id="shifts" class="scrollable"><thead><tr><th>-</th>';
- foreach($myrooms as $key => $room) {
+ foreach ($myrooms as $key => $room) {
$rid = $room["id"];
- if(array_sum($block[$rid]) == 0) {
+ if (array_sum($block[$rid]) == 0) {
// do not display columns without entries
unset($block[$rid]);
unset($myrooms[$key]);
continue;
}
$colspan = call_user_func_array('max', $block[$rid]);
- if($colspan == 0)
+ if ($colspan == 0)
$colspan = 1;
$todo[$rid] = array_fill(0, $maxshow, $colspan);
- $shifts_table .= "<th" . (($colspan > 1)? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n";
- }
- unset($block, $blocks, $firstblock, $colspan, $key, $room);
-
- $shifts_table.="</tr></thead><tbody>";
- for($i = 0; $i < $maxshow; $i++) {
- $thistime = $first + ($i*15*60);
- $shifts_table .= "<tr><th>";
- if($thistime%(24*60*60) == 23*60*60 && $endtime - $starttime > 24*60*60)
- $shifts_table .= date('y-m-d<b\r>H:i', $thistime);
- elseif($thistime%(60*60) == 0)
- $shifts_table .= date("H:i", $thistime);
- $shifts_table .= "</th>";
- foreach($myrooms as $room) {
- $rid = $room["id"];
- $empty_collides = false;
- foreach($shifts as $shift) {
- if($shift["RID"] == $rid) {
- if(floor($shift["start"]/(15*60)) == $thistime/(15*60)) {
- $blocks = ($shift["end"]-$shift["start"])/(15*60);
- if($blocks < 1)
- $blocks = 1;
-
- $collides = in_array($shift['SID'], array_keys($ownshifts));
- if(!$collides)
- foreach ($ownshifts as $ownshift) {
- if ($ownshift['start'] < $shift['end'] && $ownshift['end'] > $shift['start']) {
- $collides = true;
- break;
- }
- }
-
- // qqqqqq
- $is_free = false;
- $shifts_row = $shift['name'];
- if (in_array('admin_shifts', $privileges))
- $shifts_row .= ' ' . img_button('?p=user_shifts&edit_shift=' . $shift['SID'], 'pencil', _("edit")) . img_button('?p=user_shifts&delete_shift=' . $shift['SID'], 'bin', _("delete"));
- $shifts_row .= '<br />';
- $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id`
+ $shifts_table .= "<th" . (($colspan > 1) ? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n";
+ }
+ unset($block, $blocks, $firstblock, $colspan, $key, $room);
+
+ $shifts_table .= "</tr></thead><tbody>";
+ for ($i = 0; $i < $maxshow; $i ++) {
+ $thistime = $first + ($i * 15 * 60);
+ $shifts_table .= "<tr><th>";
+ if ($thistime % (24 * 60 * 60) == 23 * 60 * 60 && $endtime - $starttime > 24 * 60 * 60)
+ $shifts_table .= date('y-m-d<b\r>H:i', $thistime);
+ elseif ($thistime % (60 * 60) == 0)
+ $shifts_table .= date("H:i", $thistime);
+ $shifts_table .= "</th>";
+ foreach ($myrooms as $room) {
+ $rid = $room["id"];
+ $empty_collides = false;
+ foreach ($shifts as $shift) {
+ if ($shift["RID"] == $rid) {
+ if (floor($shift["start"] / (15 * 60)) == $thistime / (15 * 60)) {
+ $blocks = ($shift["end"] - $shift["start"]) / (15 * 60);
+ if ($blocks < 1)
+ $blocks = 1;
+
+ $collides = in_array($shift['SID'], array_keys($ownshifts));
+ if (! $collides)
+ foreach ($ownshifts as $ownshift) {
+ if ($ownshift['start'] < $shift['end'] && $ownshift['end'] > $shift['start']) {
+ $collides = true;
+ break;
+ }
+ }
+
+ // qqqqqq
+ $is_free = false;
+ $shifts_row = $shift['name'];
+ if (in_array('admin_shifts', $privileges))
+ $shifts_row .= ' ' . img_button('?p=user_shifts&edit_shift=' . $shift['SID'], 'pencil', _("edit")) . img_button('?p=user_shifts&delete_shift=' . $shift['SID'], 'bin', _("delete"));
+ $shifts_row .= '<br />';
+ $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id`
FROM `NeededAngelTypes`
JOIN `AngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`)
LEFT JOIN `UserAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `UserAngelTypes`.`angeltype_id`AND `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . ")
WHERE
`count` > 0
AND ";
- if ($shift['has_special_needs'])
- $query .= "`shift_id` = " . sql_escape($shift['SID']);
- else
- $query .= "`room_id` = " . sql_escape($shift['RID']);
- if (!empty($_SESSION['user_shifts']['types']))
- $query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") ";
- $query .= " ORDER BY `AngelTypes`.`name`";
- $angeltypes = sql_select($query);
-
- if (count($angeltypes) > 0) {
- foreach ($angeltypes as $angeltype) {
- $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`");
- $entry_list = array ();
- foreach ($entries as $entry) {
- if($entry['Gekommen'] == 1)
- $style="font-weight:bold;";
- else
- $style="font-weight:normal;";
- if (in_array('user_shifts_admin', $privileges))
- $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . ' ' . img_button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], 'bin', _("delete")) . '</span>';
- else
- $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) ."</span>";
- }
- if ($angeltype['count'] - count($entries) > 0) {
- $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries));
- // 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 user is not of this angel type
- $user_may_join_shift &= isset($angeltype['user_id']);
-
- // you cannot join if you are not confirmed
- if($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
- $user_may_join_shift &= isset($angeltype['confirm_user_id']);
-
- // you can only join if the shift is in future or running
- $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);
- if ($user_may_join_shift)
- $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">' . $inner_text . '&nbsp;&raquo;</a>';
- else {
- if(time() > $shift['start'])
- $entry_list[] = $inner_text . ' (vorbei)';
- elseif($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && !isset($angeltype['confirm_user_id']))
- $entry_list[] = $inner_text . ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />';
- elseif($collides)
- $entry_list[] = $inner_text;
+ if ($shift['has_special_needs'])
+ $query .= "`shift_id` = " . sql_escape($shift['SID']);
+ else
+ $query .= "`room_id` = " . sql_escape($shift['RID']);
+ if (! empty($_SESSION['user_shifts']['types']))
+ $query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") ";
+ $query .= " ORDER BY `AngelTypes`.`name`";
+ $angeltypes = sql_select($query);
+
+ if (count($angeltypes) > 0) {
+ foreach ($angeltypes as $angeltype) {
+ $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`");
+ $entry_list = array();
+ foreach ($entries as $entry) {
+ if ($entry['Gekommen'] == 1)
+ $style = "font-weight:bold;";
+ else
+ $style = "font-weight:normal;";
+ if (in_array('user_shifts_admin', $privileges))
+ $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . ' ' . img_button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], 'bin', _("delete")) . '</span>';
else
- $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] .')</a>';
+ $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . "</span>";
}
-
- unset($inner_text);
- $is_free = true;
+ if ($angeltype['count'] - count($entries) > 0) {
+ $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries));
+ // 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 user is not of this angel type
+ $user_may_join_shift &= isset($angeltype['user_id']);
+
+ // you cannot join if you are not confirmed
+ if ($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
+ $user_may_join_shift &= isset($angeltype['confirm_user_id']);
+
+ // you can only join if the shift is in future or running
+ $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);
+ if ($user_may_join_shift)
+ $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">' . $inner_text . '&nbsp;&raquo;</a>';
+ else {
+ if (time() > $shift['start'])
+ $entry_list[] = $inner_text . ' (vorbei)';
+ elseif ($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && ! isset($angeltype['confirm_user_id']))
+ $entry_list[] = $inner_text . ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />';
+ elseif ($collides)
+ $entry_list[] = $inner_text;
+ else
+ $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>';
+ }
+
+ unset($inner_text);
+ $is_free = true;
+ }
+
+ $shifts_row .= '<b>' . $angeltype['name'] . ':</b> ';
+ $shifts_row .= join(", ", $entry_list);
+ $shifts_row .= '<br />';
+ }
+ if (in_array('user_shifts_admin', $privileges)) {
+ $shifts_row .= '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">Weitere Helfer eintragen&nbsp;&raquo;</a>';
}
-
- $shifts_row .= '<b>' . $angeltype['name'] . ':</b> ';
- $shifts_row .= join(", ", $entry_list);
- $shifts_row .= '<br />';
}
- if (in_array('user_shifts_admin', $privileges)) {
- $shifts_row .= '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">Weitere Helfer eintragen&nbsp;&raquo;</a>';
+ if ($shift['own'] && ! in_array('user_shifts_admin', $privileges))
+ $class = 'own';
+ elseif ($collides && ! in_array('user_shifts_admin', $privileges))
+ $class = 'collides';
+ elseif ($is_free)
+ $class = 'free';
+ else
+ $class = 'occupied';
+ $shifts_table .= '<td rowspan="' . $blocks . '" class="' . $class . '">';
+ if (($is_free && in_array(0, $_SESSION['user_shifts']['filled'])) || (! $is_free && in_array(1, $_SESSION['user_shifts']['filled']))) {
+ $shifts_table .= $shifts_row;
+ }
+ $shifts_table .= "</td>";
+ for ($j = 0; $j < $blocks && $i + $j < $maxshow; $j ++) {
+ $todo[$rid][$i + $j] --;
}
- }
- if ($shift['own'] && !in_array('user_shifts_admin', $privileges))
- $class = 'own';
- elseif ($collides && !in_array('user_shifts_admin', $privileges))
- $class = 'collides';
- elseif ($is_free)
- $class = 'free';
- else
- $class = 'occupied';
- $shifts_table.='<td rowspan="' . $blocks . '" class="' . $class . '">';
- if (($is_free && in_array(0, $_SESSION['user_shifts']['filled'])) || (!$is_free && in_array(1, $_SESSION['user_shifts']['filled']))) {
- $shifts_table .= $shifts_row;
- }
- $shifts_table.="</td>";
- for($j=0; $j < $blocks && $i+$j < $maxshow; $j++) {
- $todo[$rid][$i+$j]--;
}
}
+ if ($shift['own'] && ! in_array('user_shifts_admin', $privileges)) {
+ $blocks = ($shift["end"] - $shift["start"]) / (15 * 60);
+ $firstblock = floor(($shift["start"] - $first) / (15 * 60));
+ if ($i >= $firstblock && $i < $firstblock + $blocks)
+ $empty_collides = true;
+ }
}
- if ($shift['own'] && !in_array('user_shifts_admin', $privileges)) {
- $blocks = ($shift["end"]-$shift["start"]) / (15*60);
- $firstblock = floor(($shift["start"]-$first) / (15*60));
- if ($i >= $firstblock && $i < $firstblock + $blocks)
- $empty_collides = true;
- }
+ // fill up row with empty <td>
+ while ($todo[$rid][$i] -- > 0)
+ $shifts_table .= '<td class="' . ($empty_collides ? 'collides ' : '') . 'empty"></td>';
}
- // fill up row with empty <td>
- while($todo[$rid][$i]-- > 0)
- $shifts_table .= '<td class="' . ($empty_collides? 'collides ' : '') . 'empty"></td>';
+ $shifts_table .= "</tr>\n";
}
- $shifts_table .= "</tr>\n";
- }
- $shifts_table .= '</tbody></table><script type="text/javascript">document.getElementById("shifts").style.maxHeight = (window.innerHeight - 100) + "px";</script>';
- // qqq
-} else {
- $shifts_table = array();
- foreach ($shifts as $shift) {
- $info = array ();
- if ($_SESSION['user_shifts']['start_day'] != $_SESSION['user_shifts']['end_day'])
- $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'];
-
- $shift_row = array(
- 'info' => join('<br />', $info),
- 'entries' => $shift['name']
- );
-
- if (in_array('admin_shifts', $privileges))
- $shift_row['info'] .= ' ' . img_button('?p=user_shifts&edit_shift=' . $shift['SID'], 'pencil', 'edit') . img_button('?p=user_shifts&delete_shift=' . $shift['SID'], 'bin', _("delete"));
- $shift_row['entries'] .= '<br />';
- $is_free = false;
- $shift_has_special_needs = 0 < sql_num_query("SELECT `id` FROM `NeededAngelTypes` WHERE `shift_id` = " . $shift['SID']);
- $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id`
+ $shifts_table .= '</tbody></table><script type="text/javascript">document.getElementById("shifts").style.maxHeight = (window.innerHeight - 100) + "px";</script>';
+ // qqq
+ } else {
+ $shifts_table = array();
+ foreach ($shifts as $shift) {
+ $info = array();
+ if ($_SESSION['user_shifts']['start_day'] != $_SESSION['user_shifts']['end_day'])
+ $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'];
+
+ $shift_row = array(
+ 'info' => join('<br />', $info),
+ 'entries' => $shift['name']
+ );
+
+ if (in_array('admin_shifts', $privileges))
+ $shift_row['info'] .= ' ' . img_button('?p=user_shifts&edit_shift=' . $shift['SID'], 'pencil', 'edit') . img_button('?p=user_shifts&delete_shift=' . $shift['SID'], 'bin', _("delete"));
+ $shift_row['entries'] .= '<br />';
+ $is_free = false;
+ $shift_has_special_needs = 0 < sql_num_query("SELECT `id` FROM `NeededAngelTypes` WHERE `shift_id` = " . $shift['SID']);
+ $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id`
FROM `NeededAngelTypes`
JOIN `AngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`)
LEFT JOIN `UserAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `UserAngelTypes`.`angeltype_id`AND `UserAngelTypes`.`user_id`=" . sql_escape($user['UID']) . ")
WHERE ";
- if ($shift_has_special_needs)
- $query .= "`shift_id` = " . sql_escape($shift['SID']);
- else
- $query .= "`room_id` = " . sql_escape($shift['RID']);
- $query .= " AND `count` > 0 ";
- if (!empty($_SESSION['user_shifts']['types']))
- $query .= "AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") ";
- $query .= "ORDER BY `AngelTypes`.`name`";
- $angeltypes = sql_select($query);
- if (count($angeltypes) > 0) {
- $my_shift = sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID']) . " AND `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0;
- foreach ($angeltypes as &$angeltype) {
- $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`");
- $entry_list = array ();
- foreach ($entries as $entry) {
- if (in_array('user_shifts_admin', $privileges))
- $entry_list[] = User_Nick_render($entry) . ' ' . img_button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], 'bin', _("delete"));
- else
- $entry_list[] = User_Nick_render($entry);
- }
- $angeltype['taken'] = count($entries);
- // do we need more angles of this type?
- if ($angeltype['count'] - count($entries) > 0) {
- $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries));
- // is the shift still running or alternatively is the user shift admin?
- $user_may_join_shift = true;
-
- /* you cannot join if user already joined this shift */
- $user_may_join_shift &= !$my_shift;
-
- // you cannot join if user is not of this angel type
- $user_may_join_shift &= isset($angeltype['user_id']);
-
- // you cannot join if you are not confirmed
- if($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
- $user_may_join_shift &= isset($angeltype['confirm_user_id']);
-
- // you can only join if the shift is in future or running
- $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);
- if ($user_may_join_shift)
- $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">' . $inner_text . ' &raquo;</a>';
- else {
- if(time() > $shift['end']) {
- $entry_list[] = $inner_text . ' (vorbei)';
- } elseif($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && !isset($angeltype['confirm_user_id'])) {
- $entry_list[] = $inner_text . ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />';
- } else {
- $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] .')</a>';
+ if ($shift_has_special_needs)
+ $query .= "`shift_id` = " . sql_escape($shift['SID']);
+ else
+ $query .= "`room_id` = " . sql_escape($shift['RID']);
+ $query .= " AND `count` > 0 ";
+ if (! empty($_SESSION['user_shifts']['types']))
+ $query .= "AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") ";
+ $query .= "ORDER BY `AngelTypes`.`name`";
+ $angeltypes = sql_select($query);
+ if (count($angeltypes) > 0) {
+ $my_shift = sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID']) . " AND `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0;
+ foreach ($angeltypes as &$angeltype) {
+ $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`");
+ $entry_list = array();
+ foreach ($entries as $entry) {
+ if (in_array('user_shifts_admin', $privileges))
+ $entry_list[] = User_Nick_render($entry) . ' ' . img_button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], 'bin', _("delete"));
+ else
+ $entry_list[] = User_Nick_render($entry);
+ }
+ $angeltype['taken'] = count($entries);
+ // do we need more angles of this type?
+ if ($angeltype['count'] - count($entries) > 0) {
+ $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries));
+ // is the shift still running or alternatively is the user shift admin?
+ $user_may_join_shift = true;
+
+ /* you cannot join if user already joined this shift */
+ $user_may_join_shift &= ! $my_shift;
+
+ // you cannot join if user is not of this angel type
+ $user_may_join_shift &= isset($angeltype['user_id']);
+
+ // you cannot join if you are not confirmed
+ if ($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
+ $user_may_join_shift &= isset($angeltype['confirm_user_id']);
+
+ // you can only join if the shift is in future or running
+ $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);
+ if ($user_may_join_shift)
+ $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">' . $inner_text . ' &raquo;</a>';
+ else {
+ if (time() > $shift['end']) {
+ $entry_list[] = $inner_text . ' (vorbei)';
+ } elseif ($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && ! isset($angeltype['confirm_user_id'])) {
+ $entry_list[] = $inner_text . ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />';
+ } else {
+ $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>';
+ }
}
+
+ unset($inner_text);
+ $is_free = true;
}
-
- unset($inner_text);
- $is_free = true;
+
+ $shift_row['entries'] .= '<b>' . $angeltype['name'] . ':</b> ';
+ $shift_row['entries'] .= join(", ", $entry_list);
+ $shift_row['entries'] .= '<br />';
+ }
+ if (in_array('user_shifts_admin', $privileges)) {
+ $shift_row['entries'] .= '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">Weitere Helfer eintragen &raquo;</a>';
+ }
+ if (($is_free && in_array(0, $_SESSION['user_shifts']['filled'])) || (! $is_free && in_array(1, $_SESSION['user_shifts']['filled']))) {
+ $shifts_table[] = $shift_row;
+ $shift['angeltypes'] = $angeltypes;
+ $ical_shifts[] = $shift;
}
-
- $shift_row['entries'] .= '<b>' . $angeltype['name'] . ':</b> ';
- $shift_row['entries'] .= join(", ", $entry_list);
- $shift_row['entries'] .= '<br />';
- }
- if (in_array('user_shifts_admin', $privileges)) {
- $shift_row['entries'] .= '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">Weitere Helfer eintragen &raquo;</a>';
- }
- if (($is_free && in_array(0, $_SESSION['user_shifts']['filled'])) || (!$is_free && in_array(1, $_SESSION['user_shifts']['filled']))) {
- $shifts_table[] = $shift_row;
- $shift['angeltypes'] = $angeltypes;
- $ical_shifts[] = $shift;
}
}
+ $shifts_table = table(array(
+ 'info' => _("Time") . "/" . _("Room"),
+ 'entries' => _("Entries")
+ ), $shifts_table);
}
- $shifts_table = table(array(
- 'info' => _("Time") . "/" . _("Room"),
- 'entries' => _("Entries")
- ), $shifts_table);
-}
-
-if ($user['api_key'] == "")
- User_reset_api_key($user);
-
-return msg() . template_render('../templates/user_shifts.html', array (
- 'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", _("Rooms")),
- 'start_select' => html_select_key("start_day", "start_day", array_combine($days, $days), $_SESSION['user_shifts']['start_day']),
- 'start_time' => $_SESSION['user_shifts']['start_time'],
- 'end_select' => html_select_key("end_day", "end_day", array_combine($days, $days), $_SESSION['user_shifts']['end_day']),
- 'end_time' => $_SESSION['user_shifts']['end_time'],
- 'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", _("Tasks") . '<sup>1</sup>'),
- 'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", _("Occupancy")),
- 'task_notice' => '<sup>1</sup>' . _("The tasks shown here are influenced by the preferences you defined in your settings! <a href=\"https://events.ccc.de/congress/2012/wiki/Volunteers#What_kind_of_volunteers_are_needed.3F\">Description of the jobs</a>."),
- 'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style']? ' checked' : '') . '> Use new style if possible</label>',
- 'shifts_table' => $shifts_table,
- 'ical_text' => sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'], page_link_to('user_myshifts') . '&reset'),
- 'filter' => _("Filter"),
-));
+
+ if ($user['api_key'] == "")
+ User_reset_api_key($user);
+
+ return msg() . template_render('../templates/user_shifts.html', array(
+ 'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", _("Rooms")),
+ 'start_select' => html_select_key("start_day", "start_day", array_combine($days, $days), $_SESSION['user_shifts']['start_day']),
+ 'start_time' => $_SESSION['user_shifts']['start_time'],
+ 'end_select' => html_select_key("end_day", "end_day", array_combine($days, $days), $_SESSION['user_shifts']['end_day']),
+ 'end_time' => $_SESSION['user_shifts']['end_time'],
+ 'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", _("Tasks") . '<sup>1</sup>'),
+ 'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", _("Occupancy")),
+ 'task_notice' => '<sup>1</sup>' . _("The tasks shown here are influenced by the preferences you defined in your settings! <a href=\"https://events.ccc.de/congress/2012/wiki/Volunteers#What_kind_of_volunteers_are_needed.3F\">Description of the jobs</a>."),
+ 'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> Use new style if possible</label>',
+ 'shifts_table' => $shifts_table,
+ 'ical_text' => sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'], page_link_to('user_myshifts') . '&reset'),
+ 'filter' => _("Filter")
+ ));
}
function make_user_shifts_export_link($page, $key) {
@@ -734,19 +714,19 @@ function get_ids_from_array($array) {
}
function make_select($items, $selected, $name, $title = null) {
- $html_items = array ();
- if (isset ($title))
+ $html_items = array();
+ if (isset($title))
$html_items[] = '<li class="heading">' . $title . '</li>' . "\n";
-
+
foreach ($items as $i)
- $html_items[] = '<li><label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '"' . (in_array($i['id'], $selected) ? ' checked="checked"' : '') . '> ' . $i['name'] . '</label>' . (!isset($i['enabled']) || $i['enabled'] ? '' : ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />') . '</li>';
+ $html_items[] = '<li><label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '"' . (in_array($i['id'], $selected) ? ' checked="checked"' : '') . '> ' . $i['name'] . '</label>' . (! isset($i['enabled']) || $i['enabled'] ? '' : ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />') . '</li>';
$html = '<div class="selection ' . $name . '">' . "\n";
$html .= '<ul id="selection_' . $name . '">' . "\n";
$html .= implode("\n", $html_items);
$html .= '</ul>' . "\n";
- $html .= buttons(array (
- button("javascript: check_all('selection_" . $name . "')", _("All"), ""),
- button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "")
+ $html .= buttons(array(
+ button("javascript: check_all('selection_" . $name . "')", _("All"), ""),
+ button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "")
));
$html .= '</div>' . "\n";
return $html;
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index db9a6888..e65f1d36 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -17,19 +17,19 @@ function header_toolbar() {
$toolbar_items = array();
if (in_array('register', $privileges))
- $toolbar_items[] = toolbar_item_link(page_link_to('register'), 'register', "Register", $p == 'register');
+ $toolbar_items[] = toolbar_item_link(page_link_to('register'), 'register', register_title(), $p == 'register');
if (in_array('user_myshifts', $privileges))
$toolbar_items[] = toolbar_item_link(page_link_to('user_myshifts'), 'engel', $user['Nick'], $p == 'user_myshifts');
if (in_array('user_settings', $privileges))
- $toolbar_items[] = toolbar_item_link(page_link_to('user_settings'), 'settings', "Settings", $p == 'user_settings');
+ $toolbar_items[] = toolbar_item_link(page_link_to('user_settings'), 'settings', settings_title(), $p == 'user_settings');
if (in_array('login', $privileges))
- $toolbar_items[] = toolbar_item_link(page_link_to('login'), 'login', "Login", $p == 'login');
+ $toolbar_items[] = toolbar_item_link(page_link_to('login'), 'login', login_title(), $p == 'login');
if (in_array('logout', $privileges))
- $toolbar_items[] = toolbar_item_link(page_link_to('logout'), 'logout', "Logout", $p == 'logout');
+ $toolbar_items[] = toolbar_item_link(page_link_to('logout'), 'logout', logout_title(), $p == 'logout');
return toolbar($toolbar_items);
}