TechWilk / rota

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

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/editPassword.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 namespace TechWilk\Rota;
 
 if (!empty($_GET['id'])) {
-    header('Location: ../user/'.(int) $_GET['id'].'/password');
+    header('Location: ../user/' . (int) $_GET['id'] . '/password');
     exit;
 }
 

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();
@@ -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/Controller/ResourceController.php

Spacing +8 added lines, -8 removed lines

@@ -61,7 +61,7 @@ 
 
     public function getResourceEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch resource GET '/resource/".$args['id']."/edit'");
+        $this->logger->info("Fetch resource GET '/resource/" . $args['id'] . "/edit'");
         $d = DocumentQuery::create()->findPK($args['id']);
 
         if (!is_null($d)) {
@@ -73,15 +73,15 @@ 
 
     public function getResourceFile(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch resource GET '/resource/".$args['id']."'");
+        $this->logger->info("Fetch resource GET '/resource/" . $args['id'] . "'");
         $resource = DocumentQuery::create()->findPk($args['id']);
-        $directory = __DIR__.'/../../../documents/';
+        $directory = __DIR__ . '/../../../documents/';
 
         if (!is_null($resource)) {
-            if (file_exists($directory.$resource->getUrl())) {
-                $file = $directory.$resource->getUrl();
-            } elseif (file_exists($directory.$resource->getId())) {
-                $file = $directory.$resource->getId();
+            if (file_exists($directory . $resource->getUrl())) {
+                $file = $directory . $resource->getUrl();
+            } elseif (file_exists($directory . $resource->getId())) {
+                $file = $directory . $resource->getId();
             } else {
                 return $this->view->render($response, 'error.twig');
             }
@@ -95,7 +95,7 @@ 
                             ->withHeader('Content-Type', 'application/download')
                             ->withHeader('Content-Description', 'File Transfer')
                             ->withHeader('Content-Transfer-Encoding', 'binary')
-                            ->withHeader('Content-Disposition', 'attachment; filename="'.$resource->getUrl().'"')
+                            ->withHeader('Content-Disposition', 'attachment; filename="' . $resource->getUrl() . '"')
                             ->withHeader('Expires', '0')
                             ->withHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
                             ->withHeader('Pragma', 'public')

src/classes/Controller/GroupController.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,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()
@@ -36,7 +36,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()
@@ -58,14 +58,14 @@ 
                 ->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 function postGroup(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Create/edit group POST '/group/".$args['id']."'");
+        $this->logger->info("Create/edit group POST '/group/" . $args['id'] . "'");
 
         $group = new Group();
 

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);
 

public/old/cr_daily.php

Spacing +6 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
         if ($availableCommits[0]['sha'] !== $commitHash) {
             $updateAvailable = true;
 
-            $email = siteSettings()->getOwner().' <'.siteSettings()->getAdminEmailAddress().'>';
+            $email = siteSettings()->getOwner() . ' <' . siteSettings()->getAdminEmailAddress() . '>';
             $message = <<<'MESSAGE'
 There is an update available for your installation of Rota.
 
@@ -114,23 +114,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>

public/old/includes/functions.php

Spacing +20 added lines, -20 removed lines

@@ -6,16 +6,16 @@ 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 
-include __DIR__.'/errors.php';
+include __DIR__ . '/errors.php';
 
 // setup the autoloading
-require_once __DIR__.'/../../../vendor/autoload.php';
+require_once __DIR__ . '/../../../vendor/autoload.php';
 
 // setup Propel
-require_once __DIR__.'/../../../generated-conf/config.php';
+require_once __DIR__ . '/../../../generated-conf/config.php';
 
 $defaultLogger = new Logger('defaultLogger');
-$defaultLogger->pushHandler(new StreamHandler(__DIR__.'/../../../logs/propel.log', Logger::WARNING));
+$defaultLogger->pushHandler(new StreamHandler(__DIR__ . '/../../../logs/propel.log', Logger::WARNING));
 
 $serviceContainer->setLogger('defaultLogger', $defaultLogger);
 
@@ -64,18 +64,18 @@ 
     return SettingsQuery::create()->findOne();
 }
 
-include __DIR__.'/functions.auth.php';
-include __DIR__.'/functions.notifications.php';
-include __DIR__.'/functions.mail.php';
-include __DIR__.'/functions.remove.php';
-include __DIR__.'/functions.discussion.php';
-include __DIR__.'/functions.event.php';
-include __DIR__.'/functions.password.php';
-include __DIR__.'/functions.users.php';
-include __DIR__.'/functions.roles.php';
-include __DIR__.'/functions.database.php';
-include __DIR__.'/functions.calendars.php';
-include __DIR__.'/functions.facebook.php';
+include __DIR__ . '/functions.auth.php';
+include __DIR__ . '/functions.notifications.php';
+include __DIR__ . '/functions.mail.php';
+include __DIR__ . '/functions.remove.php';
+include __DIR__ . '/functions.discussion.php';
+include __DIR__ . '/functions.event.php';
+include __DIR__ . '/functions.password.php';
+include __DIR__ . '/functions.users.php';
+include __DIR__ . '/functions.roles.php';
+include __DIR__ . '/functions.database.php';
+include __DIR__ . '/functions.calendars.php';
+include __DIR__ . '/functions.facebook.php';
 
 date_default_timezone_set(siteSettings()->getTimeZone());
 
@@ -175,7 +175,7 @@ 
         $stat_id = $_SESSION['login_statistic_id'];
         if (($stat_id != '') && ($stat_id != '0')) {
             $stat = StatisticQuery::create()->findPk($stat_id);
-            $stat->setDetail1($stat->getDetail1().'/'.$detail1);
+            $stat->setDetail1($stat->getDetail1() . '/' . $detail1);
             $stat->setDetail2($stat->getDate()->diff(new DateTime()));
             $stat->save();
 
@@ -208,7 +208,7 @@ 
         return 'never';
     }
 
-    return timeInWords($time).' ago';
+    return timeInWords($time) . ' ago';
 }
 
 function timeInWordsWithTense($time)
@@ -222,9 +222,9 @@ 
     }
 
     if ($time->getTimestamp() > (new DateTime())->getTimestamp()) {
-        return 'in '.timeInWords($time);
+        return 'in ' . timeInWords($time);
     } else {
-        return timeInWords($time).' ago';
+        return timeInWords($time) . ' ago';
     }
 }