aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-03-26 19:21:41 +0000
committerMario <mario@mariovavti.com>2021-03-26 19:21:41 +0000
commite6a6723d1f664a895859409ebc68bc5b171093b2 (patch)
tree099a5b252cc4128e7c7f0abc7fde3b64fff538fa
parent6e7c7771bd7aa3e2507acd06b74cd92bdb57f44b (diff)
parentb50f1657c3e5772dd6235ce98c55e71630b0c626 (diff)
downloadvolse-hubzilla-e6a6723d1f664a895859409ebc68bc5b171093b2.tar.gz
volse-hubzilla-e6a6723d1f664a895859409ebc68bc5b171093b2.tar.bz2
volse-hubzilla-e6a6723d1f664a895859409ebc68bc5b171093b2.zip
Merge branch 'air' of https://framagit.org/hubzilla/core into air
-rw-r--r--Zotlabs/Module/Regate.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php
index 0d430d68c..4cd902f7b 100644
--- a/Zotlabs/Module/Regate.php
+++ b/Zotlabs/Module/Regate.php
@@ -60,11 +60,12 @@ class Regate extends \Zotlabs\Web\Controller {
}
// do we have a valid dId2 ?
- if ( ($didx == 'a' && substr( $did2 , -2) == substr( base_convert( md5( substr( $did2, 1, -2) ),16 ,10), -2))
- || ($didx == 'e') || ($didx == 'i')) {
+ if (($didx == 'a' && substr( $did2 , -2) == substr( base_convert( md5( substr( $did2, 1, -2) ),16 ,10), -2)) || ($didx == 'e') || ($didx == 'i')) {
// check startup and expiration via [=[register
- $r = q("SELECT * FROM register WHERE reg_vital = 1 AND reg_did2 = '%s' ", dbesc($did2) );
- if ( $r && count($r) == 1 ) {
+ $r = q("SELECT * FROM register WHERE reg_vital = 1 AND reg_did2 = '%s' ORDER BY reg_created DESC ",
+ dbesc($did2)
+ );
+ if ($r && count($r)) {
$r = $r[0];
// check timeframe
if ( $r['reg_startup'] <= $now && $r['reg_expires'] >= $now ) {
@@ -244,15 +245,14 @@ class Regate extends \Zotlabs\Web\Controller {
$title = t('Register Verification');
// do we have a valid dId2 ?
- if ( ($didx == 'a' && substr( $did2 , -2) == substr( base_convert( md5( substr( $did2, 1, -2) ),16 ,10), -2))
- || ($didx == 'e') ) {
+ if (($didx == 'a' && substr( $did2 , -2) == substr( base_convert( md5( substr( $did2, 1, -2) ),16 ,10), -2)) || ($didx == 'e')) {
- $r = q("SELECT * FROM register WHERE reg_vital = 1 AND reg_didx = '%s' AND reg_did2 = '%s'",
- dbesc($didx),
- dbesc($did2)
+ $r = q("SELECT * FROM register WHERE reg_vital = 1 AND reg_didx = '%s' AND reg_did2 = '%s' ORDER BY reg_created DESC",
+ dbesc($didx),
+ dbesc($did2)
);
- if ( $r && count($r) == 1 && $r[0]['reg_flags'] &= (ACCOUNT_UNVERIFIED | ACCOUNT_PENDING)) {
+ if ($r && count($r) && $r[0]['reg_flags'] &= (ACCOUNT_UNVERIFIED | ACCOUNT_PENDING)) {
$r = $r[0];
// provide a button in case