From 55141154c083acc2d0397f4c62b4e0be1c7a19fa Mon Sep 17 00:00:00 2001 From: Bot Date: Tue, 3 Jan 2017 14:12:17 +0100 Subject: Replaced " with ' --- includes/pages/admin_rooms.php | 102 ++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 41 deletions(-) (limited to 'includes/pages/admin_rooms.php') diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php index 9bd60bcc..9738f888 100644 --- a/includes/pages/admin_rooms.php +++ b/includes/pages/admin_rooms.php @@ -5,7 +5,7 @@ */ function admin_rooms_title() { - return _("Rooms"); + return _('Rooms'); } /** @@ -13,7 +13,7 @@ function admin_rooms_title() */ function admin_rooms() { - $rooms_source = sql_select("SELECT * FROM `Room` ORDER BY `Name`"); + $rooms_source = sql_select('SELECT * FROM `Room` ORDER BY `Name`'); $rooms = []; foreach ($rooms_source as $room) { $rooms[] = [ @@ -21,22 +21,22 @@ function admin_rooms() 'from_pentabarf' => $room['FromPentabarf'] == 'Y' ? '✓' : '', 'public' => $room['show'] == 'Y' ? '✓' : '', 'actions' => table_buttons([ - button(page_link_to('admin_rooms') . '&show=edit&id=' . $room['RID'], _("edit"), 'btn-xs'), - button(page_link_to('admin_rooms') . '&show=delete&id=' . $room['RID'], _("delete"), 'btn-xs') + button(page_link_to('admin_rooms') . '&show=edit&id=' . $room['RID'], _('edit'), 'btn-xs'), + button(page_link_to('admin_rooms') . '&show=delete&id=' . $room['RID'], _('delete'), 'btn-xs') ]) ]; } $room = null; if (isset($_REQUEST['show'])) { - $msg = ""; - $name = ""; - $from_pentabarf = ""; + $msg = ''; + $name = ''; + $from_pentabarf = ''; $public = 'Y'; - $number = ""; + $number = ''; $room_id = 0; - $angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); + $angeltypes_source = sql_select('SELECT * FROM `AngelTypes` ORDER BY `name`'); $angeltypes = []; $angeltypes_count = []; foreach ($angeltypes_source as $angeltype) { @@ -47,7 +47,7 @@ function admin_rooms() if (test_request_int('id')) { $room = Room($_REQUEST['id']); if ($room === false) { - engelsystem_error("Unable to load room."); + engelsystem_error('Unable to load room.'); } if ($room == null) { redirect(page_link_to('admin_rooms')); @@ -73,11 +73,11 @@ function admin_rooms() $name = strip_request_item('name'); if (isset($room) && sql_num_query("SELECT * FROM `Room` WHERE `Name`='" . sql_escape($name) . "' AND NOT `RID`=" . sql_escape($room_id)) > 0) { $valid = false; - $msg .= error(_("This name is already in use."), true); + $msg .= error(_('This name is already in use.'), true); } } else { $valid = false; - $msg .= error(_("Please enter a name."), true); + $msg .= error(_('Please enter a name.'), true); } if (isset($_REQUEST['from_pentabarf'])) { @@ -101,25 +101,45 @@ function admin_rooms() foreach ($angeltypes as $angeltype_id => $angeltype) { if ( isset($_REQUEST['angeltype_count_' . $angeltype_id]) - && preg_match("/^[0-9]{1,4}$/", $_REQUEST['angeltype_count_' . $angeltype_id]) + && preg_match('/^[0-9]{1,4}$/', $_REQUEST['angeltype_count_' . $angeltype_id]) ) { $angeltypes_count[$angeltype_id] = $_REQUEST['angeltype_count_' . $angeltype_id]; } else { $valid = false; - $msg .= error(sprintf(_("Please enter needed angels for type %s."), $angeltype), true); + $msg .= error(sprintf(_('Please enter needed angels for type %s.'), $angeltype), true); } } if ($valid) { if (isset($room_id)) { - sql_query("UPDATE `Room` SET `Name`='" . sql_escape($name) . "', `FromPentabarf`='" . sql_escape($from_pentabarf) . "', `show`='" . sql_escape($public) . "', `Number`='" . sql_escape($number) . "' WHERE `RID`='" . sql_escape($room_id) . "' LIMIT 1"); - engelsystem_log("Room updated: " . $name . ", pentabarf import: " . $from_pentabarf . ", public: " . $public . ", number: " . $number); + sql_query(" + UPDATE `Room` + SET + `Name`='" . sql_escape($name) . "', + `FromPentabarf`='" . sql_escape($from_pentabarf) . "', + `show`='" . sql_escape($public) . "', + `Number`='" . sql_escape($number) . "' + WHERE `RID`='" . sql_escape($room_id) . "' + LIMIT 1 + "); + engelsystem_log( + 'Room updated: ' . $name + . ', pentabarf import: ' . $from_pentabarf + . ', public: ' . $public + . ', number: ' . $number + ); } else { $room_id = Room_create($name, $from_pentabarf, $public, $number); if ($room_id === false) { - engelsystem_error("Unable to create room."); + engelsystem_error('Unable to create room.'); } - engelsystem_log("Room created: " . $name . ", pentabarf import: " . $from_pentabarf . ", public: " . $public . ", number: " . $number); + engelsystem_log( + 'Room created: ' . $name + . ', pentabarf import: ' + . $from_pentabarf + . ', public: ' . $public + . ', number: ' . $number + ); } NeededAngelTypes_delete_by_room($room_id); @@ -128,16 +148,16 @@ function admin_rooms() $angeltype = AngelType($angeltype_id); if ($angeltype != null) { NeededAngelType_add(null, $angeltype_id, $room_id, $angeltype_count); - $needed_angeltype_info[] = $angeltype['name'] . ": " . $angeltype_count; + $needed_angeltype_info[] = $angeltype['name'] . ': ' . $angeltype_count; } } engelsystem_log( - "Set needed angeltypes of room " . $name - . " to: " . join(", ", $needed_angeltype_info) + 'Set needed angeltypes of room ' . $name + . ' to: ' . join(', ', $needed_angeltype_info) ); - success(_("Room saved.")); - redirect(page_link_to("admin_rooms")); + success(_('Room saved.')); + redirect(page_link_to('admin_rooms')); } } $angeltypes_count_form = []; @@ -149,47 +169,47 @@ function admin_rooms() return page_with_title(admin_rooms_title(), [ buttons([ - button(page_link_to('admin_rooms'), _("back"), 'back') + button(page_link_to('admin_rooms'), _('back'), 'back') ]), $msg, form([ div('row', [ div('col-md-6', [ - form_text('name', _("Name"), $name), - form_checkbox('from_pentabarf', _("Frab import"), $from_pentabarf), - form_checkbox('public', _("Public"), $public), - form_text('number', _("Room number"), $number) + form_text('name', _('Name'), $name), + form_checkbox('from_pentabarf', _('Frab import'), $from_pentabarf), + form_checkbox('public', _('Public'), $public), + form_text('number', _('Room number'), $number) ]), div('col-md-6', [ div('row', [ div('col-md-12', [ - form_info(_("Needed angels:")) + form_info(_('Needed angels:')) ]), join($angeltypes_count_form) ]) ]) ]), - form_submit('submit', _("Save")) + form_submit('submit', _('Save')) ]) ]); } elseif ($_REQUEST['show'] == 'delete') { if (isset($_REQUEST['ack'])) { if (!Room_delete($room_id)) { - engelsystem_error("Unable to delete room."); + engelsystem_error('Unable to delete room.'); } - engelsystem_log("Room deleted: " . $name); - success(sprintf(_("Room %s deleted."), $name)); + engelsystem_log('Room deleted: ' . $name); + success(sprintf(_('Room %s deleted.'), $name)); redirect(page_link_to('admin_rooms')); } return page_with_title(admin_rooms_title(), [ buttons([ - button(page_link_to('admin_rooms'), _("back"), 'back') + button(page_link_to('admin_rooms'), _('back'), 'back') ]), - sprintf(_("Do you want to delete room %s?"), $name), + sprintf(_('Do you want to delete room %s?'), $name), buttons([ - button(page_link_to('admin_rooms') . '&show=delete&id=' . $room_id . '&ack', _("Delete"), 'delete') + button(page_link_to('admin_rooms') . '&show=delete&id=' . $room_id . '&ack', _('Delete'), 'delete') ]) ]); } @@ -197,14 +217,14 @@ function admin_rooms() return page_with_title(admin_rooms_title(), [ buttons([ - button(page_link_to('admin_rooms') . '&show=edit', _("add")) + button(page_link_to('admin_rooms') . '&show=edit', _('add')) ]), msg(), table([ - 'name' => _("Name"), - 'from_pentabarf' => _("Frab import"), - 'public' => _("Public"), - 'actions' => "" + 'name' => _('Name'), + 'from_pentabarf' => _('Frab import'), + 'public' => _('Public'), + 'actions' => '' ], $rooms) ]); } -- cgit v1.2.3-54-g00ecf