diff options
| author | Mario <mario@mariovavti.com> | 2021-03-22 09:29:23 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-22 09:29:23 +0000 |
| commit | 02d4c5ac90b20a2019e3401be233b9d92d41d4e7 (patch) | |
| tree | 76a464e4f055d95b8760b2d8e9e3d4c5cb1fbcc9 /Zotlabs/Module/Regate.php | |
| parent | a18e297a2650e75ba35d0a81dac4c7222e076f40 (diff) | |
| parent | 13355d42f71e72c67e6cd993ee13f427a69c0eee (diff) | |
| download | volse-hubzilla-02d4c5ac90b20a2019e3401be233b9d92d41d4e7.tar.gz volse-hubzilla-02d4c5ac90b20a2019e3401be233b9d92d41d4e7.tar.bz2 volse-hubzilla-02d4c5ac90b20a2019e3401be233b9d92d41d4e7.zip | |
Merge branch 'air' of https://framagit.org/hubzilla/core into air
Diffstat (limited to 'Zotlabs/Module/Regate.php')
| -rw-r--r-- | Zotlabs/Module/Regate.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php index 077e5fd54..0d430d68c 100644 --- a/Zotlabs/Module/Regate.php +++ b/Zotlabs/Module/Regate.php @@ -61,14 +61,13 @@ 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 == '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 = $r[0]; // check timeframe if ( $r['reg_startup'] <= $now && $r['reg_expires'] >= $now ) { - if ( isset($_POST['resend']) && $didx == 'e' ) { $re = q("SELECT * FROM register WHERE reg_vital = 1 AND reg_didx = 'e' AND reg_did2 = '%s' ", dbesc($r['reg_did2']) ); if ( $re && count($re) == 1 ) { @@ -91,6 +90,8 @@ class Regate extends \Zotlabs\Web\Controller { $acpin = (preg_match('/^[0-9]{6,6}$/', $_POST['acpin']) ? $_POST['acpin'] : false); elseif ( $didx == 'e' ) $acpin = (preg_match('/^[0-9a-f]{24,24}$/', $_POST['acpin']) ? $_POST['acpin'] : false); + elseif ( $didx == 'i' ) + $acpin = $r['reg_hash']; else $acpin = false; if ( $acpin && ($r['reg_hash'] == $acpin )) { |