code maintenance
This commit is contained in:
Philip Häusler
parent
734447b40c
commit
079279a1d0
|
|
@ -6,7 +6,7 @@ function admin_new_questions() {
|
||||||
$new_messages = sql_num_query("SELECT * FROM `Questions` WHERE `AID`=0");
|
$new_messages = sql_num_query("SELECT * FROM `Questions` WHERE `AID`=0");
|
||||||
|
|
||||||
if ($new_messages > 0)
|
if ($new_messages > 0)
|
||||||
return '<p class="notice"><a href="' . page_link_to("admin_questions") . '">Es gibt unbeantwortete Fragen!</a></p><hr />';
|
return '<p class="info"><a href="' . page_link_to("admin_questions") . '">Es gibt unbeantwortete Fragen!</a></p><hr />';
|
||||||
}
|
}
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
|
|
|
||||||
|
|
@ -3,270 +3,270 @@
|
||||||
|
|
||||||
// Assistent zum Anlegen mehrerer neuer Schichten
|
// Assistent zum Anlegen mehrerer neuer Schichten
|
||||||
function admin_shifts() {
|
function admin_shifts() {
|
||||||
$msg = "";
|
$msg = "";
|
||||||
$ok = true;
|
$ok = true;
|
||||||
|
|
||||||
$rid = 0;
|
$rid = 0;
|
||||||
$start = DateTime :: createFromFormat("Y-m-d H:i", date("Y-m-d") . " 00:00")->getTimestamp();
|
$start = DateTime :: createFromFormat("Y-m-d H:i", date("Y-m-d") . " 00:00")->getTimestamp();
|
||||||
$end = $start +24 * 60 * 60;
|
$end = $start +24 * 60 * 60;
|
||||||
$mode = '';
|
$mode = '';
|
||||||
$angelmode = '';
|
$angelmode = '';
|
||||||
$length = '';
|
$length = '';
|
||||||
$change_hours = '';
|
$change_hours = '';
|
||||||
|
|
||||||
// Locations laden (auch unsichtbare - fuer Erzengel ist das ok)
|
// Locations laden (auch unsichtbare - fuer Erzengel ist das ok)
|
||||||
$rooms = sql_select("SELECT * FROM `Room` ORDER BY `Name`");
|
$rooms = sql_select("SELECT * FROM `Room` 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`");
|
||||||
$needed_angel_types = array ();
|
$needed_angel_types = array ();
|
||||||
foreach ($types as $type)
|
foreach ($types as $type)
|
||||||
$needed_angel_types[$type['id']] = 0;
|
$needed_angel_types[$type['id']] = 0;
|
||||||
|
|
||||||
if (isset ($_REQUEST['preview']) || isset ($_REQUEST['back'])) {
|
if (isset ($_REQUEST['preview']) || isset ($_REQUEST['back'])) {
|
||||||
// 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;
|
||||||
$rid = $rooms[0]['RID'];
|
$rid = $rooms[0]['RID'];
|
||||||
$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;
|
||||||
$msg .= error("Bitte gib einen Endzeitpunkt für die Schichten an.", true);
|
$msg .= error("Bitte gib einen Endzeitpunkt für die Schichten an.", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($start >= $end) {
|
if ($start >= $end) {
|
||||||
$ok = false;
|
$ok = false;
|
||||||
$msg .= error("Das Ende muss nach dem Startzeitpunkt liegen!", true);
|
$msg .= error("Das Ende muss nach dem Startzeitpunkt liegen!", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset ($_REQUEST['mode'])) {
|
if (isset ($_REQUEST['mode'])) {
|
||||||
if ($_REQUEST['mode'] == 'single') {
|
if ($_REQUEST['mode'] == 'single') {
|
||||||
$mode = 'single';
|
$mode = 'single';
|
||||||
}
|
}
|
||||||
elseif ($_REQUEST['mode'] == 'multi') {
|
elseif ($_REQUEST['mode'] == 'multi') {
|
||||||
if (isset ($_REQUEST['length']) && preg_match("/^[0-9]+$/", trim($_REQUEST['length']))) {
|
if (isset ($_REQUEST['length']) && preg_match("/^[0-9]+$/", trim($_REQUEST['length']))) {
|
||||||
$mode = 'multi';
|
$mode = 'multi';
|
||||||
$length = trim($_REQUEST['length']);
|
$length = trim($_REQUEST['length']);
|
||||||
} else {
|
} else {
|
||||||
$ok = false;
|
$ok = false;
|
||||||
$msg .= error("Bitte gib eine Schichtlänge in Minuten an.", true);
|
$msg .= error("Bitte gib eine Schichtlänge in Minuten an.", true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elseif ($_REQUEST['mode'] == 'variable') {
|
elseif ($_REQUEST['mode'] == 'variable') {
|
||||||
if (isset ($_REQUEST['change_hours']) && preg_match("/^([0-9]{2}(,|$))/", trim(str_replace(" ", "", $_REQUEST['change_hours'])))) {
|
if (isset ($_REQUEST['change_hours']) && preg_match("/^([0-9]{2}(,|$))/", trim(str_replace(" ", "", $_REQUEST['change_hours'])))) {
|
||||||
$mode = 'variable';
|
$mode = 'variable';
|
||||||
$change_hours = explode(",", $_REQUEST['change_hours']);
|
$change_hours = explode(",", $_REQUEST['change_hours']);
|
||||||
} else {
|
} else {
|
||||||
$ok = false;
|
$ok = false;
|
||||||
$msg .= error("Bitte gib die Schichtwechsel-Stunden kommagetrennt ein.", true);
|
$msg .= error("Bitte gib die Schichtwechsel-Stunden kommagetrennt ein.", true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$ok = false;
|
$ok = false;
|
||||||
$msg .= error("Bitte wähle einen Modus.", true);
|
$msg .= error("Bitte wähle einen Modus.", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset ($_REQUEST['angelmode'])) {
|
if (isset ($_REQUEST['angelmode'])) {
|
||||||
if ($_REQUEST['angelmode'] == 'location') {
|
if ($_REQUEST['angelmode'] == 'location') {
|
||||||
$angelmode = 'location';
|
$angelmode = 'location';
|
||||||
}
|
}
|
||||||
elseif ($_REQUEST['angelmode'] == 'manually') {
|
elseif ($_REQUEST['angelmode'] == 'manually') {
|
||||||
$angelmode = 'manually';
|
$angelmode = 'manually';
|
||||||
foreach ($types as $type) {
|
foreach ($types 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;
|
||||||
$msg .= error("Bitte überprüfe die Eingaben für die benötigten Engel des Typs " . $type['name'] . ".", true);
|
$msg .= error("Bitte überprüfe die Eingaben für die benötigten Engel des Typs " . $type['name'] . ".", true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (array_sum($needed_angel_types) == 0) {
|
if (array_sum($needed_angel_types) == 0) {
|
||||||
$ok = false;
|
$ok = false;
|
||||||
$msg .= error("Es werden 0 Engel benötigt. Bitte wähle benötigte Engel.", true);
|
$msg .= error("Es werden 0 Engel benötigt. Bitte wähle benötigte Engel.", true);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$ok = false;
|
$ok = false;
|
||||||
$msg .= error("Bitte Wähle einen Modus für die benötigten Engel.", true);
|
$msg .= error("Bitte Wähle einen Modus für die benötigten Engel.", true);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$ok = false;
|
$ok = false;
|
||||||
$msg .= error("Bitte wähle benötigte Engel.", true);
|
$msg .= error("Bitte wähle benötigte Engel.", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Beim Zurück-Knopf das Formular zeigen
|
// Beim Zurück-Knopf das Formular zeigen
|
||||||
if (isset ($_REQUEST['back']))
|
if (isset ($_REQUEST['back']))
|
||||||
$ok = false;
|
$ok = false;
|
||||||
|
|
||||||
// Alle Eingaben in Ordnung
|
// Alle Eingaben in Ordnung
|
||||||
if ($ok) {
|
if ($ok) {
|
||||||
if ($angelmode == 'location') {
|
if ($angelmode == 'location') {
|
||||||
$needed_angel_types = array ();
|
$needed_angel_types = array ();
|
||||||
$needed_angel_types_location = sql_select("SELECT * FROM `NeededAngelTypes` WHERE `room_id`=" . sql_escape($rid));
|
$needed_angel_types_location = sql_select("SELECT * FROM `NeededAngelTypes` WHERE `room_id`=" . sql_escape($rid));
|
||||||
foreach ($needed_angel_types_location as $type)
|
foreach ($needed_angel_types_location as $type)
|
||||||
$needed_angel_types[$type['angel_type_id']] = $type['count'];
|
$needed_angel_types[$type['angel_type_id']] = $type['count'];
|
||||||
}
|
}
|
||||||
$shifts = array ();
|
$shifts = array ();
|
||||||
if ($mode == 'single') {
|
if ($mode == 'single') {
|
||||||
$shifts[] = array (
|
$shifts[] = array (
|
||||||
'start' => $start,
|
'start' => $start,
|
||||||
'end' => $end,
|
'end' => $end,
|
||||||
'RID' => $rid,
|
'RID' => $rid,
|
||||||
'name' => $name
|
'name' => $name
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
elseif ($mode == 'multi') {
|
elseif ($mode == 'multi') {
|
||||||
$shift_start = $start;
|
$shift_start = $start;
|
||||||
do {
|
do {
|
||||||
$shift_end = $shift_start + $length * 60;
|
$shift_end = $shift_start + $length * 60;
|
||||||
|
|
||||||
if ($shift_end > $end)
|
if ($shift_end > $end)
|
||||||
$shift_end = $end;
|
$shift_end = $end;
|
||||||
if ($shift_start >= $shift_end)
|
if ($shift_start >= $shift_end)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
$shifts[] = array (
|
$shifts[] = array (
|
||||||
'start' => $shift_start,
|
'start' => $shift_start,
|
||||||
'end' => $shift_end,
|
'end' => $shift_end,
|
||||||
'RID' => $rid,
|
'RID' => $rid,
|
||||||
'name' => $name
|
'name' => $name
|
||||||
);
|
);
|
||||||
|
|
||||||
$shift_start = $shift_end;
|
$shift_start = $shift_end;
|
||||||
} while ($shift_end < $end);
|
} while ($shift_end < $end);
|
||||||
}
|
}
|
||||||
elseif ($mode == 'variable') {
|
elseif ($mode == 'variable') {
|
||||||
rsort($change_hours);
|
rsort($change_hours);
|
||||||
$day = DateTime :: createFromFormat("Y-m-d H:i", date("Y-m-d", $start) . " 00:00")->getTimestamp();
|
$day = DateTime :: createFromFormat("Y-m-d H:i", date("Y-m-d", $start) . " 00:00")->getTimestamp();
|
||||||
$change_index = 0;
|
$change_index = 0;
|
||||||
// Ersten/nächsten passenden Schichtwechsel suchen
|
// Ersten/nächsten passenden Schichtwechsel suchen
|
||||||
foreach ($change_hours as $i => $change_hour) {
|
foreach ($change_hours as $i => $change_hour) {
|
||||||
if ($start < $day + $change_hour * 60 * 60)
|
if ($start < $day + $change_hour * 60 * 60)
|
||||||
$change_index = $i;
|
$change_index = $i;
|
||||||
elseif ($start == $day + $change_hour * 60 * 60) {
|
elseif ($start == $day + $change_hour * 60 * 60) {
|
||||||
// Start trifft Schichtwechsel
|
// Start trifft Schichtwechsel
|
||||||
$change_index = ($i +count($change_hours) - 1) % count($change_hours);
|
$change_index = ($i +count($change_hours) - 1) % count($change_hours);
|
||||||
break;
|
break;
|
||||||
} else
|
} else
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$shift_start = $start;
|
$shift_start = $start;
|
||||||
do {
|
do {
|
||||||
$day = DateTime :: createFromFormat("Y-m-d H:i", date("Y-m-d", $shift_start) . " 00:00")->getTimestamp();
|
$day = DateTime :: createFromFormat("Y-m-d H:i", date("Y-m-d", $shift_start) . " 00:00")->getTimestamp();
|
||||||
$shift_end = $day + $change_hours[$change_index] * 60 * 60;
|
$shift_end = $day + $change_hours[$change_index] * 60 * 60;
|
||||||
|
|
||||||
if ($shift_end > $end)
|
if ($shift_end > $end)
|
||||||
$shift_end = $end;
|
$shift_end = $end;
|
||||||
if ($shift_start >= $shift_end)
|
if ($shift_start >= $shift_end)
|
||||||
$shift_end += 24 * 60 * 60;
|
$shift_end += 24 * 60 * 60;
|
||||||
|
|
||||||
$shifts[] = array (
|
$shifts[] = array (
|
||||||
'start' => $shift_start,
|
'start' => $shift_start,
|
||||||
'end' => $shift_end,
|
'end' => $shift_end,
|
||||||
'RID' => $rid,
|
'RID' => $rid,
|
||||||
'name' => $name
|
'name' => $name
|
||||||
);
|
);
|
||||||
|
|
||||||
$shift_start = $shift_end;
|
$shift_start = $shift_end;
|
||||||
$change_index = ($change_index +count($change_hours) - 1) % count($change_hours);
|
$change_index = ($change_index +count($change_hours) - 1) % count($change_hours);
|
||||||
} while ($shift_end < $end);
|
} while ($shift_end < $end);
|
||||||
}
|
}
|
||||||
|
|
||||||
$shifts_table = "";
|
$shifts_table = "";
|
||||||
foreach ($shifts as $shift) {
|
foreach ($shifts as $shift) {
|
||||||
$shifts_table .= '<tr><td>' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br />' . $room_array[$shift['RID']] . '</td>';
|
$shifts_table .= '<tr><td>' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '<br />' . $room_array[$shift['RID']] . '</td>';
|
||||||
$shifts_table .= '<td>' . $shift['name'];
|
$shifts_table .= '<td>' . $shift['name'];
|
||||||
foreach ($types as $type) {
|
foreach ($types as $type) {
|
||||||
if (isset ($needed_angel_types[$type['id']]) && $needed_angel_types[$type['id']] > 0)
|
if (isset ($needed_angel_types[$type['id']]) && $needed_angel_types[$type['id']] > 0)
|
||||||
$shifts_table .= '<br /><b>' . $type['name'] . ':</b> ' . $needed_angel_types[$type['id']] . ' missing';
|
$shifts_table .= '<br /><b>' . $type['name'] . ':</b> ' . $needed_angel_types[$type['id']] . ' missing';
|
||||||
}
|
}
|
||||||
$shifts_table .= '</td></tr>';
|
$shifts_table .= '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fürs Anlegen zwischenspeichern:
|
// Fürs Anlegen zwischenspeichern:
|
||||||
$_SESSION['admin_shifts_shifts'] = $shifts;
|
$_SESSION['admin_shifts_shifts'] = $shifts;
|
||||||
$_SESSION['admin_shifts_types'] = $needed_angel_types;
|
$_SESSION['admin_shifts_types'] = $needed_angel_types;
|
||||||
|
|
||||||
$hidden_types = "";
|
$hidden_types = "";
|
||||||
foreach ($needed_angel_types as $type_id => $count)
|
foreach ($needed_angel_types as $type_id => $count)
|
||||||
$hidden_types .= '<input type="hidden" name="type_' . $type_id . '" value="' . $count . '" />';
|
$hidden_types .= '<input type="hidden" name="type_' . $type_id . '" value="' . $count . '" />';
|
||||||
return template_render('../templates/admin_shift_preview.html', array (
|
return template_render('../templates/admin_shift_preview.html', array (
|
||||||
'shifts_table' => $shifts_table,
|
'shifts_table' => $shifts_table,
|
||||||
'name' => $name,
|
'name' => $name,
|
||||||
'rid' => $rid,
|
'rid' => $rid,
|
||||||
'start' => date("Y-m-d H:i", $start),
|
'start' => date("Y-m-d H:i", $start),
|
||||||
'end' => date("Y-m-d H:i", $end),
|
'end' => date("Y-m-d H:i", $end),
|
||||||
'mode' => $mode,
|
'mode' => $mode,
|
||||||
'length' => $length,
|
'length' => $length,
|
||||||
'change_hours' => $change_hours,
|
'change_hours' => $change_hours,
|
||||||
'angelmode' => $angelmode,
|
'angelmode' => $angelmode,
|
||||||
'needed_angel_types' => $hidden_types
|
'needed_angel_types' => $hidden_types
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
elseif (isset ($_REQUEST['submit'])) {
|
elseif (isset ($_REQUEST['submit'])) {
|
||||||
if (!is_array($_SESSION['admin_shifts_shifts']) || !is_array($_SESSION['admin_shifts_types'])) {
|
if (!is_array($_SESSION['admin_shifts_shifts']) || !is_array($_SESSION['admin_shifts_types'])) {
|
||||||
header("Location: ?p=admin_shifts");
|
header("Location: ?p=admin_shifts");
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($_SESSION['admin_shifts_shifts'] as $shift) {
|
foreach ($_SESSION['admin_shifts_shifts'] as $shift) {
|
||||||
sql_query("INSERT INTO `Shifts` SET `start`=" . sql_escape($shift['start']) . ", `end`=" . sql_escape($shift['end']) . ", `RID`=" . sql_escape($shift['RID']) . ", `name`='" . sql_escape($shift['name']) . "'");
|
sql_query("INSERT INTO `Shifts` SET `start`=" . sql_escape($shift['start']) . ", `end`=" . sql_escape($shift['end']) . ", `RID`=" . sql_escape($shift['RID']) . ", `name`='" . sql_escape($shift['name']) . "'");
|
||||||
$shift_id = sql_id();
|
$shift_id = sql_id();
|
||||||
foreach ($_SESSION['admin_shifts_types'] as $type_id => $count) {
|
foreach ($_SESSION['admin_shifts_types'] as $type_id => $count) {
|
||||||
sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`=" . sql_escape($shift_id) . ", `angel_type_id`=" . sql_escape($type_id) . ", `count`=" . sql_escape($count));
|
sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`=" . sql_escape($shift_id) . ", `angel_type_id`=" . sql_escape($type_id) . ", `count`=" . sql_escape($count));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$msg = success("Schichten angelegt.", true);
|
$msg = success("Schichten angelegt.", true);
|
||||||
} else {
|
} else {
|
||||||
unset ($_SESSION['admin_shifts_shifts']);
|
unset ($_SESSION['admin_shifts_shifts']);
|
||||||
unset ($_SESSION['admin_shifts_types']);
|
unset ($_SESSION['admin_shifts_types']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$room_select = html_select_key('rid', 'rid', $room_array, $_REQUEST['rid']);
|
$room_select = html_select_key('rid', 'rid', $room_array, $_REQUEST['rid']);
|
||||||
$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/admin_shifts.html', array (
|
return template_render('../templates/admin_shifts.html', array (
|
||||||
'angel_types' => $angel_types,
|
'angel_types' => $angel_types,
|
||||||
'room_select' => $room_select,
|
'room_select' => $room_select,
|
||||||
'msg' => $msg,
|
'msg' => $msg,
|
||||||
'name' => $name,
|
'name' => $name,
|
||||||
'start' => date("Y-m-d H:i", $start),
|
'start' => date("Y-m-d H:i", $start),
|
||||||
'end' => date("Y-m-d H:i", $end),
|
'end' => date("Y-m-d H:i", $end),
|
||||||
'mode_single_selected' => $_REQUEST['mode'] == 'single' ? 'checked="checked"' : '',
|
'mode_single_selected' => $_REQUEST['mode'] == 'single' ? 'checked="checked"' : '',
|
||||||
'mode_multi_selected' => $_REQUEST['mode'] == 'multi' ? 'checked="checked"' : '',
|
'mode_multi_selected' => $_REQUEST['mode'] == 'multi' ? 'checked="checked"' : '',
|
||||||
'mode_multi_length' => !empty ($_REQUEST['length']) ? $_REQUEST['length'] : '120',
|
'mode_multi_length' => !empty ($_REQUEST['length']) ? $_REQUEST['length'] : '120',
|
||||||
'mode_variable_selected' => $_REQUEST['mode'] == 'variable' ? 'checked="checked"' : '',
|
'mode_variable_selected' => $_REQUEST['mode'] == 'variable' ? 'checked="checked"' : '',
|
||||||
'mode_variable_hours' => !empty ($_REQUEST['change_hours']) ? $_REQUEST['change_hours'] : '00, 04, 08, 10, 12, 14, 16, 18, 20, 22',
|
'mode_variable_hours' => !empty ($_REQUEST['change_hours']) ? $_REQUEST['change_hours'] : '00, 04, 08, 10, 12, 14, 16, 18, 20, 22',
|
||||||
'angelmode_location_selected' => $_REQUEST['angelmode'] == 'location' ? 'checked="checked"' : '',
|
'angelmode_location_selected' => $_REQUEST['angelmode'] == 'location' ? 'checked="checked"' : '',
|
||||||
'angelmode_manually_selected' => $_REQUEST['angelmode'] == 'manually' ? 'checked="checked"' : ''
|
'angelmode_manually_selected' => $_REQUEST['angelmode'] == 'manually' ? 'checked="checked"' : ''
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ function user_unread_messages() {
|
||||||
$new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`=" . sql_escape($user['UID']));
|
$new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`=" . sql_escape($user['UID']));
|
||||||
|
|
||||||
if ($new_messages > 0)
|
if ($new_messages > 0)
|
||||||
return sprintf('<p class="notice"><a href="%s">%s %s %s</a></p><hr />', page_link_to("user_messages"), Get_Text("pub_messages_new1"), $new_messages, Get_Text("pub_messages_new2"));
|
return sprintf('<p class="info"><a href="%s">%s %s %s</a></p><hr />', page_link_to("user_messages"), Get_Text("pub_messages_new1"), $new_messages, Get_Text("pub_messages_new2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
|
|
|
||||||
|
|
@ -1,170 +1,170 @@
|
||||||
<?php
|
<?php
|
||||||
function user_meetings() {
|
function user_meetings() {
|
||||||
global $DISPLAY_NEWS, $privileges, $user;
|
global $DISPLAY_NEWS, $privileges, $user;
|
||||||
|
|
||||||
$html = "";
|
$html = "";
|
||||||
|
|
||||||
if (isset ($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page']))
|
if (isset ($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page']))
|
||||||
$page = $_REQUEST['page'];
|
$page = $_REQUEST['page'];
|
||||||
else
|
else
|
||||||
$page = 0;
|
$page = 0;
|
||||||
|
|
||||||
$news = sql_select("SELECT * FROM `News` WHERE `Treffen`=1 ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS));
|
$news = sql_select("SELECT * FROM `News` WHERE `Treffen`=1 ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS));
|
||||||
foreach ($news as $entry)
|
foreach ($news as $entry)
|
||||||
$html .= display_news($entry);
|
$html .= display_news($entry);
|
||||||
|
|
||||||
$html .= "<div class=\"pagination\">\n\n";
|
$html .= "<div class=\"pagination\">\n\n";
|
||||||
$dis_rows = ceil(sql_num_query("SELECT * FROM `News` WHERE `Treffen`=1") / $DISPLAY_NEWS);
|
$dis_rows = ceil(sql_num_query("SELECT * FROM `News` WHERE `Treffen`=1") / $DISPLAY_NEWS);
|
||||||
|
|
||||||
$html .= Get_Text(5);
|
$html .= Get_Text(5);
|
||||||
|
|
||||||
for ($i = 0; $i < $dis_rows; $i++) {
|
for ($i = 0; $i < $dis_rows; $i++) {
|
||||||
if ($i == $_REQUEST['page'])
|
if (isset($_REQUEST['page']) && $i == $_REQUEST['page'])
|
||||||
$html .= ($i +1) . " ";
|
$html .= ($i +1) . " ";
|
||||||
else
|
else
|
||||||
$html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i +1) . '</a> ';
|
$html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i +1) . '</a> ';
|
||||||
}
|
}
|
||||||
$html .= '</div>';
|
$html .= '</div>';
|
||||||
return $html;
|
return $html;
|
||||||
}
|
}
|
||||||
|
|
||||||
function display_news($news) {
|
function display_news($news) {
|
||||||
global $privileges, $p;
|
global $privileges, $p;
|
||||||
|
|
||||||
$html = "";
|
$html = "";
|
||||||
$html .= '<article class="news' . ($news['Treffen'] == 1 ? ' meeting' : '') . '">';
|
$html .= '<article class="news' . ($news['Treffen'] == 1 ? ' meeting' : '') . '">';
|
||||||
$html .= '<details>';
|
$html .= '<details>';
|
||||||
$html .= date("Y-m-d H:i", $news['Datum']) . ', ';
|
$html .= date("Y-m-d H:i", $news['Datum']) . ', ';
|
||||||
$html .= UID2Nick($news['UID']);
|
$html .= UID2Nick($news['UID']);
|
||||||
if ($p != "news_comments")
|
if ($p != "news_comments")
|
||||||
$html .= ', <a href="' . page_link_to("news_comments") . '&nid=' . $news['ID'] . '">Kommentare (' . sql_num_query("SELECT * FROM `news_comments` WHERE `Refid`='" . sql_escape($news['ID']) . "'") . ') »</a>';
|
$html .= ', <a href="' . page_link_to("news_comments") . '&nid=' . $news['ID'] . '">Kommentare (' . sql_num_query("SELECT * FROM `news_comments` WHERE `Refid`='" . sql_escape($news['ID']) . "'") . ') »</a>';
|
||||||
$html .= '</details>';
|
$html .= '</details>';
|
||||||
$html .= '<h3>' . ($news['Treffen'] == 1 ? '[Meeting] ' : '') . ReplaceSmilies($news['Betreff']) . '</h3>';
|
$html .= '<h3>' . ($news['Treffen'] == 1 ? '[Meeting] ' : '') . ReplaceSmilies($news['Betreff']) . '</h3>';
|
||||||
$html .= '<p>' . ReplaceSmilies(nl2br($news['Text'])) . '</p>';
|
$html .= '<p>' . ReplaceSmilies(nl2br($news['Text'])) . '</p>';
|
||||||
if (in_array("admin_news", $privileges))
|
if (in_array("admin_news", $privileges))
|
||||||
$html .= "<details><a href=\"" . page_link_to("admin_news") . "&action=edit&id=" . $news['ID'] . "\">Edit</a></details>\n";
|
$html .= "<details><a href=\"" . page_link_to("admin_news") . "&action=edit&id=" . $news['ID'] . "\">Edit</a></details>\n";
|
||||||
|
|
||||||
$html .= '</article>';
|
$html .= '</article>';
|
||||||
return $html;
|
return $html;
|
||||||
}
|
}
|
||||||
|
|
||||||
function user_news_comments() {
|
function user_news_comments() {
|
||||||
global $user;
|
global $user;
|
||||||
|
|
||||||
$html = "";
|
$html = "";
|
||||||
if (isset ($_REQUEST["nid"]) && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid']) && sql_num_query("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1") > 0) {
|
if (isset ($_REQUEST["nid"]) && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid']) && sql_num_query("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1") > 0) {
|
||||||
$nid = $_REQUEST["nid"];
|
$nid = $_REQUEST["nid"];
|
||||||
list ($news) = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($nid) . " LIMIT 1");
|
list ($news) = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($nid) . " LIMIT 1");
|
||||||
if (isset ($_REQUEST["text"])) {
|
if (isset ($_REQUEST["text"])) {
|
||||||
$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"]) . "')");
|
||||||
$html .= success("Eintrag wurde gespeichert", true);
|
$html .= success("Eintrag wurde gespeichert", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$html .= '<a href="' . page_link_to("news") . '">« Back</a>';
|
$html .= '<a href="' . page_link_to("news") . '">« Back</a>';
|
||||||
$html .= display_news($news);
|
$html .= display_news($news);
|
||||||
|
|
||||||
$html .= '<h2>Kommentare</h2>';
|
$html .= '<h2>Kommentare</h2>';
|
||||||
|
|
||||||
$comments = sql_select("SELECT * FROM `news_comments` WHERE `Refid`='" . sql_escape($nid) . "' ORDER BY 'ID'");
|
$comments = sql_select("SELECT * FROM `news_comments` WHERE `Refid`='" . sql_escape($nid) . "' ORDER BY 'ID'");
|
||||||
foreach ($comments as $comment) {
|
foreach ($comments as $comment) {
|
||||||
$html .= '<article class="news_comment">';
|
$html .= '<article class="news_comment">';
|
||||||
$html .= DisplayAvatar($comment['UID']);
|
$html .= DisplayAvatar($comment['UID']);
|
||||||
$html .= '<details>';
|
$html .= '<details>';
|
||||||
$html .= $comment['Datum'] . ', ';
|
$html .= $comment['Datum'] . ', ';
|
||||||
$html .= UID2Nick($comment['UID']);
|
$html .= UID2Nick($comment['UID']);
|
||||||
$html .= '</details>';
|
$html .= '</details>';
|
||||||
$html .= '<p>' . nl2br($comment['Text']) . '</p>';
|
$html .= '<p>' . nl2br($comment['Text']) . '</p>';
|
||||||
$html .= '</article>';
|
$html .= '</article>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$html .= "</table>";
|
$html .= "</table>";
|
||||||
$html .= '
|
$html .= '
|
||||||
<br />
|
<br />
|
||||||
<hr>
|
<hr>
|
||||||
<h2>Neuer Kommentar:</h2>
|
<h2>Neuer Kommentar:</h2>
|
||||||
<a name="Neu"> </a>
|
<a name="Neu"> </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><textarea name="text" cols="50" rows="10"></textarea></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
<br />
|
|
||||||
<input type="submit" value="sichern...">
|
|
||||||
</form>';
|
|
||||||
} else {
|
|
||||||
$html .= "Fehlerhafter Aufruf!";
|
|
||||||
}
|
|
||||||
|
|
||||||
return $html;
|
<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><textarea name="text" cols="50" rows="10"></textarea></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<br />
|
||||||
|
<input type="submit" value="sichern...">
|
||||||
|
</form>';
|
||||||
|
} else {
|
||||||
|
$html .= "Fehlerhafter Aufruf!";
|
||||||
|
}
|
||||||
|
|
||||||
|
return $html;
|
||||||
}
|
}
|
||||||
|
|
||||||
function user_news() {
|
function user_news() {
|
||||||
global $DISPLAY_NEWS, $privileges, $user;
|
global $DISPLAY_NEWS, $privileges, $user;
|
||||||
|
|
||||||
$html = "";
|
$html = "";
|
||||||
|
|
||||||
if (isset ($_POST["text"]) && isset ($_POST["betreff"]) && in_array("admin_news", $privileges)) {
|
if (isset ($_POST["text"]) && isset ($_POST["betreff"]) && in_array("admin_news", $privileges)) {
|
||||||
if (!isset ($_POST["treffen"]) || !in_array("admin_news", $privileges))
|
if (!isset ($_POST["treffen"]) || !in_array("admin_news", $privileges))
|
||||||
$_POST["treffen"] = 0;
|
$_POST["treffen"] = 0;
|
||||||
sql_query("INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) " .
|
sql_query("INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) " .
|
||||||
"VALUES ('" . sql_escape(time()) . "', '" . sql_escape($_POST["betreff"]) . "', '" . sql_escape($_POST["text"]) . "', '" . sql_escape($user['UID']) .
|
"VALUES ('" . sql_escape(time()) . "', '" . sql_escape($_POST["betreff"]) . "', '" . sql_escape($_POST["text"]) . "', '" . sql_escape($user['UID']) .
|
||||||
"', '" . sql_escape($_POST["treffen"]) . "');");
|
"', '" . sql_escape($_POST["treffen"]) . "');");
|
||||||
$html .= success(Get_Text(4), true);
|
$html .= success(Get_Text(4), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset ($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page']))
|
if (isset ($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page']))
|
||||||
$page = $_REQUEST['page'];
|
$page = $_REQUEST['page'];
|
||||||
else
|
else
|
||||||
$page = 0;
|
$page = 0;
|
||||||
|
|
||||||
$news = sql_select("SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS));
|
$news = sql_select("SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . sql_escape($page * $DISPLAY_NEWS) . ", " . sql_escape($DISPLAY_NEWS));
|
||||||
foreach ($news as $entry)
|
foreach ($news as $entry)
|
||||||
$html .= display_news($entry);
|
$html .= display_news($entry);
|
||||||
|
|
||||||
$html .= "<div class=\"pagination\">\n\n";
|
$html .= "<div class=\"pagination\">\n\n";
|
||||||
$dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $DISPLAY_NEWS);
|
$dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $DISPLAY_NEWS);
|
||||||
|
|
||||||
$html .= Get_Text(5);
|
$html .= Get_Text(5);
|
||||||
|
|
||||||
for ($i = 0; $i < $dis_rows; $i++) {
|
for ($i = 0; $i < $dis_rows; $i++) {
|
||||||
if (isset($_REQUEST['page']) && $i == $_REQUEST['page'])
|
if (isset($_REQUEST['page']) && $i == $_REQUEST['page'])
|
||||||
$html .= ($i +1) . " ";
|
$html .= ($i +1) . " ";
|
||||||
else
|
else
|
||||||
$html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i +1) . '</a> ';
|
$html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i +1) . '</a> ';
|
||||||
}
|
}
|
||||||
$html .= '</div>';
|
$html .= '</div>';
|
||||||
if (in_array("admin_news", $privileges)) {
|
if (in_array("admin_news", $privileges)) {
|
||||||
$html .= '<br /><hr />
|
$html .= '<br /><hr />
|
||||||
<h2>' . Get_Text(6) . '</h2>
|
<h2>' . Get_Text(6) . '</h2>
|
||||||
<a name="Neu"> </a>
|
<a name="Neu"> </a>
|
||||||
|
|
||||||
<form action="" method="post">
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td align="right">' . Get_Text(7) . '</td>
|
|
||||||
<td><input type="text" name="betreff" size="60"></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="right">' . Get_Text(8) . '</td>
|
|
||||||
<td><textarea name="text" cols="50" rows="10"></textarea></td>
|
|
||||||
</tr>';
|
|
||||||
if (in_array('admin_news', $privileges)) {
|
|
||||||
$html .= ' <tr>
|
|
||||||
<td align="right">' . Get_Text(9) . '</td>
|
|
||||||
<td><input type="checkbox" name="treffen" size="1" value="1"></td>
|
|
||||||
</tr>';
|
|
||||||
|
|
||||||
}
|
<form action="" method="post">
|
||||||
$html .= '</table>
|
<table>
|
||||||
<br />
|
<tr>
|
||||||
<input type="submit" value="' . Get_Text("save") . '">
|
<td align="right">' . Get_Text(7) . '</td>
|
||||||
</form>';
|
<td><input type="text" name="betreff" size="60"></td>
|
||||||
}
|
</tr>
|
||||||
return $html;
|
<tr>
|
||||||
|
<td align="right">' . Get_Text(8) . '</td>
|
||||||
|
<td><textarea name="text" cols="50" rows="10"></textarea></td>
|
||||||
|
</tr>';
|
||||||
|
if (in_array('admin_news', $privileges)) {
|
||||||
|
$html .= ' <tr>
|
||||||
|
<td align="right">' . Get_Text(9) . '</td>
|
||||||
|
<td><input type="checkbox" name="treffen" size="1" value="1"></td>
|
||||||
|
</tr>';
|
||||||
|
|
||||||
|
}
|
||||||
|
$html .= '</table>
|
||||||
|
<br />
|
||||||
|
<input type="submit" value="' . Get_Text("save") . '">
|
||||||
|
</form>';
|
||||||
|
}
|
||||||
|
return $html;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
@ -12,7 +12,6 @@
|
||||||
<meta name="revisit-after" content="1 days" />
|
<meta name="revisit-after" content="1 days" />
|
||||||
<script type="text/javascript" src="css/grossbild.js"></script>
|
<script type="text/javascript" src="css/grossbild.js"></script>
|
||||||
<script type="text/javascript" src="css/forms.js"></script>
|
<script type="text/javascript" src="css/forms.js"></script>
|
||||||
</script>
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/base.css" />
|
<link rel="stylesheet" type="text/css" href="css/base.css" />
|
||||||
<link rel="stylesheet" type="text/css" href="css/style%theme%.css" />
|
<link rel="stylesheet" type="text/css" href="css/style%theme%.css" />
|
||||||
</head>
|
</head>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue