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

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

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

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>