summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/pages/user_settings.php2
-rw-r--r--includes/pages/user_shifts.php66
-rw-r--r--public/css/base.css4
-rw-r--r--public/css/forms.js2
-rw-r--r--public/pic/lock.pngbin749 -> 0 bytes
5 files changed, 15 insertions, 59 deletions
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index 7aaad79a..999b890d 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -182,7 +182,7 @@ function user_settings() {
form_text('jabber', "Jabber", $jabber),
form_text('hometown', Get_Text("makeuser_Hometown"), $hometown),
$enable_tshirt_size ? form_select('tshirt_size', Get_Text("makeuser_T-Shirt"), $tshirt_sizes, $tshirt_size) : '',
- form_checkboxes('angel_types', "<span id=\"angel_types_anchor\">What do you want to do?</span><br>(<a href=\"https://events.ccc.de/congress/2012/wiki/Volunteers#What_kind_of_volunteers_are_needed.3F\">Description of job types</a>)", $angel_types, $selected_angel_types),
+ form_checkboxes('angel_types', "What do you want to do?<br>(<a href=\"https://events.ccc.de/congress/2012/wiki/Volunteers#What_kind_of_volunteers_are_needed.3F\">Description of job types</a>)", $angel_types, $selected_angel_types),
form_submit('submit', Get_Text("save"))
)),
form(array (
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index f76157d4..07db1d57 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -282,11 +282,10 @@ function view_user_shifts() {
$ical_shifts = array ();
$days = sql_select("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('admin_shifts', $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) 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` FROM `UserAngelTypes` JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`) WHERE `UserAngelTypes`.`user_id` = " . sql_escape($user['UID']) . " AND (`AngelTypes`.`restricted` = 0 OR NOT `UserAngelTypes`.`confirm_user_id` IS NULL) ORDER BY `AngelTypes`.`name`");
if (empty($types))
$types = sql_select("SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0");
$filled = array (
@@ -421,9 +420,9 @@ function view_user_shifts() {
$query .= "`shift_id` = " . sql_escape($shift['SID']);
else
$query .= "`room_id` = " . sql_escape($shift['RID']);
- $query .= " AND `count` > 0 ";
- $query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ")";
- $query .= "ORDER BY `AngelTypes`.`name`";
+ $query .= " AND `count` > 0
+ AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ")
+ ORDER BY `AngelTypes`.`name`";
$angeltypes = sql_select($query);
if (count($angeltypes) > 0) {
@@ -442,29 +441,10 @@ function view_user_shifts() {
$entry_list[] = "<span style=\"$style\">" . $entry['Nick']."</span>";
}
if ($angeltype['count'] - count($entries) > 0) {
- // 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 &= in_array($angeltype['id'], $_SESSION['user_shifts']['types']);
-
- // you can only join if the shift is in future or running
- $user_may_join_shift &= time() < $shift['end'];
-
- // User shift admins may join anybody in every shift
- $user_may_join_shift |= in_array('user_shifts_admin', $privileges);
-
- if ($user_may_join_shift) {
+ if ((time() < $shift['end'] && !$my_shift) || in_array('user_shifts_admin', $privileges)) {
$entry_list[] = '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'] . '">' . ($angeltype['count'] - count($entries)) . ' Helfer' . ($angeltype['count'] - count($entries) != 1 ? '' : '') . ' gebraucht &raquo;</a>';
} else {
- if(!in_array('user_shifts_admin', $privileges) && $angeltype['restricted'] == 1 && !isset($angeltype['confirm_user_id'])) {
- $entry_list[] = ($angeltype['count'] - count($entries)) . ' Helfer gebraucht' . ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />';
- } else {
- $entry_list[] = ($angeltype['count'] - count($entries)) . ' Helfer gebraucht' . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] .')</a>';
- }
+ $entry_list[] = ($angeltype['count'] - count($entries)) . ' Helfer gebraucht';
}
$is_free = true;
}
@@ -525,8 +505,8 @@ function view_user_shifts() {
$shift_has_special_needs = 0 < sql_num_query("SELECT `id` FROM `NeededAngelTypes` WHERE `shift_id` = " . $shift['SID']);
$query = "SELECT *
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']) . ")
+ JOIN `AngelTypes`
+ ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`)
WHERE ";
if ($shift_has_special_needs)
$query .= "`shift_id` = " . sql_escape($shift['SID']);
@@ -553,30 +533,10 @@ function view_user_shifts() {
if ($angeltype['count'] - count($entries) > 0) {
$inner_text = ($angeltype['count'] - count($entries)) . ' ' . Get_Text($angeltype['count'] - count($entries) == 1 ? 'helper' : 'helpers') . ' ' . Get_Text('needed');
// 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 &= in_array($angeltype['id'], $_SESSION['user_shifts']['types']);
-
- // you can only join if the shift is in future or running
- $user_may_join_shift &= time() < $shift['end'];
-
- // User shift admins may join anybody in every shift
- $user_may_join_shift |= in_array('user_shifts_admin', $privileges);
-
- if ($user_may_join_shift)
+ if ((time() < $shift['end'] && !$my_shift) || in_array('user_shifts_admin', $privileges))
$entry_list[] = '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['id'] . '">' . $inner_text . ' &raquo;</a>';
- else {
- if(!in_array('user_shifts_admin', $privileges) && $angeltype['restricted'] == 1 && !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>';
- }
- }
-
+ else
+ $entry_list[] = $inner_text;
unset($inner_text);
$is_free = true;
}
@@ -639,7 +599,7 @@ function make_select($items, $selected, $name, $title = null) {
$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></li>';
$html = '<div class="selection ' . $name . '">' . "\n";
$html .= '<ul id="selection_' . $name . '">' . "\n";
$html .= implode("\n", $html_items);
diff --git a/public/css/base.css b/public/css/base.css
index bb59014e..759e9157 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -389,7 +389,3 @@ tr:hover .hidden {
#filter {
padding: 10px;
}
-
-td .entries img {
- vertical-align: bottom;
-}
diff --git a/public/css/forms.js b/public/css/forms.js
index 630d8c25..8a6e2c69 100644
--- a/public/css/forms.js
+++ b/public/css/forms.js
@@ -2,7 +2,7 @@ function check_all(id) {
var obj = document.getElementById(id);
var boxes = obj.getElementsByTagName("input");
for(var i = 0; i < boxes.length; i++) {
- if(boxes[i].type == "checkbox" && !boxes[i].disabled)
+ if(boxes[i].type == "checkbox")
boxes[i].checked = true;
}
}
diff --git a/public/pic/lock.png b/public/pic/lock.png
deleted file mode 100644
index 2ebc4f6f..00000000
--- a/public/pic/lock.png
+++ /dev/null
Binary files differ
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-30 07:57:07 +0000