TechWilk / rota

public/old/events.php

Spacing +22 added lines, -22 removed lines

@@ -48,9 +48,9 @@ 
 } else {
     $urlFilters = '';
     if (isset($_SESSION['lastEventsFilter'])) {
-        $urlFilters = '&filter='.$_SESSION['lastEventsFilter'];
+        $urlFilters = '&filter=' . $_SESSION['lastEventsFilter'];
     }
-    header('Location: events.php?view=all'.$urlFilters);
+    header('Location: events.php?view=all' . $urlFilters);
     exit;
 }
 
@@ -70,7 +70,7 @@ 
         session_destroy();
         header('Location: login.php');
     } else {
-        header('Location: events.php?view='.$sessionUserID);
+        header('Location: events.php?view=' . $sessionUserID);
         exit;
     }
 }
@@ -108,11 +108,11 @@ 
     if ($editskillID != '') {
         $sql = ("INSERT INTO cr_eventPeople (eventId, userRoleId) VALUES ('$editeventID', '$editskillID')");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         // After we have inserted the data, we want to head back to the main page
-        header('Location: index.php#section'.$editeventID);
+        header('Location: index.php#section' . $editeventID);
         exit;
     }
 
@@ -125,12 +125,12 @@ 
 
             $sql = ("INSERT INTO cr_eventPeople (eventId, userRoleId) VALUES ('$editeventID', '$editskillID')");
             if (!mysqli_query(db(), $sql)) {
-                die('Error: '.mysqli_error(db()));
+                die('Error: ' . mysqli_error(db()));
             }
         }
 
         // After we have inserted the data, we want to head back to the main page
-        header('Location: index.php#section'.$editeventID);
+        header('Location: index.php#section' . $editeventID);
         exit;
     }
 }
@@ -176,7 +176,7 @@ 
                     $result = mysqli_query(db(), $mysqli_query) or die(mysqli_error(db()));
                     $row = mysqli_fetch_object($result);
 
-                    echo $row->name.'s';
+                    echo $row->name . 's';
                 } elseif ($_SESSION['onlyShowUserEvents'] == '1') {
                     echo 'My Events';
                 } else {
@@ -202,7 +202,7 @@ 
 			
 			<?php if (!empty($pendingSwaps) && $pendingSwaps > 0):
                 if ($pendingSwaps > 1) {
-                    $swapsMessage = $pendingSwaps.' swaps are pending approval. Emails have been sent to the people covering to approve the swaps.';
+                    $swapsMessage = $pendingSwaps . ' swaps are pending approval. Emails have been sent to the people covering to approve the swaps.';
                 } else {
                     $swapsMessage = 'A swap is pending approval. An email has been sent to the person covering to approve the swap.';
                 } ?>
@@ -270,7 +270,7 @@ 
 							WHERE e.type = '$filter'
 							AND e.date >= DATE(NOW())
 							AND e.removed = 0
-							ORDER BY ".$dateOrderBy;
+							ORDER BY " . $dateOrderBy;
     } else {
         $sql = "SELECT
 							DISTINCT e.id AS id,
@@ -298,7 +298,7 @@ 
 							WHERE e.date >= DATE(NOW())
 							AND ur.userId = '$view'
 							AND e.removed = 0
-							ORDER BY ".$dateOrderBy;
+							ORDER BY " . $dateOrderBy;
     }
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
@@ -316,7 +316,7 @@ 
         $newMonth = strftime('%B %Y', strtotime($row->sundayDate));
         if ($month != $newMonth) {
             $month = $newMonth;
-            echo '<li class="time-label"><span class="bg-green">'.$month.'</span></li>';
+            echo '<li class="time-label"><span class="bg-green">' . $month . '</span></li>';
         }
 
         // Event details?>
@@ -330,9 +330,9 @@ 
 						<h4><?php
                             echo date('jS: ', strtotime($row->sundayDate));
         if ($eventName != '') {
-            echo '<strong>'.$eventName.'</strong><br />'.$subType.' - <em>'.$type.'</em>';
+            echo '<strong>' . $eventName . '</strong><br />' . $subType . ' - <em>' . $type . '</em>';
         } else {
-            echo $subType.' - <em>'.$type.'</em>';
+            echo $subType . ' - <em>' . $type . '</em>';
         } ?>
 						</h4>
 					</a>
@@ -344,7 +344,7 @@ 
 				<?php //<p><strong>Rehearsal:</strong> <?php
                 //echo ($row->rehearsalDateFormatted = "0000-00-00 00:00:00") ? "none" : strftime(siteSettings()->time_format_normal,strtotime($row->rehearsalDateFormatted));</p>?>
 					
-				<p><strong><?php echo $row->eventGroup ? $row->eventGroup.': ' : '' ?></strong><?php echo $row->sermonTitle ?> <?php echo $row->bibleVerse ? '('.$row->bibleVerse.')' : '' ?></p>
+				<p><strong><?php echo $row->eventGroup ? $row->eventGroup . ': ' : '' ?></strong><?php echo $row->sermonTitle ?> <?php echo $row->bibleVerse ? '(' . $row->bibleVerse . ')' : '' ?></p>
 				
 				<p><strong>Location:</strong> <?php echo $row->eventLocation; ?></p>
 				
@@ -416,16 +416,16 @@ 
                                 } else {
                                     echo '</ul>';
                                 }
-                                echo '<p><strong>'.$groupName.'</strong></p>';
+                                echo '<p><strong>' . $groupName . '</strong></p>';
                                 echo '<ul>';
                             }
 
                             echo '<li>';
-                            echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                            echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                             echo $viewPeople->name;
 
                             if ($viewPeople->rolename != '') {
-                                echo ' - <em>'.$viewPeople->rolename.'</em>';
+                                echo ' - <em>' . $viewPeople->rolename . '</em>';
                             } else {
                                 // If there is no skill, we don't need to mention this.
                             }
@@ -451,9 +451,9 @@ 
 
 				<?php
                 if (isAdmin() || $userisBandAdmin || $userisEventEditor) {
-                    echo " <a class ='btn btn-primary' href='createEvent.php?action=edit&id=".$eventID."'><i class='fa fa-pencil'></i><span> &nbsp;Edit</span></a> "; /* Edit event */
-                    echo " <a class ='btn btn-primary' href='createEvent.php?action=copy&id=".$eventID."'><i class='fa fa-pencil'></i><span> &nbsp;Copy</span></a> "; /* Edit event */
-                    echo " <a class ='btn btn-primary' href='emailEvent.php?event=".$eventID."'><i class='fa fa-envelope-o'></i><span> &nbsp;Send email</span></a> "; /* Send email */
+                    echo " <a class ='btn btn-primary' href='createEvent.php?action=edit&id=" . $eventID . "'><i class='fa fa-pencil'></i><span> &nbsp;Edit</span></a> "; /* Edit event */
+                    echo " <a class ='btn btn-primary' href='createEvent.php?action=copy&id=" . $eventID . "'><i class='fa fa-pencil'></i><span> &nbsp;Copy</span></a> "; /* Edit event */
+                    echo " <a class ='btn btn-primary' href='emailEvent.php?event=" . $eventID . "'><i class='fa fa-envelope-o'></i><span> &nbsp;Send email</span></a> "; /* Send email */
                 }
         if (isAdmin()) {
             //echo "<a class='btn btn-primary' href='index.php?notifyEveryone=true&eventID=$eventID'><i class='fa fa-envelope-o'></i><span> &nbsp;Send email</span></a> "; /* Send email */
@@ -462,7 +462,7 @@ 
 
             echo "<ul class='dropdown-menu'>";
 
-            echo "<li><button type='button' class='btn btn-danger btn-block' data-toggle='modal' data-target='#deleteModal".$eventID."'>Delete</button></li>"; /* Delete Event */
+            echo "<li><button type='button' class='btn btn-danger btn-block' data-toggle='modal' data-target='#deleteModal" . $eventID . "'>Delete</button></li>"; /* Delete Event */
 
             echo '</ul>';
         } ?>

src/classes/Controller/UserController.php

