* @package StatusNet
* @author Craig Andrews <candrews@integralblue.com>
* @author Brion Vibber <brion@status.net>
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet Inc. http://status.net/
* @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
* @author Craig Andrews <candrews@integralblue.com>
* @author Brion Vibber <brion@status.net>
* @author Evan Prodromou <evan@status.net>
- * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @author Mikael Nordfeldth <mmn@hethane.se>
+ * @copyright 2009-2013 Free Software Foundation, Inc http://www.fsf.org
* @copyright 2009-2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class RequireValidatedEmailPlugin extends Plugin
{
/**
* Users created before this time will be grandfathered in
* without the validation requirement.
*/
-
public $grandfatherCutoff = null;
/**
* ),
* ));
*/
-
public $trustedOpenIDs = array();
+ /**
+ * Whether or not to disallow login for unvalidated users.
+ */
+ public $disallowLogin = false;
+
+ function onRouterInitialized($m)
+ {
+ $m->connect('main/confirmfirst/:code',
+ array('action' => 'confirmfirstemail'));
+ return true;
+ }
+
/**
* Event handler for notice saves; rejects the notice
* if user's address isn't validated.
*
* @return bool hook result code
*/
-
function onStartNoticeSave($notice)
{
- $user = User::staticGet('id', $notice->profile_id);
+ $user = User::getKV('id', $notice->profile_id);
if (!empty($user)) { // it's a remote notice
if (!$this->validated($user)) {
- $msg = _m("You must validate your email address before posting.");
+ // TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
+ $msg = _m('You must validate your email address before posting.');
throw new ClientException($msg);
}
}
*
* @return bool hook result code
*/
- function onStartRegistrationTry($action)
+ function onStartRegisterUser(&$user, &$profile)
{
- $email = $action->trimmed('email');
+ $email = $user->email;
if (empty($email)) {
- $action->showForm(_m('You must provide an email address to register.'));
- return false;
+ // TRANS: Client exception thrown when trying to register without providing an e-mail address.
+ throw new ClientException(_m('You must provide an email address to register.'));
}
- // Default form will run address format validation and reject if bad.
-
return true;
}
// Give other plugins a chance to override, if they can validate
// that somebody's ok despite a non-validated email.
- // FIXME: This isn't how to do it! Use Start*/End* instead
-
+ // @todo FIXME: This isn't how to do it! Use Start*/End* instead
Event::handle('RequireValidatedEmailPlugin_Override',
array($user, &$knownGood));
*
* @return bool true if user has a trusted OpenID.
*/
-
function hasTrustedOpenID($user)
{
if ($this->trustedOpenIDs && class_exists('User_openid')) {
*
* @return boolean hook value
*/
-
- function onPluginVersion(&$versions)
+ function onPluginVersion(array &$versions)
{
$versions[] =
array('name' => 'Require Validated Email',
- 'version' => STATUSNET_VERSION,
+ 'version' => GNUSOCIAL_VERSION,
'author' => 'Craig Andrews, '.
'Evan Prodromou, '.
'Brion Vibber',
'homepage' =>
'http://status.net/wiki/Plugin:RequireValidatedEmail',
'rawdescription' =>
+ // TRANS: Plugin description.
_m('Disables posting without a validated email address.'));
+
return true;
}
/**
- * Hide the notice form if the user isn't able to post.
+ * Show an error message about validating user email before posting
*
+ * @param string $tag Current tab tag value
* @param Action $action action being shown
+ * @param Form $form object producing the form
*
* @return boolean hook value
*/
-
- function onStartShowNoticeForm($action)
+ function onStartMakeEntryForm($tag, $action, &$form)
{
$user = common_current_user();
- if (!empty($user)) { // it's a remote notice
+ if (!empty($user)) {
if (!$this->validated($user)) {
- return false;
+ $action->element('div', array('class'=>'error'), _m('You must validate an email address before posting!'));
}
}
return true;
*/
function onUserRightsCheck(Profile $profile, $right, &$result)
{
- if ($right == Right::CREATEGROUP) {
- $user = User::staticGet('id', $profile->id);
+ if ($right == Right::CREATEGROUP ||
+ ($this->disallowLogin && ($right == Right::WEBLOGIN || $right == Right::API))) {
+ $user = User::getKV('id', $profile->id);
if ($user && !$this->validated($user)) {
$result = false;
return false;
}
return true;
}
+
+ function onLoginAction($action, &$login)
+ {
+ if ($action == 'confirmfirstemail') {
+ $login = true;
+ return false;
+ }
+ return true;
+ }
}