TechWilk / rota

public/old/editeventtype.php

Spacing +1 added lines, -1 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;
 }
 

public/old/pendingAccounts.php

Indentation +10 added lines, -10 removed lines

@@ -30,24 +30,24 @@
     switch ($_POST['action']) {
     case 'approve':
       $userId = approvePendingUser($id);
-      mailNewUser($userId);
-      header('Location: addUser.php?action=edit&user='.$userId);
-      break;
+        mailNewUser($userId);
+        header('Location: addUser.php?action=edit&user='.$userId);
+        break;
     case 'merge':
       $existingUserId = $_POST['existingUser'];
-      $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
-      mergePendingUserWithUserId($id, $existingUserId);
-      mailNewUser($existingUserId);
-      header('Location: addUser.php?action=edit&user='.$existingUserId);
-      break;
+        $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
+        mergePendingUserWithUserId($id, $existingUserId);
+        mailNewUser($existingUserId);
+        header('Location: addUser.php?action=edit&user='.$existingUserId);
+        break;
     case 'decline':
       declinePendingUser($id);
-      break;
+        break;
 
     default:
       // code...
       break;
-  }
+    }
 }
 
 if (empty($id)) {

Switch Indentation +19 added lines, -19 removed lines

@@ -28,25 +28,25 @@
     $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT);
 
     switch ($_POST['action']) {
-    case 'approve':
-      $userId = approvePendingUser($id);
-      mailNewUser($userId);
-      header('Location: addUser.php?action=edit&user='.$userId);
-      break;
-    case 'merge':
-      $existingUserId = $_POST['existingUser'];
-      $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
-      mergePendingUserWithUserId($id, $existingUserId);
-      mailNewUser($existingUserId);
-      header('Location: addUser.php?action=edit&user='.$existingUserId);
-      break;
-    case 'decline':
-      declinePendingUser($id);
-      break;
-
-    default:
-      // code...
-      break;
+        case 'approve':
+          $userId = approvePendingUser($id);
+          mailNewUser($userId);
+          header('Location: addUser.php?action=edit&user='.$userId);
+          break;
+        case 'merge':
+          $existingUserId = $_POST['existingUser'];
+          $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
+          mergePendingUserWithUserId($id, $existingUserId);
+          mailNewUser($existingUserId);
+          header('Location: addUser.php?action=edit&user='.$existingUserId);
+          break;
+        case 'decline':
+          declinePendingUser($id);
+          break;
+
+        default:
+          // code...
+          break;
   }
 }
 

Spacing +5 added lines, -5 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;
 }
 
@@ -31,14 +31,14 @@ 
     case 'approve':
       $userId = approvePendingUser($id);
       mailNewUser($userId);
-      header('Location: addUser.php?action=edit&user='.$userId);
+      header('Location: addUser.php?action=edit&user=' . $userId);
       break;
     case 'merge':
       $existingUserId = $_POST['existingUser'];
       $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
       mergePendingUserWithUserId($id, $existingUserId);
       mailNewUser($existingUserId);
-      header('Location: addUser.php?action=edit&user='.$existingUserId);
+      header('Location: addUser.php?action=edit&user=' . $existingUserId);
       break;
     case 'decline':
       declinePendingUser($id);
@@ -90,7 +90,7 @@ 
 <div class="box box-primary">
   <div class="box-header">
     <h2 class="box-title">
-      <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName.' '.$user->lastName ?>
+      <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName . ' ' . $user->lastName ?>
     </h2>
   </div>
   <div class="box-body">
@@ -131,7 +131,7 @@ 
             <?php
             $users = allUsersNames();
             foreach ($users as $existingUser): ?>
-            <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName.' '.$existingUser->lastName ?></option>
+            <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName . ' ' . $existingUser->lastName ?></option>
             <?php endforeach; ?>
           </select>
         </div>

public/old/install.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
 } catch (\Exception $e) {
 }
 
