TechWilk / rota

public/old/calendarTokens.php

Indentation +24 added lines, -24 removed lines

@@ -23,35 +23,35 @@
     switch ($method) {
     case 'revoke':
       $id = $_POST['id'];
-      $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT);
+        $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT);
 
-      revokeCalendarToken($id);
-      header('Location: calendarTokens.php');
-      break;
+        revokeCalendarToken($id);
+        header('Location: calendarTokens.php');
+        break;
 
     default:
       // generate new URL
       $format = $_POST['format'];
-      $description = $_POST['description'];
-
-      if (empty($format)) {
-          $error = 'Format must be set';
-          break;
-      }
-      if (empty($description)) {
-          $error = 'Device or software name cannot be empty';
-          break;
-      }
-      $count = CalendarTokenQuery::create()->filterByUserId($sessionUserId)->filterByDescription($description)->filterByRevoked(false)->count();
-      if ($count > 0) {
-          $error = 'You already have a calendar for the same device or software name. Please revoke the existing token or use a different name.';
-          break;
-      }
-
-      $token = createCalendarToken($sessionUserId, $format, $description);
-      $url = siteSettings()->getSiteUrl()."/calendar.php?user=$sessionUserId&format=$format&token=$token";
-      break;
-  }
+        $description = $_POST['description'];
+
+        if (empty($format)) {
+            $error = 'Format must be set';
+            break;
+        }
+        if (empty($description)) {
+            $error = 'Device or software name cannot be empty';
+            break;
+        }
+        $count = CalendarTokenQuery::create()->filterByUserId($sessionUserId)->filterByDescription($description)->filterByRevoked(false)->count();
+        if ($count > 0) {
+            $error = 'You already have a calendar for the same device or software name. Please revoke the existing token or use a different name.';
+            break;
+        }
+
+        $token = createCalendarToken($sessionUserId, $format, $description);
+        $url = siteSettings()->getSiteUrl()."/calendar.php?user=$sessionUserId&format=$format&token=$token";
+        break;
+    }
 }
 
 // fetch existing calendar URLs

Switch Indentation +27 added lines, -27 removed lines

@@ -21,36 +21,36 @@
     $method = $_POST['method'];
 
     switch ($method) {
-    case 'revoke':
-      $id = $_POST['id'];
-      $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT);
+        case 'revoke':
+          $id = $_POST['id'];
+          $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT);
 
-      revokeCalendarToken($id);
-      header('Location: calendarTokens.php');
-      break;
-
-    default:
-      // generate new URL
-      $format = $_POST['format'];
-      $description = $_POST['description'];
-
-      if (empty($format)) {
-          $error = 'Format must be set';
-          break;
-      }
-      if (empty($description)) {
-          $error = 'Device or software name cannot be empty';
+          revokeCalendarToken($id);
+          header('Location: calendarTokens.php');
           break;
-      }
-      $count = CalendarTokenQuery::create()->filterByUserId($sessionUserId)->filterByDescription($description)->filterByRevoked(false)->count();
-      if ($count > 0) {
-          $error = 'You already have a calendar for the same device or software name. Please revoke the existing token or use a different name.';
-          break;
-      }
 
-      $token = createCalendarToken($sessionUserId, $format, $description);
-      $url = siteSettings()->getSiteUrl()."/calendar.php?user=$sessionUserId&format=$format&token=$token";
-      break;
+        default:
+          // generate new URL
+          $format = $_POST['format'];
+          $description = $_POST['description'];
+
+          if (empty($format)) {
+              $error = 'Format must be set';
+              break;
+          }
+          if (empty($description)) {
+              $error = 'Device or software name cannot be empty';
+              break;
+          }
+          $count = CalendarTokenQuery::create()->filterByUserId($sessionUserId)->filterByDescription($description)->filterByRevoked(false)->count();
+          if ($count > 0) {
+              $error = 'You already have a calendar for the same device or software name. Please revoke the existing token or use a different name.';
+              break;
+          }
+
+          $token = createCalendarToken($sessionUserId, $format, $description);
+          $url = siteSettings()->getSiteUrl()."/calendar.php?user=$sessionUserId&format=$format&token=$token";
+          break;
   }
 }
 

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

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     case 'everyone':
       echo '<p>Function not complete, please wait while we finish writing it.</p><p>Apologies for any inconvinence.</p>';
         break;
