TechWilk / rota

public/old/swap.php

Indentation +25 added lines, -25 removed lines

@@ -49,7 +49,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'];
@@ -63,48 +63,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;
 }
@@ -165,7 +165,7 @@ 
 		<section class="content">
       
       <?php
-      if (isset($message)) { ?>
+        if (isset($message)) { ?>
       
         <p><?php echo $message ?></p>
 
@@ -226,19 +226,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 exit(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 exit(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/index.php

Indentation +110 added lines, -110 removed lines

@@ -179,10 +179,10 @@ 
     <div class="col-sm-8 col-md-8 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~ Events this week ~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~ Events this week ~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>Events this week:</h2>
 
@@ -206,17 +206,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>
@@ -271,7 +271,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`,
@@ -287,47 +287,47 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or exit(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or exit(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)) {
-                          if ($viewPeople->group == $groupId) {
-                              // Do nothing, because they are all in the same group
-                          } else {
-                              // Update the group heading
-                              $groupId = $viewPeople->group;
-                              $groupName = $viewPeople->groupName;
-                              if ($firstTime) {
-                                  $firstTime = false;
-                              } else {
-                                  echo '</ul>';
-                              }
-                              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 $viewPeople->name;
-
-                          if ($viewPeople->rolename != '') {
-                              echo ' - <em>'.$viewPeople->rolename.'</em>';
-                          } else {
-                              // If there is no skill, we don't need to mention this.
-                          }
-                          echo (isset($viewPeople->swap)) ? '</a></s>' : '';
-
-                          echo '</li>';
-                      }
-                      echo '</ul>';
-                  } else {
-                      echo '<p>No roles assigned to this event.';
-                  }
+                            if ($viewPeople->group == $groupId) {
+                                // Do nothing, because they are all in the same group
+                            } else {
+                                // Update the group heading
+                                $groupId = $viewPeople->group;
+                                $groupName = $viewPeople->groupName;
+                                if ($firstTime) {
+                                    $firstTime = false;
+                                } else {
+                                    echo '</ul>';
+                                }
+                                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 $viewPeople->name;
+
+                            if ($viewPeople->rolename != '') {
+                                echo ' - <em>'.$viewPeople->rolename.'</em>';
+                            } else {
+                                // If there is no skill, we don't need to mention this.
+                            }
+                            echo (isset($viewPeople->swap)) ? '</a></s>' : '';
+
+                            echo '</li>';
+                        }
+                        echo '</ul>';
+                    } else {
+                        echo '<p>No roles assigned to this event.';
+                    }
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -361,10 +361,10 @@ 
 
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~~ User's events ~~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~~ User's events ~~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>My events:</h2>
 
@@ -389,9 +389,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>
@@ -447,7 +447,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`,
@@ -463,47 +463,47 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or exit(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or exit(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)) {
-                          if ($viewPeople->group == $groupId) {
-                              // Do nothing, because they are all in the same group
-                          } else {
-                              // Update the group heading
-                              $groupId = $viewPeople->group;
-                              $groupName = $viewPeople->groupName;
-                              if ($firstTime) {
-                                  $firstTime = false;
-                              } else {
-                                  echo '</ul>';
-                              }
-                              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 $viewPeople->name;
-
-                          if ($viewPeople->rolename != '') {
-                              echo ' - <em>'.$viewPeople->rolename.'</em>';
-                          } else {
-                              // If there is no skill, we don't need to mention this.
-                          }
-                          echo (isset($viewPeople->swap)) ? '</a></s>' : '';
-
-                          echo '</li>';
-                      }
-                      echo '</ul>';
-                  } else {
-                      echo '<p>No roles assigned to this event.';
-                  }
+                            if ($viewPeople->group == $groupId) {
+                                // Do nothing, because they are all in the same group
+                            } else {
+                                // Update the group heading
+                                $groupId = $viewPeople->group;
+                                $groupName = $viewPeople->groupName;
+                                if ($firstTime) {
+                                    $firstTime = false;
+                                } else {
+                                    echo '</ul>';
+                                }
+                                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 $viewPeople->name;
+
+                            if ($viewPeople->rolename != '') {
+                                echo ' - <em>'.$viewPeople->rolename.'</em>';
+                            } else {
+                                // If there is no skill, we don't need to mention this.
+                            }
+                            echo (isset($viewPeople->swap)) ? '</a></s>' : '';
+
+                            echo '</li>';
+                        }
+                        echo '</ul>';
+                    } else {
+                        echo '<p>No roles assigned to this event.';
+                    }
                 ?>
                 </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">

public/old/settings.php

Indentation +11 added lines, -11 removed lines

@@ -342,17 +342,17 @@
 					<label for="skin">Application skin:</label>
 					<select name="skin" id="skin" class="form-control">
 						<?php $skinOptions = ['skin-blue-light'                                           => 'Blue &amp; Light',
-						    'skin-blue'                                                                   => 'Blue &amp; Dark',
-						    'skin-yellow-light'                                                           => 'Yellow &amp; Light',
-						    'skin-yellow'                                                                 => 'Yellow &amp; Dark',
-						    'skin-green-light'                                                            => 'Green &amp; Light',
-						    'skin-green'                                                                  => 'Green &amp; Dark',
-						    'skin-purple-light'                                                           => 'Purple &amp; Light',
-						    'skin-purple'                                                                 => 'Purple &amp; Dark',
-						    'skin-red-light'                                                              => 'Red &amp; Light',
-						    'skin-red'                                                                    => 'Red &amp; Dark',
-						    'skin-black-light'                                                            => 'Black &amp; Light',
-						    'skin-black'                                                                  => 'Black &amp; Dark', ];
+                            'skin-blue'                                                                   => 'Blue &amp; Dark',
+                            'skin-yellow-light'                                                           => 'Yellow &amp; Light',
+                            'skin-yellow'                                                                 => 'Yellow &amp; Dark',
+                            'skin-green-light'                                                            => 'Green &amp; Light',
+                            'skin-green'                                                                  => 'Green &amp; Dark',
+                            'skin-purple-light'                                                           => 'Purple &amp; Light',
+                            'skin-purple'                                                                 => 'Purple &amp; Dark',
+                            'skin-red-light'                                                              => 'Red &amp; Light',
+                            'skin-red'                                                                    => 'Red &amp; Dark',
+                            'skin-black-light'                                                            => 'Black &amp; Light',
+                            'skin-black'                                                                  => 'Black &amp; Dark', ];
 
     foreach ($skinOptions as $skinName => $skinDescription) { ?>
 						<option value="<?php echo $skinName ?>" <?php echo ($skinName == $row['skin']) ? 'selected' : '' ?>><?php echo $skinDescription ?></option>

public/old/includes/functions.facebook.php

Indentation +4 added lines, -4 removed lines

@@ -66,10 +66,10 @@
     $tokenMetadata = $oAuth2Client->debugToken($accessToken);
 
     // Validation (these will throw FacebookSDKException's when they fail)
-  $tokenMetadata->validateAppId($config['auth']['facebook']['appId']); // Replace {app-id} with your app id
-  // If you know the user ID this access token belongs to, you can validate it here
-  //$tokenMetadata->validateUserId('123');
-  $tokenMetadata->validateExpiration();
+    $tokenMetadata->validateAppId($config['auth']['facebook']['appId']); // Replace {app-id} with your app id
+    // If you know the user ID this access token belongs to, you can validate it here
+    //$tokenMetadata->validateUserId('123');
+    $tokenMetadata->validateExpiration();
 
     if (!$accessToken->isLongLived()) {
         // Exchanges a short-lived access token for a long-lived one

public/old/statistics.php

Indentation +6 added lines, -6 removed lines

@@ -141,12 +141,12 @@
     		<tbody>
     		<?php
                 $sql = "SELECT s.date,s.detail1,s.detail2,s.detail3,s.type,trim(concat(u.firstName,' ',u.lastName)) AS name FROM statistics s INNER JOIN users u ON u.id = s.userid";
-          if (!isAdmin()) {
-              $sql .= 'WHERE u.ID=s.userID';
-              if (!$debug) {
-                  $sql .= " AND s.type = 'system'";
-              }
-          }
+            if (!isAdmin()) {
+                $sql .= 'WHERE u.ID=s.userID';
+                if (!$debug) {
+                    $sql .= " AND s.type = 'system'";
+                }
+            }
                 $sql .= ' ORDER BY date desc '.$limit;
                 $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
                 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {