summaryrefslogtreecommitdiff
path: root/includes/controller
diff options
context:
space:
mode:
authorBot <bot@myigel.name>2017-01-03 14:12:17 +0100
committerIgor Scheller <igor.scheller@igorshp.de>2017-01-03 15:32:59 +0100
commit55141154c083acc2d0397f4c62b4e0be1c7a19fa (patch)
tree7e5e54a19f7df976fa68c42f21f1484112a7c257 /includes/controller
parent356b2582f3e6a43ecf2607acad4a7fe0b37f659a (diff)
Replaced " with '
Diffstat (limited to 'includes/controller')
-rw-r--r--includes/controller/angeltypes_controller.php36
-rw-r--r--includes/controller/event_config_controller.php28
-rw-r--r--includes/controller/rooms_controller.php8
-rw-r--r--includes/controller/shift_entries_controller.php42
-rw-r--r--includes/controller/shifts_controller.php88
-rw-r--r--includes/controller/shifttypes_controller.php12
-rw-r--r--includes/controller/user_angeltypes_controller.php102
-rw-r--r--includes/controller/user_driver_licenses_controller.php16
-rw-r--r--includes/controller/users_controller.php50
9 files changed, 191 insertions, 191 deletions
diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php
index 12d5287a..daa754eb 100644
--- a/includes/controller/angeltypes_controller.php
+++ b/includes/controller/angeltypes_controller.php
@@ -7,7 +7,7 @@
*/
function angeltypes_title()
{
- return _("Angeltypes");
+ return _('Angeltypes');
}
/**
@@ -61,7 +61,7 @@ function angeltypes_about_controller()
}
return [
- _("Teams/Job description"),
+ _('Teams/Job description'),
AngelTypes_about_view($angeltypes, isset($user))
];
}
@@ -83,12 +83,12 @@ function angeltype_delete_controller()
if (isset($_REQUEST['confirmed'])) {
AngelType_delete($angeltype);
- success(sprintf(_("Angeltype %s deleted."), AngelType_name_render($angeltype)));
+ success(sprintf(_('Angeltype %s deleted.'), AngelType_name_render($angeltype)));
redirect(page_link_to('angeltypes'));
}
return [
- sprintf(_("Delete angeltype %s"), $angeltype['name']),
+ sprintf(_('Delete angeltype %s'), $angeltype['name']),
AngelType_delete_view($angeltype)
];
}
@@ -130,7 +130,7 @@ function angeltype_edit_controller()
$angeltype['name'] = $result->getValue();
if (!$result->isValid()) {
$valid = false;
- error(_("Please check the name. Maybe it already exists."));
+ error(_('Please check the name. Maybe it already exists.'));
}
}
@@ -149,13 +149,13 @@ function angeltype_edit_controller()
$angeltype = AngelType_create($angeltype);
}
- success("Angel type saved.");
+ success('Angel type saved.');
redirect(angeltype_link($angeltype['id']));
}
}
return [
- sprintf(_("Edit %s"), $angeltype['name']),
+ sprintf(_('Edit %s'), $angeltype['name']),
AngelType_edit_view($angeltype, $supporter_mode)
];
}
@@ -179,7 +179,7 @@ function angeltype_controller()
$members = Users_by_angeltype($angeltype);
return [
- sprintf(_("Team %s"), $angeltype['name']),
+ sprintf(_('Team %s'), $angeltype['name']),
AngelType_view(
$angeltype,
$members,
@@ -210,19 +210,19 @@ function angeltypes_list_controller()
foreach ($angeltypes as &$angeltype) {
$actions = [
- button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], _("view"), "btn-xs")
+ button(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id'], _('view'), 'btn-xs')
];
if (in_array('admin_angel_types', $privileges)) {
$actions[] = button(
page_link_to('angeltypes') . '&action=edit&angeltype_id=' . $angeltype['id'],
- _("edit"),
- "btn-xs"
+ _('edit'),
+ 'btn-xs'
);
$actions[] = button(
page_link_to('angeltypes') . '&action=delete&angeltype_id=' . $angeltype['id'],
- _("delete"),
- "btn-xs"
+ _('delete'),
+ 'btn-xs'
);
}
@@ -230,14 +230,14 @@ function angeltypes_list_controller()
if ($angeltype['user_angeltype_id'] != null) {
$actions[] = button(
page_link_to('user_angeltypes') . '&action=delete&user_angeltype_id=' . $angeltype['user_angeltype_id'],
- _("leave"),
- "btn-xs"
+ _('leave'),
+ 'btn-xs'
);
} else {
$actions[] = button(
page_link_to('user_angeltypes') . '&action=add&angeltype_id=' . $angeltype['id'],
- _("join"),
- "btn-xs"
+ _('join'),
+ 'btn-xs'
);
}
@@ -268,7 +268,7 @@ function load_angeltype()
$angeltype = AngelType($_REQUEST['angeltype_id']);
if ($angeltype == null) {
- error(_("Angeltype doesn't exist."));
+ error(_('Angeltype doesn\'t exist . '));
redirect(page_link_to('angeltypes'));
}
diff --git a/includes/controller/event_config_controller.php b/includes/controller/event_config_controller.php
index 709d1b2a..06245c47 100644
--- a/includes/controller/event_config_controller.php
+++ b/includes/controller/event_config_controller.php
@@ -5,7 +5,7 @@
*/
function event_config_title()
{
- return _("Event config");
+ return _('Event config');
}
/**
@@ -53,40 +53,40 @@ function event_config_edit_controller()
$event_welcome_msg = null;
}
- $result = check_request_date('buildup_start_date', _("Please enter buildup start date."), true);
+ $result = check_request_date('buildup_start_date', _('Please enter buildup start date.'), true);
$buildup_start_date = $result->getValue();
$valid &= $result->isValid();
- $result = check_request_date('event_start_date', _("Please enter event start date."), true);
+ $result = check_request_date('event_start_date', _('Please enter event start date.'), true);
$event_start_date = $result->getValue();
$valid &= $result->isValid();
- $result = check_request_date('event_end_date', _("Please enter event end date."), true);
+ $result = check_request_date('event_end_date', _('Please enter event end date.'), true);
$event_end_date = $result->getValue();
$valid &= $result->isValid();
- $result = check_request_date('teardown_end_date', _("Please enter teardown end date."), true);
+ $result = check_request_date('teardown_end_date', _('Please enter teardown end date.'), true);
$teardown_end_date = $result->getValue();
$valid &= $result->isValid();
if ($buildup_start_date != null && $event_start_date != null && $buildup_start_date > $event_start_date) {
$valid = false;
- error(_("The buildup start date has to be before the event start date."));
+ error(_('The buildup start date has to be before the event start date.'));
}
if ($event_start_date != null && $event_end_date != null && $event_start_date > $event_end_date) {
$valid = false;
- error(_("The event start date has to be before the event end date."));
+ error(_('The event start date has to be before the event end date.'));
}
if ($event_end_date != null && $teardown_end_date != null && $event_end_date > $teardown_end_date) {
$valid = false;
- error(_("The event end date has to be before the teardown end date."));
+ error(_('The event end date has to be before the teardown end date.'));
}
if ($buildup_start_date != null && $teardown_end_date != null && $buildup_start_date > $teardown_end_date) {
$valid = false;
- error(_("The buildup start date has to be before the teardown end date."));
+ error(_('The buildup start date has to be before the teardown end date.'));
}
if ($valid) {
@@ -100,15 +100,15 @@ function event_config_edit_controller()
);
if ($result === false) {
- engelsystem_error("Unable to update event config.");
+ engelsystem_error('Unable to update event config.');
}
engelsystem_log(
- "Changed event config: $event_name, $event_welcome_msg, "
- . date("Y-m-d", $buildup_start_date) . ", " . date("Y-m-d", $event_start_date) . ", "
- . date("Y-m-d", $event_end_date) . ", " . date("Y-m-d", $teardown_end_date)
+ 'Changed event config: $event_name, $event_welcome_msg, '
+ . date('Y-m-d', $buildup_start_date) . ', ' . date('Y-m-d', $event_start_date) . ', '
+ . date('Y-m-d', $event_end_date) . ', ' . date('Y-m-d', $teardown_end_date)
);
- success(_("Settings saved."));
+ success(_('Settings saved.'));
redirect(page_link_to('admin_event_config'));
}
}
diff --git a/includes/controller/rooms_controller.php b/includes/controller/rooms_controller.php
index 9910f50c..3f5ff387 100644
--- a/includes/controller/rooms_controller.php
+++ b/includes/controller/rooms_controller.php
@@ -23,7 +23,7 @@ function room_controller()
$all_shifts = Shifts_by_room($room);
$days = [];
foreach ($all_shifts as $shift) {
- $day = date("Y-m-d", $shift['start']);
+ $day = date('Y-m-d', $shift['start']);
if (!in_array($day, $days)) {
$days[] = $day;
}
@@ -34,15 +34,15 @@ function room_controller()
[$room['RID']],
AngelType_ids()
);
- $selected_day = date("Y-m-d");
+ $selected_day = date('Y-m-d');
if (!empty($days)) {
$selected_day = $days[0];
}
if (isset($_REQUEST['shifts_filter_day'])) {
$selected_day = $_REQUEST['shifts_filter_day'];
}
- $shiftsFilter->setStartTime(parse_date("Y-m-d H:i", $selected_day . ' 00:00'));
- $shiftsFilter->setEndTime(parse_date("Y-m-d H:i", $selected_day . ' 23:59'));
+ $shiftsFilter->setStartTime(parse_date('Y-m-d H:i', $selected_day . ' 00:00'));
+ $shiftsFilter->setEndTime(parse_date('Y-m-d H:i', $selected_day . ' 23:59'));
$shiftsFilterRenderer = new ShiftsFilterRenderer($shiftsFilter);
$shiftsFilterRenderer->enableDaySelection($days);
diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php
index 05491ee9..8cec5f10 100644
--- a/includes/controller/shift_entries_controller.php
+++ b/includes/controller/shift_entries_controller.php
@@ -10,14 +10,14 @@ function shift_entry_add_controller()
global $privileges, $user;
$shift_id = 0;
- 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'];
} else {
redirect(page_link_to('user_shifts'));
}
// 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 = [];
foreach ($rooms as $room) {
$room_array[$room['RID']] = $room['Name'];
@@ -30,7 +30,7 @@ function shift_entry_add_controller()
}
$type_id = 0;
- if (isset($_REQUEST['type_id']) && preg_match("/^[0-9]*$/", $_REQUEST['type_id'])) {
+ if (isset($_REQUEST['type_id']) && preg_match('/^[0-9]*$/', $_REQUEST['type_id'])) {
$type_id = $_REQUEST['type_id'];
} else {
redirect(page_link_to('user_shifts'));
@@ -60,7 +60,7 @@ function shift_entry_add_controller()
if (
isset($_REQUEST['user_id'])
- && preg_match("/^[0-9]*$/", $_REQUEST['user_id'])
+ && preg_match('/^[0-9]*$/', $_REQUEST['user_id'])
&& (
in_array('user_shifts_admin', $privileges)
|| in_array('shiftentry_edit_angeltype_supporter', $privileges)
@@ -84,7 +84,7 @@ function shift_entry_add_controller()
$shift_entries
);
if (!$shift_signup_allowed->isSignupAllowed()) {
- error(_("You are not allowed to sign up for this shift. Maybe shift is full or already running."));
+ error(_('You are not allowed to sign up for this shift. Maybe shift is full or already running.'));
redirect(shift_link($shift));
}
@@ -143,26 +143,26 @@ function shift_entry_add_controller()
}
$user_source = User($user_id);
- engelsystem_log("User " . User_Nick_render($user_source) . " signed up for shift " . $shift['name'] . " from " . date("Y-m-d H:i",
- $shift['start']) . " to " . date("Y-m-d H:i", $shift['end']));
- success(_("You are subscribed. Thank you!") . ' <a href="' . page_link_to('user_myshifts') . '">' . _("My shifts") . ' &raquo;</a>');
+ engelsystem_log('User ' . User_Nick_render($user_source) . ' signed up for shift ' . $shift['name'] . ' from ' . date('Y-m-d H:i',
+ $shift['start']) . ' to ' . date('Y-m-d H:i', $shift['end']));
+ success(_('You are subscribed. Thank you!') . ' <a href="' . page_link_to('user_myshifts') . '">' . _('My shifts') . ' &raquo;</a>');
redirect(shift_link($shift));
}
$angeltype_select = '';
if (in_array('user_shifts_admin', $privileges)) {
- $users = sql_select("
+ $users = sql_select('
SELECT *, (SELECT count(*) FROM `ShiftEntry` WHERE `freeloaded`=1 AND `ShiftEntry`.`UID`=`User`.`UID`) AS `freeloaded`
FROM `User`
ORDER BY `Nick`
- ");
+ ');
$users_select = [];
foreach ($users as $usr) {
- $users_select[$usr['UID']] = $usr['Nick'] . ($usr['freeloaded'] == 0 ? "" : " (" . _("Freeloader") . ")");
+ $users_select[$usr['UID']] = $usr['Nick'] . ($usr['freeloaded'] == 0 ? '' : ' (' . _('Freeloader') . ')');
}
$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 = [];
foreach ($angeltypes_source as $angeltype) {
$angeltypes[$angeltype['id']] = $angeltype['name'];
@@ -193,13 +193,13 @@ function shift_entry_add_controller()
return ShiftEntry_edit_view(
$user_text,
- date("Y-m-d H:i", $shift['start'])
+ date('Y-m-d H:i', $shift['start'])
. ' &ndash; '
. date('Y-m-d H:i', $shift['end'])
. ' (' . shift_length($shift) . ')',
$shift['Name'],
$shift['name'],
- $angeltype_select, "",
+ $angeltype_select, '',
false,
null,
in_array('user_shifts_admin', $privileges)
@@ -250,15 +250,15 @@ function shift_entry_delete_controller()
}
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']
+ '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(_("Shift entry deleted."));
+ success(_('Shift entry deleted.'));
} else {
- error(_("Entry not found."));
+ error(_('Entry not found.'));
}
redirect(shift_link($shift_entry_source));
diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index a9f4ec28..56ee1452 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -38,7 +38,7 @@ function shift_edit_controller()
global $privileges;
// Schicht bearbeiten
- $msg = "";
+ $msg = '';
$valid = true;
if (!in_array('admin_shifts', $privileges)) {
@@ -74,11 +74,11 @@ function shift_edit_controller()
$title = strip_request_item('title');
// Auswahl der sichtbaren Locations für die Schichten
- if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room[$_REQUEST['rid']])) {
+ if (isset($_REQUEST['rid']) && preg_match('/^[0-9]+$/', $_REQUEST['rid']) && isset($room[$_REQUEST['rid']])) {
$rid = $_REQUEST['rid'];
} else {
$valid = false;
- $msg .= error(_("Please select a room."), true);
+ $msg .= error(_('Please select a room.'), true);
}
if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']])) {
@@ -88,23 +88,23 @@ function shift_edit_controller()
$msg .= error(_('Please select a shifttype.'), true);
}
- if (isset($_REQUEST['start']) && $tmp = parse_date("Y-m-d H:i", $_REQUEST['start'])) {
+ if (isset($_REQUEST['start']) && $tmp = parse_date('Y-m-d H:i', $_REQUEST['start'])) {
$start = $tmp;
} else {
$valid = false;
- $msg .= error(_("Please enter a valid starting time for the shifts."), true);
+ $msg .= error(_('Please enter a valid starting time for the shifts.'), true);
}
- if (isset($_REQUEST['end']) && $tmp = parse_date("Y-m-d H:i", $_REQUEST['end'])) {
+ if (isset($_REQUEST['end']) && $tmp = parse_date('Y-m-d H:i', $_REQUEST['end'])) {
$end = $tmp;
} else {
$valid = false;
- $msg .= error(_("Please enter a valid ending time for the shifts."), true);
+ $msg .= error(_('Please enter a valid ending time for the shifts.'), true);
}
if ($start >= $end) {
$valid = false;
- $msg .= error(_("The ending time has to be after the starting time."), true);
+ $msg .= error(_('The ending time has to be after the starting time.'), true);
}
foreach ($needed_angel_types as $needed_angeltype_id => $needed_angeltype_name) {
@@ -113,7 +113,7 @@ function shift_edit_controller()
} else {
$valid = false;
$msg .= error(sprintf(
- _("Please check your input for needed angels of type %s."),
+ _('Please check your input for needed angels of type %s.'),
$needed_angeltype_name
), true);
}
@@ -134,16 +134,16 @@ function shift_edit_controller()
$needed_angel_types_info = [];
foreach ($needed_angel_types as $type_id => $count) {
NeededAngelType_add($shift_id, $type_id, null, $count);
- $needed_angel_types_info[] = $angeltypes[$type_id] . ": " . $count;
+ $needed_angel_types_info[] = $angeltypes[$type_id] . ': ' . $count;
}
engelsystem_log(
- "Updated shift '" . $shifttypes[$shifttype_id] . ", " . $title
- . "' from " . date("Y-m-d H:i", $start)
- . " to " . date("Y-m-d H:i", $end)
- . " with angel types " . join(", ", $needed_angel_types_info)
+ 'Updated shift \'' . $shifttypes[$shifttype_id] . ', ' . $title
+ . '\' from ' . date('Y-m-d H:i', $start)
+ . ' to ' . date('Y-m-d H:i', $end)
+ . ' with angel types ' . join(', ', $needed_angel_types_info)
);
- success(_("Shift updated."));
+ success(_('Shift updated.'));
redirect(shift_link([
'SID' => $shift_id
@@ -151,7 +151,7 @@ function shift_edit_controller()
}
}
- $angel_types_spinner = "";
+ $angel_types_spinner = '';
foreach ($angeltypes as $angeltype_id => $angeltype_name) {
$angel_types_spinner .= form_spinner('type_' . $angeltype_id, $angeltype_name,
$needed_angel_types[$angeltype_id]);
@@ -161,16 +161,16 @@ function shift_edit_controller()
shifts_title(),
[
msg(),
- '<noscript>' . info(_("This page is much more comfortable with javascript."), true) . '</noscript>',
+ '<noscript>' . info(_('This page is much more comfortable with javascript.'), true) . '</noscript>',
form([
form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id),
- form_text('title', _("Title"), $title),
- form_select('rid', _("Room:"), $room, $rid),
- form_text('start', _("Start:"), date("Y-m-d H:i", $start)),
- form_text('end', _("End:"), date("Y-m-d H:i", $end)),
- '<h2>' . _("Needed angels") . '</h2>',
+ form_text('title', _('Title'), $title),
+ form_select('rid', _('Room:'), $room, $rid),
+ form_text('start', _('Start:'), date('Y-m-d H:i', $start)),
+ form_text('end', _('End:'), date('Y-m-d H:i', $end)),
+ '<h2>' . _('Needed angels') . '</h2>',
$angel_types_spinner,
- form_submit('submit', _("Save"))
+ form_submit('submit', _('Save'))
])
]
);
@@ -188,7 +188,7 @@ function shift_delete_controller()
}
// Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg)
- if (!isset($_REQUEST['delete_shift']) || !preg_match("/^[0-9]*$/", $_REQUEST['delete_shift'])) {
+ if (!isset($_REQUEST['delete_shift']) || !preg_match('/^[0-9]*$/', $_REQUEST['delete_shift'])) {
redirect(page_link_to('user_shifts'));
}
$shift_id = $_REQUEST['delete_shift'];
@@ -203,22 +203,22 @@ function shift_delete_controller()
Shift_delete($shift_id);
engelsystem_log(
- "Deleted shift " . $shift['name']
- . " from " . date("Y-m-d H:i", $shift['start'])
- . " to " . date("Y-m-d H:i", $shift['end'])
+ 'Deleted shift ' . $shift['name']
+ . ' from ' . date('Y-m-d H:i', $shift['start'])
+ . ' to ' . date('Y-m-d H:i', $shift['end'])
);
- success(_("Shift deleted."));
+ success(_('Shift deleted.'));
redirect(page_link_to('user_shifts'));
}
return page_with_title(shifts_title(), [
error(sprintf(
- _("Do you want to delete the shift %s from %s to %s?"),
+ _('Do you want to delete the shift %s from %s to %s?'),
$shift['name'],
- date("Y-m-d H:i", $shift['start']),
- date("H:i", $shift['end'])
+ date('Y-m-d H:i', $shift['start']),
+ date('H:i', $shift['end'])
), true),
- '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _("delete") . '</a>'
+ '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _('delete') . '</a>'
]);
}
@@ -239,7 +239,7 @@ function shift_controller()
$shift = Shift($_REQUEST['shift_id']);
if ($shift == null) {
- error(_("Shift could not be found."));
+ error(_('Shift could not be found.'));
redirect(page_link_to('user_shifts'));
}
@@ -323,24 +323,24 @@ function shifts_json_export_all_controller()
{
global $api_key;
- if ($api_key == "") {
- engelsystem_error("Config contains empty apikey.");
+ if ($api_key == '') {
+ engelsystem_error('Config contains empty apikey.');
}
if (!isset($_REQUEST['api_key'])) {
- engelsystem_error("Missing parameter api_key.");
+ engelsystem_error('Missing parameter api_key.');
}
if ($_REQUEST['api_key'] != $api_key) {
- engelsystem_error("Invalid api_key.");
+ engelsystem_error('Invalid api_key.');
}
$shifts_source = Shifts();
if ($shifts_source === false) {
- engelsystem_error("Unable to load shifts.");
+ engelsystem_error('Unable to load shifts.');
}
- header("Content-Type: application/json; charset=utf-8");
+ header('Content-Type: application/json; charset=utf-8');
raw_output(json_encode($shifts_source));
}
@@ -352,23 +352,23 @@ function shifts_json_export_controller()
{
global $user;
- if (!isset($_REQUEST['key']) || !preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) {
- engelsystem_error("Missing key.");
+ if (!isset($_REQUEST['key']) || !preg_match('/^[0-9a-f]{32}$/', $_REQUEST['key'])) {
+ engelsystem_error('Missing key.');
}
$key = $_REQUEST['key'];
$user = User_by_api_key($key);
if ($user == null) {
- engelsystem_error("Key invalid.");
+ engelsystem_error('Key invalid.');
}
if (!in_array('shifts_json_export', privileges_for_user($user['UID']))) {
- engelsystem_error("No privilege for shifts_json_export.");
+ engelsystem_error('No privilege for shifts_json_export.');
}
$shifts = load_ical_shifts();
- header("Content-Type: application/json; charset=utf-8");
+ header('Content-Type: application/json; charset=utf-8');
raw_output(json_encode($shifts));
}
diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php
index 08576641..55bea389 100644
--- a/includes/controller/shifttypes_controller.php
+++ b/includes/controller/shifttypes_controller.php
@@ -41,7 +41,7 @@ function shifttype_delete_controller()
}
return [
- sprintf(_("Delete shifttype %s"), $shifttype['name']),
+ sprintf(_('Delete shifttype %s'), $shifttype['name']),
ShiftType_delete_view($shifttype)
];
}
@@ -54,9 +54,9 @@ function shifttype_delete_controller()
function shifttype_edit_controller()
{
$shifttype_id = null;
- $name = "";
+ $name = '';
$angeltype_id = null;
- $description = "";
+ $description = '';
$angeltypes = AngelTypes();
@@ -85,7 +85,7 @@ function shifttype_edit_controller()
error(_('Please enter a name.'));
}
- if (isset($_REQUEST['angeltype_id']) && preg_match("/^[0-9]+$/", $_REQUEST['angeltype_id'])) {
+ if (isset($_REQUEST['angeltype_id']) && preg_match('/^[0-9]+$/', $_REQUEST['angeltype_id'])) {
$angeltype_id = $_REQUEST['angeltype_id'];
} else {
$angeltype_id = null;
@@ -157,7 +157,7 @@ function shifttypes_list_controller()
{
$shifttypes = ShiftTypes();
if ($shifttypes === false) {
- engelsystem_error("Unable to load shifttypes.");
+ engelsystem_error('Unable to load shifttypes.');
}
return [
@@ -173,7 +173,7 @@ function shifttypes_list_controller()
*/
function shifttypes_title()
{
- return _("Shifttypes");
+ return _('Shifttypes');
}
/**
diff --git a/includes/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php
index 3a316ee1..0855e4c9 100644
--- a/includes/controller/user_angeltypes_controller.php
+++ b/includes/controller/user_angeltypes_controller.php
@@ -24,9 +24,9 @@ function user_angeltypes_unconfirmed_hint()
. '</a>';
}
- return sprintf(ngettext("There is %d unconfirmed angeltype.", "There are %d unconfirmed angeltypes.",
+ return sprintf(ngettext('There is %d unconfirmed angeltype.', 'There are %d unconfirmed angeltypes.',
count($unconfirmed_user_angeltypes)),
- count($unconfirmed_user_angeltypes)) . " " . _('Angel types which need approvals:') . ' ' . join(', ',
+ count($unconfirmed_user_angeltypes)) . ' ' . _('Angel types which need approvals:') . ' ' . join(', ',
$unconfirmed_links);
}
@@ -40,31 +40,31 @@ function user_angeltypes_delete_all_controller()
global $user;
if (!isset($_REQUEST['angeltype_id'])) {
- error(_("Angeltype doesn't exist."));
+ error(_('Angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$angeltype = AngelType($_REQUEST['angeltype_id']);
if ($angeltype == null) {
- error(_("Angeltype doesn't exist."));
+ error(_('Angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
if (!User_is_AngelType_supporter($user, $angeltype)) {
- error(_("You are not allowed to delete all users for this angeltype."));
+ error(_('You are not allowed to delete all users for this angeltype.'));
redirect(page_link_to('angeltypes'));
}
if (isset($_REQUEST['confirmed'])) {
UserAngelTypes_delete_all($angeltype['id']);
- engelsystem_log(sprintf("Denied all users for angeltype %s", AngelType_name_render($angeltype)));
- success(sprintf(_("Denied all users for angeltype %s."), AngelType_name_render($angeltype)));
+ engelsystem_log(sprintf('Denied all users for angeltype %s', AngelType_name_render($angeltype)));
+ success(sprintf(_('Denied all users for angeltype %s.'), AngelType_name_render($angeltype)));
redirect(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id']);
}
return [
- _("Deny all users"),
+ _('Deny all users'),
UserAngelTypes_delete_all_view($angeltype)
];
}
@@ -79,37 +79,37 @@ function user_angeltypes_confirm_all_controller()
global $user, $privileges;
if (!isset($_REQUEST['angeltype_id'])) {
- error(_("Angeltype doesn't exist."));
+ error(_('Angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$angeltype = AngelType($_REQUEST['angeltype_id']);
if ($angeltype == null) {
- error(_("Angeltype doesn't exist."));
+ error(_('Angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype);
if ($user_angeltype == null) {
- error(_("User angeltype doesn't exist."));
+ error(_('User angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
if (!in_array('admin_user_angeltypes', $privileges) && !$user_angeltype['supporter']) {
- error(_("You are not allowed to confirm all users for this angeltype."));
+ error(_('You are not allowed to confirm all users for this angeltype.'));
redirect(page_link_to('angeltypes'));
}
if (isset($_REQUEST['confirmed'])) {
UserAngelTypes_confirm_all($angeltype['id'], $user);
- engelsystem_log(sprintf("Confirmed all users for angeltype %s", AngelType_name_render($angeltype)));
- success(sprintf(_("Confirmed all users for angeltype %s."), AngelType_name_render($angeltype)));
+ engelsystem_log(sprintf('Confirmed all users for angeltype %s', AngelType_name_render($angeltype)));
+ success(sprintf(_('Confirmed all users for angeltype %s.'), AngelType_name_render($angeltype)));
redirect(page_link_to('angeltypes') . '&action=view&angeltype_id=' . $angeltype['id']);
}
return [
- _("Confirm all users"),
+ _('Confirm all users'),
UserAngelTypes_confirm_all_view($angeltype)
];
}
@@ -124,46 +124,46 @@ function user_angeltype_confirm_controller()
global $user;
if (!isset($_REQUEST['user_angeltype_id'])) {
- error(_("User angeltype doesn't exist."));
+ error(_('User angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$user_angeltype = UserAngelType($_REQUEST['user_angeltype_id']);
if ($user_angeltype == null) {
- error(_("User angeltype doesn't exist."));
+ error(_('User angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$angeltype = AngelType($user_angeltype['angeltype_id']);
if ($angeltype == null) {
- error(_("Angeltype doesn't exist."));
+ error(_('Angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
if (!User_is_AngelType_supporter($user, $angeltype)) {
- error(_("You are not allowed to confirm this users angeltype."));
+ error(_('You are not allowed to confirm this users angeltype.'));
redirect(page_link_to('angeltypes'));
}
$user_source = User($user_angeltype['user_id']);
if ($user_source == null) {
- error(_("User doesn't exist."));
+ error(_('User doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
if (isset($_REQUEST['confirmed'])) {
$result = UserAngelType_confirm($user_angeltype['id'], $user);
if ($result === false) {
- engelsystem_error("Unable to confirm user angeltype.");
+ engelsystem_error('Unable to confirm user angeltype.');
}
engelsystem_log(sprintf(
- "%s confirmed for angeltype %s",
+ '%s confirmed for angeltype %s',
User_Nick_render($user_source),
AngelType_name_render($angeltype)
));
success(sprintf(
- _("%s confirmed for angeltype %s."),
+ _('%s confirmed for angeltype %s.'),
User_Nick_render($user_source),
AngelType_name_render($angeltype)
));
@@ -171,7 +171,7 @@ function user_angeltype_confirm_controller()
}
return [
- _("Confirm angeltype for user"),
+ _('Confirm angeltype for user'),
UserAngelType_confirm_view($user_angeltype, $user_source, $angeltype)
];
}
@@ -186,40 +186,40 @@ function user_angeltype_delete_controller()
global $user;
if (!isset($_REQUEST['user_angeltype_id'])) {
- error(_("User angeltype doesn't exist."));
+ error(_('User angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$user_angeltype = UserAngelType($_REQUEST['user_angeltype_id']);
if ($user_angeltype == null) {
- error(_("User angeltype doesn't exist."));
+ error(_('User angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$angeltype = AngelType($user_angeltype['angeltype_id']);
if ($angeltype == null) {
- error(_("Angeltype doesn't exist."));
+ error(_('Angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$user_source = User($user_angeltype['user_id']);
if ($user_source == null) {
- error(_("User doesn't exist."));
+ error(_('User doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
if ($user['UID'] != $user_angeltype['user_id'] && !User_is_AngelType_supporter($user, $angeltype)) {
- error(_("You are not allowed to delete this users angeltype."));
+ error(_('You are not allowed to delete this users angeltype.'));
redirect(page_link_to('angeltypes'));
}
if (isset($_REQUEST['confirmed'])) {
$result = UserAngelType_delete($user_angeltype);
if ($result === false) {
- engelsystem_error("Unable to delete user angeltype.");
+ engelsystem_error('Unable to delete user angeltype.');
}
- $success_message = sprintf(_("User %s removed from %s."), User_Nick_render($user_source), $angeltype['name']);
+ $success_message = sprintf(_('User %s removed from %s.'), User_Nick_render($user_source), $angeltype['name']);
engelsystem_log($success_message);
success($success_message);
@@ -227,7 +227,7 @@ function user_angeltype_delete_controller()
}
return [
- _("Remove angeltype"),
+ _('Remove angeltype'),
UserAngelType_delete_view($user_angeltype, $user_source, $angeltype)
];
}
@@ -243,37 +243,37 @@ function user_angeltype_update_controller()
$supporter = false;
if (!in_array('admin_angel_types', $privileges)) {
- error(_("You are not allowed to set supporter rights."));
+ error(_('You are not allowed to set supporter rights.'));
redirect(page_link_to('angeltypes'));
}
if (!isset($_REQUEST['user_angeltype_id'])) {
- error(_("User angeltype doesn't exist."));
+ error(_('User angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
- if (isset($_REQUEST['supporter']) && preg_match("/^[01]$/", $_REQUEST['supporter'])) {
- $supporter = $_REQUEST['supporter'] == "1";
+ if (isset($_REQUEST['supporter']) && preg_match('/^[01]$/', $_REQUEST['supporter'])) {
+ $supporter = $_REQUEST['supporter'] == '1';
} else {
- error(_("No supporter update given."));
+ error(_('No supporter update given.'));
redirect(page_link_to('angeltypes'));
}
$user_angeltype = UserAngelType($_REQUEST['user_angeltype_id']);
if ($user_angeltype == null) {
- error(_("User angeltype doesn't exist."));
+ error(_('User angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$angeltype = AngelType($user_angeltype['angeltype_id']);
if ($angeltype == null) {
- error(_("Angeltype doesn't exist."));
+ error(_('Angeltype doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
$user_source = User($user_angeltype['user_id']);
if ($user_source == null) {
- error(_("User doesn't exist."));
+ error(_('User doesn\'t exist.'));
redirect(page_link_to('angeltypes'));
}
@@ -281,7 +281,7 @@ function user_angeltype_update_controller()
UserAngelType_update($user_angeltype['id'], $supporter);
$success_message = sprintf(
- $supporter ? _("Added supporter rights for %s to %s.") : _("Removed supporter rights for %s from %s."),
+ $supporter ? _('Added supporter rights for %s to %s.') : _('Removed supporter rights for %s from %s.'),
AngelType_name_render($angeltype),
User_Nick_render($user_source)
);
@@ -292,7 +292,7 @@ function user_angeltype_update_controller()
}
return [
- $supporter ? _("Add supporter rights") : _("Remove supporter rights"),
+ $supporter ? _('Add supporter rights') : _('Remove supporter rights'),
UserAngelType_update_view($user_angeltype, $user_source, $angeltype, $supporter)
];
}
@@ -326,19 +326,19 @@ function user_angeltype_add_controller()
$user_angeltype_id = UserAngelType_create($user_source, $angeltype);
engelsystem_log(sprintf(
- "User %s added to %s.",
+ 'User %s added to %s.',
User_Nick_render($user_source),
AngelType_name_render($angeltype)
));
success(sprintf(
- _("User %s added to %s."),
+ _('User %s added to %s.'),
User_Nick_render($user_source),
AngelType_name_render($angeltype)
));
UserAngelType_confirm($user_angeltype_id, $user_source);
engelsystem_log(sprintf(
- "User %s confirmed as %s.",
+ 'User %s confirmed as %s.',
User_Nick_render($user),
AngelType_name_render($angeltype)
));
@@ -348,7 +348,7 @@ function user_angeltype_add_controller()
}
return [
- _("Add user to angeltype"),
+ _('Add user to angeltype'),
UserAngelType_add_view($angeltype, $users_source, $user_source['UID'])
];
}
@@ -365,21 +365,21 @@ function user_angeltype_join_controller($angeltype)
$user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype);
if ($user_angeltype != null) {
- error(sprintf(_("You are already a %s."), $angeltype['name']));
+ error(sprintf(_('You are already a %s.'), $angeltype['name']));
redirect(page_link_to('angeltypes'));
}
if (isset($_REQUEST['confirmed'])) {
$user_angeltype_id = UserAngelType_create($user, $angeltype);
- $success_message = sprintf(_("You joined %s."), $angeltype['name']);
- engelsystem_log(sprintf("User %s joined %s.", User_Nick_render($user), AngelType_name_render($angeltype)));
+ $success_message = sprintf(_('You joined %s.'), $angeltype['name']);
+ engelsystem_log(sprintf('User %s joined %s.', User_Nick_render($user), AngelType_name_render($angeltype)));
success($success_message);
if (in_array('admin_user_angeltypes', $privileges)) {
UserAngelType_confirm($user_angeltype_id, $user);
engelsystem_log(sprintf(
- "User %s confirmed as %s.",
+ 'User %s confirmed as %s.',
User_Nick_render($user),
AngelType_name_render($angeltype)
));
@@ -389,7 +389,7 @@ function user_angeltype_join_controller($angeltype)
}
return [
- sprintf(_("Become a %s"), $angeltype['name']),
+ sprintf(_('Become a %s'), $angeltype['name']),
UserAngelType_join_view($user, $angeltype)
];
}
diff --git a/includes/controller/user_driver_licenses_controller.php b/includes/controller/user_driver_licenses_controller.php
index f2a1c521..9562cfe0 100644
--- a/includes/controller/user_driver_licenses_controller.php
+++ b/includes/controller/user_driver_licenses_controller.php
@@ -21,8 +21,8 @@ function user_driver_license_required_hint()
foreach ($angeltypes as $angeltype) {
if ($angeltype['requires_driver_license']) {
return sprintf(
- _("You joined an angeltype which requires a driving license. Please edit your driving license information here: %s."),
- '<a href="' . user_driver_license_edit_link() . '">' . _("driving license information") . '</a>'
+ _('You joined an angeltype which requires a driving license. Please edit your driving license information here: %s.'),
+ '<a href="' . user_driver_license_edit_link() . '">' . _('driving license information') . '</a>'
);
}
}
@@ -127,22 +127,22 @@ function user_driver_license_edit_controller()
} else {
UserDriverLicenses_update($user_driver_license);
}
- engelsystem_log("Driver license information updated.");
- success(_("Your driver license information has been saved."));
+ engelsystem_log('Driver license information updated.');
+ success(_('Your driver license information has been saved.'));
redirect(user_link($user_source));
} else {
- error(_("Please select at least one driving license."));
+ error(_('Please select at least one driving license.'));
}
} elseif ($user_driver_license['id'] != null) {
UserDriverLicenses_delete($user_source['UID']);
- engelsystem_log("Driver license information removed.");
- success(_("Your driver license information has been removed."));
+ engelsystem_log('Driver license information removed.');
+ success(_('Your driver license information has been removed.'));
redirect(user_link($user_source));
}
}
return [
- sprintf(_("Edit %s driving license information"), $user_source['Nick']),
+ sprintf(_('Edit %s driving license information'), $user_source['Nick']),
UserDriverLicense_edit_view($user_source, $wants_to_drive, $user_driver_license)
];
}
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index a9f7dd61..72bddd14 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -53,7 +53,7 @@ function user_delete_controller()
// You cannot delete yourself
if ($user['UID'] == $user_source['UID']) {
- error(_("You cannot delete yourself."));
+ error(_('You cannot delete yourself.'));
redirect(user_link($user));
}
@@ -64,7 +64,7 @@ function user_delete_controller()
$user['UID']))
) {
$valid = false;
- error(_("Your password is incorrect. Please try it again."));
+ error(_('Your password is incorrect. Please try it again.'));
}
if ($valid) {
@@ -74,15 +74,15 @@ function user_delete_controller()
}
mail_user_delete($user_source);
- success(_("User deleted."));
- engelsystem_log(sprintf("Deleted %s", User_Nick_render($user_source)));
+ success(_('User deleted.'));
+ engelsystem_log(sprintf('Deleted %s', User_Nick_render($user_source)));
redirect(users_link());
}
}
return [
- sprintf(_("Delete %s"), $user_source['Nick']),
+ sprintf(_('Delete %s'), $user_source['Nick']),
User_delete_view($user_source)
];
}
@@ -147,7 +147,7 @@ function user_edit_vouchers_controller()
$vouchers = trim($_REQUEST['vouchers']);
} else {
$valid = false;
- error(_("Please enter a valid number of vouchers."));
+ error(_('Please enter a valid number of vouchers.'));
}
if ($valid) {
@@ -158,8 +158,8 @@ function user_edit_vouchers_controller()
engelsystem_error('Unable to update user.');
}
- success(_("Saved the number of vouchers."));
- engelsystem_log(User_Nick_render($user_source) . ': ' . sprintf("Got %s vouchers",
+ success(_('Saved the number of vouchers.'));
+ engelsystem_log(User_Nick_render($user_source) . ': ' . sprintf('Got %s vouchers',
$user_source['got_voucher']));
redirect(user_link($user_source));
@@ -167,7 +167,7 @@ function user_edit_vouchers_controller()
}
return [
- sprintf(_("%s's vouchers"), $user_source['Nick']),
+ sprintf(_('%s\'s vouchers'), $user_source['Nick']),
User_edit_vouchers_view($user_source)
];
}
@@ -183,12 +183,12 @@ function user_controller()
if (isset($_REQUEST['user_id'])) {
$user_source = User($_REQUEST['user_id']);
if ($user_source == null) {
- error(_("User not found."));
+ error(_('User not found.'));
redirect('?');
}
}
- $shifts = Shifts_by_user($user_source, in_array("user_shifts_admin", $privileges));
+ $shifts = Shifts_by_user($user_source, in_array('user_shifts_admin', $privileges));
foreach ($shifts as &$shift) {
// TODO: Move queries to model
$shift['needed_angeltypes'] = sql_select("
@@ -208,7 +208,7 @@ function user_controller()
}
}
- if ($user_source['api_key'] == "") {
+ if ($user_source['api_key'] == '') {
User_reset_api_key($user_source, false);
}
@@ -278,7 +278,7 @@ function user_password_recovery_set_new_controller()
global $min_password_length;
$user_source = User_by_password_recovery_token($_REQUEST['token']);
if ($user_source == null) {
- error(_("Token is not correct."));
+ error(_('Token is not correct.'));
redirect(page_link_to('login'));
}
@@ -288,16 +288,16 @@ function user_password_recovery_set_new_controller()
if (isset($_REQUEST['password']) && strlen($_REQUEST['password']) >= $min_password_length) {
if ($_REQUEST['password'] != $_REQUEST['password2']) {
$valid = false;
- error(_("Your passwords don't match."));
+ error(_('Your passwords don\'t match.'));
}
} else {
$valid = false;
- error(_("Your password is to short (please use at least 6 characters)."));
+ error(_('Your password is to short (please use at least 6 characters).'));
}
if ($valid) {
set_password($user_source['UID'], $_REQUEST['password']);
- success(_("Password saved."));
+ success(_('Password saved.'));
redirect(page_link_to('login'));
}
}
@@ -321,28 +321,28 @@ function user_password_recovery_start_controller()
$user_source = User_by_email($email);
if ($user_source == null) {
$valid = false;
- error(_("E-mail address is not correct."));
+ error(_('E-mail address is not correct.'));
}
} else {
$valid = false;
- error(_("E-mail address is not correct."));
+ error(_('E-mail address is not correct.'));
}
} else {
$valid = false;
- error(_("Please enter your e-mail."));
+ error(_('Please enter your e-mail.'));
}
if ($valid) {
$token = User_generate_password_recovery_token($user_source);
engelsystem_email_to_user(
$user_source,
- _("Password recovery"),
+ _('Password recovery'),
sprintf(
- _("Please visit %s to recover your password."),
+ _('Please visit %s to recover your password.'),
page_link_to_absolute('user_password_recovery') . '&token=' . $token
)
);
- success(_("We sent an email containing your password recovery link."));
+ success(_('We sent an email containing your password recovery link.'));
redirect(page_link_to('login'));
}
}
@@ -372,7 +372,7 @@ function user_password_recovery_controller()
*/
function user_password_recovery_title()
{
- return _("Password recovery");
+ return _('Password recovery');
}
/**
@@ -388,11 +388,11 @@ function load_user()
$user = User($_REQUEST['user_id']);
if ($user === false) {
- engelsystem_error("Unable to load user.");
+ engelsystem_error('Unable to load user.');
}
if ($user == null) {
- error(_("User doesn't exist."));
+ error(_('User doesn\'t exist.'));
redirect(page_link_to());
}