-  default:
+    default:
     echo '<p>Error: Insufficient parameters.</p>';
     echo '<p>Please inform the system administrator</p>';
     break;

public/old/fb-login.php

Indentation +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
 $_SESSION['foo'] = 'bar';
 
 $fb = new Facebook\Facebook([
-  'app_id'                => $config['auth']['facebook']['appId'],
-  'app_secret'            => $config['auth']['facebook']['appSecret'],
-  'default_graph_version' => 'v2.2',
-  ]);
+    'app_id'                => $config['auth']['facebook']['appId'],
+    'app_secret'            => $config['auth']['facebook']['appSecret'],
+    'default_graph_version' => 'v2.2',
+    ]);
 
 $helper = $fb->getRedirectLoginHelper();
 

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

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

Indentation +48 added lines, -48 removed lines

@@ -178,10 +178,10 @@ 
     <div class="col-sm-8 col-md-8 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~ Events this week ~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?> 
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~ Events this week ~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?> 
 
       <h2>Events this week:</h2>
 
@@ -205,17 +205,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>
@@ -268,7 +268,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`,
@@ -284,13 +284,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)) {
@@ -323,9 +323,9 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                    else:
                     echo '<p>No roles assigned to this event.';
-                  endif;
+                    endif;
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -359,10 +359,10 @@ 
 
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~~ User's events ~~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~~ User's events ~~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>My events:</h2>
 
@@ -387,9 +387,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>
@@ -445,7 +445,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`,
@@ -461,13 +461,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)) {
@@ -500,9 +500,9 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                    else:
                     echo '<p>No roles assigned to this event.';
-                  endif;
+                    endif;
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -537,10 +537,10 @@ 
     <div class="col-sm-4 col-md-4 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~ Remaining events ~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~ Remaining events ~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
       <?php if (isset($remainingEventsInGroups)): ?>
 
       <div class="row">
@@ -616,10 +616,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

@@ -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>

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>

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

Braces +5 added lines, -2 removed lines

@@ -407,7 +407,8 @@ 
 									<?php if ($userHasRole): ?>
 										<?php if ($isReserve): ?>
 										<a href="addUser.php?action=regular&user=<?php echo $user->getId() ?>&role=<?php echo $role->getId() ?>" class="text-green">make regular</a>
-										<?php else: ?>
+										<?php else {
+    : ?>
 										<a href="addUser.php?action=reserve&user=<?php echo $user->getId() ?>&role=<?php echo $role->getId() ?>" class="text-orange">make reserve</a>
 										<?php endif ?>
 									<?php endif ?>
@@ -437,7 +438,9 @@ 
 						<p><em>Contact the person in charge of your rota to alter your roles</em></p>
 					</div><!-- /.box-body -->
 
-					<?php endif; ?>
+					<?php endif;
+}
+?>
 
           </fieldset>
 					<div class="box-footer">

Indentation +24 added lines, -24 removed lines

@@ -84,7 +84,7 @@ 
 // If the form has been submitted, then we need to handle the data.
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 
-  // sanitise inputs
+    // sanitise inputs
     if (isAdmin()) {
         $firstname = $_POST['firstname'];
         $firstname = strip_tags($firstname);
@@ -257,8 +257,8 @@ 
           <div class="box-body">
 
     			<?php
-          // if isAdmin() == false
-          // ordered in this way to build the page with contact details before permissions
+            // if isAdmin() == false
+            // ordered in this way to build the page with contact details before permissions
                 if (!isAdmin()) {
                     if ($userId == $sessionUserID) {
                         echo $firstname.' '.$lastname;
@@ -304,15 +304,15 @@ 
 
 					<?php
 
-          if (isAdmin()) {
-              ?>
+            if (isAdmin()) {
+                ?>
 
           <div class="checkbox">
       			<label for="isAdmin">
               <input name="isAdmin" id="isAdmin" type="checkbox" value="1" <?php if ($userisAdmin == '1') {
-                  echo 'checked="checked"';
-              } elseif ($userisAdmin == '0') {
-              } ?> />
+                    echo 'checked="checked"';
+                } elseif ($userisAdmin == '0') {
+                } ?> />
               Make them an ADMIN?:
             </label>
           </div>
@@ -320,9 +320,9 @@ 
           <div class="checkbox">
       			<label for="isBandAdmin">
               <input class="checkbox" name="isBandAdmin" id="isBandAdmin" type="checkbox" value="1" <?php if ($userisBandAdmin == '1') {
-                  echo 'checked="checked"';
-              } elseif ($userisBandAdmin == '0') {
-              } ?> />
+                    echo 'checked="checked"';
+                } elseif ($userisBandAdmin == '0') {
+                } ?> />
               Make them a BAND admin?:
             </label>
           </div>
@@ -330,9 +330,9 @@ 
           <div class="checkbox">
       			<label for="isEventEditor">
         			<input class="checkbox" name="isEventEditor" id="isEventEditor" type="checkbox" value="1" <?php if ($userIsEventEditor == '1') {
-                  echo 'checked="checked"';
-              } elseif ($userIsEventEditor == '0') {
-              } ?> />
+                    echo 'checked="checked"';
+                } elseif ($userIsEventEditor == '0') {
+                } ?> />
               Make them an EVENT EDITOR?:
             </label>
           </div>
@@ -340,14 +340,14 @@ 
 					<hr />
 
 					<?php
-          } ?>
+            } ?>
 
           <div class="checkbox">
       			<label for="isOverviewRecipient">
         			<input class="checkbox" <?php echo isAdmin() ? '' : 'disabled="disabled"' ?> name="isOverviewRecipient" id="isOverviewRecipient" type="checkbox" value="1" <?php if ($userIsOverviewRecipient == '1' || is_null($userIsOverviewRecipient)) {
-              echo 'checked="checked"';
-          } elseif ($userIsOverviewRecipient == '0') {
-          }?> />
+                echo 'checked="checked"';
+            } elseif ($userIsOverviewRecipient == '0') {
+            }?> />
               Receive group emails?:
             </label>
           </div>
