TechWilk / rota

public/api/v1/index.php

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;

Spacing +4 added lines, -4 removed lines

@@ -23,9 +23,9 @@ 
 // Start of API
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-require_once __DIR__.'/../../../vendor/autoload.php';
+require_once __DIR__ . '/../../../vendor/autoload.php';
 
-require_once __DIR__.'/../../../generated-conf/config.php';
+require_once __DIR__ . '/../../../generated-conf/config.php';
 
 // Create and configure Slim app
 $app = new \Slim\App(['settings' => $config]);
@@ -36,7 +36,7 @@ 
 
 $container = $app->getContainer();
 
-$container['db'] = function ($c) {
+$container['db'] = function($c) {
     $db_config = $c['settings']['db'];
     $db = new Database($db_config);
 
@@ -49,7 +49,7 @@ 
 
 // ~~~~~~~~~~~~~~~ Series ~~~~~~~~~~~~~~~
 
-$app->post('/series', function ($request, $response, $args) {
+$app->post('/series', function($request, $response, $args) {
     $postData = $request->getParsedBody();
 
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);

public/plugins/datatables/extensions/Scroller/examples/data/ssp.php

Spacing +5 added lines, -5 removed lines

@@ -29,11 +29,11 @@
 // parameter represents the DataTables column identifier. In this case simple
 // indexes
 $columns = [
-    ['db' => 'id',         'dt' => 0],
-    ['db' => 'firstname',  'dt' => 1],
-    ['db' => 'surname',    'dt' => 2],
-    ['db' => 'zip',        'dt' => 3],
-    ['db' => 'country',    'dt' => 4],
+    ['db' => 'id', 'dt' => 0],
+    ['db' => 'firstname', 'dt' => 1],
+    ['db' => 'surname', 'dt' => 2],
+    ['db' => 'zip', 'dt' => 3],
+    ['db' => 'country', 'dt' => 4],
 ];
 
 // SQL server connection information

public/old/swaps.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 // ensure user is allowed to see page
 
 if (!isAdmin() && $queryStringUser != $sessionUserId) {
-    header('Location: swaps.php?user='.$sessionUserId);
+    header('Location: swaps.php?user=' . $sessionUserId);
 }
 
 // fetch swaps
@@ -90,11 +90,11 @@ 
               <p>
                 <strong>
                   <s class="text-red">
-                    <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
+                    <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
                   </s>
                   &#8594;
                   <span class="text-green">
-                    <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
+                    <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
                   </span>
                 </strong>
               </p>

public/old/overview.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,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;
 }
 
@@ -115,7 +115,7 @@ 
 
 		  <?php
             else:
-                echo '<div class="box-body">'.$sentSuccess.'</div>';
+                echo '<div class="box-body">' . $sentSuccess . '</div>';
             endif;
             ?>
 				</div>

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'; ?>

Spacing +7 added lines, -7 removed lines

@@ -110,7 +110,7 @@ 
 if (!empty($eventId)) {
     // ensure user is logged in before allowing creation of swap
     if (!(isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true)) {
-        $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/swap.php?event='.$eventId;
+        $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/swap.php?event=' . $eventId;
         header('Location: login.php');
     }
     $createSwap = true;
@@ -186,11 +186,11 @@ 
             <p>
               <strong>
                 <s class="text-red">
-                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
+                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
                 </s>
                 &#8594;
                 <span class="text-green">
-                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
+                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
                 </span>
               </strong>
             </p>
@@ -225,16 +225,16 @@ 
                 <select name="newUserRole" class="form-control">
                   <?php
                   if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
-                      $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
+                      $whereAnd = 'r.groupId = ' . groupIdWithRole($role->roleId) . ' AND r.allowRoleSwaps IS NOT FALSE';
                   } else {
-                      $whereAnd = 'r.id = '.$role->roleId;
+                      $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';
+                  $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>
+                    <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'] . ' ' . $row['lastName'] . ' (' . $row['name'] . ')'; ?></option>
                   <?php
                   } ?>
                 </select>

public/old/emailGroup.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         $statusMessage = 'Sent successfully';
     } else {
         foreach ($sent as $errorMessage) {
-            $statusMessage .= '<p>'.$errorMessage.'</p>';
+            $statusMessage .= '<p>' . $errorMessage . '</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';
+}
+?>

Spacing +15 added lines, -15 removed lines

@@ -45,7 +45,7 @@ 
 if (($userisBandAdmin) || ($userisEventEditor) || (isAdmin())) {
     // Just continue the code
 } else {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
 }
 
 if ($userisBandAdmin) {
@@ -82,7 +82,7 @@ 
         $location = $row['location'];
         $locationname = $row['locationname'];
         if ($action == 'edit') {
-            $formaction = '?action=edit&id='.$id;
+            $formaction = '?action=edit&id=' . $id;
         } else {
             $formaction = '';
         }
@@ -136,8 +136,8 @@ 
 
     // convert format of date
     $date = str_replace('/', '-', $date); // ensure it isn't read as mm/dd/yyyy
-    $date = strftime('%Y-%m-%d', strtotime($date.' 00:00:00'));
-    $date = $date.' '.$time.':00';
+    $date = strftime('%Y-%m-%d', strtotime($date . ' 00:00:00'));
+    $date = $date . ' ' . $time . ':00';
     $date = mysqli_real_escape_string(db(), $date);
 
     if ($action == 'edit') {
@@ -207,10 +207,10 @@ 
         //if ($userisBandAdmin) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from skills where groupid=2)";
         //if ($userisEventEditor) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from skills where groupid!=2)";
         if ($userisBandAdmin) {
-            $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from skills where groupid in (2,3,4))';
+            $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from skills where groupid in (2,3,4))';
         }
         if ($userisEventEditor) {
-            $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from skills where not (groupid in (2,3,4)))';
+            $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from skills where not (groupid in (2,3,4)))';
         }
         mysqli_query(db(), $delete_all_sql) or die(mysqli_error(db()));
     }
@@ -218,9 +218,9 @@ 
     // redirect
     if (isset($_SESSION['lastEventsFilter'])) {
         $type = $_SESSION['lastEventsFilter'];
-        header('Location: events.php?view=all&filter='.$type.'#event'.$eventID);
+        header('Location: events.php?view=all&filter=' . $type . '#event' . $eventID);
     } else {
-        header('Location: events.php?view=all#event'.$eventID);
+        header('Location: events.php?view=all#event' . $eventID);
     }
     exit;
 }
