TechWilk / rota

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/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]);
     }

public/old/tableView.php

Spacing +15 added lines, -15 removed lines

@@ -111,7 +111,7 @@ 
 									 FROM cr_eventTypes et
 									 WHERE id IN (SELECT e.type
 										 						FROM cr_events e
-																WHERE '.$whereTwoMonth.'
+																WHERE '.$whereTwoMonth . '
 																AND e.removed = 0)
 									 ORDER BY name';
         $result = mysqli_query(db(), $filter_sql) or die(mysqli_error(db()));
@@ -132,7 +132,7 @@ 
 <tr>
 	<td ><strong>Event</strong></td>
 	<?php
-    $sql = 'SELECT * FROM cr_groups g ORDER BY '.$group_sorting_name;
+    $sql = 'SELECT * FROM cr_groups g ORDER BY ' . $group_sorting_name;
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
@@ -162,7 +162,7 @@ 
 
     if ($filter == '') {
         $sql .= '
-							AND '.$whereTwoMonth.'
+							AND '.$whereTwoMonth . '
 						ORDER BY
 							e.date';
     } elseif ($filter == 'all') {
@@ -172,7 +172,7 @@ 
     } elseif ($filter != '') {
         $sql .= "
 							AND e.type = '$filter'
-							AND ".$whereTwoMonth.'
+							AND " . $whereTwoMonth . '
 						ORDER BY
 							e.date';
     }
@@ -186,31 +186,31 @@ 
         echo '<tr>';
         echo '<td >';
         setlocale(LC_TIME, $lang_locale); //de_DE
-        echo '<a href="event.php?id='.$row['id'].'">';
+        echo '<a href="event.php?id=' . $row['id'] . '">';
         echo strftime($time_format_short, strtotime($row['sundayDate'])); // %a, <strong>%e. %b</strong>, KW%V
         echo '</a>';
 
         //$row['sundayDate']
         if (!empty($row['eventType'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventType'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventType'] . '</em>';
         }
         if (!empty($row['eventSubType'])) {
-            echo ' - <em>'.$row['eventSubType'].'</em>';
+            echo ' - <em>' . $row['eventSubType'] . '</em>';
         }
         if (!empty($row['eventLocation'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventLocation'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventLocation'] . '</em>';
         }
         if (!empty($row['name'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['name'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['name'] . '</em>';
         }
         if (!empty($row['eventGroup'])) {
-            echo '<br /><strong>&nbsp;&nbsp;&nbsp;'.$row['eventGroup'].'</strong>';
+            echo '<br /><strong>&nbsp;&nbsp;&nbsp;' . $row['eventGroup'] . '</strong>';
         }
         if (!empty($row['sermonTitle'])) {
-            echo ': '.$row['sermonTitle'];
+            echo ': ' . $row['sermonTitle'];
         }
         if (!empty($row['bibleVerse'])) {
-            echo ' <em>('.$row['bibleVerse'].')</em>';
+            echo ' <em>(' . $row['bibleVerse'] . ')</em>';
         }
         echo '</td>';
 
@@ -242,16 +242,16 @@ 
                     if ($previousName == '') {
                         // new name
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
-                        echo $name.' <em>('.$viewPeople['role'];
+                        echo $name . ' <em>(' . $viewPeople['role'];
                     } elseif ($previousName != $name) {
                         echo ')</em>';
                         echo ($viewPeople['userId'] != $sessionUserId) ? '</strong>' : '';
                         echo '<br />'; // line break from previous name
                         // new name
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
-                        echo $name.' <em>('.$viewPeople['role'];
+                        echo $name . ' <em>(' . $viewPeople['role'];
                     } else {
-                        echo ', '.$viewPeople['role'];
+                        echo ', ' . $viewPeople['role'];
                     }
 
                     $peopleInEvent = true;

public/old/event.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
 
 if (!empty($_GET['id'])) {
-    header('Location: ../event/'.(int) $_GET['id']);
+    header('Location: ../event/' . (int) $_GET['id']);
 }

src/classes/Controller/EventController.php

Spacing +8 added lines, -8 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();

public/old/error.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 <br>
 The following error has occurred
 <?php
-echo " on page '".$page."':<br><br>";
+echo " on page '" . $page . "':<br><br>";
     echo '<strong>';
 
     switch ($no) {

public/old/cr_daily.php

Spacing +5 added lines, -5 removed lines

@@ -87,23 +87,23 @@
                     WHERE
                         date >= CURDATE()
                         AND date_format( date , "%y-%m-%d" )
-                                <= date_format( DATE_ADD(now(), INTERVAL '.$daysAlert.' DAY ) , "%y-%m-%d" )';
+                                <= date_format( DATE_ADD(now(), INTERVAL '.$daysAlert . ' DAY ) , "%y-%m-%d" )';
         $resultEvents = mysqli_query(db(), $sqlEvents) or die(mysqli_error(db()));
         $i = 0;
         while ($rowEvents = mysqli_fetch_array($resultEvents, MYSQLI_ASSOC)) {
             $usersNotified = notifyEveryoneForEvent($rowEvents['id']);
             if (count($usersNotified) > 0) {
-                $out = $out.'Automatic notifications sent to users ('.implode(', ', $usersNotified).') for event '.$rowEvents['id'].' on '.$rowEvents['date'].".<br>\r\n";
+                $out = $out . 'Automatic notifications sent to users (' . implode(', ', $usersNotified) . ') for event ' . $rowEvents['id'] . ' on ' . $rowEvents['date'] . ".<br>\r\n";
             } else {
-                $out = $out.'No notifications sent for event '.$rowEvents['id'].' on '.$rowEvents['date'].".<br>\r\n";
+                $out = $out . 'No notifications sent for event ' . $rowEvents['id'] . ' on ' . $rowEvents['date'] . ".<br>\r\n";
             }
             $i = $i + 1;
         }
         if ($i == 0) {
-            $out = $out.'No events found to automatically notify for.';
+            $out = $out . 'No events found to automatically notify for.';
         }
     } else {
-        $out = $out.'Automatic notifications are disabled.';
+        $out = $out . 'Automatic notifications are disabled.';
     } ?>
 <html>
 	<body>