@@ -355,9 +355,9 @@ 
 					<div class="checkbox">
       			<label for="isReminderRecipient">
         			<input class="checkbox" disabled= "disabled" name="isReminderRecipient" id="isReminderRecipient" type="checkbox" value="1" <?php if (true/*$userIsReminderRecipient == '1' || is_null($userIsReminderRecipient)*/) {
-              echo 'checked="checked"';
-          } elseif (true/*$userIsReminderRecipient*/ == '0') {
-          }?> />
+                echo 'checked="checked"';
+            } elseif (true/*$userIsReminderRecipient*/ == '0') {
+            }?> />
               Receive email reminders?: (optional in future update to system)
             </label>
           </div>
@@ -447,18 +447,18 @@ 
                 } else {
                     echo '<input class="btn btn-primary" type="submit" value="Add user" />';
                 }
-         ?>
+            ?>
 		</div><!-- /.box-footer -->
   	</form>
   </div>
 </div>
 <div id="right">
 <?php if (isAdmin()) {
-             ?>
+                ?>
 
 		<div class="item"><a class="btn" href="users.php">View all users</a></div>
 		<?php
-         }
+            }
 
             if ($action == 'edit') {
                 ?>

public/old/discussiontopic.php

Spacing +12 added lines, -12 removed lines

@@ -48,18 +48,18 @@ 
 if ($postremove == 'true') {
     removePost($postid);
     if ($redirect == 'true') {
-        header('Location: discussion.php?categoryid='.$parentid);
+        header('Location: discussion.php?categoryid=' . $parentid);
     } else {
-        header('Location: discussiontopic.php?id='.$id.'&parentid='.$parentid);
+        header('Location: discussiontopic.php?id=' . $id . '&parentid=' . $parentid);
     }
 }
 
 if ($subscribe == 'true') {
     subscribeto($userID, 0, $id);
-    header('Location: discussiontopic.php?id='.$id.'&parentid='.$parentid);
+    header('Location: discussiontopic.php?id=' . $id . '&parentid=' . $parentid);
 } elseif ($subscribe == 'false') {
     unsubscribefrom($subscription);
-    header('Location: discussiontopic.php?id='.$id.'&parentid='.$parentid);
+    header('Location: discussiontopic.php?id=' . $id . '&parentid=' . $parentid);
 }
 
 // If the form has been sent, we need to handle the data.
@@ -74,18 +74,18 @@ 
         // If we are starting a new discussion
         $sql = ("INSERT INTO cr_discussion (CategoryParent, userID, topic, topicName, date) VALUES ('$parentid', '$userID', '$discussion', '$discussiontopic', NOW())");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
         $type = 'category';
         notifySubscribers($parentid, $type, $userID);
-        header('Location: discussion.php?categoryid='.$parentid);
+        header('Location: discussion.php?categoryid=' . $parentid);
         exit;
     } else {
         // Otherwise we reply in thread
         $sql = ("INSERT INTO cr_discussion (topicParent, CategoryParent, userID, topic, date) 
 		VALUES ('$id', '$parentid', '$userID', '$discussion', NOW())");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
         if ($subscribestatus == 'false') {
             subscribeto($userID, 0, $id);
@@ -138,7 +138,7 @@ 
 	<div class="elementBackground">
 	<h2><a name="addcategory"><?php echo $row['name']; ?></a> - <span class="postdate"><em><?php echo $row['dateFormatted']; ?></em></span> 
 	<?php if (isAdmin()) {
-                echo "<a href='discussiontopic.php?redirect=true&postremove=true&postid=".$row['id'].'&parentid='.$parentid."'><img src='graphics/close.png' /></a><br />";
+                echo "<a href='discussiontopic.php?redirect=true&postremove=true&postid=" . $row['id'] . '&parentid=' . $parentid . "'><img src='graphics/close.png' /></a><br />";
             } ?>
 	</h2>
 	<p><?php echo stripslashes($topic); ?></p>
@@ -158,7 +158,7 @@ 
 	<div class="elementBackground">
 	<h2><a name="addcategory"><?php echo $row['name']; ?></a> - <span class="postdate"><em><?php echo $row['dateFormatted']; ?></em></span>
 	<?php if (isAdmin()) {
-                echo "<a href='discussiontopic.php?postremove=true&postid=".$row['id'].'&parentid='.$parentid.'&id='.$id."'><img src='graphics/close.png' /></a>";
+                echo "<a href='discussiontopic.php?postremove=true&postid=" . $row['id'] . '&parentid=' . $parentid . '&id=' . $id . "'><img src='graphics/close.png' /></a>";
             } ?></h2>
 	<p><?php echo stripslashes($topic); ?></p>
 	</div>
@@ -176,11 +176,11 @@ 
             }
 
             if ($isSubscribed != '') {
-                $subscribe = '<div class="item"><a href="discussiontopic.php?subscribe=false&subscription='.$isSubscribed.'&id='.
-                    $id.'&parentid='.$parentid.'">Unsubscribe from this post</a></div>';
+                $subscribe = '<div class="item"><a href="discussiontopic.php?subscribe=false&subscription=' . $isSubscribed . '&id=' .
+                    $id . '&parentid=' . $parentid . '">Unsubscribe from this post</a></div>';
                 $subscribestatus = 'true';
             } else {
-                $subscribe = '<div class="item"><a href="discussiontopic.php?subscribe=true&id='.$id.'&parentid='.$parentid.'">
+                $subscribe = '<div class="item"><a href="discussiontopic.php?subscribe=true&id=' . $id . '&parentid=' . $parentid . '">
 				Subscribe to this post</a></div>';
                 $subscribestatus = 'false';
             }