TechWilk / rota

public/old/includes/functions.event.php

Spacing +69 added lines, -69 removed lines

@@ -14,7 +14,7 @@ 
     $sql = ("INSERT INTO cr_eventPeople (eventId, userRoleId) VALUES ('$eventId', '$userRoleId')");
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -29,7 +29,7 @@ 
 {
     $sql = "DELETE FROM cr_eventPeople WHERE eventId = '$id' AND userRoleId = '$userRoleId'";
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -170,40 +170,40 @@ 
 
     $ob = mysqli_fetch_object($result);
 
-    $subject = 'Swap requested: '.$ob->newUserName.' - '.$ob->eventDate;
-    $message = "Date:\t\t ".strftime($ob->time_format_long, strtotime($ob->eventDate))."\r\n".
-                "Requested by:\t\t ".$ob->requestedBy."\r\n".
-                "Swap from:\t\t ".$ob->oldUserName.' - '.$ob->oldRole."\r\n".
-                "Swap to:\t\t ".$ob->newUserName.' - '.$ob->newRole."\r\n".
-                "Accept:\t\t ".$ob->siteurl.'/swap.php?action='.'accept&swap='.$swapId.'&verify='.$verificationCode."\r\n "."\r\n".
-                "Decline:\t\t ".$ob->siteurl.'/swap.php?action='.'decline&swap='.$swapId.'&verify='.$verificationCode."\r\n "."\r\n";
+    $subject = 'Swap requested: ' . $ob->newUserName . ' - ' . $ob->eventDate;
+    $message = "Date:\t\t " . strftime($ob->time_format_long, strtotime($ob->eventDate)) . "\r\n" .
+                "Requested by:\t\t " . $ob->requestedBy . "\r\n" .
+                "Swap from:\t\t " . $ob->oldUserName . ' - ' . $ob->oldRole . "\r\n" .
+                "Swap to:\t\t " . $ob->newUserName . ' - ' . $ob->newRole . "\r\n" .
+                "Accept:\t\t " . $ob->siteurl . '/swap.php?action=' . 'accept&swap=' . $swapId . '&verify=' . $verificationCode . "\r\n " . "\r\n" .
+                "Decline:\t\t " . $ob->siteurl . '/swap.php?action=' . 'decline&swap=' . $swapId . '&verify=' . $verificationCode . "\r\n " . "\r\n";
 
     $from = $ob->siteadmin;
 
-    $linkToSwap = 'swap.php?swap='.$swapId;
+    $linkToSwap = 'swap.php?swap=' . $swapId;
 
     $sessionUserId = $_SESSION['userid'];
 
     if ($sessionUserId == $ob->oldUserId) {    // if old user requests swap
         // notify new user
-        $notificationMessage = $ob->oldUserFirstName.' requested a swap';
+        $notificationMessage = $ob->oldUserFirstName . ' requested a swap';
         $notificationId = createNotificationForUser($ob->newUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     } elseif ($sessionUserId == $ob->newUserId) {    // if new user requests swap
         // notify old user
-        $notificationMessage = $ob->newUserFirstName.' requested a swap';
+        $notificationMessage = $ob->newUserFirstName . ' requested a swap';
         $notificationId = createNotificationForUser($ob->oldUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
     } else { // notify both users
         $sessionUserFirstName = getFirstNameWithId($sessionUserId);
-        $notificationMessageOldUser = $sessionUserFirstName.' requested a swap for '.$ob->newUserFirstName;
-        $notificationMessageNewUser = $sessionUserFirstName.' requested a swap for '.$ob->oldUserFirstName;
+        $notificationMessageOldUser = $sessionUserFirstName . ' requested a swap for ' . $ob->newUserFirstName;
+        $notificationMessageNewUser = $sessionUserFirstName . ' requested a swap for ' . $ob->oldUserFirstName;
         $notificationIdOldUser = createNotificationForUser($ob->oldUserId, $notificationMessageOldUser, $message, 'swap', $linkToSwap);
         $notificationIdNewUser = createNotificationForUser($ob->newUserId, $notificationMessageNewUser, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationIdOldUser, $notificationMessageOldUser);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationIdNewUser, $notificationMessageNewUser);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationIdOldUser, $notificationMessageOldUser);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationIdNewUser, $notificationMessageNewUser);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     }
