X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FRequireValidatedEmail%2FRequireValidatedEmailPlugin.php;h=734cabbcd5182169b5eee61086637bb55e9e0f79;hb=ab93bb009c8533c8847aafe76ba9774d9d74e7ca;hp=980b7beb6e3f9fd362c36da0f97c912eb724d05b;hpb=47f31bce47b182aa55c02c7872d7e473d3ab10f2;p=quix0rs-gnu-social.git diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index 980b7beb6e..734cabbcd5 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -24,6 +24,8 @@ * @package StatusNet * @author Craig Andrews * @author Brion Vibber + * @author Evan Prodromou + * @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/ @@ -43,19 +45,18 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @author Craig Andrews * @author Brion Vibber * @author Evan Prodromou - * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org + * @author Mikael Nordfeldth + * @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; /** @@ -72,9 +73,20 @@ class RequireValidatedEmailPlugin extends Plugin * ), * )); */ - public $trustedOpenIDs = array(); + /** + * Whether or not to disallow login for unvalidated users. + */ + public $disallowLogin = false; + + public function onRouterInitialized(URLMapper $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. @@ -83,15 +95,18 @@ class RequireValidatedEmailPlugin extends Plugin * * @return bool hook result code */ - - function onStartNoticeSave($notice) + public function onStartNoticeSave(Notice $notice) { - $user = User::staticGet('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."); - throw new ClientException($msg); - } + $author = $notice->getProfile(); + if (!$author->isLocal()) { + // remote notice + return true; + } + $user = $author->getUser(); + if (!$this->validated($user)) { + // 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 true; } @@ -104,17 +119,15 @@ class RequireValidatedEmailPlugin extends Plugin * * @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; } @@ -126,7 +139,7 @@ class RequireValidatedEmailPlugin extends Plugin * * @return bool */ - protected function validated($user) + protected function validated(User $user) { // The email field is only stored after validation... // Until then you'll find them in confirm_address. @@ -137,8 +150,7 @@ class RequireValidatedEmailPlugin extends Plugin // 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)); @@ -153,7 +165,7 @@ class RequireValidatedEmailPlugin extends Plugin * * @return bool true if user is grandfathered */ - protected function grandfathered($user) + protected function grandfathered(User $user) { if ($this->grandfatherCutoff) { $created = strtotime($user->created . " GMT"); @@ -174,8 +186,7 @@ class RequireValidatedEmailPlugin extends Plugin * * @return bool true if user has a trusted OpenID. */ - - function hasTrustedOpenID($user) + function hasTrustedOpenID(User $user) { if ($this->trustedOpenIDs && class_exists('User_openid')) { foreach ($this->trustedOpenIDs as $regex) { @@ -201,36 +212,38 @@ class RequireValidatedEmailPlugin extends Plugin * * @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; @@ -246,8 +259,9 @@ class RequireValidatedEmailPlugin extends Plugin */ 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; @@ -255,4 +269,13 @@ class RequireValidatedEmailPlugin extends Plugin } return true; } + + function onLoginAction($action, &$login) + { + if ($action == 'confirmfirstemail') { + $login = true; + return false; + } + return true; + } }