-$url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+$url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 $url = substr($url, 0, -12); // remove "/install.php" from url
 
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -48,7 +48,7 @@ 
         //exit;
         $conn->exec($sql);
     } catch (\Exception $e) {
-        echo 'Error (code: '.$e->getCode().') adding tables to database: '.$e->getMessage();
+        echo 'Error (code: ' . $e->getCode() . ') adding tables to database: ' . $e->getMessage();
         exit;
     }
 
@@ -58,7 +58,7 @@ 
     $lastname = $_POST['lastname'];
     $lastname = trim(strip_tags($lastname));
 
-    $username = strtolower($firstname).'.'.strtolower($lastname);
+    $username = strtolower($firstname) . '.' . strtolower($lastname);
 
     $password = $_POST['password'];
 
@@ -82,7 +82,7 @@ 
     try {
         $user->save();
     } catch (\Exception $e) {
-        echo 'Error (code: '.$e->getCode().') adding user to database: '.$e->getMessage();
+        echo 'Error (code: ' . $e->getCode() . ') adding user to database: ' . $e->getMessage();
         exit;
     }
 
@@ -179,7 +179,7 @@ 
 
     $settings->save();
 
-    header('Location: login.php?username='.$username); // Move to the home page of the admin section
+    header('Location: login.php?username=' . $username); // Move to the home page of the admin section
     exit;
 }
 

public/old/includes/errors.php

Spacing +1 added lines, -1 removed lines

@@ -2,6 +2,6 @@
 
 namespace TechWilk\Rota;
 
-ini_set('display_errors', false);    // set on for development, off for production
+ini_set('display_errors', false); // set on for development, off for production
 ini_set('log_errors', true);
 error_reporting(E_ALL);

public/old/linkSocialAuth.php

Switch Indentation +11 added lines, -11 removed lines

@@ -37,22 +37,22 @@
     $platform = strtolower($_POST['platform']);
 
     switch ($_POST['action']) {
-    case 'link':
-      switch ($platform) {
+        case 'link':
+          switch ($platform) {
         case 'facebook':
           $_SESSION['fb-callback-url'] = 'fb-link.php';
           header('Location: fb-login.php');
           exit;
-      }
-      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');
-      break;
-
-    default:
-      // code...
+          }
       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');
+          break;
+
+        default:
+          // code...
+          break;
   }
 }
 

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:

Braces +5 added lines, -2 removed lines

@@ -106,14 +106,17 @@
       <input type="hidden" name="action" value="unlink" />
       <button class="btn btn-danger">Unlink</button>
     </form>
-    <?php else: ?>
+    <?php else {
+    : ?>
     <form action="#" method="post">
       <input type="hidden" name="id" value="<?php echo $id ?>" />
       <input type="hidden" name="platform" value="<?php echo $platform ?>" />
       <input type="hidden" name="action" value="link" />
       <button class="btn btn-primary">Link</button>
     </form>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
   </div>
 </div>
 <?php endforeach; ?>

Indentation +7 added lines, -7 removed lines

@@ -41,19 +41,19 @@
       switch ($platform) {
         case 'facebook':
           $_SESSION['fb-callback-url'] = 'fb-link.php';
-          header('Location: fb-login.php');
-          exit;
-      }
-      break;
+            header('Location: fb-login.php');
+            exit;
+        }
+        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');
-      break;
+        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:
       // code...
       break;
-  }
+    }
 }
 
 // list of possible social account links (names used as platform names in database)

public/old/index.php

Braces +12 added lines, -4 removed lines

@@ -323,8 +323,10 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                  else {
+                      :
                     echo '<p>No roles assigned to this event.';
+                  }
                   endif;
                 ?>
                 </div>
@@ -353,7 +355,8 @@ 
         <a href="events.php?view=all" class="btn btn-primary">view all events</a>
       </div>
 
-      <?php else: ?>
+      <?php else {
+    : ?>
       <p>There are no events this week. <a href="events.php?view=all">View all events</a></p>
       <?php endif ?>
 
@@ -374,6 +377,7 @@ 
 
         <?php // Month separators
         $newMonth = strftime('%B %Y', strtotime($event->date));
+}
         if ($month != $newMonth):
         $month = $newMonth;
         ?>