@@ -233,60 +233,60 @@ 
 
     $ob = mysqli_fetch_object($result);
 
-    $subject = 'Swap accepted: '.$ob->newUserName.' - '.$ob->eventDate;
-    $message = "The following swap has been accepted\r\n\r\n".
-                "Date:\t\t ".strftime($ob->time_format_long, strtotime($ob->eventDate))."\r\n".
-                "Requested by:\t\t ".$ob->requestedBy."\r\n".
-                "Swap from:\t\t ".$ob->oldUserName.' - '.$ob->oldRole."\r\n".
-                "Swap to:\t\t ".$ob->newUserName.' - '.$ob->newRole."\r\n";
+    $subject = 'Swap accepted: ' . $ob->newUserName . ' - ' . $ob->eventDate;
+    $message = "The following swap has been accepted\r\n\r\n" .
+                "Date:\t\t " . strftime($ob->time_format_long, strtotime($ob->eventDate)) . "\r\n" .
+                "Requested by:\t\t " . $ob->requestedBy . "\r\n" .
+                "Swap from:\t\t " . $ob->oldUserName . ' - ' . $ob->oldRole . "\r\n" .
+                "Swap to:\t\t " . $ob->newUserName . ' - ' . $ob->newRole . "\r\n";
     $from = $ob->siteadmin;
 
-    $linkToSwap = 'swap.php?swap='.$swapId;
+    $linkToSwap = 'swap.php?swap=' . $swapId;
 
     $sessionUserId = $_SESSION['userid'];
 
     if ($sessionUserId == $ob->oldUserId) {    // if old user accepted swap
         // notify new user
-        $notificationMessage = $ob->oldUserFirstName.' accepted a swap';
+        $notificationMessage = $ob->oldUserFirstName . ' accepted a swap';
         $notificationId = createNotificationForUser($ob->newUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     } elseif ($sessionUserId == $ob->newUserId) {    // if new user accepted swap
         // notify old user
-        $notificationMessage = $ob->newUserFirstName.' accepted a swap';
+        $notificationMessage = $ob->newUserFirstName . ' accepted a swap';
         $notificationId = createNotificationForUser($ob->oldUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
     } elseif (isset($_GET['token'])) { // if accepted by email URL with token
         // notify whoever requested swap
         if ($ob->newUserId == $ob->requestedBy) {
-            $notificationMessage = 'Swap accepted with '.$ob->oldUserFirstName;
+            $notificationMessage = 'Swap accepted with ' . $ob->oldUserFirstName;
             $notificationId = createNotificationForUser($ob->newUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-            createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+            createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
             sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
         } elseif ($ob->oldUserId == $ob->requestedBy) {
-            $notificationMessage = 'Swap accepted with '.$ob->newUserFirstName;
+            $notificationMessage = 'Swap accepted with ' . $ob->newUserFirstName;
             $notificationId = createNotificationForUser($ob->oldUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-            createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+            createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
             sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
         } else { // notify both
-            $notificationMessageOldUser = 'Swap accepted with '.$ob->newUserFirstName;
-            $notificationMessageNewUser = 'Swap accepted with '.$ob->oldUserFirstName;
+            $notificationMessageOldUser = 'Swap accepted with ' . $ob->newUserFirstName;
+            $notificationMessageNewUser = 'Swap accepted with ' . $ob->oldUserFirstName;
             $notificationIdOldUser = createNotificationForUser($ob->oldUserId, $notificationMessageOldUser, $message, 'swap', $linkToSwap);
             $notificationIdNewUser = createNotificationForUser($ob->newUserId, $notificationMessageNewUser, $message, 'swap', $linkToSwap);
-            createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationIdOldUser, $notificationMessage);
-            createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationIdNewUser, $notificationMessage);
+            createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationIdOldUser, $notificationMessage);
+            createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationIdNewUser, $notificationMessage);
             sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
             sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
         }
     } else { // notify both users
         $sessionUserFirstName = getFirstNameWithId($sessionUserId);
-        $notificationMessageOldUser = $sessionUserFirstName.' accepted a swap for '.$ob->newUserFirstName;
-        $notificationMessageNewUser = $sessionUserFirstName.' accepted a swap for '.$ob->oldUserFirstName;
+        $notificationMessageOldUser = $sessionUserFirstName . ' accepted a swap for ' . $ob->newUserFirstName;
+        $notificationMessageNewUser = $sessionUserFirstName . ' accepted a swap for ' . $ob->oldUserFirstName;
         $notificationIdOldUser = createNotificationForUser($ob->oldUserId, $notificationMessageOldUser, $message, 'swap', $linkToSwap);
         $notificationIdNewUser = createNotificationForUser($ob->newUserId, $notificationMessageNewUser, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationIdOldUser, $notificationMessage);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationIdNewUser, $notificationMessage);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationIdOldUser, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationIdNewUser, $notificationMessage);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     }
