@@ -29,11 +29,11 @@ |
||
| 29 | 29 | // parameter represents the DataTables column identifier. In this case simple |
| 30 | 30 | // indexes |
| 31 | 31 | $columns = [ |
| 32 | - ['db' => 'id', 'dt' => 0], |
|
| 33 | - ['db' => 'firstname', 'dt' => 1], |
|
| 34 | - ['db' => 'surname', 'dt' => 2], |
|
| 35 | - ['db' => 'zip', 'dt' => 3], |
|
| 36 | - ['db' => 'country', 'dt' => 4], |
|
| 32 | + ['db' => 'id', 'dt' => 0], |
|
| 33 | + ['db' => 'firstname', 'dt' => 1], |
|
| 34 | + ['db' => 'surname', 'dt' => 2], |
|
| 35 | + ['db' => 'zip', 'dt' => 3], |
|
| 36 | + ['db' => 'country', 'dt' => 4], |
|
| 37 | 37 | ]; |
| 38 | 38 | |
| 39 | 39 | // SQL server connection information |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | // ensure user is allowed to see page |
| 40 | 40 | |
| 41 | 41 | if (!isAdmin() && $queryStringUser != $sessionUserId) { |
| 42 | - header('Location: swaps.php?user='.$sessionUserId); |
|
| 42 | + header('Location: swaps.php?user=' . $sessionUserId); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | // fetch swaps |
@@ -90,11 +90,11 @@ discard block |
||
| 90 | 90 | <p> |
| 91 | 91 | <strong> |
| 92 | 92 | <s class="text-red"> |
| 93 | - <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>) |
|
| 93 | + <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>) |
|
| 94 | 94 | </s> |
| 95 | 95 | → |
| 96 | 96 | <span class="text-green"> |
| 97 | - <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>) |
|
| 97 | + <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>) |
|
| 98 | 98 | </span> |
| 99 | 99 | </strong> |
| 100 | 100 | </p> |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | exit; |
| 34 | 34 | } |
| 35 | 35 | if (!isAdmin()) { |
| 36 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 36 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 37 | 37 | exit; |
| 38 | 38 | } |
| 39 | 39 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | <?php |
| 117 | 117 | else: |
| 118 | - echo '<div class="box-body">'.$sentSuccess.'</div>'; |
|
| 118 | + echo '<div class="box-body">' . $sentSuccess . '</div>'; |
|
| 119 | 119 | endif; |
| 120 | 120 | ?> |
| 121 | 121 | </div> |
@@ -64,21 +64,21 @@ discard block |
||
| 64 | 64 | case 'accept': |
| 65 | 65 | if (canAcceptSwap($swapId) || $verify == verificationCodeForSwap($swapId)) { |
| 66 | 66 | switch (acceptSwap($swapId)) { |
| 67 | - case '1': |
|
| 68 | - $message = 'Swap Successful'; |
|
| 69 | - break; |
|
| 70 | - case '2': |
|
| 71 | - $message = 'Swap already accepted.'; |
|
| 72 | - break; |
|
| 73 | - case '3': |
|
| 74 | - $message = 'Swap already declined.'; |
|
| 75 | - break; |
|
| 76 | - case '4': |
|
| 77 | - $message = 'Swap already reverted.'; |
|
| 78 | - break; |
|
| 79 | - default: |
|
| 80 | - $err = 'Technical issue - please inform system administrator'; |
|
| 81 | - break; |
|
| 67 | + case '1': |
|
| 68 | + $message = 'Swap Successful'; |
|
| 69 | + break; |
|
| 70 | + case '2': |
|
| 71 | + $message = 'Swap already accepted.'; |
|
| 72 | + break; |
|
| 73 | + case '3': |
|
| 74 | + $message = 'Swap already declined.'; |
|
| 75 | + break; |
|
| 76 | + case '4': |
|
| 77 | + $message = 'Swap already reverted.'; |
|
| 78 | + break; |
|
| 79 | + default: |
|
| 80 | + $err = 'Technical issue - please inform system administrator'; |
|
| 81 | + break; |
|
| 82 | 82 | } |
| 83 | 83 | } else { |
| 84 | 84 | $err = 'Swap Already Actioned or Verification Code Invalid'; |
@@ -87,15 +87,15 @@ discard block |
||
| 87 | 87 | case 'decline': |
| 88 | 88 | if (canDeclineSwap($swapId) || $verify == verificationCodeForSwap($swapId)) { |
| 89 | 89 | switch (declineSwap($swapId)) { |
| 90 | - case '1': |
|
| 91 | - $message = 'Swap declined'; |
|
| 92 | - break; |
|
| 93 | - case '2': |
|
| 94 | - $message = 'Swap already declined.'; |
|
| 95 | - break; |
|
| 96 | - default: |
|
| 97 | - $err = 'Technical issue - please inform system administrator'; |
|
| 98 | - break; |
|
| 90 | + case '1': |
|
| 91 | + $message = 'Swap declined'; |
|
| 92 | + break; |
|
| 93 | + case '2': |
|
| 94 | + $message = 'Swap already declined.'; |
|
| 95 | + break; |
|
| 96 | + default: |
|
| 97 | + $err = 'Technical issue - please inform system administrator'; |
|
| 98 | + break; |
|
| 99 | 99 | } |
| 100 | 100 | } else { |
| 101 | 101 | $err = 'Swap Already Actioned or Verification Code Invalid'; |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | if (!empty($eventId)) { |
| 111 | 111 | // ensure user is logged in before allowing creation of swap |
| 112 | 112 | if (!(isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true)) { |
| 113 | - $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/swap.php?event='.$eventId; |
|
| 113 | + $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/swap.php?event=' . $eventId; |
|
| 114 | 114 | header('Location: login.php'); |
| 115 | 115 | } |
| 116 | 116 | $createSwap = true; |
@@ -186,11 +186,11 @@ discard block |
||
| 186 | 186 | <p> |
| 187 | 187 | <strong> |
| 188 | 188 | <s class="text-red"> |
| 189 | - <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>) |
|
| 189 | + <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>) |
|
| 190 | 190 | </s> |
| 191 | 191 | → |
| 192 | 192 | <span class="text-green"> |
| 193 | - <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>) |
|
| 193 | + <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>) |
|
| 194 | 194 | </span> |
| 195 | 195 | </strong> |
| 196 | 196 | </p> |
@@ -225,16 +225,16 @@ discard block |
||
| 225 | 225 | <select name="newUserRole" class="form-control"> |
| 226 | 226 | <?php |
| 227 | 227 | if (roleCanSwapToOtherRoleInGroup($role->roleId)) { |
| 228 | - $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE'; |
|
| 228 | + $whereAnd = 'r.groupId = ' . groupIdWithRole($role->roleId) . ' AND r.allowRoleSwaps IS NOT FALSE'; |
|
| 229 | 229 | } else { |
| 230 | - $whereAnd = 'r.id = '.$role->roleId; |
|
| 230 | + $whereAnd = 'r.id = ' . $role->roleId; |
|
| 231 | 231 | } |
| 232 | - $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'; |
|
| 232 | + $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'; |
|
| 233 | 233 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 234 | 234 | |
| 235 | 235 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 236 | 236 | ?> |
| 237 | - <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option> |
|
| 237 | + <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'] . ' ' . $row['lastName'] . ' (' . $row['name'] . ')'; ?></option> |
|
| 238 | 238 | <?php |
| 239 | 239 | } ?> |
| 240 | 240 | </select> |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | $statusMessage = 'Sent successfully'; |
| 54 | 54 | } else { |
| 55 | 55 | foreach ($sent as $errorMessage) { |
| 56 | - $statusMessage .= '<p>'.$errorMessage.'</p>'; |
|
| 56 | + $statusMessage .= '<p>' . $errorMessage . '</p>'; |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | if (!isAdmin()) { |
| 37 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 37 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 38 | 38 | exit; |
| 39 | 39 | } |
| 40 | 40 | |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | if (!isAdmin()) { |
| 17 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 17 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 18 | 18 | exit; |
| 19 | 19 | } |
| 20 | 20 | |
@@ -28,25 +28,25 @@ |
||
| 28 | 28 | $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT); |
| 29 | 29 | |
| 30 | 30 | switch ($_POST['action']) { |
| 31 | - case 'approve': |
|
| 32 | - $userId = approvePendingUser($id); |
|
| 33 | - mailNewUser($userId); |
|
| 34 | - header('Location: addUser.php?action=edit&user='.$userId); |
|
| 35 | - break; |
|
| 36 | - case 'merge': |
|
| 37 | - $existingUserId = $_POST['existingUser']; |
|
| 38 | - $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT); |
|
| 39 | - mergePendingUserWithUserId($id, $existingUserId); |
|
| 40 | - mailNewUser($existingUserId); |
|
| 41 | - header('Location: addUser.php?action=edit&user='.$existingUserId); |
|
| 42 | - break; |
|
| 43 | - case 'decline': |
|
| 44 | - declinePendingUser($id); |
|
| 45 | - break; |
|
| 46 | - |
|
| 47 | - default: |
|
| 48 | - // code... |
|
| 49 | - break; |
|
| 31 | + case 'approve': |
|
| 32 | + $userId = approvePendingUser($id); |
|
| 33 | + mailNewUser($userId); |
|
| 34 | + header('Location: addUser.php?action=edit&user='.$userId); |
|
| 35 | + break; |
|
| 36 | + case 'merge': |
|
| 37 | + $existingUserId = $_POST['existingUser']; |
|
| 38 | + $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT); |
|
| 39 | + mergePendingUserWithUserId($id, $existingUserId); |
|
| 40 | + mailNewUser($existingUserId); |
|
| 41 | + header('Location: addUser.php?action=edit&user='.$existingUserId); |
|
| 42 | + break; |
|
| 43 | + case 'decline': |
|
| 44 | + declinePendingUser($id); |
|
| 45 | + break; |
|
| 46 | + |
|
| 47 | + default: |
|
| 48 | + // code... |
|
| 49 | + break; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | if (!isAdmin()) { |
| 17 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 17 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 18 | 18 | exit; |
| 19 | 19 | } |
| 20 | 20 | |
@@ -31,14 +31,14 @@ discard block |
||
| 31 | 31 | case 'approve': |
| 32 | 32 | $userId = approvePendingUser($id); |
| 33 | 33 | mailNewUser($userId); |
| 34 | - header('Location: addUser.php?action=edit&user='.$userId); |
|
| 34 | + header('Location: addUser.php?action=edit&user=' . $userId); |
|
| 35 | 35 | break; |
| 36 | 36 | case 'merge': |
| 37 | 37 | $existingUserId = $_POST['existingUser']; |
| 38 | 38 | $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT); |
| 39 | 39 | mergePendingUserWithUserId($id, $existingUserId); |
| 40 | 40 | mailNewUser($existingUserId); |
| 41 | - header('Location: addUser.php?action=edit&user='.$existingUserId); |
|
| 41 | + header('Location: addUser.php?action=edit&user=' . $existingUserId); |
|
| 42 | 42 | break; |
| 43 | 43 | case 'decline': |
| 44 | 44 | declinePendingUser($id); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | <div class="box box-primary"> |
| 91 | 91 | <div class="box-header"> |
| 92 | 92 | <h2 class="box-title"> |
| 93 | - <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName.' '.$user->lastName ?> |
|
| 93 | + <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName . ' ' . $user->lastName ?> |
|
| 94 | 94 | </h2> |
| 95 | 95 | </div> |
| 96 | 96 | <div class="box-body"> |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | <?php |
| 132 | 132 | $users = allUsersNames(); |
| 133 | 133 | foreach ($users as $existingUser): ?> |
| 134 | - <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> |
|
| 134 | + <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> |
|
| 135 | 135 | <?php endforeach; ?> |
| 136 | 136 | </select> |
| 137 | 137 | </div> |
@@ -2,6 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace TechWilk\Rota; |
| 4 | 4 | |
| 5 | -ini_set('display_errors', false); // set on for development, off for production |
|
| 5 | +ini_set('display_errors', false); // set on for development, off for production |
|
| 6 | 6 | ini_set('log_errors', true); |
| 7 | 7 | error_reporting(E_ALL); |