TechWilk / rota

public/old/roles.php

Spacing +7 added lines, -7 removed lines

@@ -14,7 +14,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -34,7 +34,7 @@ 
 if ($role && $assignTo) {
     $sql = "UPDATE cr_roles r SET r.groupId = '$assignTo' WHERE r.id = '$role'";
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
     header('Location: roles.php');
     exit;
@@ -70,7 +70,7 @@ 
         $sql = "INSERT INTO cr_roles (name, description, rehersalId, groupId)
             VALUES ('$newrole', '$newrole', $rehersal, $groupId)";
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } else {
         // Handle renaming of the roles
@@ -103,11 +103,11 @@ 
     $i = 1;
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
         if ($type == 'option') {
-            $list = $list."<option value='".$row['id']."'>".$row['name'].'</option>';
+            $list = $list . "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>';
         } elseif ($type == 'li') {
-            $list = $list.'<li>'.$row['name'].'</li>';
+            $list = $list . '<li>' . $row['name'] . '</li>';
         } elseif ($type == 'li-a') {
-            $list = $list."<li><a href='roles.php?role=".$roleId.'&assignto='.$row['id']."'>".$row['name'].'</a></li>';
+            $list = $list . "<li><a href='roles.php?role=" . $roleId . '&assignto=' . $row['id'] . "'>" . $row['name'] . '</a></li>';
         }
         $i++;
     }
@@ -173,7 +173,7 @@ 
             $group = $row['groupId'];
             $down = $group + 1;
             $up = $group - 1;
-            echo '<div><strong>'.$groupname.'</strong><br />';
+            echo '<div><strong>' . $groupname . '</strong><br />';
         }
         // Print text input box if a role exists for the group.
         // Allows user to update role names and move roles between groups

src/routes.php

Spacing +58 added lines, -58 removed lines