@@ -315,39 +315,39 @@ 
 
     $ob = mysqli_fetch_object($result);
 
-    $subject = 'Swap declined: '.$ob->newUserName.' - '.$ob->eventDate;
-    $message = "The following swap has been declined\r\n\r\n".
-                "Date:\t\t ".strftime($ob->time_format_long, strtotime($ob->eventDate))."\r\n".
-                "Requested by:\t\t ".$ob->requestedBy."\r\n".
-                "Swap from:\t\t ".$ob->oldUserName.' - '.$ob->oldRole."\r\n".
-                "Swap to:\t\t ".$ob->newUserName.' - '.$ob->newRole."\r\n";
+    $subject = 'Swap declined: ' . $ob->newUserName . ' - ' . $ob->eventDate;
+    $message = "The following swap has been declined\r\n\r\n" .
+                "Date:\t\t " . strftime($ob->time_format_long, strtotime($ob->eventDate)) . "\r\n" .
+                "Requested by:\t\t " . $ob->requestedBy . "\r\n" .
+                "Swap from:\t\t " . $ob->oldUserName . ' - ' . $ob->oldRole . "\r\n" .
+                "Swap to:\t\t " . $ob->newUserName . ' - ' . $ob->newRole . "\r\n";
 
     $from = $ob->siteadmin;
 
-    $linkToSwap = 'swap.php?swap='.$swapId;
+    $linkToSwap = 'swap.php?swap=' . $swapId;
 
     $sessionUserId = $_SESSION['userid'];
 
     if ($sessionUserId == $ob->oldUserId) {    // if old user declines swap
         // notify new user
-        $notificationMessage = $ob->oldUserFirstName.' declined a swap';
+        $notificationMessage = $ob->oldUserFirstName . ' declined a swap';
         $notificationId = createNotificationForUser($ob->newUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     } elseif ($sessionUserId == $ob->newUserId) {    // if new user declines swap
         // notify old user
-        $notificationMessage = $ob->newUserFirstName.' declined a swap';
+        $notificationMessage = $ob->newUserFirstName . ' declined a swap';
         $notificationId = createNotificationForUser($ob->oldUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
     } else { // notify both users
         $sessionUserFirstName = getFirstNameWithId($sessionUserId);
-        $notificationMessageOldUser = $sessionUserFirstName.' declined a swap for '.$ob->newUserFirstName;
-        $notificationMessageNewUser = $sessionUserFirstName.' declined a swap for '.$ob->oldUserFirstName;
+        $notificationMessageOldUser = $sessionUserFirstName . ' declined a swap for ' . $ob->newUserFirstName;
+        $notificationMessageNewUser = $sessionUserFirstName . ' declined a swap for ' . $ob->oldUserFirstName;
         $notificationIdOldUser = createNotificationForUser($ob->oldUserId, $notificationMessageOldUser, $message, 'swap', $linkToSwap);
         $notificationIdNewUser = createNotificationForUser($ob->newUserId, $notificationMessageNewUser, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationIdOldUser, $notificationMessage);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationIdNewUser, $notificationMessage);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationIdOldUser, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationIdNewUser, $notificationMessage);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
     }
@@ -496,7 +496,7 @@ 
 
     $sql = "UPDATE cr_eventGroups SET archived = true WHERE id = '$seriesId'";
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -505,13 +505,13 @@ 
     $sql = "INSERT INTO cr_bandMembers (bandId, userRoleId) VALUES ('$bandId', '$userRoleId')";
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
 function getEventUrl($eventId)
 {
-    return 'event.php?id='.$eventId;
+    return 'event.php?id=' . $eventId;
 }
 
 function getEventDetails($eventID, $separator, $type = 4, $apprev_description = true, $prefix = '')