@@ -297,7 +297,7 @@ 
                                         while ($ob = mysqli_fetch_object($result)) {
                                             if (!(isset($type) && $ob->id == $type)) {
                                                 $defaultTime = strftime('%H:%M', strtotime($ob->defaultTime));
-                                                echo "<option value='".$ob->id."' title='".$ob->description."' data-time='".($defaultTime == '00:00' ? '' : $defaultTime)."' data-location='".(is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId)."'>".$ob->name.'</option>';
+                                                echo "<option value='" . $ob->id . "' title='" . $ob->description . "' data-time='" . ($defaultTime == '00:00' ? '' : $defaultTime) . "' data-location='" . (is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId) . "'>" . $ob->name . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -323,7 +323,7 @@ 
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                             if (isset($subtype) && $row['id'] == $subtype) {
                                             } else {
-                                                echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
+                                                echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -351,7 +351,7 @@ 
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                             if (isset($location) && $row['id'] == $location) {
                                             } else {
-                                                echo "<option value='".$row['id']."'>".$row['name'].'</option>';
+                                                echo "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -482,7 +482,7 @@ 
                                     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                         if (isset($type) && $row['id'] == $type) {
                                         } else {
-                                            echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
+                                            echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
                                         }
                                     } ?>
 								</select>
@@ -552,8 +552,8 @@ 
 										<?php foreach ($role->getUserRoles() as $userRole): ?>
 											<?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: ?>
+											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option>
+											<?php else : ?>
 											<?php $countReserve += 1 ?>
 											<?php endif //!userRole->getReserve?>
 										<?php endforeach //users?>
@@ -563,7 +563,7 @@ 
 										<?php foreach ($role->getUserRoles() as $userRole): ?>
 											<?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>
+											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option>
 											<?php endif ?>
 										<?php endforeach //users?>
 										</optgroup>

public/old/editRole.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 }
 
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 

public/old/editeventtype.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }