TechWilk / rota

public/old/overview.php

Braces +3 added lines, -1 removed lines

@@ -114,8 +114,10 @@
 			</form>
 
 		  <?php
-            else:
+            else {
+                :
                 echo '<div class="box-body">'.$sentSuccess.'</div>';
+            }
             endif;
             ?>
 				</div>

public/old/swap.php

Braces +5 added lines, -2 removed lines

@@ -271,14 +271,17 @@
 
         <?php endforeach; ?>
       
-      <?php else: ?>
+      <?php else {
+    : ?>
       <?php // event has no roles the user can cover?>
       
       <div class="alert alert-warning">
         <h4><i class="icon fa fa-info"></i>There are no roles in the event you are skilled to cover.</h4>
         <p>If you need adding to the rota, speak to an admin.</p>
       </div>
-      <?php endif; ?>
+      <?php endif;
+}
+?>
 
 
 <?php include 'includes/footer.php'; ?>

Indentation +25 added lines, -25 removed lines

@@ -47,7 +47,7 @@ 
 $swapId = filter_var($swapId, FILTER_SANITIZE_NUMBER_INT);
 
 switch ($action) {
-  case 'swap':
+    case 'swap':
     if ($_SERVER['REQUEST_METHOD'] == 'POST') {
         $eventPersonId = $_POST['eventPerson'];
         $newUserRoleId = $_POST['newUserRole'];
@@ -61,48 +61,48 @@ 
         $err = 'Swap details incorrect, please try again.';
     }
     break;
-  case 'accept':
+    case 'accept':
     if (canAcceptSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (acceptSwap($swapId)) {
         case '1':
           $message = 'Swap Successful';
-          break;
+            break;
         case '2':
           $message = 'Swap already accepted.';
-          break;
+            break;
         case '3':
           $message = 'Swap already declined.';
-          break;
+            break;
         case '4':
           $message = 'Swap already reverted.';
-          break;
+            break;
         default:
           $err = 'Technical issue - please inform system administrator';
-          break;
-      }
+            break;
+        }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';
     }
     break;
-  case 'decline':
+    case 'decline':
     if (canDeclineSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (declineSwap($swapId)) {
         case '1':
           $message = 'Swap declined';
-          break;
+            break;
         case '2':
           $message = 'Swap already declined.';
-          break;
+            break;
         default:
           $err = 'Technical issue - please inform system administrator';
-          break;
+            break;
         }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';
     }
     break;
 
-  default:
+    default:
     // code...
     break;
 }
@@ -163,7 +163,7 @@ 
 		<section class="content">
       
       <?php
-      if (isset($message)): ?>
+        if (isset($message)): ?>
       
         <p><?php echo $message ?></p>
 
@@ -224,19 +224,19 @@ 
                 <label for="newUserRole">Swap To:</label>
                 <select name="newUserRole" class="form-control">
                   <?php
-                  if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
-                      $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
-                  } else {
-                      $whereAnd = 'r.id = '.$role->roleId;
-                  }
-                  $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name';
-                  $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
-
-                  while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
-                      ?>
+                    if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
+                        $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
+                    } else {
+                        $whereAnd = 'r.id = '.$role->roleId;
+                    }
+                    $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name';
+                    $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
+
+                    while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+                        ?>
                     <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option>
                   <?php
-                  } ?>
+                    } ?>
                 </select>
               </div>
             </div>

public/old/subTypes.php

Indentation +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
     }
 
     // After we have inserted the data, we want to head back to the main users page
-     header('Location: subTypes.php'); // Move to the home page of the admin section
-      exit;
+        header('Location: subTypes.php'); // Move to the home page of the admin section
+        exit;
 }
 include 'includes/header.php';
 ?>

public/old/createEvent.php

Braces +5 added lines, -2 removed lines

@@ -567,7 +567,8 @@ 
 											<?php if (!$userRole->getReserve()): ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
 											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
-											<?php else: ?>
+											<?php else {
+    : ?>
 											<?php $countReserve += 1 ?>
 											<?php endif //!userRole->getReserve?>
 										<?php endforeach //users?>
@@ -646,4 +647,6 @@ 
   </div><!-- /.createSeries -->
 
 
-<?php include 'includes/footer.php'; ?>
+<?php include 'includes/footer.php';
+}
+?>

public/old/events.php

Braces +3 added lines, -1 removed lines

@@ -435,8 +435,10 @@
 
                             echo '</li>';
                         }
-        echo '</ul>'; else:
+        echo '</ul>'; else {
+            :
                         echo '<p>No roles assigned to this event.';
+        }
         endif; ?>
 			</div><!-- /.user-roles -->
 		</div><!-- /.box-body -->

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

public/old/linkSocialAuth.php

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

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