Spacing +5 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
 
     public function getUserEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."/edit'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "/edit'");
         $u = UserQuery::create()->findPK($args['id']);
 
         if (is_null($u)) {
@@ -112,7 +112,7 @@ 
 
     public function getUser(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "'");
         $u = UserQuery::create()->findPK($args['id']);
 
         if (is_null($u)) {
@@ -127,7 +127,7 @@ 
 
     public function getUserWidgetOnly(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "'");
         $u = UserQuery::create()->findPK($args['id']);
 
         if (is_null($u)) {
@@ -142,7 +142,7 @@ 
 
     public function getUserPasswordForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."/password'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "/password'");
         $u = UserQuery::create()->findPK($args['id']);
 
         if (is_null($u)) {
@@ -157,7 +157,7 @@ 
 
     public function postUserPasswordChange(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Create user POST '/user/".$args['id']."/password'");
+        $this->logger->info("Create user POST '/user/" . $args['id'] . "/password'");
 
         $data = $request->getParsedBody();
 

src/classes/Controller/AuthController.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 
     public function getLoginAuth(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Login auth GET '/login/".$args['provider']."'");
+        $this->logger->info("Login auth GET '/login/" . $args['provider'] . "'");
 
         // login
         $authUrl = $this->auth->getCallbackUrl($this->router);
@@ -88,7 +88,7 @@ 
 
     public function getLoginCallback(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Login auth GET '/login/".$args['provider']."/callback'");
+        $this->logger->info("Login auth GET '/login/" . $args['provider'] . "/callback'");
 
         // login
         try {

src/classes/AuthProvider/Callback/FacebookAuth.php

Spacing +10 added lines, -10 removed lines

@@ -43,7 +43,7 @@ 
 
         $path = $this->router->pathFor('login-callback', ['provider' => $this->getAuthProviderSlug()]);
 
-        $url = $this->baseUrl.$path;
+        $url = $this->baseUrl . $path;
 
         return $helper->getLoginUrl($url, $this->permissions);
     }
@@ -56,12 +56,12 @@ 
             $accessToken = $helper->getAccessToken();
         } catch (FacebookResponseException $e) {
             // When Graph returns an error
-            echo 'Graph returned an error: '.$e->getMessage();
+            echo 'Graph returned an error: ' . $e->getMessage();
 
             return false;
         } catch (FacebookSDKException $e) {
             // When validation fails or other local issues
-            echo 'Facebook SDK returned an error: '.$e->getMessage();
+            echo 'Facebook SDK returned an error: ' . $e->getMessage();
 
             return false;
         }
@@ -69,10 +69,10 @@ 
         if (!isset($accessToken)) {
             if ($helper->getError()) {
                 header('HTTP/1.0 401 Unauthorized');
-                echo 'Error: '.$helper->getError()."\n";
-                echo 'Error Code: '.$helper->getErrorCode()."\n";
-                echo 'Error Reason: '.$helper->getErrorReason()."\n";
-                echo 'Error Description: '.$helper->getErrorDescription()."\n";
+                echo 'Error: ' . $helper->getError() . "\n";
+                echo 'Error Code: ' . $helper->getErrorCode() . "\n";
+                echo 'Error Reason: ' . $helper->getErrorReason() . "\n";
+                echo 'Error Description: ' . $helper->getErrorDescription() . "\n";
             } else {
                 header('HTTP/1.0 400 Bad Request');
                 echo 'Bad request';
@@ -98,7 +98,7 @@ 
             try {
                 $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
             } catch (FacebookSDKException $e) {
-                echo '<p>Error getting long-lived access token: '.$helper->getMessage()."</p>\n\n";
+                echo '<p>Error getting long-lived access token: ' . $helper->getMessage() . "</p>\n\n";
 
                 return false;
             }
@@ -122,10 +122,10 @@ 
             // Returns a `Facebook\FacebookResponse` object
             $response = $this->facebook->get('/me?fields=id,name,email', $accessToken);
         } catch (Facebook\Exceptions\FacebookResponseException $e) {
-            echo 'Graph returned an error: '.$e->getMessage();
+            echo 'Graph returned an error: ' . $e->getMessage();
             exit;
         } catch (Facebook\Exceptions\FacebookSDKException $e) {
-            echo 'Facebook SDK returned an error: '.$e->getMessage();
+            echo 'Facebook SDK returned an error: ' . $e->getMessage();
             exit;
         }
 

src/dependencies.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 $container = $app->getContainer();
 
 // TWIG view renderer
-$container['view'] = function ($c) {
+$container['view'] = function($c) {
     $settings = $c->get('settings')['renderer'];
     $view = new Twig($settings['template_path'], [
         'cache' => false, // or 'path/to/cache'
@@ -41,7 +41,7 @@ 
     $env = $view->getEnvironment();
     $env->addGlobal('site', new Site());
     $env->addGlobal('currenturl', $c->get('request')->getUri());
-    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath().'/'.$c->get('request')->getUri()->getPath());
+    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath() . '/' . $c->get('request')->getUri()->getPath());
 
     if (isset($_SESSION['userId'])) {
         $u = UserQuery::create()->findPk($_SESSION['userId']);
@@ -54,7 +54,7 @@ 
 };
 
 // monolog
-$container['logger'] = function ($c) {
+$container['logger'] = function($c) {
     $settings = $c->get('settings')['logger'];
     $logger = new Monolog\Logger($settings['name']);
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -63,7 +63,7 @@ 
     return $logger;
 };
 
-$container['auth'] = function ($c) {
+$container['auth'] = function($c) {
     $authConfig = getConfig()['auth'];
 
     // full domain e.g. https://example.com
@@ -81,7 +81,7 @@ 
             break;
 
         case 'onebody':
-            $url = $authConfig['onebody']['url'].'/';
+            $url = $authConfig['onebody']['url'] . '/';
             $email = new EmailAddress($authConfig['onebody']['email']);
             $apiKey = $authConfig['onebody']['apiKey'];
 

src/classes/Controller/GroupController.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 {
     public function getGroup(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch group GET '/group/".$args['id']."'");
+        $this->logger->info("Fetch group GET '/group/" . $args['id'] . "'");
         $events = EventQuery::create()
             ->useEventPersonQuery()
                 ->useUserRoleQuery()
@@ -38,7 +38,7 @@ 
 
     public function getGroupRoles(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch group roles GET '/group/".$args['id']."/roles'");
+        $this->logger->info("Fetch group roles GET '/group/" . $args['id'] . "/roles'");
         $events = EventQuery::create()
             ->useEventPersonQuery()
                 ->useUserRoleQuery()
@@ -60,7 +60,7 @@ 
                 ->findPk($args['id']);
 
         // temporary redirect
-        return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home').'old/roles.php');
+        return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home') . 'old/roles.php');
 
         return $this->view->render($response, 'group-roles.twig', ['events' => $events, 'group' => $group]);
     }

src/routes.php

Spacing +54 added lines, -54 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,95 +56,95 @@ 
 // 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/preachers', EventController::class.':getAllEventsToPrint')->setName('events-print');
+    $this->get('s/print/preachers', EventController::class . ':getAllEventsToPrint')->setName('events-print');
 
-    $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}]', EventController::class . ':postEvent')->setName('event-post');
+    $this->post('/{id}/assign', EventController::class . ':postEventAssign')->setName('event-assign-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');
 });
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // 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'");
 
     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 '/'");
 

public/old/index.php

Spacing +13 added lines, -13 removed lines

@@ -221,7 +221,7 @@ 
             </div><!-- /.timeline-header -->
 
             <div class="timeline-body">
-              <p><strong><?php echo $event->getEventGroup() ? $event->getEventGroup()->getName().': ' : '' ?></strong><?php echo $event->getSermonTitle() ?> <?php echo $event->getBibleVerse() ? '('.$event->getBibleVerse().')' : '' ?></p>
+              <p><strong><?php echo $event->getEventGroup() ? $event->getEventGroup()->getName() . ': ' : '' ?></strong><?php echo $event->getSermonTitle() ?> <?php echo $event->getBibleVerse() ? '(' . $event->getBibleVerse() . ')' : '' ?></p>
               <p><strong>Location:</strong> <?php echo $event->getLocation()->getName(); ?></p>
 
               <?php if ($event->getComments()): ?>
@@ -281,7 +281,7 @@ 
                                   INNER JOIN cr_groups g ON g.id = r.groupId
                                   INNER JOIN cr_users u ON u.id = ur.userId
                                   INNER JOIN cr_eventPeople ep ON ep.userRoleId = ur.id
-                                WHERE ep.eventId = '".$event->getId()."'
+                                WHERE ep.eventId = '".$event->getId() . "'
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
@@ -306,16 +306,16 @@ 
                             } else {
                                 echo '</ul>';
                             }
-                            echo '<p><strong>'.$groupName.'</strong></p>';
+                            echo '<p><strong>' . $groupName . '</strong></p>';
                             echo '<ul>';
                         }
 
                         echo '<li>';
-                        echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                        echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                         echo $viewPeople->name;
 
                         if ($viewPeople->rolename != '') {
-                            echo ' - <em>'.$viewPeople->rolename.'</em>';
+                            echo ' - <em>' . $viewPeople->rolename . '</em>';
                         } else {
                             // If there is no skill, we don't need to mention this.
                         }
@@ -397,7 +397,7 @@ 
             </div><!-- /.timeline-header -->
 
             <div class="timeline-body">
-              <p><strong><?php echo $event->eventGroup ? $event->eventGroup.': ' : '' ?></strong><?php echo $event->sermonTitle ?> <?php echo $event->bibleVerse ? '('.$event->bibleVerse.')' : '' ?></p>
+              <p><strong><?php echo $event->eventGroup ? $event->eventGroup . ': ' : '' ?></strong><?php echo $event->sermonTitle ?> <?php echo $event->bibleVerse ? '(' . $event->bibleVerse . ')' : '' ?></p>
               <p><strong>Location:</strong> <?php echo $event->eventLocation; ?></p>
 
               <?php if ($event->comment != ''): ?>
@@ -458,7 +458,7 @@ 
                                   INNER JOIN cr_groups g ON g.id = r.groupId
                                   INNER JOIN cr_users u ON u.id = ur.userId
                                   INNER JOIN cr_eventPeople ep ON ep.userRoleId = ur.id
-                                WHERE ep.eventId = '".$event->id."'
+                                WHERE ep.eventId = '".$event->id . "'
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
@@ -483,16 +483,16 @@ 
                             } else {
                                 echo '</ul>';
                             }
-                            echo '<p><strong>'.$groupName.'</strong></p>';
+                            echo '<p><strong>' . $groupName . '</strong></p>';
                             echo '<ul>';
                         }
 
                         echo '<li>';
-                        echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                        echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                         echo $viewPeople->name;
 
                         if ($viewPeople->rolename != '') {
-                            echo ' - <em>'.$viewPeople->rolename.'</em>';
+                            echo ' - <em>' . $viewPeople->rolename . '</em>';
                         } else {
                             // If there is no skill, we don't need to mention this.
                         }
@@ -563,7 +563,7 @@ 
                   ">
                   <?php echo timeInWordsWithTense($event->getDate()) ?>
                 </span>
-                <?php else: ?>
+                <?php else : ?>
                 <span class="pull-right badge bg-red">
                   never
                 </span>
@@ -628,7 +628,7 @@ 
             <img class="img-circle" src="<?php echo getProfileImageUrl($_SESSION['userid'], 'large') ?>" alt="User Avatar">
           </div>
           <!-- /.widget-user-image -->
-          <h3 class="widget-user-username"><?php echo $user->getFirstName().' '.$user->getLastName() ?></h3>
+          <h3 class="widget-user-username"><?php echo $user->getFirstName() . ' ' . $user->getLastName() ?></h3>
           <h5 class="widget-user-desc">Account created <?php echo $user->getCreated('M. Y') ?></h5>
         </div>
         <div class="box-footer no-padding">
@@ -652,7 +652,7 @@ 
                 $userHasEmail = (strlen($user->getEmail()) > 3);
                 $emailRemindersEnabled = ($userHasEmail && true); // todo: add opt-out for email reminders
                 ?>
-                Email Reminders <span class="pull-right badge bg-<?php echo $emailRemindersEnabled ? 'green' : 'red' ?>"><?php echo $emailRemindersEnabled ? siteSettings()->getDaysToAlert().' days before' : ($userHasEmail ? 'Disabled' : 'No email address') ?></span>
+                Email Reminders <span class="pull-right badge bg-<?php echo $emailRemindersEnabled ? 'green' : 'red' ?>"><?php echo $emailRemindersEnabled ? siteSettings()->getDaysToAlert() . ' days before' : ($userHasEmail ? 'Disabled' : 'No email address') ?></span>
               </a>
             </li>
             <li>

public/old/includes/functions.mail.php

Spacing +80 added lines, -80 removed lines

@@ -27,12 +27,12 @@ 
 {
     $dbMailId = mailToDb($to, $subject, $message, $from, $bcc);
 
-    $subject = '[rota] '.$subject;
+    $subject = '[rota] ' . $subject;
 
     $message .= "\n\n";
-    $message .= siteSettings()->getOwner()."\n";
-    $message .= 'Mail generated with ChurchRota V.'.siteSettings()->getVersion()."\n";
-    $message .= siteSettings()->getSiteUrl()."\n";
+    $message .= siteSettings()->getOwner() . "\n";
+    $message .= 'Mail generated with ChurchRota V.' . siteSettings()->getVersion() . "\n";
+    $message .= siteSettings()->getSiteUrl() . "\n";
 
     $mailSentOk = false;
 
@@ -76,14 +76,14 @@ 
     //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird.
     //spaces to suppress automatic removal of "unnecessary linefeeds" in outlook 2003
     $crlf = "      \n";
-    $message = str_replace("\r\n", $crlf, $message);  //replace crlf's
+    $message = str_replace("\r\n", $crlf, $message); //replace crlf's
 
     //--------------------------------------------------------------------------------
-    $headers = 'From: '.$from.$crlf.
-    'Reply-To: '.$from.$crlf.
-    'Mime-Version: 1.0'.$crlf.
-    'Content-Type: text/plain; charset=ISO-8859-1'.$crlf;
-    'Content-Transfer-Encoding: quoted-printable'.$crlf;
+    $headers = 'From: ' . $from . $crlf .
+    'Reply-To: ' . $from . $crlf .
+    'Mime-Version: 1.0' . $crlf .
+    'Content-Type: text/plain; charset=ISO-8859-1' . $crlf;
+    'Content-Transfer-Encoding: quoted-printable' . $crlf;
     $headerSimple = $headers;
 
     //--------------------------------------------------------------------------------
@@ -92,8 +92,8 @@ 
     $to = str_replace(';', ',', $to);
 
     if ($mail_dbg) {
-        $subject = ' - Mail Debug: '.$subject;   //debug output
-        $message .= $crlf.'To: '.$to.$crlf;   //debug move to to end of message
+        $subject = ' - Mail Debug: ' . $subject; //debug output
+        $message .= $crlf . 'To: ' . $to . $crlf; //debug move to to end of message
     }
 
     //--------------------------------------------------------------------------------
@@ -105,13 +105,13 @@ 
     foreach ($teile as $adr) {
         if (preg_replace("/([a-zA-Z0-9._%+-]+)(@)([a-zA-Z0-9.-]+)(\.)([a-zA-Z]+)/i", '# # #', trim($adr)) == '# # #') {
             if ($mail_dbg) {
-                $message .= 'Bcc: '.trim($adr).$crlf;
+                $message .= 'Bcc: ' . trim($adr) . $crlf;
             } else {
-                $headers .= 'Bcc: '.trim($adr).$crlf;
+                $headers .= 'Bcc: ' . trim($adr) . $crlf;
             }
             $i = $i + 1;
         } else {
-            $bcc_err .= $adr.$crlf;
+            $bcc_err .= $adr . $crlf;
             $err .= +1;
         }
     }
@@ -144,10 +144,10 @@ 
         if ($mailOk) {
             //mail($from, "[ChurchRota] Mail status - OK", "address ok: " . $i, $headerSimple);
         } else {
-            mail($from, '[Rota] Mail status - ERROR', 'to: '.$to.$crlf.'address ok: '.$i.$crlf.'address errors: '.$err.$crlf.$bcc_err, $headerSimple);
+            mail($from, '[Rota] Mail status - ERROR', 'to: ' . $to . $crlf . 'address ok: ' . $i . $crlf . 'address errors: ' . $err . $crlf . $bcc_err, $headerSimple);
 
             return false;
-            logFailedMailWithId($dbMailId, 'address ok: '.$i.$crlf.'address errors: '.$err.$crlf.$bcc_err, $headerSimple);
+            logFailedMailWithId($dbMailId, 'address ok: ' . $i . $crlf . 'address errors: ' . $err . $crlf . $bcc_err, $headerSimple);
         }
     }
 
@@ -204,9 +204,9 @@ 
         }
         $categoryname = $row['categoryname'];
         $to = $row['email'];
-        $subject = 'New post: '.$objectname;
+        $subject = 'New post: ' . $objectname;
 
-        $finalmessage = 'Dear '.$postname."\n \n".$message.$objectname."\n \n".
+        $finalmessage = 'Dear ' . $postname . "\n \n" . $message . $objectname . "\n \n" .
         'To see the post, please login using your username and password';
 
         sendMail($to, $subject, $finalmessage, $row['siteadmin']);
@@ -226,19 +226,19 @@ 
 
     $message = siteSettings()->getNewUserMessage();
 
-    $name = $user->firstName.' '.$user->lastName;
+    $name = $user->firstName . ' ' . $user->lastName;
     $message = str_replace('[name]', $name, $message);
     $message = str_replace('[username]', $user->username, $message);
     $message = str_replace('[password]', $password, $message);
     $message = str_replace('[siteurl]', siteSettings()->getSiteUrl(), $message);
 
-    $subject = 'Account created for '.$name;
+    $subject = 'Account created for ' . $name;
 
-    $to = $name.' <'.$user->email.'>';
-    $from = siteSettings()->getOwner().' <'.siteSettings()->getAdminEmailAddress().'>';
+    $to = $name . ' <' . $user->email . '>';
+    $from = siteSettings()->getOwner() . ' <' . siteSettings()->getAdminEmailAddress() . '>';
 
     sendMail($to, $subject, $message, $from);
-    sendMail($from, 'ADMIN COPY: '.$subject, $message, $from);
+    sendMail($from, 'ADMIN COPY: ' . $subject, $message, $from);
 }
 
 function parseEmailTemplate($message, $values)
@@ -249,7 +249,7 @@ 
     $values['siteemail'] = siteSettings()->getAdminEmailAddress();
 
     foreach ($values as $template_field => $value) {
-        $message = str_ireplace('['.$template_field.']', trim($value), $message);
+        $message = str_ireplace('[' . $template_field . ']', trim($value), $message);
     }
     $message = trim($message);
 
@@ -265,7 +265,7 @@ 
     $message = str_replace('[rehearsal]', $rehearsal, $message);
     if (is_array($rotaoutput)):
         foreach ($rotaoutput as $key => $skill):
-            $skillfinal = $skillfinal.$skill.' ';
+            $skillfinal = $skillfinal . $skill . ' ';
     endforeach; else:
         $skillfinal = $rotaoutput;
     endif;
@@ -283,7 +283,7 @@ 
 function notifyIndividual($userID, $eventID, $skillID)
 {
     notifyEveryoneForEvent($eventID, $skillID, $userID);
-    $eventID = 0;  //disables following code through empty sql result
+    $eventID = 0; //disables following code through empty sql result
 
     $sql = "SELECT *,
 	(SELECT CONCAT(`firstname`, ' ', `lastname`) FROM cr_users WHERE `cr_users`.id = `cr_skills`.`userID` ORDER BY `cr_users`.firstname) AS `name`,
@@ -324,13 +324,13 @@ 
             if (($row['eventRehearsal'] == '0') or ($row['eventRehearsalChange'] == '1')) {
                 $rehearsal = $row['norehearsalemail'];
             } else {
-                $rehearsal = $row['yesrehearsal'].' on '.$rehearsaldate.' at '.$location;
+                $rehearsal = $row['yesrehearsal'] . ' on ' . $rehearsaldate . ' at ' . $location;
             }
         }
 
         $skill = $row['category'];
         if ($row['joinedskill'] != '') {
-            $skill = $skill.' - '.$row['joinedskill'];
+            $skill = $skill . ' - ' . $row['joinedskill'];
         } else {
             // If there is no skill, then we don't need to mention this fact.
         }
@@ -346,7 +346,7 @@ 
         $location = $row['eventLocationFormatted'];
         $rotaoutput = $skill;
         $to = $row['email'];
-        $subject = 'Rota reminder: '.$date;
+        $subject = 'Rota reminder: ' . $date;
 
         $message = emailTemplate($message, $name, $date, $location, $rehearsal, $rotaoutput, $username, $siteurl);
 
@@ -417,9 +417,9 @@ 
 
                 $type = $ob->eventType;
 
-                $eventdetails = $eventrow['eventGroup'].': '.$eventrow['sermonTitle'];
+                $eventdetails = $eventrow['eventGroup'] . ': ' . $eventrow['sermonTitle'];
                 if (!empty($eventrow['bibleVerse'])) {
-                    $eventdetails .= ' ('.$eventrow['bibleVerse'].')';
+                    $eventdetails .= ' (' . $eventrow['bibleVerse'] . ')';
                 }
             }
 
@@ -442,7 +442,7 @@ 
             while ($roleRow = mysqli_fetch_array($roleResult, MYSQLI_ASSOC)) {
                 if (($roleRow['name'] == '') || ($roleRow['name'] == $roleRow['description'])):
                     $roles[] = $roleRow['description']; else:
-                    $roles[] = $roleRow['description'].' - '.$roleRow['name'];
+                    $roles[] = $roleRow['description'] . ' - ' . $roleRow['name'];
                 endif;
             }
 
@@ -462,11 +462,11 @@ 
             $message = siteSettings()->getNotificationEmail();
             $rotaoutput = implode(', ', $roles);
 
-            $to = $ob->name.' <'.$ob->email.'>';
-            $from = siteSettings()->getOwner().' <'.siteSettings()->getAdminEmailAddress().'>';
+            $to = $ob->name . ' <' . $ob->email . '>';
+            $from = siteSettings()->getOwner() . ' <' . siteSettings()->getAdminEmailAddress() . '>';
 
             //$subject = "Rota reminder: " . $date;
-            $subject = 'Reminder: '.implode(', ', $roles).' - '.$type.': '.$date;
+            $subject = 'Reminder: ' . implode(', ', $roles) . ' - ' . $type . ': ' . $date;
 
             $rotadetails = getEventDetails($eventId, "\r\n", 0, false, "\t");
 
@@ -501,7 +501,7 @@ 
 							ep.notified = 1
 						WHERE
 							ep.eventId = '$eventId'
-							AND ur.userId IN (".implode(', ', $countarray).')';
+							AND ur.userId IN (" . implode(', ', $countarray) . ')';
 
         mysqli_query(db(), $sql) or die(mysqli_error(db()));
     }
@@ -530,14 +530,14 @@ 
     $user = mysqli_fetch_object($result);
 
     if (!$user->email) {
-        return 'No email address present for '.$user->firstName.' '.$user->lastName;
+        return 'No email address present for ' . $user->firstName . ' ' . $user->lastName;
     }
 
     if (!$user->recieveReminderEmails) {
-        return $user->firstName.' '.$user->lastName.' opted not to recieve reminder emails';
+        return $user->firstName . ' ' . $user->lastName . ' opted not to recieve reminder emails';
     }
 
-    $name = $user->firstName.' '.$user->lastName;
+    $name = $user->firstName . ' ' . $user->lastName;
 
     //line seperator for mails
     //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird.
@@ -570,7 +570,7 @@ 
     $eventDetails .= ' - ';
     $eventDetails .= "\r\n";
     $eventDetails .= $event->type;
-    $eventDetails .= $event->eventGroup.': '.$event->sermonTitle.' ('.$event->bibleVerse.')';
+    $eventDetails .= $event->eventGroup . ': ' . $event->sermonTitle . ' (' . $event->bibleVerse . ')';
     $eventDetails .= "\r\n";
     $eventDetails .= "\r\n";
 
@@ -594,7 +594,7 @@ 
         'event.type'     => $event->type,
         'event.location' => $event->location,
 
-        'event.sermon'        => $event->eventGroup.': '.$event->sermonTitle.' ('.$event->bibleVerse.')',
+        'event.sermon'        => $event->eventGroup . ': ' . $event->sermonTitle . ' (' . $event->bibleVerse . ')',
         'event.sermon.name'   => $event->sermonTitle,
         'event.sermon.series' => $event->eventGroup,
         'event.sermon.verse'  => $event->bibleVerse,
@@ -608,8 +608,8 @@ 
 
     //$message = str_replace("\r\n",$crlf,$message);
 
-    $to = $name.' <'.$user->email.'>';
-    $from = siteSettings()->getOwner().' <'.$siteSettings()->getAdminEmailAddress().'>';
+    $to = $name . ' <' . $user->email . '>';
+    $from = siteSettings()->getOwner() . ' <' . $siteSettings()->getAdminEmailAddress() . '>';
 
     $sent = false;
     $sent = sendMail($to, $subject, $message, $from);
@@ -617,10 +617,10 @@ 
     if ($sent == true) {
         return true;
     } else {
-        return 'Error while sending mail to '.$user->firstName.' '.$user->lastName;
+        return 'Error while sending mail to ' . $user->firstName . ' ' . $user->lastName;
     }
 
-    return 'Unknown error for '.$user->firstName.' '.$user->lastName;
+    return 'Unknown error for ' . $user->firstName . ' ' . $user->lastName;
 }
 
 function getEventEmailSubject($eventId)
@@ -667,16 +667,16 @@ 
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
     $groupNames = '';
     while ($group = mysqli_fetch_object($result)) {
-        $groupNames .= $group->name.', ';
+        $groupNames .= $group->name . ', ';
     }
 
     if (isset($errors)) {
-        createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to '.$groupNames.' groups with errors: '.implode(', ', $errors), 'email');
+        createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to ' . $groupNames . ' groups with errors: ' . implode(', ', $errors), 'email');
 
         return $errors;
     }
 
-    createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to '.$groupNames, 'email');
+    createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to ' . $groupNames, 'email');
 
     return $true;
 }
@@ -728,16 +728,16 @@ 
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
     $groupNames = '';
     while ($group = mysqli_fetch_object($result)) {
-        $groupNames .= $group->name.', ';
+        $groupNames .= $group->name . ', ';
     }
 
     if (isset($errors)) {
-        createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to '.$groupNames." groups with errors: \n- ".implode("\n- ", $errors), 'email');
+        createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to ' . $groupNames . " groups with errors: \n- " . implode("\n- ", $errors), 'email');
 
         return $errors;
     }
 
-    createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to '.$groupNames, 'email');
+    createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to ' . $groupNames, 'email');
 
     return $true;
 }
@@ -753,14 +753,14 @@ 
     $user = mysqli_fetch_object($result);
 
     if (!$user->email) {
-        return 'No email address present for '.$user->firstName.' '.$user->lastName;
+        return 'No email address present for ' . $user->firstName . ' ' . $user->lastName;
     }
 
     if (!$user->isOverviewRecipient) {
-        return $user->firstName.' '.$user->lastName.' opted not to recieve group emails';
+        return $user->firstName . ' ' . $user->lastName . ' opted not to recieve group emails';
     }
 
-    $name = $user->firstName.' '.$user->lastName;
+    $name = $user->firstName . ' ' . $user->lastName;
 
     //line seperator for mails
     //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird.
@@ -823,8 +823,8 @@ 
 
     //$message = str_replace("\r\n",$crlf,$message);
 
-    $to = $name.' <'.$user->email.'>';
-    $from = siteSettings()->getOwner().' <'.$siteadmin.'>';
+    $to = $name . ' <' . $user->email . '>';
+    $from = siteSettings()->getOwner() . ' <' . $siteadmin . '>';
 
     $sent = false;
     $sent = sendMail($to, $subject, $message, $from);
@@ -832,10 +832,10 @@ 
     if ($sent == true) {
         return true;
     } else {
-        return 'Error while sending mail to '.$user->firstName.' '.$user->lastName;
+        return 'Error while sending mail to ' . $user->firstName . ' ' . $user->lastName;
     }
 
-    return 'Unknown error for '.$user->firstName.' '.$user->lastName;
+    return 'Unknown error for ' . $user->firstName . ' ' . $user->lastName;
 }
 
 // returns either true, or error message string
