TechWilk / rota

public/api/v1/index.php

Indentation +50 added lines, -50 removed lines

@@ -82,7 +82,7 @@ 
     $location = $event->getLocation();
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'            => $event->getId(),
                     'name'          => $event->name,
                     'date'          => $event->datetime,
@@ -95,8 +95,8 @@ 
                                                                 'related' => '/events/'.$event->getId().'/series/'.$series->getId(),
                                                     ],
                                                     'data' => [
-                                                      'type' => 'series',
-                                                      'id'   => $series->getId(),
+                                                        'type' => 'series',
+                                                        'id'   => $series->getId(),
                                                     ],
                                         ],
                                         'types' => [
@@ -105,8 +105,8 @@ 
                                                                 'related' => '/events/'.$event->getId().'/types/'.$type->getId(),
                                                     ],
                                                     'data' => [
-                                                      'type' => 'types',
-                                                      'id'   => $type->getId(),
+                                                        'type' => 'types',
+                                                        'id'   => $type->getId(),
                                                     ],
                                         ],
                                         'sub-types' => [
@@ -130,56 +130,56 @@ 
                                                     ],
                                         ],
                     ],
-          ],
-          'included' => [
-                          [
+            ],
+            'included' => [
+                            [
                             'type'       => 'series',
                             'id'         => $series->getId(),
                             'attributes' => [
-                                          'name'        => $series->name,
-                                          'description' => $series->description,
+                                            'name'        => $series->name,
+                                            'description' => $series->description,
                             ],
                             'links' => [
                                         'self' => '/series/'.$series->getId(),
                             ],
-                          ],
-                          [
+                            ],
+                            [
                             'type'       => 'types',
                             'id'         => $type->getId(),
                             'attributes' => [
-                                      'name'        => $type->name,
-                                      'description' => $type->description,
+                                        'name'        => $type->name,
+                                        'description' => $type->description,
                             ],
                             'links' => [
                                         'self' => '/types/'.$type->getId(),
                             ],
-                          ],
-                          [
+                            ],
+                            [
                             'type'       => 'sub-types',
                             'id'         => $sub_type->getId(),
                             'attributes' => [
-                                      'name'        => $sub_type->name,
-                                      'description' => $sub_type->description,
+                                        'name'        => $sub_type->name,
+                                        'description' => $sub_type->description,
                             ],
                             'links' => [
                                         'self' => '/sub-types/'.$sub_type->getId(),
                             ],
-                          ],
-                          [
+                            ],
+                            [
                             'type'       => 'locations',
                             'id'         => $location->getId(),
                             'attributes' => [
-                                      'name' => $location->name,
+                                        'name' => $location->name,
                             ],
                             'links' => [
                                         'self' => '/locations/'.$location->getId(),
                             ],
-                          ],
-          ],
-          'meta' => [
+                            ],
+            ],
+            'meta' => [
                     'status' => '200',
-          ],
-  ];
+            ],
+    ];
 
     return $response->withJson($data, 200);
 });
@@ -199,12 +199,12 @@ 
     $series->createInDb($this->db);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $series->getId(),
                     'name'        => $series->name,
                     'description' => $series->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -216,12 +216,12 @@ 
     $series->getFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $series->getId(),
                     'name'        => $series->name,
                     'description' => $series->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -233,11 +233,11 @@ 
     $series->deleteFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'       => $series->getId(),
                     'archived' => true,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -257,12 +257,12 @@ 
     $type->createInDb($this->db);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $type->getId(),
                     'name'        => $type->name,
                     'description' => $type->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -274,12 +274,12 @@ 
     $type->getFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $type->getId(),
                     'name'        => $type->name,
                     'description' => $type->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -291,11 +291,11 @@ 
     $type->deleteFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'       => $type->getId(),
                     'archived' => true,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -315,12 +315,12 @@ 
     $type->createInDb($this->db);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $type->getId(),
                     'name'        => $type->name,
                     'description' => $type->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -332,12 +332,12 @@ 
     $type->getFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'          => $type->getId(),
                     'name'        => $type->name,
                     'description' => $type->description,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -349,11 +349,11 @@ 
     $type->deleteFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'       => $type->getId(),
                     'archived' => true,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -371,11 +371,11 @@ 
     $type->createInDb($this->db);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'   => $location->getId(),
                     'name' => $location->name,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -387,11 +387,11 @@ 
     $location->getFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'   => $location->getId(),
                     'name' => $location->name,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });
@@ -403,11 +403,11 @@ 
     $location->deleteFromDbWithId($this->db, $id);
 
     $data = [
-          'data' => [
+            'data' => [
                     'id'       => $location->getId(),
                     'archived' => true,
                     ],
-          ];
+            ];
 
     return $response->withJson($data);
 });

Braces +3 added lines, -1 removed lines

@@ -419,7 +419,9 @@
 // End of very very very basic auth
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-else:
+else {
+    :
 http_response_code(401);
+}
 
 endif;

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

Indentation +8 added lines, -8 removed lines

@@ -34,11 +34,11 @@ 
 
 // get token
 $response = $client->request(
-  'POST',
-  'v3/tokens.json',
-  ['form_params' => ['api_key' => siteConfig()['recording']['locomotivecms']['apiKey'],
-                       'email' => siteConfig()['recording']['locomotivecms']['email'], ]]
-  );
+    'POST',
+    'v3/tokens.json',
+    ['form_params' => ['api_key' => siteConfig()['recording']['locomotivecms']['apiKey'],
+                        'email' => siteConfig()['recording']['locomotivecms']['email'], ]]
+    );
 if ($response->getStatusCode() == 201) {
     $token = json_decode($response->getBody())->token;
 }
@@ -46,9 +46,9 @@ 
 // test token
 if (isset($token)) {
     $response = $client->request(
-  'GET',
-  'v3/my_account.json',
-  ['query' => ['auth_token' => $token]]);
+    'GET',
+    'v3/my_account.json',
+    ['query' => ['auth_token' => $token]]);
     var_dump($response);
 } else {
     echo '<p>Unable to connect to main site</p>';

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/includes/functions.mail.php

Braces +6 added lines, -2 removed lines

@@ -266,8 +266,10 @@ 
     if (is_array($rotaoutput)):
         foreach ($rotaoutput as $key => $skill):
             $skillfinal = $skillfinal.$skill.' ';
-    endforeach; else:
+    endforeach; else {
+        :
         $skillfinal = $rotaoutput;
+    }
     endif;
     $message = str_replace('[rotaoutput]', $skillfinal, $message);
     $message = str_replace('[siteurl]', $siteurl, $message);
@@ -445,8 +447,10 @@ 
             $roles = [];
             while ($roleRow = mysqli_fetch_array($roleResult, MYSQLI_ASSOC)) {
                 if (($roleRow['name'] == '') || ($roleRow['name'] == $roleRow['description'])):
-                    $roles[] = $roleRow['description']; else:
+                    $roles[] = $roleRow['description']; else {
+                        :
                     $roles[] = $roleRow['description'].' - '.$roleRow['name'];
+                    }
                 endif;
             }