diff options
Diffstat (limited to 'mod/uservalidationbyemail/actions')
| -rw-r--r-- | mod/uservalidationbyemail/actions/delete.php | 5 | ||||
| -rw-r--r-- | mod/uservalidationbyemail/actions/resend_validation.php | 5 | ||||
| -rw-r--r-- | mod/uservalidationbyemail/actions/validate.php | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/mod/uservalidationbyemail/actions/delete.php b/mod/uservalidationbyemail/actions/delete.php index 14d40e89c..b076d3048 100644 --- a/mod/uservalidationbyemail/actions/delete.php +++ b/mod/uservalidationbyemail/actions/delete.php @@ -25,9 +25,8 @@ foreach ($user_guids as $guid) { } // don't delete validated users - $is_validated = uservalidationbyemail_get_user_validation_status($guid); - - if ($is_validated || !$user->delete()) { + $is_validated = elgg_get_user_validation_status($guid); + if ($is_validated !== FALSE || !$user->delete()) { $error = TRUE; continue; } diff --git a/mod/uservalidationbyemail/actions/resend_validation.php b/mod/uservalidationbyemail/actions/resend_validation.php index 70c2244b9..59a69b0f6 100644 --- a/mod/uservalidationbyemail/actions/resend_validation.php +++ b/mod/uservalidationbyemail/actions/resend_validation.php @@ -25,9 +25,8 @@ foreach ($user_guids as $guid) { } // don't resend emails to validated users - $is_validated = uservalidationbyemail_get_user_validation_status($guid); - - if ($is_validated || !uservalidationbyemail_request_validation($guid)) { + $is_validated = elgg_get_user_validation_status($guid); + if ($is_validated !== FALSE || !uservalidationbyemail_request_validation($guid)) { $error = TRUE; continue; } diff --git a/mod/uservalidationbyemail/actions/validate.php b/mod/uservalidationbyemail/actions/validate.php index cc4554722..d6be9cfe5 100644 --- a/mod/uservalidationbyemail/actions/validate.php +++ b/mod/uservalidationbyemail/actions/validate.php @@ -25,10 +25,10 @@ foreach ($user_guids as $guid) { } // only validate if not validated - $is_validated = uservalidationbyemail_get_user_validation_status($guid); - $validate_success = uservalidationbyemail_set_user_validation_status($guid, TRUE); + $is_validated = elgg_get_user_validation_status($guid); + $validate_success = elgg_set_user_validation_status($guid, TRUE, 'manual'); - if ($is_validated || !($validate_success && $user->enable())) { + if ($is_validated !== FALSE || !($validate_success && $user->enable())) { $error = TRUE; continue; } |