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

angel views in english complete

This commit is contained in:
Philip Häusler 2013-11-25 21:56:56 +01:00
parent 813751ac7a
commit 85d9bf4f9c
11 changed files with 534 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/pages/guest_credits.php
View File

@ -1,5 +1,9 @@
<?php <?php
function credits_title() {
return _("Credits");
}
function guest_credits() { function guest_credits() {
return template_render('../templates/guest_credits.html', array ()); return template_render('../templates/guest_credits.html', array());
} }
?> ?>

11
includes/pages/guest_login.php
View File

@ -1,4 +1,15 @@
<?php <?php
function login_title() {
return _("Login");
}
function register_title() {
return _("Register");
}
function logout_title() {
return _("Logout");
}
// Engel registrieren // Engel registrieren
function guest_register() { function guest_register() {

62
includes/pages/user_myshifts.php
View File

@ -9,29 +9,28 @@ function user_myshifts() {
global $user, $privileges; global $user, $privileges;
$msg = ""; $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']; $id = $_REQUEST['id'];
} else { } else {
$id = $user['UID']; $id = $user['UID'];
} }
list ($shifts_user) = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); list($shifts_user) = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1");
if (isset ($_REQUEST['reset'])) { if (isset($_REQUEST['reset'])) {
if ($_REQUEST['reset'] == "ack") { if ($_REQUEST['reset'] == "ack") {
User_reset_api_key($user); User_reset_api_key($user);
success("Key geändert."); success("Key geändert.");
redirect(page_link_to('user_myshifts')); redirect(page_link_to('user_myshifts'));
} }
return template_render('../templates/user_myshifts_reset.html', array ()); return template_render('../templates/user_myshifts_reset.html', array());
} } elseif (isset($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) {
elseif (isset ($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) {
$id = $_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"); $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) { if (count($shift) > 0) {
$shift = $shift[0]; $shift = $shift[0];
if (isset ($_REQUEST['submit'])) { if (isset($_REQUEST['submit'])) {
$comment = strip_request_item_nl('comment'); $comment = strip_request_item_nl('comment');
$user_source = User($shift['UID']); $user_source = User($shift['UID']);
sql_query("UPDATE `ShiftEntry` SET `Comment`='" . sql_escape($comment) . "' WHERE `id`=" . sql_escape($id) . " LIMIT 1"); sql_query("UPDATE `ShiftEntry` SET `Comment`='" . sql_escape($comment) . "' WHERE `id`=" . sql_escape($id) . " LIMIT 1");
@ -40,18 +39,10 @@ function user_myshifts() {
redirect(page_link_to('user_myshifts')); redirect(page_link_to('user_myshifts'));
} }
return template_render('../templates/user_shifts_add.html', array ( 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']);
'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']
));
} else } else
redirect(page_link_to('user_myshifts')); 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']; $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']) . " LIMIT 1");
if (count($shift) > 0) { if (count($shift) > 0) {
@ -72,13 +63,13 @@ function user_myshifts() {
foreach ($shifts as $shift) { foreach ($shifts as $shift) {
$shift_info = $shift['name']; $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`"); $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> '; $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'])); $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(); $shift_entries = array();
foreach($users_source as $user_source) { foreach ($users_source as $user_source) {
if($user['UID'] == $user_source['UID']) if ($user['UID'] == $user_source['UID'])
$shift_entries[] = '<b>' . $user_source['Nick'] . '</b>'; $shift_entries[] = '<b>' . $user_source['Nick'] . '</b>';
else else
$shift_entries[] = User_Nick_render($user_source); $shift_entries[] = User_Nick_render($user_source);
@ -98,29 +89,38 @@ function user_myshifts() {
if ($id == $user['UID']) if ($id == $user['UID'])
$myshift['actions'] .= img_button(page_link_to('user_myshifts') . '&edit=' . $shift['id'], 'pencil', _("edit")); $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)) 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']; $timesum += $shift['end'] - $shift['start'];
$myshifts_table[] = $myshift; $myshifts_table[] = $myshift;
} }
if(count($myshifts_table) > 0) 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' => ""); $myshifts_table[] = array(
'date' => '<b>' . _("Sum:") . '</b>',
'time' => "<b>" . round($timesum / (60 * 60), 1) . " h</b>",
'room' => "",
'shift_info' => "",
'comment' => "",
'actions' => ""
);
return page(array( return page(array(
msg(), 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'] ? 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'] ? 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'))) : '', $id != $user['UID'] ? buttons(array(
button(page_link_to('admin_user') . '&amp;id=' . $shifts_user['UID'], "Edit " . $shifts_user['Nick'], 'edit')
)) : '',
table(array( table(array(
'date' => "Tag", 'date' => _("Day"),
'time' => "Zeit", 'time' => _("Time"),
'room' => "Ort", 'room' => _("Location"),
'shift_info' => "Name &amp; Kollegen", 'shift_info' => _("Name &amp; workmates"),
'comment' => "Kommentar", 'comment' => _("Comment"),
'actions' => "Aktion" 'actions' => _("Action")
), $myshifts_table), ), $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) : '', $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') '<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')
)); ));
} }
?> ?>

14
includes/pages/user_news.php
View File

@ -1,4 +1,8 @@
<?php <?php
function user_news_comments_title() {
return _("News comments");
}
function news_title() { function news_title() {
return _("News"); 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'])); $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"]) . "')"); 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); 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>'; $html .= '<a href="' . page_link_to("news") . '">&laquo; Back</a>';
@ -100,22 +104,22 @@ function user_news_comments() {
$html .= ' $html .= '
<br /> <br />
<hr> <hr>
<h2>Neuer Kommentar:</h2> <h2>' . _("New Comment:") . '</h2>
<a name="Neu">&nbsp;</a> <a name="Neu">&nbsp;</a>
<form action="' . page_link_to("news_comments") . '" method="post"> <form action="' . page_link_to("news_comments") . '" method="post">
<input type="hidden" name="nid" value="' . $_REQUEST["nid"] . '"> <input type="hidden" name="nid" value="' . $_REQUEST["nid"] . '">
<table> <table>
<tr> <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> <td><textarea name="text" cols="50" rows="10"></textarea></td>
</tr> </tr>
</table> </table>
<br /> <br />
<input type="submit" value="sichern..."> <input type="submit" value="' . _("Save") . '">
</form>'; </form>';
} else { } else {
$html .= "Fehlerhafter Aufruf!"; $html .= _("Fehlerhafter Aufruf!");
} }
return $html; return $html;

40
includes/pages/user_questions.php
View File

@ -6,52 +6,40 @@ function questions_title() {
function user_questions() { function user_questions() {
global $user; global $user;
if (!isset ($_REQUEST['action'])) { if (! isset($_REQUEST['action'])) {
$open_questions = ""; $open_questions = sql_select("SELECT * FROM `Questions` WHERE `AID`=0 AND `UID`=" . sql_escape($user['UID']));
$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>';
$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']); $answer_user_source = User($question['AID']);
if($answer_user_source === false) if ($answer_user_source === false)
engelsystem_error("Unable to load user."); engelsystem_error(_("Unable to load user."));
$question['answer_user'] = User_Nick_render($answer_user_source);
$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>';
} }
return template_render('../templates/user_questions.html', array ( return Questions_view($open_questions, $answered_questions, page_link_to("user_questions") . '&action=ask');
'link' => page_link_to("user_questions"),
'open_questions' => $open_questions,
'answered_questions' => $answered_questions
));
} else { } else {
switch ($_REQUEST['action']) { switch ($_REQUEST['action']) {
case 'ask' : case 'ask':
$question = strip_request_item_nl('question'); $question = strip_request_item_nl('question');
if ($question != "") { if ($question != "") {
sql_query("INSERT INTO `Questions` SET `UID`=" . sql_escape($user['UID']) . ", `Question`='" . sql_escape($question) . "'"); sql_query("INSERT INTO `Questions` SET `UID`=" . sql_escape($user['UID']) . ", `Question`='" . sql_escape($question) . "'");
redirect(page_link_to("user_questions")); redirect(page_link_to("user_questions"));
} else } else
return error("Gib eine Frage ein!", true); return error(_("Please enter a question!"), true);
break; break;
case 'delete' : case 'delete':
if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
$id = $_REQUEST['id']; $id = $_REQUEST['id'];
else 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"); $question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1");
if (count($question) > 0 && $question[0]['UID'] == $user['UID']) { if (count($question) > 0 && $question[0]['UID'] == $user['UID']) {
sql_query("DELETE FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); sql_query("DELETE FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1");
redirect(page_link_to("user_questions")); redirect(page_link_to("user_questions"));
} else } else
return error("No question found.", true); return error(_("No question found."), true);
break; break;
} }
} }

6
includes/pages/user_settings.php
View File

@ -1,4 +1,8 @@
<?php <?php
function settings_title() {
return _("Settings");
}
function user_settings() { function user_settings() {
global $enable_tshirt_size, $tshirt_sizes, $themes, $locales; global $enable_tshirt_size, $tshirt_sizes, $themes, $locales;
global $user; global $user;
@ -108,7 +112,7 @@ function user_settings() {
} }
engelsystem_log("Own angel types set to: " . join(", ", $user_angel_type_info)); engelsystem_log("Own angel types set to: " . join(", ", $user_angel_type_info));
success("Settings saved."); success(_("Settings saved."));
redirect(page_link_to('user_settings')); redirect(page_link_to('user_settings'));
} }
} elseif (isset($_REQUEST['submit_password'])) { } elseif (isset($_REQUEST['submit_password'])) {

308
includes/pages/user_shifts.php
View File

@ -7,38 +7,34 @@ function user_shifts() {
global $user, $privileges; global $user, $privileges;
// Löschen einzelner Schicht-Einträge (Also Belegung einer Schicht von Engeln) durch Admins // 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']) && in_array('user_shifts_admin', $privileges)) {
if (isset ($_REQUEST['entry_id']) && test_request_int('entry_id')) if (isset($_REQUEST['entry_id']) && test_request_int('entry_id'))
$entry_id = $_REQUEST['entry_id']; $entry_id = $_REQUEST['entry_id'];
else else
redirect(page_link_to('user_shifts')); 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`, `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]; $shift_entry_source = $shift_entry_source[0];
sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($entry_id) . " LIMIT 1"); 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']); 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."); success("Der Schicht-Eintrag wurde gelöscht.");
} } else
else error("Entry not found."); error("Entry not found.");
redirect(page_link_to('user_shifts')); redirect(page_link_to('user_shifts'));
} } // Schicht bearbeiten
// Schicht bearbeiten elseif (isset($_REQUEST['edit_shift']) && in_array('admin_shifts', $privileges)) {
elseif (isset ($_REQUEST['edit_shift']) && in_array('admin_shifts', $privileges)) {
$msg = ""; $msg = "";
$ok = true; $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']; $shift_id = $_REQUEST['edit_shift'];
else else
redirect(page_link_to('user_shifts')); redirect(page_link_to('user_shifts'));
/* /*
if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1") > 0) { * 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')); }
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 * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1");
@ -48,14 +44,14 @@ function user_shifts() {
// Locations laden // Locations laden
$rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`"); $rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
$room_array = array (); $room_array = array();
foreach ($rooms as $room) foreach ($rooms as $room)
$room_array[$room['RID']] = $room['Name']; $room_array[$room['RID']] = $room['Name'];
// Engeltypen laden // Engeltypen laden
$types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
$angel_types = array(); $angel_types = array();
$needed_angel_types = array (); $needed_angel_types = array();
foreach ($types as $type) { foreach ($types as $type) {
$angel_types[$type['id']] = $type; $angel_types[$type['id']] = $type;
$needed_angel_types[$type['id']] = 0; $needed_angel_types[$type['id']] = 0;
@ -64,15 +60,15 @@ function user_shifts() {
// Benötigte Engeltypen vom Raum // 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`"); $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) { foreach ($needed_angel_types_source as $type) {
if($type['count'] != "") if ($type['count'] != "")
$needed_angel_types[$type['id']] =$type['count']; $needed_angel_types[$type['id']] = $type['count'];
} }
// Benötigte Engeltypen von der Schicht // 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`"); $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){ foreach ($needed_angel_types_source as $type) {
if($type['count'] != "") if ($type['count'] != "")
$needed_angel_types[$type['id']] =$type['count']; $needed_angel_types[$type['id']] = $type['count'];
} }
$name = $shift['name']; $name = $shift['name'];
@ -80,12 +76,12 @@ function user_shifts() {
$start = $shift['start']; $start = $shift['start'];
$end = $shift['end']; $end = $shift['end'];
if (isset ($_REQUEST['submit'])) { if (isset($_REQUEST['submit'])) {
// Name/Bezeichnung der Schicht, darf leer sein // Name/Bezeichnung der Schicht, darf leer sein
$name = strip_request_item('name'); $name = strip_request_item('name');
// Auswahl der sichtbaren Locations für die Schichten // 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']; $rid = $_REQUEST['rid'];
else { else {
$ok = false; $ok = false;
@ -93,14 +89,14 @@ function user_shifts() {
$msg .= error("Wähle bitte einen Raum aus.", true); $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(); $start = $tmp->getTimestamp();
else { else {
$ok = false; $ok = false;
$msg .= error("Bitte gib einen Startzeitpunkt für die Schichten an.", true); $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(); $end = $tmp->getTimestamp();
else { else {
$ok = false; $ok = false;
@ -113,7 +109,7 @@ function user_shifts() {
} }
foreach ($needed_angel_types_source as $type) { 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']]); $needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]);
} else { } else {
$ok = false; $ok = false;
@ -140,14 +136,14 @@ function user_shifts() {
$angel_types = ""; $angel_types = "";
foreach ($types as $type) { foreach ($types as $type) {
$angel_types .= template_render('../templates/admin_shifts_angel_types.html', array ( $angel_types .= template_render('../templates/admin_shifts_angel_types.html', array(
'id' => $type['id'], 'id' => $type['id'],
'type' => $type['name'], 'type' => $type['name'],
'value' => $needed_angel_types[$type['id']] 'value' => $needed_angel_types[$type['id']]
)); ));
} }
return template_render('../templates/user_shifts_edit.html', array ( return template_render('../templates/user_shifts_edit.html', array(
'msg' => $msg, 'msg' => $msg,
'name' => $name, 'name' => $name,
'room_select' => $room_select, 'room_select' => $room_select,
@ -155,10 +151,9 @@ function user_shifts() {
'end' => date("Y-m-d H:i", $end), 'end' => date("Y-m-d H:i", $end),
'angel_types' => $angel_types 'angel_types' => $angel_types
)); ));
} } // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg)
// 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)) {
elseif (isset ($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) { if (isset($_REQUEST['delete_shift']) && preg_match("/^[0-9]*$/", $_REQUEST['delete_shift']))
if (isset ($_REQUEST['delete_shift']) && preg_match("/^[0-9]*$/", $_REQUEST['delete_shift']))
$shift_id = $_REQUEST['delete_shift']; $shift_id = $_REQUEST['delete_shift'];
else else
redirect(page_link_to('user_shifts')); redirect(page_link_to('user_shifts'));
@ -169,7 +164,7 @@ function user_shifts() {
$shift = $shift[0]; $shift = $shift[0];
// Schicht löschen bestätigt // 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 `ShiftEntry` WHERE `SID`=" . sql_escape($shift_id));
sql_query("DELETE FROM `NeededAngelTypes` WHERE `shift_id`=" . 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"); sql_query("DELETE FROM `Shifts` WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1");
@ -179,15 +174,14 @@ function user_shifts() {
redirect(page_link_to('user_shifts')); redirect(page_link_to('user_shifts'));
} }
return template_render('../templates/user_shifts_admin_delete.html', array ( return template_render('../templates/user_shifts_admin_delete.html', array(
'name' => $shift['name'], 'name' => $shift['name'],
'start' => date("Y-m-d H:i", $shift['start']), 'start' => date("Y-m-d H:i", $shift['start']),
'end' => date("H:i", $shift['end']), 'end' => date("H:i", $shift['end']),
'id' => $shift_id 'id' => $shift_id
)); ));
} } elseif (isset($_REQUEST['shift_id'])) {
elseif (isset ($_REQUEST['shift_id'])) { if (isset($_REQUEST['shift_id']) && preg_match("/^[0-9]*$/", $_REQUEST['shift_id']))
if (isset ($_REQUEST['shift_id']) && preg_match("/^[0-9]*$/", $_REQUEST['shift_id']))
$shift_id = $_REQUEST['shift_id']; $shift_id = $_REQUEST['shift_id'];
else else
redirect(page_link_to('user_shifts')); redirect(page_link_to('user_shifts'));
@ -197,19 +191,19 @@ function user_shifts() {
redirect(page_link_to('user_shifts')); redirect(page_link_to('user_shifts'));
$shift = $shift[0]; $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']; $type_id = $_REQUEST['type_id'];
else else
redirect(page_link_to('user_shifts')); redirect(page_link_to('user_shifts'));
// Schicht läuft schon, Eintragen für Engel nicht mehr möglich // Schicht läuft schon, Eintragen für Engel nicht mehr möglich
if(!in_array('user_shifts_admin', $privileges) && time() > $shift['start']) { 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."); 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')); redirect(page_link_to('user_shifts'));
} }
// Another shift the user is signed up for collides with this one // 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."); error("Du bist bereits in einer parallelen Schicht eingetragen. Bitte kontaktiere den Schichtkoordinator, um dich eintragen zu lassen.");
redirect(page_link_to('user_shifts')); redirect(page_link_to('user_shifts'));
} }
@ -223,10 +217,10 @@ function user_shifts() {
redirect(page_link_to('user_shifts')); redirect(page_link_to('user_shifts'));
$type = $type[0]; $type = $type[0];
if (isset ($_REQUEST['submit'])) { if (isset($_REQUEST['submit'])) {
$selected_type_id = $type_id; $selected_type_id = $type_id;
if (in_array('user_shifts_admin', $privileges)) { 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']; $user_id = $_REQUEST['user_id'];
else else
$user_id = $user['UID']; $user_id = $user['UID'];
@ -234,7 +228,7 @@ function user_shifts() {
if (sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($user_id) . " LIMIT 1") == 0) if (sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($user_id) . " LIMIT 1") == 0)
redirect(page_link_to('user_shifts')); 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']; $selected_type_id = $_REQUEST['angeltype_id'];
} else } else
$user_id = $user['UID']; $user_id = $user['UID'];
@ -255,13 +249,13 @@ function user_shifts() {
if (in_array('user_shifts_admin', $privileges)) { if (in_array('user_shifts_admin', $privileges)) {
$users = sql_select("SELECT * FROM `User` ORDER BY `Nick`"); $users = sql_select("SELECT * FROM `User` ORDER BY `Nick`");
$users_select = array (); $users_select = array();
foreach ($users as $usr) foreach ($users as $usr)
$users_select[$usr['UID']] = $usr['Nick']; $users_select[$usr['UID']] = $usr['Nick'];
$user_text = html_select_key('user_id', 'user_id', $users_select, $user['UID']); $user_text = html_select_key('user_id', 'user_id', $users_select, $user['UID']);
$angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
$angeltypes = array (); $angeltypes = array();
foreach ($angeltypes_source as $angeltype) foreach ($angeltypes_source as $angeltype)
$angeltypes[$angeltype['id']] = $angeltype['name']; $angeltypes[$angeltype['id']] = $angeltype['name'];
$angeltyppe_select = html_select_key('angeltype_id', 'angeltype_id', $angeltypes, $type['id']); $angeltyppe_select = html_select_key('angeltype_id', 'angeltype_id', $angeltypes, $type['id']);
@ -270,14 +264,7 @@ function user_shifts() {
$angeltyppe_select = $type['name']; $angeltyppe_select = $type['name'];
} }
return template_render('../templates/user_shifts_add.html', array ( 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, "");
'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' => ""
));
} else { } else {
return view_user_shifts(); return view_user_shifts();
} }
@ -287,48 +274,48 @@ function view_user_shifts() {
global $user, $privileges; global $user, $privileges;
global $ical_shifts; 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`"); $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`"); $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`"); $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `AngelTypes`.`name`");
else 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`"); $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)) if (empty($types))
$types = sql_select("SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0"); $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0");
$filled = array ( $filled = array(
array ( array(
'id' => '1', 'id' => '1',
'name' => _('occupied') 'name' => _('occupied')
), ),
array ( array(
'id' => '0', 'id' => '0',
'name' => _('free') 'name' => _('free')
) )
); );
if (!isset ($_SESSION['user_shifts'])) if (! isset($_SESSION['user_shifts']))
$_SESSION['user_shifts'] = array (); $_SESSION['user_shifts'] = array();
if (!isset ($_SESSION['user_shifts']['filled'])) { if (! isset($_SESSION['user_shifts']['filled'])) {
$_SESSION['user_shifts']['filled'] = array ( $_SESSION['user_shifts']['filled'] = array(
0 0
); );
} }
foreach (array ( foreach (array(
'rooms', 'rooms',
'types', 'types',
'filled' 'filled'
) as $key) { ) as $key) {
if (isset ($_REQUEST[$key])) { if (isset($_REQUEST[$key])) {
$filtered = array_filter($_REQUEST[$key], 'is_numeric'); $filtered = array_filter($_REQUEST[$key], 'is_numeric');
if (!empty ($filtered)) if (! empty($filtered))
$_SESSION['user_shifts'][$key] = $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); $_SESSION['user_shifts'][$key] = array_map('get_ids_from_array', $$key);
} }
@ -338,18 +325,21 @@ function view_user_shifts() {
else else
$_SESSION['user_shifts']['new_style'] = false; $_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; $_SESSION['user_shifts']['new_style'] = true;
foreach (array ('start', 'end') as $key) { foreach (array(
if (isset ($_REQUEST[$key . '_day']) && in_array($_REQUEST[$key . '_day'], $days)) 'start',
'end'
) as $key) {
if (isset($_REQUEST[$key . '_day']) && in_array($_REQUEST[$key . '_day'], $days))
$_SESSION['user_shifts'][$key . '_day'] = $_REQUEST[$key . '_day']; $_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']; $_SESSION['user_shifts'][$key . '_time'] = $_REQUEST[$key . '_time'];
if (!isset ($_SESSION['user_shifts'][$key . '_day'])) { if (! isset($_SESSION['user_shifts'][$key . '_day'])) {
$time = date('Y-m-d', time() + ($key == 'end'? 24*60*60 : 0)); $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)); $_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'); $_SESSION['user_shifts'][$key . '_time'] = date('H:i');
} }
if ($_SESSION['user_shifts']['start_day'] > $_SESSION['user_shifts']['end_day']) if ($_SESSION['user_shifts']['start_day'] > $_SESSION['user_shifts']['end_day'])
@ -357,13 +347,15 @@ function view_user_shifts() {
if ($_SESSION['user_shifts']['start_day'] == $_SESSION['user_shifts']['end_day'] && $_SESSION['user_shifts']['start_time'] >= $_SESSION['user_shifts']['end_time']) 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'; $_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(); $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(); $endtime = $endtime->getTimestamp();
if (!isset ($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0) if (! isset($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0)
$_SESSION['user_shifts']['rooms'] = array(0); $_SESSION['user_shifts']['rooms'] = array(
0
);
$SQL = "SELECT DISTINCT `Shifts`.*, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs' $SQL = "SELECT DISTINCT `Shifts`.*, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs'
FROM `Shifts` FROM `Shifts`
@ -393,85 +385,73 @@ function view_user_shifts() {
unset($ownshifts_source); unset($ownshifts_source);
$shifts_table = ""; $shifts_table = "";
//qqqq // qqqq
/* /*
[0] => Array * [0] => Array ( [SID] => 1 [start] => 1355958000 [end] => 1355961600 [RID] => 1 [name] => [URL] => [PSID] => [room_name] => test1 [has_special_needs] => 1 [is_full] => 0 )
(
[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']) { if ($_SESSION['user_shifts']['new_style']) {
$first = 15*60*floor($starttime/(15*60)); $first = 15 * 60 * floor($starttime / (15 * 60));
$maxshow = ceil(($endtime - $first) / (60*15)); $maxshow = ceil(($endtime - $first) / (60 * 15));
$block=array(); $block = array();
$todo=array(); $todo = array();
$myrooms = $rooms; $myrooms = $rooms;
// delete un-selected rooms from array // delete un-selected rooms from array
foreach($myrooms as $k => $v) { foreach ($myrooms as $k => $v) {
if(array_search($v["id"],$_SESSION['user_shifts']['rooms'])===FALSE) if (array_search($v["id"], $_SESSION['user_shifts']['rooms']) === FALSE)
unset($myrooms[$k]); unset($myrooms[$k]);
// initialize $block array // initialize $block array
$block[$v["id"]] = array_fill(0, $maxshow, 0); $block[$v["id"]] = array_fill(0, $maxshow, 0);
} }
// calculate number of parallel shifts in each timeslot for each room // calculate number of parallel shifts in each timeslot for each room
foreach($shifts as $k => $shift) { foreach ($shifts as $k => $shift) {
$rid = $shift["RID"]; $rid = $shift["RID"];
$blocks = ($shift["end"]-$shift["start"]) / (15*60); $blocks = ($shift["end"] - $shift["start"]) / (15 * 60);
$firstblock = floor(($shift["start"]-$first) / (15*60)); $firstblock = floor(($shift["start"] - $first) / (15 * 60));
for($i = $firstblock; $i < $blocks + $firstblock && $i < $maxshow; $i++) for ($i = $firstblock; $i < $blocks + $firstblock && $i < $maxshow; $i ++)
$block[$rid][$i]++; $block[$rid][$i] ++;
$shifts[$k]['own'] = in_array($shift['SID'], array_keys($ownshifts)); $shifts[$k]['own'] = in_array($shift['SID'], array_keys($ownshifts));
} }
$shifts_table = '<table id="shifts" class="scrollable"><thead><tr><th>-</th>'; $shifts_table = '<table id="shifts" class="scrollable"><thead><tr><th>-</th>';
foreach($myrooms as $key => $room) { foreach ($myrooms as $key => $room) {
$rid = $room["id"]; $rid = $room["id"];
if(array_sum($block[$rid]) == 0) { if (array_sum($block[$rid]) == 0) {
// do not display columns without entries // do not display columns without entries
unset($block[$rid]); unset($block[$rid]);
unset($myrooms[$key]); unset($myrooms[$key]);
continue; continue;
} }
$colspan = call_user_func_array('max', $block[$rid]); $colspan = call_user_func_array('max', $block[$rid]);
if($colspan == 0) if ($colspan == 0)
$colspan = 1; $colspan = 1;
$todo[$rid] = array_fill(0, $maxshow, $colspan); $todo[$rid] = array_fill(0, $maxshow, $colspan);
$shifts_table .= "<th" . (($colspan > 1)? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n"; $shifts_table .= "<th" . (($colspan > 1) ? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n";
} }
unset($block, $blocks, $firstblock, $colspan, $key, $room); unset($block, $blocks, $firstblock, $colspan, $key, $room);
$shifts_table.="</tr></thead><tbody>"; $shifts_table .= "</tr></thead><tbody>";
for($i = 0; $i < $maxshow; $i++) { for ($i = 0; $i < $maxshow; $i ++) {
$thistime = $first + ($i*15*60); $thistime = $first + ($i * 15 * 60);
$shifts_table .= "<tr><th>"; $shifts_table .= "<tr><th>";
if($thistime%(24*60*60) == 23*60*60 && $endtime - $starttime > 24*60*60) if ($thistime % (24 * 60 * 60) == 23 * 60 * 60 && $endtime - $starttime > 24 * 60 * 60)
$shifts_table .= date('y-m-d<b\r>H:i', $thistime); $shifts_table .= date('y-m-d<b\r>H:i', $thistime);
elseif($thistime%(60*60) == 0) elseif ($thistime % (60 * 60) == 0)
$shifts_table .= date("H:i", $thistime); $shifts_table .= date("H:i", $thistime);
$shifts_table .= "</th>"; $shifts_table .= "</th>";
foreach($myrooms as $room) { foreach ($myrooms as $room) {
$rid = $room["id"]; $rid = $room["id"];
$empty_collides = false; $empty_collides = false;
foreach($shifts as $shift) { foreach ($shifts as $shift) {
if($shift["RID"] == $rid) { if ($shift["RID"] == $rid) {
if(floor($shift["start"]/(15*60)) == $thistime/(15*60)) { if (floor($shift["start"] / (15 * 60)) == $thistime / (15 * 60)) {
$blocks = ($shift["end"]-$shift["start"])/(15*60); $blocks = ($shift["end"] - $shift["start"]) / (15 * 60);
if($blocks < 1) if ($blocks < 1)
$blocks = 1; $blocks = 1;
$collides = in_array($shift['SID'], array_keys($ownshifts)); $collides = in_array($shift['SID'], array_keys($ownshifts));
if(!$collides) if (! $collides)
foreach ($ownshifts as $ownshift) { foreach ($ownshifts as $ownshift) {
if ($ownshift['start'] < $shift['end'] && $ownshift['end'] > $shift['start']) { if ($ownshift['start'] < $shift['end'] && $ownshift['end'] > $shift['start']) {
$collides = true; $collides = true;
@ -496,7 +476,7 @@ function view_user_shifts() {
$query .= "`shift_id` = " . sql_escape($shift['SID']); $query .= "`shift_id` = " . sql_escape($shift['SID']);
else else
$query .= "`room_id` = " . sql_escape($shift['RID']); $query .= "`room_id` = " . sql_escape($shift['RID']);
if (!empty($_SESSION['user_shifts']['types'])) if (! empty($_SESSION['user_shifts']['types']))
$query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") "; $query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") ";
$query .= " ORDER BY `AngelTypes`.`name`"; $query .= " ORDER BY `AngelTypes`.`name`";
$angeltypes = sql_select($query); $angeltypes = sql_select($query);
@ -504,16 +484,16 @@ function view_user_shifts() {
if (count($angeltypes) > 0) { if (count($angeltypes) > 0) {
foreach ($angeltypes as $angeltype) { 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`"); $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 (); $entry_list = array();
foreach ($entries as $entry) { foreach ($entries as $entry) {
if($entry['Gekommen'] == 1) if ($entry['Gekommen'] == 1)
$style="font-weight:bold;"; $style = "font-weight:bold;";
else else
$style="font-weight:normal;"; $style = "font-weight:normal;";
if (in_array('user_shifts_admin', $privileges)) 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>'; $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . ' ' . img_button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], 'bin', _("delete")) . '</span>';
else else
$entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) ."</span>"; $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . "</span>";
} }
if ($angeltype['count'] - count($entries) > 0) { if ($angeltype['count'] - count($entries) > 0) {
$inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries)); $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries));
@ -521,13 +501,13 @@ function view_user_shifts() {
$user_may_join_shift = true; $user_may_join_shift = true;
// you cannot join if user alread joined a parallel or this shift // you cannot join if user alread joined a parallel or this shift
$user_may_join_shift &= !$collides; $user_may_join_shift &= ! $collides;
// you cannot join if user is not of this angel type // you cannot join if user is not of this angel type
$user_may_join_shift &= isset($angeltype['user_id']); $user_may_join_shift &= isset($angeltype['user_id']);
// you cannot join if you are not confirmed // you cannot join if you are not confirmed
if($angeltype['restricted'] == 1 && isset($angeltype['user_id'])) if ($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
$user_may_join_shift &= isset($angeltype['confirm_user_id']); $user_may_join_shift &= isset($angeltype['confirm_user_id']);
// you can only join if the shift is in future or running // you can only join if the shift is in future or running
@ -538,14 +518,14 @@ function view_user_shifts() {
if ($user_may_join_shift) 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>'; $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 { else {
if(time() > $shift['start']) if (time() > $shift['start'])
$entry_list[] = $inner_text . ' (vorbei)'; $entry_list[] = $inner_text . ' (vorbei)';
elseif($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && !isset($angeltype['confirm_user_id'])) 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." />'; $entry_list[] = $inner_text . ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />';
elseif($collides) elseif ($collides)
$entry_list[] = $inner_text; $entry_list[] = $inner_text;
else else
$entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] .')</a>'; $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>';
} }
unset($inner_text); unset($inner_text);
@ -560,43 +540,43 @@ function view_user_shifts() {
$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 .= '<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)) if ($shift['own'] && ! in_array('user_shifts_admin', $privileges))
$class = 'own'; $class = 'own';
elseif ($collides && !in_array('user_shifts_admin', $privileges)) elseif ($collides && ! in_array('user_shifts_admin', $privileges))
$class = 'collides'; $class = 'collides';
elseif ($is_free) elseif ($is_free)
$class = 'free'; $class = 'free';
else else
$class = 'occupied'; $class = 'occupied';
$shifts_table.='<td rowspan="' . $blocks . '" class="' . $class . '">'; $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']))) { 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 .= $shifts_row;
} }
$shifts_table.="</td>"; $shifts_table .= "</td>";
for($j=0; $j < $blocks && $i+$j < $maxshow; $j++) { for ($j = 0; $j < $blocks && $i + $j < $maxshow; $j ++) {
$todo[$rid][$i+$j]--; $todo[$rid][$i + $j] --;
} }
} }
} }
if ($shift['own'] && !in_array('user_shifts_admin', $privileges)) { if ($shift['own'] && ! in_array('user_shifts_admin', $privileges)) {
$blocks = ($shift["end"]-$shift["start"]) / (15*60); $blocks = ($shift["end"] - $shift["start"]) / (15 * 60);
$firstblock = floor(($shift["start"]-$first) / (15*60)); $firstblock = floor(($shift["start"] - $first) / (15 * 60));
if ($i >= $firstblock && $i < $firstblock + $blocks) if ($i >= $firstblock && $i < $firstblock + $blocks)
$empty_collides = true; $empty_collides = true;
} }
} }
// fill up row with empty <td> // fill up row with empty <td>
while($todo[$rid][$i]-- > 0) while ($todo[$rid][$i] -- > 0)
$shifts_table .= '<td class="' . ($empty_collides? 'collides ' : '') . 'empty"></td>'; $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>'; $shifts_table .= '</tbody></table><script type="text/javascript">document.getElementById("shifts").style.maxHeight = (window.innerHeight - 100) + "px";</script>';
// qqq // qqq
} else { } else {
$shifts_table = array(); $shifts_table = array();
foreach ($shifts as $shift) { foreach ($shifts as $shift) {
$info = array (); $info = array();
if ($_SESSION['user_shifts']['start_day'] != $_SESSION['user_shifts']['end_day']) if ($_SESSION['user_shifts']['start_day'] != $_SESSION['user_shifts']['end_day'])
$info[] = date("Y-m-d", $shift['start']); $info[] = date("Y-m-d", $shift['start']);
$info[] = date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']); $info[] = date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']);
@ -623,7 +603,7 @@ function view_user_shifts() {
else else
$query .= "`room_id` = " . sql_escape($shift['RID']); $query .= "`room_id` = " . sql_escape($shift['RID']);
$query .= " AND `count` > 0 "; $query .= " AND `count` > 0 ";
if (!empty($_SESSION['user_shifts']['types'])) if (! empty($_SESSION['user_shifts']['types']))
$query .= "AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") "; $query .= "AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") ";
$query .= "ORDER BY `AngelTypes`.`name`"; $query .= "ORDER BY `AngelTypes`.`name`";
$angeltypes = sql_select($query); $angeltypes = sql_select($query);
@ -631,7 +611,7 @@ function view_user_shifts() {
$my_shift = sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID']) . " AND `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 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) { 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`"); $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 (); $entry_list = array();
foreach ($entries as $entry) { foreach ($entries as $entry) {
if (in_array('user_shifts_admin', $privileges)) 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")); $entry_list[] = User_Nick_render($entry) . ' ' . img_button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], 'bin', _("delete"));
@ -646,13 +626,13 @@ function view_user_shifts() {
$user_may_join_shift = true; $user_may_join_shift = true;
/* you cannot join if user already joined this shift */ /* you cannot join if user already joined this shift */
$user_may_join_shift &= !$my_shift; $user_may_join_shift &= ! $my_shift;
// you cannot join if user is not of this angel type // you cannot join if user is not of this angel type
$user_may_join_shift &= isset($angeltype['user_id']); $user_may_join_shift &= isset($angeltype['user_id']);
// you cannot join if you are not confirmed // you cannot join if you are not confirmed
if($angeltype['restricted'] == 1 && isset($angeltype['user_id'])) if ($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
$user_may_join_shift &= isset($angeltype['confirm_user_id']); $user_may_join_shift &= isset($angeltype['confirm_user_id']);
// you can only join if the shift is in future or running // you can only join if the shift is in future or running
@ -663,12 +643,12 @@ function view_user_shifts() {
if ($user_may_join_shift) 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>'; $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">' . $inner_text . ' &raquo;</a>';
else { else {
if(time() > $shift['end']) { if (time() > $shift['end']) {
$entry_list[] = $inner_text . ' (vorbei)'; $entry_list[] = $inner_text . ' (vorbei)';
} elseif($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && !isset($angeltype['confirm_user_id'])) { } 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." />'; $entry_list[] = $inner_text . ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />';
} else { } else {
$entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] .')</a>'; $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>';
} }
} }
@ -683,7 +663,7 @@ function view_user_shifts() {
if (in_array('user_shifts_admin', $privileges)) { 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>'; $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']))) { if (($is_free && in_array(0, $_SESSION['user_shifts']['filled'])) || (! $is_free && in_array(1, $_SESSION['user_shifts']['filled']))) {
$shifts_table[] = $shift_row; $shifts_table[] = $shift_row;
$shift['angeltypes'] = $angeltypes; $shift['angeltypes'] = $angeltypes;
$ical_shifts[] = $shift; $ical_shifts[] = $shift;
@ -694,12 +674,12 @@ function view_user_shifts() {
'info' => _("Time") . "/" . _("Room"), 'info' => _("Time") . "/" . _("Room"),
'entries' => _("Entries") 'entries' => _("Entries")
), $shifts_table); ), $shifts_table);
} }
if ($user['api_key'] == "") if ($user['api_key'] == "")
User_reset_api_key($user); User_reset_api_key($user);
return msg() . template_render('../templates/user_shifts.html', array ( return msg() . template_render('../templates/user_shifts.html', array(
'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", _("Rooms")), '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_select' => html_select_key("start_day", "start_day", array_combine($days, $days), $_SESSION['user_shifts']['start_day']),
'start_time' => $_SESSION['user_shifts']['start_time'], 'start_time' => $_SESSION['user_shifts']['start_time'],
@ -708,11 +688,11 @@ return msg() . template_render('../templates/user_shifts.html', array (
'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", _("Tasks") . '<sup>1</sup>'), '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")), '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>."), '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>', '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, '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'), '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"), 'filter' => _("Filter")
)); ));
} }
function make_user_shifts_export_link($page, $key) { function make_user_shifts_export_link($page, $key) {
@ -734,17 +714,17 @@ function get_ids_from_array($array) {
} }
function make_select($items, $selected, $name, $title = null) { function make_select($items, $selected, $name, $title = null) {
$html_items = array (); $html_items = array();
if (isset ($title)) if (isset($title))
$html_items[] = '<li class="heading">' . $title . '</li>' . "\n"; $html_items[] = '<li class="heading">' . $title . '</li>' . "\n";
foreach ($items as $i) 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 = '<div class="selection ' . $name . '">' . "\n";
$html .= '<ul id="selection_' . $name . '">' . "\n"; $html .= '<ul id="selection_' . $name . '">' . "\n";
$html .= implode("\n", $html_items); $html .= implode("\n", $html_items);
$html .= '</ul>' . "\n"; $html .= '</ul>' . "\n";
$html .= buttons(array ( $html .= buttons(array(
button("javascript: check_all('selection_" . $name . "')", _("All"), ""), button("javascript: check_all('selection_" . $name . "')", _("All"), ""),
button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "") button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "")
)); ));

8
includes/sys_menu.php
View File

@ -17,19 +17,19 @@ function header_toolbar() {
$toolbar_items = array(); $toolbar_items = array();
if (in_array('register', $privileges)) 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)) if (in_array('user_myshifts', $privileges))
$toolbar_items[] = toolbar_item_link(page_link_to('user_myshifts'), 'engel', $user['Nick'], $p == 'user_myshifts'); $toolbar_items[] = toolbar_item_link(page_link_to('user_myshifts'), 'engel', $user['Nick'], $p == 'user_myshifts');
if (in_array('user_settings', $privileges)) 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)) 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)) 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); return toolbar($toolbar_items);
} }

