TechWilk / rota

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/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';
     }
 }
 

src/classes/Controller/JobController.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         }
 
         $client = new Client();
-        $url = $site->getUrl()['base'].$this->router->pathFor('home').'old/cr_daily.php';
+        $url = $site->getUrl()['base'] . $this->router->pathFor('home') . 'old/cr_daily.php';
         $guzzleResponse = $client->get($url, [
             'query' => [
                 'token' => $args['token'],

src/classes/Controller/NotificationController.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 {
     public function getNotificationClick(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch settings GET '/notification/".$args['id']."'");
+        $this->logger->info("Fetch settings GET '/notification/" . $args['id'] . "'");
 
         $n = NotificationQuery::create()->findPk($args['id']);
 
@@ -35,7 +35,7 @@ 
 
                 return $response->withStatus(302)->withHeader('Location', $this->router->pathFor($link['route'], $link['attributes']));
             } else {
-                return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home').$n->getLink());
+                return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home') . $n->getLink());
             }
         }
 

public/old/statistics.php

Spacing +18 added lines, -18 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;
 }
 
@@ -26,28 +26,28 @@ 
     if ($method == 'truncate') {
         $sql = "CREATE TABLE tmp_system_statistics as SELECT * from statistics WHERE type='system'";
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = ('TRUNCATE TABLE statistics');
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = ('ALTER TABLE statistics  AUTO_INCREMENT = 50');
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = 'INSERT INTO statistics (userid,date,type,detail1,detail2,detail3,script) ';
-        $sql = $sql.'SELECT userid,date,type,detail1,detail2,detail3,script from tmp_system_statistics order by date';
+        $sql = $sql . 'SELECT userid,date,type,detail1,detail2,detail3,script from tmp_system_statistics order by date';
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = 'DROP TABLE tmp_system_statistics';
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         insertStatistics('system', __FILE__, 'statistics deleted');
@@ -103,22 +103,22 @@ 
               <?php
 
                         $sql = 'SELECT VERSION( ) AS mysqli_version';
-            $result = mysqli_query(db(), $sql) or die('MySQL-Error: '.mysqli_error(db()));
+            $result = mysqli_query(db(), $sql) or die('MySQL-Error: ' . mysqli_error(db()));
             $dbv = mysqli_fetch_array($result, MYSQLI_ASSOC);
             $mysqli_version = $dbv['mysqli_version'];
 
             if (substr($mysqli_version, 0, 1) == 5) {
-                $sql = "SELECT getBrowserInfo(detail3) as browser,count(*) as count from statistics where detail1 like 'login%' and detail3!='' group by getBrowserInfo(detail3) order by count desc ".$browserLimit;
+                $sql = "SELECT getBrowserInfo(detail3) as browser,count(*) as count from statistics where detail1 like 'login%' and detail3!='' group by getBrowserInfo(detail3) order by count desc " . $browserLimit;
             } else {
-                $sql = "SELECT detail3 as browser,count(*) as count from statistics where detail1 like 'login%' and detail3!='' group by detail3 order by count desc ".$browserLimit;
+                $sql = "SELECT detail3 as browser,count(*) as count from statistics where detail1 like 'login%' and detail3!='' group by detail3 order by count desc " . $browserLimit;
             }
 
             $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
             while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                 extract($row);
                 echo '<tr>';
-                echo '<td>'.$browser.'</td>';
-                echo '<td>'.$count.'</td>';
+                echo '<td>' . $browser . '</td>';
+                echo '<td>' . $count . '</td>';
                 echo '</tr>';
             } ?>
 
@@ -145,16 +145,16 @@ 
                   $sql .= " AND s.type = 'system'";
               }
           }
-                $sql .= ' ORDER BY date desc '.$limit;
+                $sql .= ' ORDER BY date desc ' . $limit;
                 $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
                 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                     extract($row);
                     echo '<tr>';
-                    echo '<td>'.$date.'</td>';
-                    echo '<td>'.$name.'</td>';
-                    echo '<td>'.$type.'</td>';
-                    echo '<td>'.$detail1.'</td>';
-                    echo '<td>'.$detail2.'</td>';
+                    echo '<td>' . $date . '</td>';
+                    echo '<td>' . $name . '</td>';
+                    echo '<td>' . $type . '</td>';
+                    echo '<td>' . $detail1 . '</td>';
+                    echo '<td>' . $detail2 . '</td>';
                     //echo "<td>".$detail3."</td>";
                     echo '</tr>';
                 }

public/old/tableView.php

Spacing +15 added lines, -15 removed lines

@@ -111,7 +111,7 @@ 
 									 FROM eventTypes et
 									 WHERE id IN (SELECT e.type
 										 						FROM 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 groups g ORDER BY '.$group_sorting_name;
+    $sql = 'SELECT * FROM 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;