@@ -551,9 +551,9 @@ 
 						e.id = $eventID ";
 
     if ($type == 1) {
-        $sql = $sql."AND ((g.id in (10,11)) OR (g.id=2 and u.firstname='Team')) ";
+        $sql = $sql . "AND ((g.id in (10,11)) OR (g.id=2 and u.firstname='Team')) ";
     }
-    $sql = $sql.'ORDER BY e.id, g.id desc, role, firstname, lastname ';
+    $sql = $sql . 'ORDER BY e.id, g.id desc, role, firstname, lastname ';
 
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
@@ -571,32 +571,32 @@ 
 
         $firstname = $row['firstname'];
         if ($firstname != 'Team') {
-            $firstname = ltrim(substr($firstname, 0, 1).'.', '.');
+            $firstname = ltrim(substr($firstname, 0, 1) . '.', '.');
         }
 
         $lastname = $row['lastname'];
 
-        $returnValue = $returnValue.$separator;
+        $returnValue = $returnValue . $separator;
         switch ($type) {
             case 0:
                 //all persons of event
                 //break;    ->  no special handling, fallthrough to case 1
             case 1:
                 //only persons with groupID in 10,11,2  ->  handled in sql query
-                $returnValue = $returnValue.$prefix.ltrim($group.': ');
-                $returnValue = $returnValue.trim($firstname.' '.$lastname);
+                $returnValue = $returnValue . $prefix . ltrim($group . ': ');
+                $returnValue = $returnValue . trim($firstname . ' ' . $lastname);
                 break;
             case 2:
                 //only event date and event type
-                $returnValue = $returnValue.strftime($time_format_normal, strtotime($eventDate));
-                $returnValue = $returnValue.$separator;
-                $returnValue = $returnValue.$eventType;
+                $returnValue = $returnValue . strftime($time_format_normal, strtotime($eventDate));
+                $returnValue = $returnValue . $separator;
+                $returnValue = $returnValue . $eventType;
 
                 return trim(substr($returnValue, strlen($separator) - 1)); //ends while loop
                 break;
             case 4:
                 //only event type
-                $returnValue = $returnValue.$eventType;
+                $returnValue = $returnValue . $eventType;
 
                 return trim(substr($returnValue, strlen($separator) - 1)); //ends while loop
                 break;

public/old/editPassword.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 

 <div class="box box-primary">

   <div class="box-header">

-    <h2 class="box-title">Change password - <?php echo $firstname.' '.$lastname.'<br>'; ?></h2>

+    <h2 class="box-title">Change password - <?php echo $firstname . ' ' . $lastname . '<br>'; ?></h2>

   </div><!-- /.box-header -->

   <div class="box-body">

 

public/old/calendarTokens.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
       }
 
       $token = createCalendarToken($sessionUserId, $format, $description);
-      $url = siteSettings()->getSiteUrl()."/calendar.php?user=$sessionUserId&format=$format&token=$token";
+      $url = siteSettings()->getSiteUrl() . "/calendar.php?user=$sessionUserId&format=$format&token=$token";
       break;
   }
 }
@@ -128,7 +128,7 @@ 
             <?php echo empty($calendars) ? '<p>none</p>' : '' ?>
             <?php foreach ($calendars as $calendar): ?>
                 <?php echo $calendar->revoked ? '<s>' : '' ?>
-                <p><?php echo $calendar->description.' ('.$calendar->format.')'; ?></p>
+                <p><?php echo $calendar->description . ' (' . $calendar->format . ')'; ?></p>
                 <?php if (!$calendar->revoked): ?>
                 <form action="#" method="post">
                   <input type="hidden" name="method" value="revoke" />

public/old/fb-login.php

Spacing +2 added lines, -2 removed lines

@@ -25,6 +25,6 @@
 $helper = $fb->getRedirectLoginHelper();
 
 $permissions = ['email']; // Optional permissions
-$loginUrl = $helper->getLoginUrl(siteSettings()->getSiteUrl().'/fb-callback.php', $permissions);
+$loginUrl = $helper->getLoginUrl(siteSettings()->getSiteUrl() . '/fb-callback.php', $permissions);
 
-header('Location: '.$loginUrl);
+header('Location: ' . $loginUrl);

public/old/emails.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,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;
 }
 
@@ -71,7 +71,7 @@ 
     if ($editskillID != '') {
         $sql = ("INSERT INTO cr_eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         // After we have inserted the data, we want to head back to the main page
@@ -88,7 +88,7 @@ 
 
             $sql = ("INSERT INTO cr_eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')");
             if (!mysqli_query(db(), $sql)) {
-                die('Error: '.mysqli_error(db()));
+                die('Error: ' . mysqli_error(db()));
             }
         }
 

public/old/linkSocialAuth.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
       break;
     case 'unlink':
       removeSocialAuthFromUserWithId($id, $platform);
-      createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
+      createNotificationForUser($id, ucfirst($platform) . ' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
       break;
 
     default:

public/old/index.php

Spacing +13 added lines, -13 removed lines

@@ -222,7 +222,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->getComment() != ''): ?>
@@ -280,7 +280,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";
 
@@ -305,16 +305,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.
                         }
@@ -396,7 +396,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 != ''): ?>
@@ -457,7 +457,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";
 
@@ -482,16 +482,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.
                         }
@@ -562,7 +562,7 @@ 
                   ">
                   <?php echo timeInWordsWithTense($event->getDate()) ?>
                 </span>
-                <?php else: ?>
+                <?php else : ?>
                 <span class="pull-right badge bg-red">
                   never
                 </span>
@@ -627,7 +627,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">
@@ -651,7 +651,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/termCard.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
 
 // ensure user is logged in
 if (!(isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true)) {
-    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/termCard.php';
+    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/termCard.php';
     header('Location: login.php');
 }
 
@@ -42,12 +42,12 @@ 
 
 while ($ob = mysqli_fetch_object($result)) {
     echo '<tr>';
-    echo '<td>'.date('j F', strtotime($ob->eventDate)).'</td>';
-    echo '<td>'.date('g:i a', strtotime($ob->eventDate)).'</td>';
-    echo '<td>'.$ob->eventName.'</td>';
-    echo '<td>'.$ob->eventSubType.'</td>';
-    echo '<td>'.$ob->sermonTitle;
-    echo $ob->bibleVerse ? ' ('.$ob->bibleVerse.')</td>' : '';
+    echo '<td>' . date('j F', strtotime($ob->eventDate)) . '</td>';
+    echo '<td>' . date('g:i a', strtotime($ob->eventDate)) . '</td>';
+    echo '<td>' . $ob->eventName . '</td>';
+    echo '<td>' . $ob->eventSubType . '</td>';
+    echo '<td>' . $ob->sermonTitle;
+    echo $ob->bibleVerse ? ' (' . $ob->bibleVerse . ')</td>' : '';
     echo '</tr>';
 }
 echo '</table>';

public/old/addUser.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 session_start();
 
 if (!(isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true)) {
-    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/addUser.php?'.$_SERVER['QUERY_STRING'];
+    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/addUser.php?' . $_SERVER['QUERY_STRING'];
     header('Location: login.php');
     exit;
 }
@@ -56,7 +56,7 @@ 
         $userRole = UserRoleQuery::create()->filterByUser($user)->filterByRoleId($roleId)->findOne();
         $userRole->setReserve(false);
         $userRole->save();
-        header('Location: addUser.php?action=edit&user='.$user->getId());
+        header('Location: addUser.php?action=edit&user=' . $user->getId());
         exit;
 
         break;
@@ -67,7 +67,7 @@ 
         $userRole = UserRoleQuery::create()->filterByUser($user)->filterByRoleId($roleId)->findOne();
         $userRole->setReserve(true);
         $userRole->save();
-        header('Location: addUser.php?action=edit&user='.$user->getId());
+        header('Location: addUser.php?action=edit&user=' . $user->getId());
         exit;
         break;
 
@@ -176,7 +176,7 @@ 
         }
     }
     if (isAdmin()) {
-        header('Location: users.php#section'.$userId);
+        header('Location: users.php#section' . $userId);
         exit;
     }
 }
@@ -261,7 +261,7 @@ 
           // ordered in this way to build the page with contact details before permissions
                 if (!isAdmin()) {
                     if ($userId == $sessionUserID) {
-                        echo $firstname.' '.$lastname;
+                        echo $firstname . ' ' . $lastname;
                         $isCompromised = false;
                     } else {
                         notifyAttack(__FILE__, 'Impersonating Attack', $sessionUserID);