@@ -848,14 +848,14 @@ 
     $user = mysqli_fetch_object($result);
 
     if (!$user->email) {
-        return 'No email address present for '.$user->firstName.' '.$user->lastName;
+        return 'No email address present for ' . $user->firstName . ' ' . $user->lastName;
     }
 
     if (!$user->isOverviewRecipient) {
-        return $user->firstName.' '.$user->lastName.' opted not to recieve group emails';
+        return $user->firstName . ' ' . $user->lastName . ' opted not to recieve group emails';
     }
 
-    $name = $user->firstName.' '.$user->lastName;
+    $name = $user->firstName . ' ' . $user->lastName;
 
     //line seperator for mails
     //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird.
@@ -888,7 +888,7 @@ 
     }
 
     if (!isset($events)) {
-        return $name.' has no events in the upcoming rota';
+        return $name . ' has no events in the upcoming rota';
     }
 
     $events = implode(', ', $events);
@@ -941,7 +941,7 @@ 
 
         $eventDetails .= $row['joinedskills'];
         $eventDetails .= "\r\n";
-        $eventDetails .= 'Notes: '.$row['comment'];
+        $eventDetails .= 'Notes: ' . $row['comment'];
         $eventDetails .= "\r\n";
         $eventDetails .= "\r\n";
     }
