@@ -196,7 +196,7 @@ |
||
196 | 196 | /** |
197 | 197 | * Determine if the user is marked as available for an event. |
198 | 198 | * |
199 | - * @return bool if user is available |
|
199 | + * @return null|boolean if user is available |
|
200 | 200 | */ |
201 | 201 | public function isAvailableForEvent(Event $event) |
202 | 202 | { |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | */ |
78 | 78 | public function getName() |
79 | 79 | { |
80 | - return $this->firstname.' '.$this->lastname; |
|
80 | + return $this->firstname . ' ' . $this->lastname; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -96,16 +96,16 @@ discard block |
||
96 | 96 | if ($socialAuth->getPlatform() == 'facebook') { |
97 | 97 | switch ($size) { |
98 | 98 | case 'small': // 50px x 50px |
99 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=square'; |
|
99 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=square'; |
|
100 | 100 | break; |
101 | 101 | case 'medium': // 200px x 200px |
102 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large'; |
|
102 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large'; |
|
103 | 103 | break; |
104 | 104 | case 'large': // 200px x 200px |
105 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large'; |
|
105 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large'; |
|
106 | 106 | break; |
107 | 107 | default: |
108 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture'; |
|
108 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture'; |
|
109 | 109 | break; |
110 | 110 | } |
111 | 111 | } elseif ($socialAuth->getPlatform() == 'onebody') { |
@@ -114,16 +114,16 @@ discard block |
||
114 | 114 | $extension = pathinfo($socialAuth->getMeta()['photo-file-name'], PATHINFO_EXTENSION); |
115 | 115 | switch ($size) { |
116 | 116 | case 'small': // 50px x 50px |
117 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension; |
|
117 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension; |
|
118 | 118 | break; |
119 | 119 | case 'medium': // 150px x 150px |
120 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/small/'.$photoFingerprint.'.'.$extension; |
|
120 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/small/' . $photoFingerprint . '.' . $extension; |
|
121 | 121 | break; |
122 | 122 | case 'large': // 500px x 500px |
123 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/medium/'.$photoFingerprint.'.'.$extension; |
|
123 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/medium/' . $photoFingerprint . '.' . $extension; |
|
124 | 124 | break; |
125 | 125 | default: |
126 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension; |
|
126 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension; |
|
127 | 127 | break; |
128 | 128 | } |
129 | 129 | } |
@@ -132,16 +132,16 @@ discard block |
||
132 | 132 | |
133 | 133 | switch ($size) { |
134 | 134 | case 'small': // 50px x 50px |
135 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm'; |
|
135 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm'; |
|
136 | 136 | break; |
137 | 137 | case 'medium': // 200px x 200px |
138 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=200&d=mm'; |
|
138 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=200&d=mm'; |
|
139 | 139 | break; |
140 | 140 | case 'large': // 500px x 500px |
141 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=500&d=mm'; |
|
141 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=500&d=mm'; |
|
142 | 142 | break; |
143 | 143 | default: |
144 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm'; |
|
144 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm'; |
|
145 | 145 | break; |
146 | 146 | } |
147 | 147 | } |
@@ -119,6 +119,9 @@ |
||
119 | 119 | return true; |
120 | 120 | } |
121 | 121 | |
122 | + /** |
|
123 | + * @param EmailAddress $username |
|
124 | + */ |
|
122 | 125 | private function numberOfLoginAttemptsIsOk($username) |
123 | 126 | { |
124 | 127 | $numberOfAllowedAttempts = 8; |
@@ -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> |
@@ -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 |
@@ -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> |