* @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/
*/
public $disallowLogin = false;
- function onAutoload($cls)
- {
- $dir = dirname(__FILE__);
-
- switch ($cls)
- {
- case 'ConfirmfirstemailAction':
- include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
- return false;
- default:
- return true;
- }
- }
-
- function onRouterInitialized($m)
+ public function onRouterInitialized(URLMapper $m)
{
$m->connect('main/confirmfirst/:code',
array('action' => 'confirmfirstemail'));
*
* @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)) {
- // 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);
- }
+ $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;
}
*
* @return bool hook result code
*/
- function onStartRegisterUser(&$user, &$profile)
+ function onStartRegisterUser(User &$user, Profile &$profile)
{
$email = $user->email;
*
* @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.
*
* @return bool true if user is grandfathered
*/
- protected function grandfathered($user)
+ protected function grandfathered(User $user)
{
if ($this->grandfatherCutoff) {
$created = strtotime($user->created . " GMT");
*
* @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) {
*
* @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',
}
/**
- * 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;
{
if ($right == Right::CREATEGROUP ||
($this->disallowLogin && ($right == Right::WEBLOGIN || $right == Right::API))) {
- $user = User::staticGet('id', $profile->id);
+ $user = User::getKV('id', $profile->id);
if ($user && !$this->validated($user)) {
$result = false;
return false;