diff options
| author | Mario <mario@mariovavti.com> | 2021-04-09 09:49:36 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-04-09 09:49:36 +0000 |
| commit | 01b081d809d128e0922fb404921f452c51c2ddb2 (patch) | |
| tree | db100aa4c3b257943b95ab192514a8a93cfa6ba9 /include | |
| parent | a34d8852b6695086ef3c9f5ff882d0d033f7d4a5 (diff) | |
| download | volse-hubzilla-01b081d809d128e0922fb404921f452c51c2ddb2.tar.gz volse-hubzilla-01b081d809d128e0922fb404921f452c51c2ddb2.tar.bz2 volse-hubzilla-01b081d809d128e0922fb404921f452c51c2ddb2.zip | |
register: only return verified registrations in get_pending_accounts(), more invite handling fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/account.php | 5 | ||||
| -rw-r--r-- | include/js_strings.php | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/account.php b/include/account.php index 10131c5d4..f7e2c7e32 100644 --- a/include/account.php +++ b/include/account.php @@ -1271,9 +1271,8 @@ function get_pending_accounts() { // better useability at the moment to tell all (ACCOUNT_PENDING >= 0) instead of (> 0 for those need approval) - $r = q("SELECT reg_did2, reg_created, reg_startup, reg_expires, reg_email, reg_atip, reg_hash, reg_id, - CASE (reg_flags & %d) WHEN 0 THEN 1 WHEN 1 THEN 0 END AS reg_vfd - FROM register WHERE reg_vital = 1 AND (reg_flags & %d) >= 0", + $r = q("SELECT reg_did2, reg_created, reg_startup, reg_expires, reg_email, reg_atip, reg_hash, reg_id + FROM register WHERE reg_vital = 1 AND (reg_flags & %d) = 0 AND (reg_flags & %d) >= 0", intval(ACCOUNT_UNVERIFIED), intval(ACCOUNT_PENDING) ); diff --git a/include/js_strings.php b/include/js_strings.php index 25b73d71e..ed73b0420 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -119,7 +119,8 @@ function js_strings() { '$download_info' => t('Please stand by while your download is being prepared.'), // mod register - '$email_not_valid' => t('Email address not valid') + '$email_not_valid' => t('Email address not valid'), + '$email_required' => t('Required') )); } |