14
public/index.php
View File

@ -13,7 +13,9 @@ require_once ('includes/sys_template.php');
require_once ('includes/model/LogEntries_model.php'); require_once ('includes/model/LogEntries_model.php');
require_once ('includes/model/User_model.php'); require_once ('includes/model/User_model.php');
require_once ('includes/view/Questions_view.php');
require_once ('includes/view/Shifts_view.php'); require_once ('includes/view/Shifts_view.php');
require_once ('includes/view/ShiftEntry_view.php');
require_once ('includes/view/User_view.php'); require_once ('includes/view/User_view.php');
require_once ('includes/helper/internationalization_helper.php'); require_once ('includes/helper/internationalization_helper.php');
@ -37,10 +39,12 @@ require_once ('includes/pages/admin_shifts.php');
require_once ('includes/pages/admin_user.php'); require_once ('includes/pages/admin_user.php');
require_once ('includes/pages/admin_user_angeltypes.php'); require_once ('includes/pages/admin_user_angeltypes.php');
require_once ('includes/pages/guest_faq.php'); require_once ('includes/pages/guest_faq.php');
require_once ('includes/pages/guest_login.php');
require_once ('includes/pages/user_messages.php'); require_once ('includes/pages/user_messages.php');
require_once ('includes/pages/user_myshifts.php'); require_once ('includes/pages/user_myshifts.php');
require_once ('includes/pages/user_news.php'); require_once ('includes/pages/user_news.php');
require_once ('includes/pages/user_questions.php'); require_once ('includes/pages/user_questions.php');
require_once ('includes/pages/user_settings.php');
require_once ('includes/pages/user_shifts.php'); require_once ('includes/pages/user_shifts.php');
require_once ('includes/pages/user_wakeup.php'); require_once ('includes/pages/user_wakeup.php');
@ -83,6 +87,7 @@ elseif (in_array($p, $privileges)) {
$content = user_news(); $content = user_news();
} elseif ($p == "news_comments") { } elseif ($p == "news_comments") {
require_once ('includes/pages/user_news.php'); require_once ('includes/pages/user_news.php');
$title = user_news_comments_title();
$content = user_news_comments(); $content = user_news_comments();
} elseif ($p == "user_meetings") { } elseif ($p == "user_meetings") {
$title = meetings_title(); $title = meetings_title();
@ -103,16 +108,16 @@ elseif (in_array($p, $privileges)) {
$title = wakeup_title(); $title = wakeup_title();
$content = user_wakeup(); $content = user_wakeup();
} elseif ($p == "user_settings") { } elseif ($p == "user_settings") {
require_once ('includes/pages/user_settings.php'); $title = settings_title();
$content = user_settings(); $content = user_settings();
} elseif ($p == "login") { } elseif ($p == "login") {
require_once ('includes/pages/guest_login.php'); $title = login_title();
$content = guest_login(); $content = guest_login();
} elseif ($p == "register") { } elseif ($p == "register") {
require_once ('includes/pages/guest_login.php'); $title = register_title();
$content = guest_register(); $content = guest_register();
} elseif ($p == "logout") { } elseif ($p == "logout") {
require_once ('includes/pages/guest_login.php'); $title = logout_title();
$content = guest_logout(); $content = guest_logout();
} elseif ($p == "admin_questions") { } elseif ($p == "admin_questions") {
$title = admin_questions_title(); $title = admin_questions_title();
@ -165,6 +170,7 @@ elseif (in_array($p, $privileges)) {
} }
} elseif ($p == "credits") { } elseif ($p == "credits") {
require_once ('includes/pages/guest_credits.php'); require_once ('includes/pages/guest_credits.php');
$title = credits_title();
$content = guest_credits(); $content = guest_credits();
} elseif ($p == "faq") { } elseif ($p == "faq") {
$title = faq_title(); $title = faq_title();

19
templates/user_questions.html
View File

@ -1,22 +1,3 @@
<p>
Unbeantwortete Fragen:
</p>
<table>
<thead>
<tr>
<th>
Frage
</th>
<th>
&nbsp;
</th>
</tr>
</thead>
<tbody>
%open_questions%
</tbody>
</table>
<hr/>
<p> <p>
Beantwortete Fragen: Beantwortete Fragen:
</p> </p>

45
templates/user_shifts_add.html
View File

@ -1,45 +0,0 @@
<form action="" method="post">
<fieldset>
<p>
<label>
Helfer:
</label>
%angel%
</p>
<p>
<label>
Datum/Dauer:
</label>
%date%
</p>
<p>
<label>
Ort:
</label>
%location%
</p>
<p>
<label>
Titel:
</label>
%title%
</p>
<p>
<label>
Typ:
</label>
%type%
</p>
<p>
<label>
Kommentar:
<br/>
(Nur für Dich)
</label>
<textarea name="comment">%comment%</textarea>
</p>
<p>
<input type="submit" name="submit" value="Speichern" />
</p>
</fieldset>
</form>