@@ -20,35 +20,35 @@ 
 // USER
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/user', function () {
-    $this->get('s', UserController::class.':getAllUsers')->setName('users');
+$app->group('/user', function() {
+    $this->get('s', UserController::class . ':getAllUsers')->setName('users');
 
-    $this->get('/{id}/widget-only', UserController::class.':getUserWidgetOnly')->setName('user-widget-only');
+    $this->get('/{id}/widget-only', UserController::class . ':getUserWidgetOnly')->setName('user-widget-only');
 
-    $this->get('/new', UserController::class.':getNewUserForm')->setName('user-new');
-    $this->get('/{id}/edit', UserController::class.':getUserEditForm')->setName('user-edit');
-    $this->get('/{id}/password', UserController::class.':getUserPasswordForm')->setName('user-password');
+    $this->get('/new', UserController::class . ':getNewUserForm')->setName('user-new');
+    $this->get('/{id}/edit', UserController::class . ':getUserEditForm')->setName('user-edit');
+    $this->get('/{id}/password', UserController::class . ':getUserPasswordForm')->setName('user-password');
 
-    $this->get('/me', UserController::class.':getCurrentUser')->setName('user-me');
-    $this->get('/{id}', UserController::class.':getUser')->setName('user');
+    $this->get('/me', UserController::class . ':getCurrentUser')->setName('user-me');
+    $this->get('/{id}', UserController::class . ':getUser')->setName('user');
 
-    $this->post('[/{id}]', UserController::class.':postUser')->setName('user-post');
-    $this->post('/{id}/password', UserController::class.':postUserPasswordChange')->setName('user-password-post');
+    $this->post('[/{id}]', UserController::class . ':postUser')->setName('user-post');
+    $this->post('/{id}/password', UserController::class . ':postUserPasswordChange')->setName('user-password-post');
 
     // roles
-    $this->get('/{id}/roles', RoleController::class.':getAssignRolesForm')->setName('user-roles');
-    $this->post('/{id}/roles', RoleController::class.':postUserAssignRoles')->setName('user-assign-post');
+    $this->get('/{id}/roles', RoleController::class . ':getAssignRolesForm')->setName('user-roles');
+    $this->post('/{id}/roles', RoleController::class . ':postUserAssignRoles')->setName('user-assign-post');
 
     // availability
-    $this->get('/{id}/availability', AvailabilityController::class.':getAvailabilityForm')->setName('user-availability');
-    $this->post('/{id}/availability', AvailabilityController::class.':postAvailability')->setName('user-availability-post');
+    $this->get('/{id}/availability', AvailabilityController::class . ':getAvailabilityForm')->setName('user-availability');
+    $this->post('/{id}/availability', AvailabilityController::class . ':postAvailability')->setName('user-availability-post');
 
     // calendar
-    $this->group('/me/calendar', function () {
-        $this->get('s', CalendarController::class.':getCalendarTokens')->setName('user-calendars');
-        $this->get('/new', CalendarController::class.':getNewCalendarForm')->setName('user-calendars');
-        $this->get('/{id}/revoke', CalendarController::class.':getRevokeCalendar')->setName('user-calendar-revoke');
-        $this->post('/new', CalendarController::class.':postNewCalendar')->setName('user-calendar-new-post');
+    $this->group('/me/calendar', function() {
+        $this->get('s', CalendarController::class . ':getCalendarTokens')->setName('user-calendars');
+        $this->get('/new', CalendarController::class . ':getNewCalendarForm')->setName('user-calendars');
+        $this->get('/{id}/revoke', CalendarController::class . ':getRevokeCalendar')->setName('user-calendar-revoke');
+        $this->post('/new', CalendarController::class . ':postNewCalendar')->setName('user-calendar-new-post');
     });
 });
 
@@ -56,103 +56,103 @@ 
 // EVENT
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/event', function () {
-    $this->get('s', EventController::class.':getAllEvents')->setName('events');
-    $this->get('s/type/{id}', EventController::class.':getAllEventsWithType')->setName('events-eventtype');
-    $this->get('s/subtype/{id}', EventController::class.':getAllEventsWithSubType')->setName('events-eventsubtype');
+$app->group('/event', function() {
+    $this->get('s', EventController::class . ':getAllEvents')->setName('events');
+    $this->get('s/type/{id}', EventController::class . ':getAllEventsWithType')->setName('events-eventtype');
+    $this->get('s/subtype/{id}', EventController::class . ':getAllEventsWithSubType')->setName('events-eventsubtype');
 
-    $this->get('s/print/info', EventController::class.':getAllEventInfoToPrint')->setName('events-print-info');
+    $this->get('s/print/info', EventController::class . ':getAllEventInfoToPrint')->setName('events-print-info');
 
-    $this->get('/new', EventController::class.':getNewEventForm')->setName('event-new');
-    $this->get('/{id}/edit', EventController::class.':getEventEditForm')->setName('event-edit');
-    $this->get('/{id}/copy', EventController::class.':getEventCopyForm')->setName('event-copy');
-    $this->get('/{id}/assign', EventController::class.':getEventAssignForm')->setName('event-assign');
+    $this->get('/new', EventController::class . ':getNewEventForm')->setName('event-new');
+    $this->get('/{id}/edit', EventController::class . ':getEventEditForm')->setName('event-edit');
+    $this->get('/{id}/copy', EventController::class . ':getEventCopyForm')->setName('event-copy');
+    $this->get('/{id}/assign', EventController::class . ':getEventAssignForm')->setName('event-assign');
 
-    $this->get('/{id}', EventController::class.':getEvent')->setName('event');
+    $this->get('/{id}', EventController::class . ':getEvent')->setName('event');
 
-    $this->post('[/{id}]', EventController::class.':postEvent')->setName('event-post');
-    $this->post('/{id}/assign', EventController::class.':postEventAssign')->setName('event-assign-post');
-    $this->post('/{id}/comment', EventController::class.':postEventComment')->setName('event-comment-post');
+    $this->post('[/{id}]', EventController::class . ':postEvent')->setName('event-post');
+    $this->post('/{id}/assign', EventController::class . ':postEventAssign')->setName('event-assign-post');
+    $this->post('/{id}/comment', EventController::class . ':postEventComment')->setName('event-comment-post');
 });
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // RESOURCE
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/resource', function () {
-    $this->get('s', ResourceController::class.':getAllResources')->setName('resources');
+$app->group('/resource', function() {
+    $this->get('s', ResourceController::class . ':getAllResources')->setName('resources');
 
-    $this->get('[/new]', ResourceController::class.':getNewResourceForm')->setName('resource-new');
-    $this->get('/{id}/edit', ResourceController::class.':getResourceEditForm')->setName('resource-edit');
+    $this->get('[/new]', ResourceController::class . ':getNewResourceForm')->setName('resource-new');
+    $this->get('/{id}/edit', ResourceController::class . ':getResourceEditForm')->setName('resource-edit');
 
-    $this->get('/{id}', ResourceController::class.':getResourceFile')->setName('resource');
+    $this->get('/{id}', ResourceController::class . ':getResourceFile')->setName('resource');
 
-    $this->post('[/{id}]', ResourceController::class.':postResource')->setName('resource-post');
+    $this->post('[/{id}]', ResourceController::class . ':postResource')->setName('resource-post');
 });
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // ROLES & GROUPS
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/group', function () {
-    $this->get('/{id}', GroupController::class.':getGroup')->setName('group');
-    $this->get('/{id}/roles', GroupController::class.':getGroupRoles')->setName('group-roles');
+$app->group('/group', function() {
+    $this->get('/{id}', GroupController::class . ':getGroup')->setName('group');
+    $this->get('/{id}/roles', GroupController::class . ':getGroupRoles')->setName('group-roles');
 
-    $this->get('/{id}/events', EventController::class.':getAllEventsToPrintForGroup')->setName('group-events-print');
+    $this->get('/{id}/events', EventController::class . ':getAllEventsToPrintForGroup')->setName('group-events-print');
 
-    $this->post('[/{id}]', GroupController::class.':postGroup')->setName('group-post');
+    $this->post('[/{id}]', GroupController::class . ':postGroup')->setName('group-post');
 });
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // AUTH
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->get('/login', AuthController::class.':getLoginForm')->setName('login');
+$app->get('/login', AuthController::class . ':getLoginForm')->setName('login');
 
-$app->get('/login/{provider}', AuthController::class.':getLoginAuth')->setName('login-auth');
-$app->get('/login/{provider}/callback', AuthController::class.':getLoginCallback')->setName('login-callback');
-$app->get('/signup', PendingUserController::class.':getSignUpForm')->setName('sign-up');
-$app->get('/signup/cancel', PendingUserController::class.':getSignUpCancel')->setName('sign-up-cancel');
+$app->get('/login/{provider}', AuthController::class . ':getLoginAuth')->setName('login-auth');
+$app->get('/login/{provider}/callback', AuthController::class . ':getLoginCallback')->setName('login-callback');
+$app->get('/signup', PendingUserController::class . ':getSignUpForm')->setName('sign-up');
+$app->get('/signup/cancel', PendingUserController::class . ':getSignUpCancel')->setName('sign-up-cancel');
 
-$app->get('/logout', AuthController::class.':getLogout')->setName('logout');
+$app->get('/logout', AuthController::class . ':getLogout')->setName('logout');
 
-$app->post('/login', AuthController::class.':postLogin')->setName('login-post');
-$app->post('/signup', PendingUserController::class.':postSignUp')->setName('sign-up-post');
+$app->post('/login', AuthController::class . ':postLogin')->setName('login-post');
+$app->post('/signup', PendingUserController::class . ':postSignUp')->setName('sign-up-post');
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // NOTIFICATIONS
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->get('/notification/{id}[/{referrer}]', NotificationController::class.':getNotificationClick')->setName('notification');
+$app->get('/notification/{id}[/{referrer}]', NotificationController::class . ':getNotificationClick')->setName('notification');
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // CALENDAR
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->get('/calendar/{token}.{format}', CalendarController::class.':getRenderedCalendar')->setName('user-calendar');
+$app->get('/calendar/{token}.{format}', CalendarController::class . ':getRenderedCalendar')->setName('user-calendar');
 
 // legacy
-$app->get('/calendar.php', CalendarController::class.':getLegacyRenderedCalendar')->setName('user-calendar');
+$app->get('/calendar.php', CalendarController::class . ':getLegacyRenderedCalendar')->setName('user-calendar');
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // OTHER
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->get('/settings', function ($request, $response, $args) {
+$app->get('/settings', function($request, $response, $args) {
     // Sample log message
     $this->logger->info("Fetch settings GET '/settings'");
 
-    $url = $this->router->pathFor('home').'old/settings.php';
+    $url = $this->router->pathFor('home') . 'old/settings.php';
 
     return $response->withStatus(303)->withHeader('Location', $url);
     //return $this->view->render($response, 'settings.twig', []);
 })->setName('settings');
 
-$app->get('/token', function ($request, $response, $args) {
+$app->get('/token', function($request, $response, $args) {
     return $response->getBody()->write(Crypt::generateToken(30));
 })->setName('token');
 
-$app->get('/', function ($request, $response, $args) {
+$app->get('/', function($request, $response, $args) {
     // Sample log message
     $this->logger->info("Fetch home GET '/'");
 

src/classes/Controller/EventController.php

Spacing +10 added lines, -10 removed lines

@@ -31,7 +31,7 @@ 
 
     public function getAllEventsWithType(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/events/type/".$args['id']."'");
+        $this->logger->info("Fetch event GET '/events/type/" . $args['id'] . "'");
 
         $eventType = EventTypeQuery::create()->findPk($args['id']);
 
@@ -42,7 +42,7 @@ 
 
     public function getAllEventsWithSubType(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/events/type/".$args['id']."'");
+        $this->logger->info("Fetch event GET '/events/type/" . $args['id'] . "'");
 
         $eventType = EventSubTypeQuery::create()->findPk($args['id']);
 
@@ -85,7 +85,7 @@ 
             $e->setCreatedBy($this->auth->currentUser());
         }
         $e->setName($data['name']);
-        $e->setDate(DateTime::createFromFormat('d/m/Y H:i', $data['date'].' '.$data['time']));
+        $e->setDate(DateTime::createFromFormat('d/m/Y H:i', $data['date'] . ' ' . $data['time']));
         $e->setEventTypeId($data['type']);
         $e->setEventSubTypeId($data['subtype']);
         $e->setLocationId($data['location']);
@@ -118,7 +118,7 @@ 
 
     public function getEvent(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/event/".$args['id']."'");
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "'");
         $e = EventQuery::create()->findPK($args['id']);
 
         if (!$e->authoriser()->readableBy($this->auth->currentUser())) {
@@ -134,7 +134,7 @@ 
 
     public function getEventEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/edit'");
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/edit'");
         $e = EventQuery::create()->findPK($args['id']);
         $l = LocationQuery::create()->orderByName()->find();
         $et = EventTypeQuery::create()->orderByName()->find();
@@ -149,7 +149,7 @@ 
 
     public function getEventCopyForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/copy'");
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/copy'");
         $e = EventQuery::create()->findPK($args['id']);
         $l = LocationQuery::create()->orderByName()->find();
         $et = EventTypeQuery::create()->orderByName()->find();
@@ -164,7 +164,7 @@ 
 
     public function getEventAssignForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/assign'");
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/assign'");
         $e = EventQuery::create()->findPK($args['id']);
         $ur = UserRoleQuery::create()->find();
 
@@ -177,7 +177,7 @@ 
 
     public function postEventAssign(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Create event people POST '/event".$args['id']."/assign'");
+        $this->logger->info("Create event people POST '/event" . $args['id'] . "/assign'");
 
         $eventId = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
         $existingUserRoles = UserRoleQuery::create()->useEventPersonQuery()->filterByEventId($eventId)->endUse()->find();
@@ -223,7 +223,7 @@ 
 
     public function getAllEventsToPrintForGroup(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event printable page GET '/group/".$args['id']."/events'");
+        $this->logger->info("Fetch event printable page GET '/group/" . $args['id'] . "/events'");
 
         $groupId = (int) $args['id'];
 
@@ -269,7 +269,7 @@ 
 
     public function postEventComment(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Create event people POST '/event".$args['id']."/comment'");
+        $this->logger->info("Create event people POST '/event" . $args['id'] . "/comment'");
 
         $eventId = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);