forked from GNUsocial/gnu-social
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
commit
9b75e162c7
@ -14,8 +14,6 @@ registered prior to that timestamp.
|
||||
|
||||
|
||||
Todo:
|
||||
* make email field required on registration form
|
||||
* add a more visible indicator that validation is still outstanding
|
||||
* localization for UI strings
|
||||
* test with XMPP, API posting
|
||||
|
||||
|
@ -54,12 +54,33 @@ class RequireValidatedEmailPlugin extends Plugin
|
||||
$user = User::staticGet('id', $notice->profile_id);
|
||||
if (!empty($user)) { // it's a remote notice
|
||||
if (!$this->validated($user)) {
|
||||
throw new ClientException(_("You must validate your email address before posting."));
|
||||
throw new ClientException(_m("You must validate your email address before posting."));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Event handler for registration attempts; rejects the registration
|
||||
* if email field is missing.
|
||||
*
|
||||
* @param RegisterAction $action
|
||||
* @return bool hook result code
|
||||
*/
|
||||
function onStartRegistrationTry($action)
|
||||
{
|
||||
$email = $action->trimmed('email');
|
||||
|
||||
if (empty($email)) {
|
||||
$action->showForm(_m('You must provide an email address to register.'));
|
||||
return false;
|
||||
}
|
||||
|
||||
// Default form will run address format validation and reject if bad.
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a user has a validated email address or has been
|
||||
* otherwise grandfathered in.
|
||||
|
@ -0,0 +1,31 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-03-10 10:05-0800\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=CHARSET\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: RequireValidatedEmailPlugin.php:57
|
||||
msgid "You must validate your email address before posting."
|
||||
msgstr ""
|
||||
|
||||
#: RequireValidatedEmailPlugin.php:75
|
||||
msgid "You must provide an email address to register."
|
||||
msgstr ""
|
||||
|
||||
#: RequireValidatedEmailPlugin.php:128
|
||||
msgid ""
|
||||
"The Require Validated Email plugin disables posting for accounts that do not "
|
||||
"have a validated email address."
|
||||
msgstr ""
|
Loading…
Reference in New Issue
Block a user