@@ -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 | { |
@@ -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; |
@@ -53,8 +53,8 @@ |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // After we have inserted the data, we want to head back to the main users page |
| 56 | - header('Location: subTypes.php'); // Move to the home page of the admin section |
|
| 57 | - exit; |
|
| 56 | + header('Location: subTypes.php'); // Move to the home page of the admin section |
|
| 57 | + exit; |
|
| 58 | 58 | } |
| 59 | 59 | include 'includes/header.php'; |
| 60 | 60 | ?> |
@@ -30,24 +30,24 @@ |
||
| 30 | 30 | switch ($_POST['action']) { |
| 31 | 31 | case 'approve': |
| 32 | 32 | $userId = approvePendingUser($id); |
| 33 | - mailNewUser($userId); |
|
| 34 | - header('Location: addUser.php?action=edit&user='.$userId); |
|
| 35 | - break; |
|
| 33 | + mailNewUser($userId); |
|
| 34 | + header('Location: addUser.php?action=edit&user='.$userId); |
|
| 35 | + break; |
|
| 36 | 36 | case 'merge': |
| 37 | 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; |
|
| 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 | 43 | case 'decline': |
| 44 | 44 | declinePendingUser($id); |
| 45 | - break; |
|
| 45 | + break; |
|
| 46 | 46 | |
| 47 | 47 | default: |
| 48 | 48 | // code... |
| 49 | 49 | break; |
| 50 | - } |
|
| 50 | + } |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | if (empty($id)) { |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | case 'everyone': |
| 52 | 52 | echo '<p>Function not complete, please wait while we finish writing it.</p><p>Apologies for any inconvinence.</p>'; |
| 53 | 53 | break; |
| 54 | - default: |
|
| 54 | + default: |
|
| 55 | 55 | echo '<p>Error: Insufficient parameters.</p>'; |
| 56 | 56 | echo '<p>Please inform the system administrator</p>'; |
| 57 | 57 | break; |
@@ -5,18 +5,18 @@ |
||
| 5 | 5 | include 'includes/config.php'; |
| 6 | 6 | include 'includes/functions.php'; |
| 7 | 7 | |
| 8 | - // you have to open the session first |
|
| 9 | - session_start(); |
|
| 8 | + // you have to open the session first |
|
| 9 | + session_start(); |
|
| 10 | 10 | |
| 11 | 11 | //if ($debug) notifyInfo(__FILE__,"logout",$_SESSION['userid']); //only_for_testing// |
| 12 | 12 | if ($debug) { |
| 13 | 13 | insertStatistics('user', __FILE__, 'logout'); |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | - //remove all the variables in the session |
|
| 17 | - session_unset(); |
|
| 16 | + //remove all the variables in the session |
|
| 17 | + session_unset(); |
|
| 18 | 18 | |
| 19 | - // destroy the session |
|
| 20 | - session_destroy(); |
|
| 19 | + // destroy the session |
|
| 20 | + session_destroy(); |
|
| 21 | 21 | |
| 22 | - header('Location: login.php'); |
|
| 22 | + header('Location: login.php'); |
|
@@ -19,11 +19,11 @@ |
||
| 19 | 19 | { |
| 20 | 20 | return EventQuery::create() |
| 21 | 21 | ->useEventPersonQuery() |
| 22 | - ->useUserRoleQuery() |
|
| 22 | + ->useUserRoleQuery() |
|
| 23 | 23 | ->useRoleQuery() |
| 24 | - ->filterByGroup($this) |
|
| 24 | + ->filterByGroup($this) |
|
| 25 | + ->endUse() |
|
| 25 | 26 | ->endUse() |
| 26 | - ->endUse() |
|
| 27 | 27 | ->endUse() |
| 28 | 28 | ->orderByDate('desc') |
| 29 | 29 | ->findOne(); |
@@ -41,19 +41,19 @@ |
||
| 41 | 41 | switch ($platform) { |
| 42 | 42 | case 'facebook': |
| 43 | 43 | $_SESSION['fb-callback-url'] = 'fb-link.php'; |
| 44 | - header('Location: fb-login.php'); |
|
| 45 | - exit; |
|
| 46 | - } |
|
| 47 | - break; |
|
| 44 | + header('Location: fb-login.php'); |
|
| 45 | + exit; |
|
| 46 | + } |
|
| 47 | + break; |
|
| 48 | 48 | case 'unlink': |
| 49 | 49 | removeSocialAuthFromUserWithId($id, $platform); |
| 50 | - createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account. Login via Facebook is now disabled for your account. Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php'); |
|
| 51 | - break; |
|
| 50 | + createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account. Login via Facebook is now disabled for your account. Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php'); |
|
| 51 | + break; |
|
| 52 | 52 | |
| 53 | 53 | default: |
| 54 | 54 | // code... |
| 55 | 55 | break; |
| 56 | - } |
|
| 56 | + } |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | // list of possible social account links (names used as platform names in database) |
@@ -142,10 +142,10 @@ |
||
| 142 | 142 | </form> |
| 143 | 143 | </div><!-- /.box --> |
| 144 | 144 | <?php |
| 145 | - if (isAdmin()) { |
|
| 146 | - ?> |
|
| 145 | + if (isAdmin()) { |
|
| 146 | + ?> |
|
| 147 | 147 | <div id="right"> |
| 148 | 148 | <div class="item"><a href="settings.php">Back to settings</a></div> |
| 149 | 149 | <?php |
| 150 | - } ?> |
|
| 150 | + } ?> |
|
| 151 | 151 | <?php include 'includes/footer.php'; ?> |