@@ -957,8 +957,8 @@ 
 
     //$message = str_replace("\r\n",$crlf,$message);
 
-    $to = $name.' <'.$user->email.'>';
-    $from = siteSettings()->getOwner().' <'.$siteadmin.'>';
+    $to = $name . ' <' . $user->email . '>';
+    $from = siteSettings()->getOwner() . ' <' . $siteadmin . '>';
 
     $sent = false;
     $sent = sendMail($to, $subject, $message, $from);
@@ -966,10 +966,10 @@ 
     if ($sent == true) {
         return true;
     } else {
-        return 'Error while sending mail to '.$user->firstName.' '.$user->lastName;
+        return 'Error while sending mail to ' . $user->firstName . ' ' . $user->lastName;
     }
 
-    return 'Unknown error for '.$user->firstName.' '.$user->lastName;
+    return 'Unknown error for ' . $user->firstName . ' ' . $user->lastName;
 }
 
 function notifyAttack($fileName, $attackType, $attackerID)
@@ -984,10 +984,10 @@ 
 
     while ($row = mysqli_fetch_array($userresult, MYSQLI_ASSOC)) {
         $subject = 'SECURITY-ALERT - Attack blocked successfully';
-        $message = "Type:\t\t ".$attackType."<br>\r\n".
-                    "Attacker:\t ".$row[name]."<br>\r\n".
-                    "Date:\t\t ".date('Y-m-d H:i:s')."<br>\r\n".
-                    "Script:\t\t ".$fileName."\r\n "."<br>\r\n";
+        $message = "Type:\t\t " . $attackType . "<br>\r\n" .
+                    "Attacker:\t " . $row[name] . "<br>\r\n" .
+                    "Date:\t\t " . date('Y-m-d H:i:s') . "<br>\r\n" .
+                    "Script:\t\t " . $fileName . "\r\n " . "<br>\r\n";
 
         //$headers = 'From: ' . $row['siteadmin'] . "\r\n" .
         //'Reply-To: ' . $row['siteadmin'] . "\r\n";
@@ -997,8 +997,8 @@ 
         //mail($to, $subject, strip_tags($message), $headers);
         sendMail($to, $subject, strip_tags($message), $to);
 
-        echo $subject.'<br><br>';
-        echo $message.'<br>';
+        echo $subject . '<br><br>';
+        echo $message . '<br>';
         echo 'An email about this incident was sent to administrator!';
     }
 }
@@ -1013,11 +1013,11 @@ 
     $userresult = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
     while ($row = mysqli_fetch_array($userresult, MYSQLI_ASSOC)) {
-        $subject = 'Info - '.$infoMsg.' - '.$row[name];
-        $message = "Type:\t\t ".$infoMsg."<br>\r\n".
-                    "User:\t\t ".$row[name]."<br>\r\n".
-                    "Date:\t\t ".date('Y-m-d H:i:s')."<br>\r\n".
-                    "Script:\t\t ".$fileName."\r\n "."<br>\r\n";
+        $subject = 'Info - ' . $infoMsg . ' - ' . $row[name];
+        $message = "Type:\t\t " . $infoMsg . "<br>\r\n" .
+                    "User:\t\t " . $row[name] . "<br>\r\n" .
+                    "Date:\t\t " . date('Y-m-d H:i:s') . "<br>\r\n" .
+                    "Script:\t\t " . $fileName . "\r\n " . "<br>\r\n";
 
         //$headers = 'From: ' . $row['siteadmin'] . "\r\n" .
         //'Reply-To: ' . $row['siteadmin'] . "\r\n";
@@ -1034,7 +1034,7 @@ 
     if (preg_match("/(\{\{)((.)+){1}(\}\})/", $message, $matches) == 1) {
         $defaultSubject = $matches[2];
         //$subject = str_replace(array("{{","}}"),"",$matches[0]);
-        $message = str_replace($matches[1].$matches[2].$matches[4], '', $message);
+        $message = str_replace($matches[1] . $matches[2] . $matches[4], '', $message);
         //$message = $matches[4];
 
         //$message = $message . "\r\n\r\n";