'SpecialBlockme' => 'includes/specials/SpecialBlockme.php',
'SpecialBookSources' => 'includes/specials/SpecialBooksources.php',
'SpecialCategories' => 'includes/specials/SpecialCategories.php',
+ 'SpecialChangeEmail' => 'includes/specials/SpecialChangeEmail.php',
'SpecialChangePassword' => 'includes/specials/SpecialChangePassword.php',
'SpecialComparePages' => 'includes/specials/SpecialComparePages.php',
'SpecialContributions' => 'includes/specials/SpecialContributions.php',
$helpMessages[] = 'prefs-help-email-others';
}
+ $link = $wgUser->getSkin()->link(
+ SpecialPage::getTitleFor( 'ChangeEmail' ),
+ wfMsgHtml( $user->getEmail() ? 'prefs-changeemail' : 'prefs-setemail' ),
+ array(),
+ array( 'returnto' => SpecialPage::getTitleFor( 'Preferences' ) ) );
+
$defaultPreferences['emailaddress'] = array(
- 'type' => $wgAuth->allowPropChange( 'emailaddress' ) ? 'email' : 'info',
- 'default' => $user->getEmail(),
- 'section' => 'personal/email',
+ 'type' => 'info',
+ 'raw' => true,
+ 'default' => $user->getEmail()
+ ? htmlspecialchars( $user->getEmail() ) . " ($link)"
+ : $link,
'label-message' => 'youremail',
- 'help-messages' => $helpMessages,
- 'validation-callback' => array( 'Preferences', 'validateEmail' ),
+ 'section' => 'personal/email',
);
global $wgEmailAuthentication;
* @return bool|Status|string
*/
static function tryFormSubmit( $formData, $entryPoint = 'internal' ) {
- global $wgUser, $wgEmailAuthentication, $wgEnableEmail;
+ global $wgUser;
$result = true;
'emailaddress',
);
- if ( $wgEnableEmail ) {
- $newaddr = $formData['emailaddress'];
- $oldaddr = $wgUser->getEmail();
- if ( ( $newaddr != '' ) && ( $newaddr != $oldaddr ) ) {
- # the user has supplied a new email address on the login page
- # new behaviour: set this new emailaddr from login-page into user database record
- $wgUser->setEmail( $newaddr );
- # but flag as "dirty" = unauthenticated
- $wgUser->invalidateEmail();
- if ( $wgEmailAuthentication ) {
- # Mail a temporary password to the dirty address.
- # User can come back through the confirmation URL to re-enable email.
- $type = $oldaddr != '' ? 'changed' : 'set';
- $result = $wgUser->sendConfirmationMail( $type );
- if ( !$result->isGood() ) {
- return htmlspecialchars( $result->getWikiText( 'mailerror' ) );
- } elseif ( $entryPoint == 'ui' ) {
- $result = 'eauth';
- }
- }
- } else {
- $wgUser->setEmail( $newaddr );
- }
- if ( $oldaddr != $newaddr ) {
- wfRunHooks( 'PrefsEmailAudit', array( $wgUser, $oldaddr, $newaddr ) );
- }
- }
-
// Fortunately, the realname field is MUCH simpler
global $wgHiddenPrefs;
if ( !in_array( 'realname', $wgHiddenPrefs ) ) {
return Status::newGood();
}
+ /*
+ * Try to set a user's email address.
+ * This does *not* try to validate the address.
+ * @param $user User
+ * @param $newaddr string New email address
+ * @return Array (true on success or Status on failure, info string)
+ */
+ public static function trySetUserEmail( User $user, $newaddr ) {
+ global $wgEnableEmail, $wgEmailAuthentication;
+ $info = ''; // none
+
+ if ( $wgEnableEmail ) {
+ $oldaddr = $user->getEmail();
+ if ( ( $newaddr != '' ) && ( $newaddr != $oldaddr ) ) {
+ # The user has supplied a new email address on the login page
+ # new behaviour: set this new emailaddr from login-page into user database record
+ $user->setEmail( $newaddr );
+ # But flag as "dirty" = unauthenticated
+ $user->invalidateEmail();
+ if ( $wgEmailAuthentication ) {
+ # Mail a temporary password to the dirty address.
+ # User can come back through the confirmation URL to re-enable email.
+ $type = $oldaddr != '' ? 'changed' : 'set';
+ $result = $user->sendConfirmationMail( $type );
+ if ( !$result->isGood() ) {
+ return array( $result, 'mailerror' );
+ }
+ $info = 'eauth';
+ }
+ } else {
+ $user->setEmail( $newaddr );
+ }
+ if ( $oldaddr != $newaddr ) {
+ wfRunHooks( 'PrefsEmailAudit', array( $user, $oldaddr, $newaddr ) );
+ }
+ }
+
+ return array( true, $info );
+ }
+
/**
* @param $user User
* @return array
static function getList() {
global $wgSpecialPages;
global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication;
+ global $wgEnableEmail;
if ( !is_object( self::$mList ) ) {
wfProfileIn( __METHOD__ );
self::$mList['Invalidateemail'] = 'EmailInvalidation';
}
+ if ( $wgEnableEmail ) {
+ self::$mList['ChangeEmail'] = 'SpecialChangeEmail';
+ }
+
// Add extension special pages
self::$mList = array_merge( self::$mList, $wgSpecialPages );
static function getLocalNameFor( $name, $subpage = false ) {
global $wgContLang;
$aliases = $wgContLang->getSpecialPageAliases();
-
+
if ( isset( $aliases[$name][0] ) ) {
$name = $aliases[$name][0];
} else {
--- /dev/null
+<?php
+/**
+ * Implements Special:ChangeEmail
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ */
+
+/**
+ * Let users change their email address.
+ *
+ * @ingroup SpecialPage
+ */
+class SpecialChangeEmail extends SpecialPage {
+ public function __construct() {
+ parent::__construct( 'ChangeEmail' );
+ }
+
+ /**
+ * Main execution point
+ */
+ function execute( $par ) {
+ global $wgRequest;
+
+ $out = $this->getOutput();
+ if ( wfReadOnly() ) {
+ $out->readOnlyPage();
+ return;
+ }
+
+ $user = $this->getUser();
+
+ $this->mPassword = $wgRequest->getVal( 'wpPassword' );
+ $this->mNewEmail = $wgRequest->getVal( 'wpNewEmail' );
+
+ $this->setHeaders();
+ $this->outputHeader();
+ $out->disallowUserJs();
+
+ if ( !$wgRequest->wasPosted() && !$user->isLoggedIn() ) {
+ $this->error( wfMsg( 'changeemail-no-info' ) );
+ return;
+ }
+
+ if ( $wgRequest->wasPosted() && $wgRequest->getBool( 'wpCancel' ) ) {
+ $this->doReturnTo();
+ return;
+ }
+
+ if ( $wgRequest->wasPosted()
+ && $user->matchEditToken( $wgRequest->getVal( 'token' ) ) )
+ {
+ $info = $this->attemptChange( $user, $this->mPassword, $this->mNewEmail );
+ if ( $info === true ) {
+ $this->doReturnTo();
+ } elseif ( $info === 'eauth' ) {
+ # Notify user that a confirmation email has been sent...
+ $out->wrapWikiMsg( "<div class='error' style='clear: both;'>\n$1\n</div>",
+ 'eauthentsent', $user->getName() );
+ $this->doReturnTo( 'soft' ); // just show the link to go back
+ return; // skip form
+ }
+ }
+
+ $this->showForm();
+ }
+
+ protected function doReturnTo( $type = 'hard' ) {
+ global $wgRequest;
+ $titleObj = Title::newFromText( $wgRequest->getVal( 'returnto' ) );
+ if ( !$titleObj instanceof Title ) {
+ $titleObj = Title::newMainPage();
+ }
+ if ( $type == 'hard' ) {
+ $this->getOutput()->redirect( $titleObj->getFullURL() );
+ } else {
+ $this->getOutput()->addReturnTo( $titleObj );
+ }
+ }
+
+ protected function error( $msg ) {
+ $this->getOutput()->addHTML( Xml::element('p', array( 'class' => 'error' ), $msg ) );
+ }
+
+ protected function showForm() {
+ global $wgRequest;
+
+ $user = $this->getUser();
+
+ $oldEmailText = $user->getEmail()
+ ? $user->getEmail()
+ : wfMsg( 'changeemail-none' );
+
+ $this->getOutput()->addHTML(
+ Xml::fieldset( wfMsg( 'changeemail-header' ) ) .
+ Xml::openElement( 'form',
+ array(
+ 'method' => 'post',
+ 'action' => $this->getTitle()->getLocalUrl(),
+ 'id' => 'mw-changeemail-form' ) ) . "\n" .
+ Html::hidden( 'token', $user->editToken() ) . "\n" .
+ Html::hidden( 'returnto', $wgRequest->getVal( 'returnto' ) ) . "\n" .
+ wfMsgExt( 'changeemail-text', array( 'parse' ) ) . "\n" .
+ Xml::openElement( 'table', array( 'id' => 'mw-changeemail-table' ) ) . "\n" .
+ $this->pretty( array(
+ array( 'wpName', 'username', 'text', $user->getName() ),
+ array( 'wpOldEmail', 'changeemail-oldemail', 'text', $oldEmailText ),
+ array( 'wpNewEmail', 'changeemail-newemail', 'input', $this->mNewEmail ),
+ array( 'wpPassword', 'yourpassword', 'password', $this->mPassword ),
+ ) ) . "\n" .
+ "<tr>\n" .
+ "<td></td>\n" .
+ '<td class="mw-input">' .
+ Xml::submitButton( wfMsg( 'changeemail-submit' ) ) .
+ Xml::submitButton( wfMsg( 'changeemail-cancel' ), array( 'name' => 'wpCancel' ) ) .
+ "</td>\n" .
+ "</tr>\n" .
+ Xml::closeElement( 'table' ) .
+ Xml::closeElement( 'form' ) .
+ Xml::closeElement( 'fieldset' ) . "\n"
+ );
+ }
+
+ protected function pretty( $fields ) {
+ $out = '';
+ foreach ( $fields as $list ) {
+ list( $name, $label, $type, $value ) = $list;
+ if( $type == 'text' ) {
+ $field = htmlspecialchars( $value );
+ } else {
+ $attribs = array( 'id' => $name );
+ if ( $name == 'wpPassword' ) {
+ $attribs[] = 'autofocus';
+ }
+ $field = Html::input( $name, $value, $type, $attribs );
+ }
+ $out .= "<tr>\n";
+ $out .= "\t<td class='mw-label'>";
+ if ( $type != 'text' ) {
+ $out .= Xml::label( wfMsg( $label ), $name );
+ } else {
+ $out .= wfMsgHtml( $label );
+ }
+ $out .= "</td>\n";
+ $out .= "\t<td class='mw-input'>";
+ $out .= $field;
+ $out .= "</td>\n";
+ $out .= "</tr>";
+ }
+ return $out;
+ }
+
+ /**
+ * @return bool|string true or string on success, false on failure
+ */
+ protected function attemptChange( User $user, $pass, $newaddr ) {
+ if ( $newaddr != '' && !Sanitizer::validateEmail( $newaddr ) ) {
+ $this->error( wfMsgExt( 'invalidemailaddress', 'parseinline' ) );
+ return false;
+ }
+
+ $throttleCount = LoginForm::incLoginThrottle( $user->getName() );
+ if ( $throttleCount === true ) {
+ $this->error( wfMsgHtml( 'login-throttled' ) );
+ return false;
+ }
+
+ if ( !$user->checkPassword( $pass ) ) {
+ $this->error( wfMsgHtml( 'wrongpassword' ) );
+ return false;
+ }
+
+ if ( $throttleCount ) {
+ LoginForm::clearLoginThrottle( $user->getName() );
+ }
+
+ list( $status, $info ) = Preferences::trySetUserEmail( $user, $newaddr );
+ if ( $status !== true ) {
+ if ( $status instanceof Status ) {
+ $this->getOutput()->addHTML(
+ '<p class="error">' .
+ $this->getOutput()->parseInline( $status->getWikiText( $info ) ) .
+ '</p>' );
+ }
+ return false;
+ }
+
+ $user->saveSettings();
+ return $info ? $info : true;
+ }
+}
);
}
- if ( $wgRequest->getCheck( 'eauth' ) ) {
- $wgOut->wrapWikiMsg( "<div class='error' style='clear: both;'>\n$1\n</div>",
- 'eauthentsent', $wgUser->getName() );
- }
-
$htmlForm = Preferences::getFormObject( $wgUser );
$htmlForm->setSubmitCallback( array( 'Preferences', 'tryUISubmit' ) );
'Booksources' => array( 'BookSources' ),
'BrokenRedirects' => array( 'BrokenRedirects' ),
'Categories' => array( 'Categories' ),
+ 'ChangeEmail' => array( 'ChangeEmail' ),
'ChangePassword' => array( 'ChangePassword', 'ResetPass', 'ResetPassword' ),
'ComparePages' => array( 'ComparePages' ),
'Confirmemail' => array( 'ConfirmEmail' ),
Temporary password: $2',
'passwordreset-emailsent' => 'A reminder e-mail has been sent.',
+# Special:ChangeEmail
+'changeemail' => 'Change E-mail address',
+'changeemail-header' => 'Change account e-mail address',
+'changeemail-text' => 'Complete this form to change your e-mail address. You will need to enter your password to confirm this change.',
+'changeemail-no-info' => 'You must be logged in to access this page directly.',
+'changeemail-oldemail' => 'Current E-mail address:',
+'changeemail-newemail' => 'New E-mail address:',
+'changeemail-none' => '(none)',
+'changeemail-submit' => 'Change E-mail',
+'changeemail-cancel' => 'Cancel',
+
# Edit page toolbar
'bold_sample' => 'Bold text',
'bold_tip' => 'Bold text',
'prefs-watchlist-token' => 'Watchlist token:',
'prefs-misc' => 'Misc',
'prefs-resetpass' => 'Change password',
+'prefs-changeemail' => 'Change E-mail',
+'prefs-setemail' => 'Set an E-mail address',
'prefs-email' => 'E-mail options',
'prefs-rendering' => 'Appearance',
'saveprefs' => 'Save',
'passwordreset-emailelement',
'passwordreset-emailsent',
),
+ 'changeemail' => array(
+ 'changeemail',
+ 'changeemail-header',
+ 'changeemail-text',
+ 'changeemail-no-info',
+ 'changeemail-oldemail',
+ 'changeemail-newemail',
+ 'changeemail-submit',
+ 'changeemail-cancel',
+ ),
'toolbar' => array(
'bold_sample',
'bold_tip',
'prefs-watchlist-token',
'prefs-misc', // continue checking if used from here on (r49916)
'prefs-resetpass',
+ 'prefs-changeemail',
+ 'prefs-setemail',
'prefs-email',
'prefs-rendering',
'saveprefs',
'mail' => 'E-mail sending',
'passwordstrength' => 'JavaScript password checks',
'resetpass' => 'Change password dialog',
+ 'changeemail' => 'Change E-mail dialog',
'passwordreset' => 'Special:PasswordReset',
'toolbar' => 'Edit page toolbar',
'edit' => 'Edit pages',
dépôts / lhc / web / wiklou.git / commitdiff