diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-27 22:25:46 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-27 22:25:46 +0100 |
| commit | 843d6311112c9174a1731c42a9d257f3f3a0bd0a (patch) | |
| tree | ebb275fd10c7010a86667e083b2389a9b4407745 /include/account.php | |
| parent | 2e4e56f7cc696b2c52014f0050294826caa74d7d (diff) | |
| parent | bd0f63980ba0d0e606f2dd7a65313f7e150d330a (diff) | |
| download | volse-hubzilla-843d6311112c9174a1731c42a9d257f3f3a0bd0a.tar.gz volse-hubzilla-843d6311112c9174a1731c42a9d257f3f3a0bd0a.tar.bz2 volse-hubzilla-843d6311112c9174a1731c42a9d257f3f3a0bd0a.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/account.php')
| -rw-r--r-- | include/account.php | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/include/account.php b/include/account.php index 6c6fdece4..3ac485974 100644 --- a/include/account.php +++ b/include/account.php @@ -262,24 +262,46 @@ function create_account($arr) { function verify_email_address($arr) { - $hash = random_string(); - - $r = q("INSERT INTO register ( hash, created, uid, password, lang ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ", - dbesc($hash), - dbesc(datetime_convert()), - intval($arr['account']['account_id']), - dbesc('verify'), - dbesc($arr['account']['account_language']) - ); + if(array_key_exists('resend',$arr)) { + $email = $arr['email']; + $a = q("select * from account where account_email = '%s' limit 1", + dbesc($arr['email']) + ); + if(! ($a && ($a[0]['account_flags'] & ACCOUNT_UNVERIFIED))) { + return false; + } + $account = $a[0]; + $v = q("select * from register where uid = %d and password = 'verify' limit 1", + intval($account['account_id']) + ); + if($v) { + $hash = $v[0]['hash']; + } + else { + return false; + } + } + else { + $hash = random_string(24); + + $r = q("INSERT INTO register ( hash, created, uid, password, lang ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ", + dbesc($hash), + dbesc(datetime_convert()), + intval($arr['account']['account_id']), + dbesc('verify'), + dbesc($arr['account']['account_language']) + ); + $account = $arr['account']; + } - push_lang(($arr['account']['account_language']) ? $arr['account']['account_language'] : 'en'); + push_lang(($account['account_language']) ? $account['account_language'] : 'en'); $email_msg = replace_macros(get_intltext_template('register_verify_member.tpl'), [ '$sitename' => get_config('system','sitename'), '$siteurl' => z_root(), '$email' => $arr['email'], - '$uid' => $arr['account']['account_id'], + '$uid' => $account['account_id'], '$hash' => $hash, '$details' => $details ] |