TechWilk / rota

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

Switch Indentation +24 added lines, -24 removed lines

@@ -64,21 +64,21 @@ 
   case 'accept':
     if (canAcceptSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (acceptSwap($swapId)) {
-        case '1':
-          $message = 'Swap Successful';
-          break;
-        case '2':
-          $message = 'Swap already accepted.';
-          break;
-        case '3':
-          $message = 'Swap already declined.';
-          break;
-        case '4':
-          $message = 'Swap already reverted.';
-          break;
-        default:
-          $err = 'Technical issue - please inform system administrator';
-          break;
+            case '1':
+              $message = 'Swap Successful';
+              break;
+            case '2':
+              $message = 'Swap already accepted.';
+              break;
+            case '3':
+              $message = 'Swap already declined.';
+              break;
+            case '4':
+              $message = 'Swap already reverted.';
+              break;
+            default:
+              $err = 'Technical issue - please inform system administrator';
+              break;
       }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';
@@ -87,15 +87,15 @@ 
   case 'decline':
     if (canDeclineSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (declineSwap($swapId)) {
-        case '1':
-          $message = 'Swap declined';
-          break;
-        case '2':
-          $message = 'Swap already declined.';
-          break;
-        default:
-          $err = 'Technical issue - please inform system administrator';
-          break;
+            case '1':
+              $message = 'Swap declined';
+              break;
+            case '2':
+              $message = 'Swap already declined.';
+              break;
+            default:
+              $err = 'Technical issue - please inform system administrator';
+              break;
         }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';

Spacing +7 added lines, -7 removed lines

@@ -112,7 +112,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;
@@ -188,11 +188,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>
@@ -227,16 +227,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 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>
+                    <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/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;
 }
 

public/old/pendingAccounts.php

Switch Indentation +19 added lines, -19 removed lines

@@ -28,25 +28,25 @@
     $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT);
 
     switch ($_POST['action']) {
-    case 'approve':
-      $userId = approvePendingUser($id);
-      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;
-    case 'decline':
-      declinePendingUser($id);
-      break;
-
-    default:
-      // code...
-      break;
+        case 'approve':
+          $userId = approvePendingUser($id);
+          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;
+        case 'decline':
+          declinePendingUser($id);
+          break;
+
+        default:
+          // code...
+          break;
   }
 }
 

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,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;
 }
 
@@ -33,14 +33,14 @@ 
     case 'approve':
       $userId = approvePendingUser($id);
       mailNewUser($userId);
-      header('Location: addUser.php?action=edit&user='.$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);
+      header('Location: addUser.php?action=edit&user=' . $existingUserId);
       break;
     case 'decline':
       declinePendingUser($id);
@@ -92,7 +92,7 @@ 
 <div class="box box-primary">
   <div class="box-header">
     <h2 class="box-title">
-      <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName.' '.$user->lastName ?>
+      <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName . ' ' . $user->lastName ?>
     </h2>
   </div>
   <div class="box-body">
@@ -133,7 +133,7 @@ 
             <?php
             $users = allUsersNames();
             foreach ($users as $existingUser) { ?>
-            <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName.' '.$existingUser->lastName ?></option>
+            <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName . ' ' . $existingUser->lastName ?></option>
             <?php } ?>
           </select>
         </div>

public/old/install.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
 } catch (\Exception $e) {
 }
 
-$url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+$url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 $url = substr($url, 0, -12); // remove "/install.php" from url
 
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -48,7 +48,7 @@ 
         //exit;
         $conn->exec($sql);
     } catch (\Exception $e) {
-        echo 'Error (code: '.$e->getCode().') adding tables to database: '.$e->getMessage();
+        echo 'Error (code: ' . $e->getCode() . ') adding tables to database: ' . $e->getMessage();
         exit;
     }
 
@@ -58,7 +58,7 @@ 
     $lastname = $_POST['lastname'];
     $lastname = trim(strip_tags($lastname));
 
-    $username = strtolower($firstname).'.'.strtolower($lastname);
+    $username = strtolower($firstname) . '.' . strtolower($lastname);
 
     $password = $_POST['password'];
 
@@ -82,7 +82,7 @@ 
     try {
         $user->save();
     } catch (\Exception $e) {
-        echo 'Error (code: '.$e->getCode().') adding user to database: '.$e->getMessage();
+        echo 'Error (code: ' . $e->getCode() . ') adding user to database: ' . $e->getMessage();
         exit;
     }
 
@@ -179,7 +179,7 @@ 
 
     $settings->save();
 
-    header('Location: login.php?username='.$username); // Move to the home page of the admin section
+    header('Location: login.php?username=' . $username); // Move to the home page of the admin section
     exit;
 }
 

public/old/includes/errors.php

Spacing +1 added lines, -1 removed lines

@@ -2,6 +2,6 @@
 
 namespace TechWilk\Rota;
 
-ini_set('display_errors', false);    // set on for development, off for production
+ini_set('display_errors', false); // set on for development, off for production
 ini_set('log_errors', true);
 error_reporting(E_ALL);