@@ -500,8 +504,10 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                  else {
+                      :
                     echo '<p>No roles assigned to this event.';
+                  }
                   endif;
                 ?>
                 </div>
@@ -527,7 +533,8 @@ 
         <?php endforeach ?>
       </ul>
 
-      <?php else: ?>
+      <?php else {
+    : ?>
       <p>You have no events on the upcoming rota. <a href="events.php">View all events</a></p>
       <?php endif ?>
 
@@ -649,6 +656,7 @@ 
               <a href="addUser.php?action=edit">
                 <?php
                 $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>

Indentation +48 added lines, -48 removed lines

@@ -177,10 +177,10 @@ 
     <div class="col-sm-8 col-md-8 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~ Events this week ~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~ Events this week ~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>Events this week:</h2>
 
@@ -204,17 +204,17 @@ 
             <div class="timeline-header">
               <a href="event.php?id=<?php echo $event->getId() ?>">
                 <h4><?php
-                  echo $event->getDate('jS: ');
-                  $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find();
-                  $roles = [];
-                  foreach ($eventPeople as $eventPerson) {
-                      if ($eventPerson->getUserRole()->getUserId() == $user->getId()) {
-                          $roles[] = $eventPerson->getUserRole()->getRole()->getName();
-                      }
-                  }
-                  $roles = implode(', ', $roles);
-                  echo $roles != '' ? $roles : 'No involvement';
-                  ?>
+                    echo $event->getDate('jS: ');
+                    $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find();
+                    $roles = [];
+                    foreach ($eventPeople as $eventPerson) {
+                        if ($eventPerson->getUserRole()->getUserId() == $user->getId()) {
+                            $roles[] = $eventPerson->getUserRole()->getRole()->getName();
+                        }
+                    }
+                    $roles = implode(', ', $roles);
+                    echo $roles != '' ? $roles : 'No involvement';
+                    ?>
                 </h4>
               </a>
               <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->getEventTypeId() ?>"><?php echo $event->getEventType()->getName() ?></a>
@@ -269,7 +269,7 @@ 
                 <div class="modal-body">
                   <?php
 
-                  $sqlPeople = "SELECT
+                    $sqlPeople = "SELECT
                                 CONCAT(u.firstname, ' ', u.lastname) AS `name`,
                                 r.name AS `rolename`,
                                 ep.notified AS `notified`,
@@ -285,13 +285,13 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
+                    $groupName = '';
+                    $groupId = 0;
+                    $identifier = '1';
+                    $firstTime = true;
 
-                  if (mysqli_num_rows($resultPeople) > 0):
+                    if (mysqli_num_rows($resultPeople) > 0):
 
                     ?>
                     <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) {
@@ -324,9 +324,9 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                    else:
                     echo '<p>No roles assigned to this event.';
-                  endif;
+                    endif;
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -360,10 +360,10 @@ 
 
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~~ User's events ~~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~~ User's events ~~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>My events:</h2>
 
@@ -388,9 +388,9 @@ 
             <div class="timeline-header">
               <a href="event.php?id=<?php echo $event->id ?>">
                 <h4><?php
-                  echo date('jS: ', strtotime($event->date));
-                  echo $event->roles;
-                  ?>
+                    echo date('jS: ', strtotime($event->date));
+                    echo $event->roles;
+                    ?>
                 </h4>
               </a>
               <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->eventTypeId ?>"><?php echo $event->eventType ?></a>
@@ -446,7 +446,7 @@ 
                 <div class="modal-body">
                   <?php
 
-                  $sqlPeople = "SELECT
+                    $sqlPeople = "SELECT
                                 CONCAT(u.firstname, ' ', u.lastname) AS `name`,
                                 r.name AS `rolename`,
                                 ep.notified AS `notified`,
@@ -462,13 +462,13 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
+                    $groupName = '';
+                    $groupId = 0;
+                    $identifier = '1';
+                    $firstTime = true;
 
-                  if (mysqli_num_rows($resultPeople) > 0):
+                    if (mysqli_num_rows($resultPeople) > 0):
 
                     ?>
                     <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) {
@@ -501,9 +501,9 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                    else:
                     echo '<p>No roles assigned to this event.';
-                  endif;
+                    endif;
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -538,10 +538,10 @@ 
     <div class="col-sm-4 col-md-4 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~ Remaining events ~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~ Remaining events ~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
       <?php if (isset($remainingEventsInGroups)): ?>
 
       <div class="row">
@@ -617,10 +617,10 @@ 
 
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~~ User details ~~~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~~ User details ~~~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <div class="box box-widget widget-user-2">
         <div class="widget-user-header bg-yellow">

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 groups g ON g.id = r.groupId
                                   INNER JOIN users u ON u.id = ur.userId
                                   INNER JOIN 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 groups g ON g.id = r.groupId
                                   INNER JOIN users u ON u.id = ur.userId
                                   INNER JOIN 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/index.php

Spacing +7 added lines, -7 removed lines

@@ -6,31 +6,31 @@
     // To help the built-in PHP dev server, check if the request was actually for
     // something which should probably be served as a static file
     $url = parse_url($_SERVER['REQUEST_URI']);
-    $file = __DIR__.$url['path'];
+    $file = __DIR__ . $url['path'];
     if (is_file($file)) {
         return false;
     }
 }
 
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 // setup Propel (autoload configured though composer)
-require_once __DIR__.'/../generated-conf/config.php';
+require_once __DIR__ . '/../generated-conf/config.php';
 
 session_start();
 
 // Instantiate the app
-$settings = require __DIR__.'/../src/settings.php';
+$settings = require __DIR__ . '/../src/settings.php';
 $app = new \Slim\App($settings);
 
 // Set up dependencies
-require __DIR__.'/../src/dependencies.php';
+require __DIR__ . '/../src/dependencies.php';
 
 // Register middleware
-require __DIR__.'/../src/middleware.php';
+require __DIR__ . '/../src/middleware.php';
 
 // Register routes
-require __DIR__.'/../src/routes.php';
+require __DIR__ . '/../src/routes.php';
 
 // Run app
 $app->run();

generated-classes/TechWilk/Rota/Document.php

Spacing +3 added lines, -3 removed lines

@@ -22,16 +22,16 @@
         }
         //$acceptedFileExtensions = ['jpg', 'png', 'jpeg', 'gif', 'docx', 'pdf', 'xlsx', 'pptx'];
         $acceptedFileTypes = ['image/gif', 'image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/excel'];
-        $target_dir = __DIR__.'/../documents/';
+        $target_dir = __DIR__ . '/../documents/';
         $this->setUrl($file->getClientFilename());
         //$fileExtension = pathinfo(basename($file->getName()),PATHINFO_EXTENSION);
 
         // Allow certain file formats only
         if (!in_array($file->getClientMediaType(), $acceptedFileTypes)) {
-            throw new InvalidArgumentException('Sorry, only '.implode(', ', $acceptedFileTypes).' files are allowed.');
+            throw new InvalidArgumentException('Sorry, only ' . implode(', ', $acceptedFileTypes) . ' files are allowed.');
         }
         $this->save();
-        $target_file = $target_dir.$this->getId();
+        $target_file = $target_dir . $this->getId();
 
         // Check if file already exists
         if (file_exists($target_file)) {

generated-classes/TechWilk/Rota/Group.php

Indentation +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@
     {
         return EventQuery::create()
             ->useEventPersonQuery()
-              ->useUserRoleQuery()
+                ->useUserRoleQuery()
                 ->useRoleQuery()
-                  ->filterByGroup($this)
+                    ->filterByGroup($this)
+                ->endUse()
                 ->endUse()
-              ->endUse()
             ->endUse()
             ->orderByDate('desc')
             ->findOne();