GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Move mail_confirm_address out of mail.php

Browse Source
This commit is contained in:
Mikael Nordfeldth
2016-03-06 17:27:40 +01:00
parent 47ae21c08e
commit 6ec72b2978
7 changed files with 94 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/EmailRegistration/EmailRegistrationPlugin.php
View File

@@ -106,9 +106,9 @@ class EmailRegistrationPlugin extends Plugin
throw new ClientException(_m('Not a valid email address.'));
}
$confirm = Confirm_address::getAddress($email, self::CONFIRMTYPE);
if (empty($confirm)) {
try {
$confirm = Confirm_address::getByAddress($email, self::CONFIRMTYPE);
} catch (NoResultException $e) {
$confirm = Confirm_address::saveNew(null, $email, 'register');
}

8
plugins/EmailRegistration/scripts/cancelemailregistration.php
View File

@@ -41,15 +41,15 @@ if (count($args) == 0) {
$email = $args[0];
$confirm = Confirm_address::getAddress($email, EmailRegistrationPlugin::CONFIRMTYPE);
try {
$confirm = Confirm_address::getByAddress($email, EmailRegistrationPlugin::CONFIRMTYPE);
if (!empty($confirm)) {
if (have_option('d', 'dryrun')) {
print "[Dry run mode] Deleted confirmation code {$confirm->code} for {$confirm->address}.\n";
} else {
$confirm->delete();
print "Deleted confirmation code {$confirm->code} for {$confirm->address}.\n";
}
} else {
print "Couldn't find an email registration code for {$email}.\n";
} catch (NoResultException $e) {
print "Exception thrown for {$email}: {$e->getMessage()}";
}