* (bug 20489) $wgIllegalFileChars added to override the default list of illegal characters in file names.
* (bug 19646) $wgImgAuthDetails added to display reason access to uploaded file was denied to users(img_auth only)
* (bug 19646) $wgImgAuthPublicTest added to test to see if img_auth set up correctly (img_auth only)
-* UserLoginForm and UserCreateForm hooks, and AuthPlugin::modifyUITemplate, now receive a
- SpecialPage subclass instead of a QuickTemplate subclass. Hence there is no
- $template->set(), etc. The hook has access to most of the stuff that will go into the
- Login/Create form; see the documentation on HTMLForm for syntax for extra fields.
-* LoginForm class is deprecated, its state constants are now in the Login class.
=== New features in 1.16 ===
'AbortLogin': Return false to cancel account login.
$user: the User object being authenticated against
$password: the password being submitted, not yet checked for validity
-&$retval: a Login class constant to return from authenticateUserData();
- default is Login::ABORTED. Note that the client may be using
+&$retval: a LoginForm class constant to return from authenticateUserData();
+ default is LoginForm::ABORTED. Note that the client may be using
a machine API rather than the HTML user interface.
'AbortMove': allows to abort moving an article (title)
succeeded or failed. No return data is accepted; this hook is for auditing only.
$user: the User object being authenticated against
$password: the password being submitted and found wanting
-$retval: a Login class constant with authenticateUserData() return
+$retval: a LoginForm class constant with authenticateUserData() return
value (SUCCESS, WRONG_PASS, etc)
'LogLine': Processes a single log entry on Special:Log
determine if the password was valid
'UserCreateForm': change to manipulate the login form
-$sp: SpecialCreateAccount instance
+$template: SimpleTemplate instance for the form
'UserCryptPassword': called when hashing a password, return false to implement
your own hashing method
$inject_html: Any HTML to inject after the "logged in" message.
'UserLoginForm': change to manipulate the login form
-$sp: SpecialUserLogin instance
+$template: SimpleTemplate instance for the form
'UserLoginMailPassword': Block users from emailing passwords
$name: the username to email the password of.
/**
* Modify options in the login template.
*
- * @param $sp SpecialUserlogin or SpecialCreateAccount object.
- * @param $type String 'signup' or 'login'. Redundant because
- * you can just use instanceof to tell the two cases apart.
+ * @param $template UserLoginTemplate object.
+ * @param $type String 'signup' or 'login'.
*/
- public function modifyUITemplate( &$sp, $type=null ) {
+ public function modifyUITemplate( &$template, &$type ) {
# Override this!
- $sp->mDomains = false;
+ $template->set( 'usedomain', false );
}
/**
'LinksUpdate' => 'includes/LinksUpdate.php',
'LocalisationCache' => 'includes/LocalisationCache.php',
'LocalisationCache_BulkLoad' => 'includes/LocalisationCache.php',
- 'LoginForm' => 'includes/Login.php', # For B/C
- 'Login' => 'includes/Login.php',
'LogPage' => 'includes/LogPage.php',
'LogPager' => 'includes/LogEventsList.php',
'LogEventsList' => 'includes/LogEventsList.php',
'AncientPagesPage' => 'includes/specials/SpecialAncientpages.php',
'BrokenRedirectsPage' => 'includes/specials/SpecialBrokenRedirects.php',
'ContribsPager' => 'includes/specials/SpecialContributions.php',
- 'SpecialCreateAccount' => 'includes/specials/SpecialCreateAccount.php',
'DBLockForm' => 'includes/specials/SpecialLockdb.php',
'DBUnlockForm' => 'includes/specials/SpecialUnlockdb.php',
'DeadendPagesPage' => 'includes/specials/SpecialDeadendpages.php',
'ImportStringSource' => 'includes/Import.php',
'LinkSearchPage' => 'includes/specials/SpecialLinkSearch.php',
'ListredirectsPage' => 'includes/specials/SpecialListredirects.php',
+ 'LoginForm' => 'includes/specials/SpecialUserlogin.php',
'LonelyPagesPage' => 'includes/specials/SpecialLonelypages.php',
'LongPagesPage' => 'includes/specials/SpecialLongpages.php',
'MIMEsearchPage' => 'includes/specials/SpecialMIMEsearch.php',
'UnwatchedpagesPage' => 'includes/specials/SpecialUnwatchedpages.php',
'UploadForm' => 'includes/specials/SpecialUpload.php',
'UploadFormMogile' => 'includes/specials/SpecialUploadMogile.php',
- 'SpecialUserLogin' => 'includes/specials/SpecialUserlogin.php',
'UserrightsPage' => 'includes/specials/SpecialUserrights.php',
'UsersPager' => 'includes/specials/SpecialListusers.php',
'WantedCategoriesPage' => 'includes/specials/SpecialWantedcategories.php',
+++ /dev/null
-<?php
-
-/**
- * Encapsulates the backend activities of logging a user into the wiki.
- */
-class Login {
-
- const SUCCESS = 0;
- const NO_NAME = 1;
- const ILLEGAL = 2;
- const WRONG_PLUGIN_PASS = 3;
- const NOT_EXISTS = 4;
- const WRONG_PASS = 5;
- const EMPTY_PASS = 6;
- const RESET_PASS = 7;
- const ABORTED = 8;
- const CREATE_BLOCKED = 9;
- const THROTTLED = 10;
-
- const MAIL_READ_ONLY = 11;
- const MAIL_PASSCHANGE_FORBIDDEN = 12;
- const MAIL_BLOCKED = 13;
- const MAIL_PING_THROTTLED = 14;
- const MAIL_PASS_THROTTLED = 15;
- const MAIL_EMPTY_EMAIL = 16;
- const MAIL_BAD_IP = 17;
- const MAIL_ERROR = 18;
-
- var $mName, $mPassword, $mPosted;
- var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage;
-
- private $mExtUser = null;
-
- public $mUser;
- public $mMailResult;
-
- /**
- * Constructor
- * @param WebRequest $request A WebRequest object passed by reference.
- * uses $wgRequest if not given.
- */
- public function __construct( &$request=null ) {
- global $wgRequest, $wgAuth, $wgHiddenPrefs, $wgEnableEmail, $wgRedirectOnLogin;
- if( !$request ) $request = &$wgRequest;
-
- $this->mName = $request->getText( 'wpName' );
- $this->mPassword = $request->getText( 'wpPassword' );
- $this->mDomain = $request->getText( 'wpDomain' );
- $this->mPosted = $request->wasPosted();
- $this->mRemember = $request->getCheck( 'wpRemember' );
-
- if( $wgEnableEmail ) {
- $this->mEmail = $request->getText( 'wpEmail' );
- } else {
- $this->mEmail = '';
- }
- if( !in_array( 'realname', $wgHiddenPrefs ) ) {
- $this->mRealName = $request->getText( 'wpRealName' );
- } else {
- $this->mRealName = '';
- }
-
- if( !$wgAuth->validDomain( $this->mDomain ) ) {
- $this->mDomain = 'invaliddomain';
- }
- $wgAuth->setDomain( $this->mDomain );
-
- # Attempt to generate the User
- $this->mUser = User::newFromName( $this->mName );
- }
-
- /**
- * Actually add a user to the database.
- * Give it a User object that has been initialised with a name.
- *
- * @param $u User object.
- * @param $autocreate boolean -- true if this is an autocreation via auth plugin
- * @return User object.
- */
- public function initUser( $autocreate ) {
- global $wgAuth;
-
- $this->mUser->addToDatabase();
-
- if ( $wgAuth->allowPasswordChange() ) {
- $this->mUser->setPassword( $this->mPassword );
- }
-
- $this->mUser->setEmail( $this->mEmail );
- $this->mUser->setRealName( $this->mRealName );
- $this->mUser->setToken();
-
- $wgAuth->initUser( $this->mUser, $autocreate );
-
- if( $this->mExtUser ) {
- $this->mExtUser->link( $this->mUser->getId() );
- $email = $this->mExtUser->getPref( 'emailaddress' );
- if( $email && !$this->mEmail ) {
- $this->mUser->setEmail( $email );
- }
- }
-
- $this->mUser->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
- $this->mUser->saveSettings();
-
- # Update user count
- $ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
- $ssUpdate->doUpdate();
-
- return $this->mUser;
- }
-
- public function attemptLogin(){
- global $wgUser;
- $code = $this->authenticateUserData();
- if( !$code == self::SUCCESS ){
- return $code;
- }
- if( (bool)$this->mRemember != (bool)$wgUser->getOption( 'rememberpassword' ) ) {
- $wgUser->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
- $wgUser->saveSettings();
- } else {
- $wgUser->invalidateCache();
- }
- $wgUser->setCookies();
-
- # Reset the throttle
- $key = wfMemcKey( 'password-throttle', wfGetIP(), md5( $this->mName ) );
- global $wgMemc;
- $wgMemc->delete( $key );
-
- $injected_html = '';
- wfRunHooks('UserLoginComplete', array(&$wgUser, &$injected_html));
-
- return self::SUCCESS;
- }
-
- /**
- * Internally authenticate the login request.
- *
- * This may create a local account as a side effect if the
- * authentication plugin allows transparent local account
- * creation.
- */
- public function authenticateUserData() {
- global $wgUser, $wgAuth;
- if ( '' == $this->mName ) {
- return self::NO_NAME;
- }
-
- global $wgPasswordAttemptThrottle;
-
- $throttleCount = 0;
- if ( is_array( $wgPasswordAttemptThrottle ) ) {
- $throttleKey = wfMemcKey( 'password-throttle', wfGetIP(), md5( $this->mName ) );
- $count = $wgPasswordAttemptThrottle['count'];
- $period = $wgPasswordAttemptThrottle['seconds'];
-
- global $wgMemc;
- $throttleCount = $wgMemc->get( $throttleKey );
- if ( !$throttleCount ) {
- $wgMemc->add( $throttleKey, 1, $period ); // start counter
- } else if ( $throttleCount < $count ) {
- $wgMemc->incr($throttleKey);
- } else if ( $throttleCount >= $count ) {
- return self::THROTTLED;
- }
- }
-
- # Load $wgUser now, and check to see if we're logging in as the same
- # name. This is necessary because loading $wgUser (say by calling
- # getName()) calls the UserLoadFromSession hook, which potentially
- # creates the user in the database. Until we load $wgUser, checking
- # for user existence using User::newFromName($name)->getId() below
- # will effectively be using stale data.
- if ( $wgUser->getName() === $this->mName ) {
- wfDebug( __METHOD__.": already logged in as {$this->mName}\n" );
- return self::SUCCESS;
- }
-
- $this->mExtUser = ExternalUser::newFromName( $this->mName );
-
- # TODO: Allow some magic here for invalid external names, e.g., let the
- # user choose a different wiki name.
- if( is_null( $this->mUser ) || !User::isUsableName( $this->mUser->getName() ) ) {
- return self::ILLEGAL;
- }
-
- $isAutoCreated = false;
- if ( 0 == $this->mUser->getID() ) {
- $status = $this->attemptAutoCreate( $this->mUser );
- if ( $status !== self::SUCCESS ) {
- return $status;
- } else {
- $isAutoCreated = true;
- }
- } else {
- $this->mUser->load();
- }
-
- # Give general extensions, such as a captcha, a chance to abort logins
- $abort = self::ABORTED;
- if( !wfRunHooks( 'AbortLogin', array( $this->mUser, $this->mPassword, &$abort ) ) ) {
- return $abort;
- }
-
- if( !$this->mUser->checkPassword( $this->mPassword ) ) {
- if( $this->mUser->checkTemporaryPassword( $this->mPassword ) ) {
- # The e-mailed temporary password should not be used for actual
- # logins; that's a very sloppy habit, and insecure if an
- # attacker has a few seconds to click "search" on someone's
- # open mail reader.
- #
- # Allow it to be used only to reset the password a single time
- # to a new value, which won't be in the user's e-mail archives
- #
- # For backwards compatibility, we'll still recognize it at the
- # login form to minimize surprises for people who have been
- # logging in with a temporary password for some time.
- #
- # As a side-effect, we can authenticate the user's e-mail ad-
- # dress if it's not already done, since the temporary password
- # was sent via e-mail.
- if( !$this->mUser->isEmailConfirmed() ) {
- $this->mUser->confirmEmail();
- $this->mUser->saveSettings();
- }
-
- # At this point we just return an appropriate code/ indicating
- # that the UI should show a password reset form; bot interfaces
- # etc will probably just fail cleanly here.
- $retval = self::RESET_PASS;
- } else {
- $retval = '' == $this->mPassword ? self::EMPTY_PASS : self::WRONG_PASS;
- }
- } else {
- $wgAuth->updateUser( $this->mUser );
- $wgUser = $this->mUser;
-
- # Reset throttle after a successful login
- if( $throttleCount ) {
- $wgMemc->delete( $throttleKey );
- }
-
- if( $isAutoCreated ) {
- # Must be run after $wgUser is set, for correct new user log
- wfRunHooks( 'AuthPluginAutoCreate', array( $wgUser ) );
- }
-
- $retval = self::SUCCESS;
- }
- wfRunHooks( 'LoginAuthenticateAudit', array( $this->mUser, $this->mPassword, $retval ) );
- return $retval;
- }
-
- /**
- * Attempt to automatically create a user on login. Only succeeds if there
- * is an external authentication method which allows it.
- * @return integer Status code
- */
- public function attemptAutoCreate( $user ) {
- global $wgAuth, $wgUser, $wgAutocreatePolicy;
-
- if( $wgUser->isBlockedFromCreateAccount() ) {
- wfDebug( __METHOD__.": user is blocked from account creation\n" );
- return self::CREATE_BLOCKED;
- }
-
- # If the external authentication plugin allows it, automatically cre-
- # ate a new account for users that are externally defined but have not
- # yet logged in.
- if( $this->mExtUser ) {
- # mExtUser is neither null nor false, so use the new ExternalAuth
- # system.
- if( $wgAutocreatePolicy == 'never' ) {
- return self::NOT_EXISTS;
- }
- if( !$this->mExtUser->authenticate( $this->mPassword ) ) {
- return self::WRONG_PLUGIN_PASS;
- }
- } else {
- # Old AuthPlugin.
- if( !$wgAuth->autoCreate() ) {
- return self::NOT_EXISTS;
- }
- if( !$wgAuth->userExists( $user->getName() ) ) {
- wfDebug( __METHOD__.": user does not exist\n" );
- return self::NOT_EXISTS;
- }
- if( !$wgAuth->authenticate( $user->getName(), $this->mPassword ) ) {
- wfDebug( __METHOD__.": \$wgAuth->authenticate() returned false, aborting\n" );
- return self::WRONG_PLUGIN_PASS;
- }
- }
-
- wfDebug( __METHOD__.": creating account\n" );
- $this->initUser( true );
- return self::SUCCESS;
- }
-
- /**
- * Email the user a new password, if appropriate to do so.
- * @param $text String message key
- * @param $title String message key
- * @return Status code
- */
- public function mailPassword( $text='passwordremindertext', $title='passwordremindertitle' ) {
- global $wgUser, $wgOut, $wgAuth, $wgServer, $wgScript, $wgNewPasswordExpiry;
-
- if( wfReadOnly() )
- return self::MAIL_READ_ONLY;
-
- if( !$wgAuth->allowPasswordChange() )
- return self::MAIL_PASSCHANGE_FORBIDDEN;
-
- # Check against blocked IPs
- # FIXME: -- should we not?
- if( $wgUser->isBlocked() )
- return self::MAIL_BLOCKED;
-
- # Check for hooks
- $error = null;
- if ( ! wfRunHooks( 'UserLoginMailPassword', array( $this->mName, &$error ) ) )
- return $error;
-
- # Check against the rate limiter
- if( $wgUser->pingLimiter( 'mailpassword' ) )
- return self::MAIL_PING_THROTTLED;
-
- # Check for a valid name
- if ( '' == $this->mName )
- return self::NO_NAME;
- $this->mUser = User::newFromName( $this->mName );
- if( is_null( $this->mUser ) )
- return self::NO_NAME;
-
- # And that the resulting user actually exists
- if ( 0 == $this->mUser->getId() )
- return self::NOT_EXISTS;
-
- # Check against password throttle
- if ( $this->mUser->isPasswordReminderThrottled() )
- return self::MAIL_PASS_THROTTLED;
-
- # User doesn't have email address set
- if ( '' == $this->mUser->getEmail() )
- return self::MAIL_EMPTY_EMAIL;
-
- # Don't send to people who are acting fishily by hiding their IP
- $ip = wfGetIP();
- if( !$ip )
- return self::MAIL_BAD_IP;
-
- # Let hooks do things with the data
- wfRunHooks( 'User::mailPasswordInternal', array(&$wgUser, &$ip, &$this->mUser) );
-
- $newpass = $this->mUser->randomPassword();
- $this->mUser->setNewpassword( $newpass, true );
- $this->mUser->saveSettings();
-
- $message = wfMsgExt( $text, array( 'parsemag' ), $ip, $this->mUser->getName(), $newpass,
- $wgServer . $wgScript, round( $wgNewPasswordExpiry / 86400 ) );
- $this->mMailResult = $this->mUser->sendMail( wfMsg( $title ), $message );
-
- if( WikiError::isError( $this->mMailResult ) ) {
- return self::MAIL_ERROR;
- } else {
- return self::SUCCESS;
- }
- }
-}
-
-/**
- * For backwards compatibility, mainly with the state constants, which
- * could be referred to in old extensions with the old class name.
- * @deprecated
- */
-class LoginForm extends Login {}
\ No newline at end of file
'Listredirects' => array( 'SpecialPage', 'Listredirects' ),
# Login/create account
- 'Userlogin' => 'SpecialUserLogin',
- 'CreateAccount' => 'SpecialCreateAccount',
+ 'Userlogin' => array( 'SpecialPage', 'Userlogin' ),
+ 'CreateAccount' => array( 'SpecialRedirectToSpecial', 'CreateAccount', 'Userlogin', 'signup', array( 'uselang' ) ),
# Users and rights
'Blockip' => array( 'SpecialPage', 'Blockip', 'block' ),
'wpName' => $params['name'],
'wpPassword' => $params['password'],
'wpDomain' => $params['domain'],
- 'wpRemember' => '1'
+ 'wpRemember' => ''
));
// Init session if necessary
wfSetupSession();
}
- $loginForm = new Login( $req );
- switch ( $authRes = $loginForm->attemptLogin() ) {
- case Login::SUCCESS :
+ $loginForm = new LoginForm($req);
+ switch ($authRes = $loginForm->authenticateUserData()) {
+ case LoginForm :: SUCCESS :
global $wgUser, $wgCookiePrefix;
+ $wgUser->setOption('rememberpassword', 1);
+ $wgUser->setCookies();
+
+ // Run hooks. FIXME: split back and frontend from this hook.
+ // FIXME: This hook should be placed in the backend
+ $injected_html = '';
+ wfRunHooks('UserLoginComplete', array(&$wgUser, &$injected_html));
+
$result['result'] = 'Success';
$result['lguserid'] = intval($wgUser->getId());
$result['lgusername'] = $wgUser->getName();
$result['sessionid'] = session_id();
break;
- case Login::NO_NAME :
+ case LoginForm :: NO_NAME :
$result['result'] = 'NoName';
break;
- case Login::ILLEGAL :
+ case LoginForm :: ILLEGAL :
$result['result'] = 'Illegal';
break;
- case Login::WRONG_PLUGIN_PASS :
+ case LoginForm :: WRONG_PLUGIN_PASS :
$result['result'] = 'WrongPluginPass';
break;
- case Login::NOT_EXISTS :
+ case LoginForm :: NOT_EXISTS :
$result['result'] = 'NotExists';
break;
- case Login::WRONG_PASS :
+ case LoginForm :: WRONG_PASS :
$result['result'] = 'WrongPass';
break;
- case Login::EMPTY_PASS :
+ case LoginForm :: EMPTY_PASS :
$result['result'] = 'EmptyPass';
break;
- case Login::CREATE_BLOCKED :
+ case LoginForm :: CREATE_BLOCKED :
$result['result'] = 'CreateBlocked';
$result['details'] = 'Your IP address is blocked from account creation';
break;
- case Login::THROTTLED :
+ case LoginForm :: THROTTLED :
global $wgPasswordAttemptThrottle;
$result['result'] = 'Throttled';
$result['wait'] = intval($wgPasswordAttemptThrottle['seconds']);
break;
default :
- ApiBase::dieDebug(__METHOD__, "Unhandled case value: {$authRes}");
+ ApiBase :: dieDebug(__METHOD__, "Unhandled case value: {$authRes}");
}
$this->getResult()->addValue(null, 'login', $result);
+++ /dev/null
-<?php
-/**
- * Special page for creating/registering new user accounts.
- * @ingroup SpecialPage
- */
-class SpecialCreateAccount extends SpecialPage {
-
- var $mUsername, $mPassword, $mRetype, $mReturnTo, $mPosted;
- var $mCreateaccountMail, $mRemember, $mEmail, $mDomain, $mLanguage;
- var $mReturnToQuery;
-
- public $mDomains = array();
-
- public $mUseEmail = true; # Can be switched off by AuthPlugins etc
- public $mUseRealname = true;
- public $mUseRemember = true;
-
- public $mFormHeader = '';
- public $mFormFields = array(
- 'Name' => array(
- 'type' => 'text',
- 'label-message' => 'yourname',
- 'id' => 'wpName2',
- 'tabindex' => '1',
- 'size' => '20',
- 'required' => '1',
- 'autofocus' => '',
- ),
- 'Password' => array(
- 'type' => 'password',
- 'label-message' => 'yourpassword',
- 'size' => '20',
- 'id' => 'wpPassword2',
- 'required' => '',
- ),
- 'Retype' => array(
- 'type' => 'password',
- 'label-message' => 'yourpasswordagain',
- 'size' => '20',
- 'id' => 'wpRetype',
- 'required' => '',
- ),
- 'Email' => array(
- 'type' => 'email',
- 'label-message' => 'youremail',
- 'size' => '20',
- 'id' => 'wpEmail',
- ),
- 'RealName' => array(
- 'type' => 'text',
- 'label-message' => 'yourrealname',
- 'id' => 'wpRealName',
- 'tabindex' => '1',
- 'size' => '20',
- 'help-message' => 'prefs-help-realname',
- ),
- 'Remember' => array(
- 'type' => 'check',
- 'label-message' => 'remembermypassword',
- 'id' => 'wpRemember',
- ),
- 'Domain' => array(
- 'type' => 'select',
- 'id' => 'wpDomain',
- 'label-message' => 'yourdomainname',
- 'options' => null,
- 'default' => null,
- ),
- );
-
- public function __construct(){
- parent::__construct( 'CreateAccount', 'createaccount' );
- $this->mLogin = new Login();
- }
-
- public function execute( $par ){
- global $wgUser, $wgOut;
-
- $this->setHeaders();
- $this->loadQuery();
-
- # Block signup here if in readonly. Keeps user from
- # going through the process (filling out data, etc)
- # and being informed later.
- if( wfReadOnly() ) {
- $wgOut->readOnlyPage();
- return;
- }
- # Bail out straightaway on permissions errors
- if( !$this->userCanExecute( $wgUser ) ) {
- $this->displayRestrictionError();
- return;
- } elseif( $wgUser->isBlockedFromCreateAccount() ) {
- $this->userBlockedMessage();
- return;
- } elseif( count( $permErrors = $this->getTitle()->getUserPermissionsErrors( 'createaccount', $wgUser, true ) )>0 ) {
- $wgOut->showPermissionsErrorPage( $permErrors, 'createaccount' );
- return;
- }
-
- if( $this->mPosted ) {
- if( $this->mCreateaccountMail ) {
- return $this->addNewAccountMailPassword();
- } else {
- return $this->addNewAccount();
- }
- } else {
- $this->showMainForm('');
- }
- }
-
- /**
- * Load the member variables from the request parameters
- */
- protected function loadQuery(){
- global $wgRequest, $wgAuth, $wgHiddenPrefs, $wgEnableEmail, $wgRedirectOnLogin;
- $this->mCreateaccountMail = $wgRequest->getCheck( 'wpCreateaccountMail' )
- && $wgEnableEmail;
-
- $this->mUsername = $wgRequest->getText( 'wpName' );
- $this->mPassword = $wgRequest->getText( 'wpPassword' );
- $this->mRetype = $wgRequest->getText( 'wpRetype' );
- $this->mDomain = $wgRequest->getText( 'wpDomain' );
- $this->mReturnTo = $wgRequest->getVal( 'returnto' );
- $this->mReturnToQuery = $wgRequest->getVal( 'returntoquery' );
- $this->mPosted = $wgRequest->wasPosted();
- $this->mCreateaccountMail = $wgRequest->getCheck( 'wpCreateaccountMail' )
- && $wgEnableEmail;
- $this->mRemember = $wgRequest->getCheck( 'wpRemember' );
- $this->mLanguage = $wgRequest->getText( 'uselang' );
-
- if ( $wgRedirectOnLogin ) {
- $this->mReturnTo = $wgRedirectOnLogin;
- $this->mReturnToQuery = '';
- }
-
- if( $wgEnableEmail ) {
- $this->mEmail = $wgRequest->getText( 'wpEmail' );
- } else {
- $this->mEmail = '';
- }
- if( !in_array( 'realname', $wgHiddenPrefs ) ) {
- $this->mRealName = $wgRequest->getText( 'wpRealName' );
- } else {
- $this->mRealName = '';
- }
-
- if( !$wgAuth->validDomain( $this->mDomain ) ) {
- $this->mDomain = 'invaliddomain';
- }
- $wgAuth->setDomain( $this->mDomain );
-
- # When switching accounts, it sucks to get automatically logged out
- $returnToTitle = Title::newFromText( $this->mReturnTo );
- if( is_object( $returnToTitle ) && $returnToTitle->isSpecial( 'Userlogout' ) ) {
- $this->mReturnTo = '';
- $this->mReturnToQuery = '';
- }
- }
-
- /**
- * Add a new account, and mail its password to the user
- */
- protected function addNewAccountMailPassword() {
- global $wgOut;
-
- if( !$this->mEmail ) {
- $this->showMainForm( wfMsg( 'noemail', htmlspecialchars( $this->mUsername ) ) );
- return;
- }
-
- if( !$this->addNewaccountInternal() ) {
- return;
- }
-
- # Wipe the initial password
- $this->mLogin->mUser->setPassword( null );
- $this->mLogin->mUser->saveSettings();
-
- # And mail them a temporary one
- $result = $this->mLogin->mailPassword( 'createaccount-title', 'createaccount-text' );
-
- wfRunHooks( 'AddNewAccount', array( $this->mLogin->mUser, true ) );
- $this->mLogin->mUser->addNewUserLogEntry();
-
- $wgOut->setPageTitle( wfMsg( 'accmailtitle' ) );
- $wgOut->setRobotPolicy( 'noindex,nofollow' );
- $wgOut->setArticleRelated( false );
-
- if( $result != Login::SUCCESS ) {
- if( $result == Login::MAIL_ERROR ){
- $this->showMainForm( wfMsg( 'mailerror', $this->mLogin->mMailResult->getMessage() ) );
- } else {
- $this->showMainForm( wfMsg( 'mailerror' ) );
- }
- } else {
- $wgOut->addWikiMsg( 'accmailtext', $this->mLogin->mUser->getName(), $this->mLogin->mUser->getEmail() );
- $wgOut->returnToMain( false );
- }
- }
-
- /**
- * Create a new user account from the provided data
- */
- protected function addNewAccount() {
- global $wgUser, $wgEmailAuthentication;
-
- # Create the account and abort if there's a problem doing so
- if( !$this->addNewAccountInternal() )
- return;
- $user = $this->mLogin->mUser;
-
- # If we showed up language selection links, and one was in use, be
- # smart (and sensible) and save that language as the user's preference
- global $wgLoginLanguageSelector;
- if( $wgLoginLanguageSelector && $this->mLanguage )
- $user->setOption( 'language', $this->mLanguage );
-
- # Send out an email authentication message if needed
- if( $wgEmailAuthentication && User::isValidEmailAddr( $user->getEmail() ) ) {
- global $wgOut;
- $error = $user->sendConfirmationMail();
- if( WikiError::isError( $error ) ) {
- $wgOut->addWikiMsg( 'confirmemail_sendfailed', $error->getMessage() );
- } else {
- $wgOut->addWikiMsg( 'confirmemail_oncreate' );
- }
- }
-
- # Save settings (including confirmation token)
- $user->saveSettings();
-
- # If not logged in, assume the new account as the current one and set
- # session cookies then show a "welcome" message or a "need cookies"
- # message as needed
- if( $wgUser->isAnon() ) {
- $wgUser = $user;
- $wgUser->setCookies();
- wfRunHooks( 'AddNewAccount', array( $wgUser ) );
- $wgUser->addNewUserLogEntry();
- if( $this->hasSessionCookie() ) {
- return $this->successfulCreation();
- } else {
- return $this->cookieRedirectCheck();
- }
- } else {
- # Confirm that the account was created
- global $wgOut;
- $self = SpecialPage::getTitleFor( 'Userlogin' );
- $wgOut->setPageTitle( wfMsgHtml( 'accountcreated' ) );
- $wgOut->setArticleRelated( false );
- $wgOut->setRobotPolicy( 'noindex,nofollow' );
- $wgOut->addWikiMsg( 'accountcreatedtext', $user->getName() );
- $wgOut->returnToMain( false, $self );
- wfRunHooks( 'AddNewAccount', array( $user ) );
- $user->addNewUserLogEntry();
- return true;
- }
- }
-
- /**
- * Deeper mechanics of initialising a new user and passing it
- * off to Login::initUser()
- * return Bool whether the user was successfully created
- */
- protected function addNewAccountInternal() {
- global $wgUser, $wgOut;
- global $wgEnableSorbs, $wgProxyWhitelist;
- global $wgMemc, $wgAccountCreationThrottle;
- global $wgAuth, $wgMinimalPasswordLength;
- global $wgEmailConfirmToEdit;
-
- # If the user passes an invalid domain, something is fishy
- if( !$wgAuth->validDomain( $this->mDomain ) ) {
- $this->showMainForm( wfMsg( 'wrongpassword' ) );
- return false;
- }
-
- # If we are not allowing users to login locally, we should be checking
- # to see if the user is actually able to authenticate to the authenti-
- # cation server before they create an account (otherwise, they can
- # create a local account and login as any domain user). We only need
- # to check this for domains that aren't local.
- if( !in_array( $this->mDomain, array( 'local', '' ) )
- && !$wgAuth->canCreateAccounts()
- && ( !$wgAuth->userExists( $this->mUsername )
- || !$wgAuth->authenticate( $this->mUsername, $this->mPassword )
- ) )
- {
- $this->showMainForm( wfMsg( 'wrongpassword' ) );
- return false;
- }
-
- $ip = wfGetIP();
- if( $wgEnableSorbs && !in_array( $ip, $wgProxyWhitelist ) &&
- $wgUser->inSorbsBlacklist( $ip ) )
- {
- $this->showMainForm( wfMsg( 'sorbs_create_account_reason' ) . ' (' . htmlspecialchars( $ip ) . ')' );
- return false;
- }
-
- # Now create a dummy user ($user) and check if it is valid
- $name = trim( $this->mUsername );
- $user = User::newFromName( $name, 'creatable' );
- if( is_null( $user ) ) {
- $this->showMainForm( wfMsg( 'noname' ) );
- return false;
- }
-
- if( 0 != $user->idForName() ) {
- $this->showMainForm( wfMsg( 'userexists' ) );
- return false;
- }
-
- if( 0 != strcmp( $this->mPassword, $this->mRetype ) ) {
- $this->showMainForm( wfMsg( 'badretype' ) );
- return false;
- }
-
- # check for minimal password length
- $valid = $user->isValidPassword( $this->mPassword );
- if( $valid !== true ) {
- if ( !$this->mCreateaccountMail ) {
- $this->showMainForm( wfMsgExt( $valid, array( 'parsemag' ), $wgMinimalPasswordLength ) );
- return false;
- } else {
- # do not force a password for account creation by email
- # set invalid password, it will be replaced later by a random generated password
- $this->mPassword = null;
- }
- }
-
- # if you need a confirmed email address to edit, then obviously you
- # need an email address.
- if( $wgEmailConfirmToEdit && empty( $this->mEmail ) ) {
- $this->showMainForm( wfMsg( 'noemailtitle' ) );
- return false;
- }
-
- if( !empty( $this->mEmail ) && !User::isValidEmailAddr( $this->mEmail ) ) {
- $this->showMainForm( wfMsg( 'invalidemailaddress' ) );
- return false;
- }
-
- # Set some additional data so the AbortNewAccount hook can be used for
- # more than just username validation
- $user->setEmail( $this->mEmail );
- $user->setRealName( $this->mRealName );
-
- $abortError = '';
- if( !wfRunHooks( 'AbortNewAccount', array( $user, &$abortError ) ) ) {
- # Hook point to add extra creation throttles and blocks
- wfDebug( "LoginForm::addNewAccountInternal: a hook blocked creation\n" );
- $this->showMainForm( $abortError );
- return false;
- }
-
- if( $wgAccountCreationThrottle && $wgUser->isPingLimitable() ) {
- $key = wfMemcKey( 'acctcreate', 'ip', $ip );
- $value = $wgMemc->get( $key );
- if ( !$value ) {
- $wgMemc->set( $key, 0, 86400 );
- }
- if( $value >= $wgAccountCreationThrottle ) {
- $this->showMainForm( wfMsgExt( 'acct_creation_throttle_hit', array( 'parseinline' ), $wgAccountCreationThrottle ) );
- return false;
- }
- $wgMemc->incr( $key );
- }
-
- if( !$wgAuth->addUser( $user, $this->mPassword, $this->mEmail, $this->mRealName ) ) {
- $this->showMainForm( wfMsg( 'externaldberror' ) );
- return false;
- }
-
- $this->mLogin->mUser = $user;
- $this->mLogin->initUser( false );
- return true;
- }
-
- /**
- * Run any hooks registered for logins, then
- * display a message welcoming the user.
- */
- protected function successfulCreation(){
- global $wgUser, $wgOut;
-
- # Run any hooks; display injected HTML
- $injected_html = '';
- wfRunHooks('UserLoginComplete', array(&$wgUser, &$injected_html));
-
- SpecialUserLogin::displaySuccessfulLogin(
- 'welcomecreation',
- $injected_html,
- $this->mReturnTo,
- $this->mReturnToQuery );
- }
-
- /**
- * Display a message indicating that account creation from their IP has
- * been blocked by a (range)block with 'block account creation' enabled.
- * It's likely that this feature will be used for blocking large numbers
- * of innocent people, e.g. range blocks on schools. Don't blame it on
- * the user. There's a small chance that it really is the user's fault,
- * i.e. the username is blocked and they haven't bothered to log out
- * before trying to create an account to evade it, but we'll leave that
- * to their guilty conscience to figure out...
- */
- protected function userBlockedMessage() {
- global $wgOut, $wgUser;
-
- $wgOut->setPageTitle( wfMsg( 'cantcreateaccounttitle' ) );
- $wgOut->setRobotPolicy( 'noindex,nofollow' );
- $wgOut->setArticleRelated( false );
-
- $ip = wfGetIP();
- $blocker = User::whoIs( $wgUser->mBlock->mBy );
- $block_reason = $wgUser->mBlock->mReason;
-
- if( strval( $block_reason ) === '' ) {
- $block_reason = wfMsgExt( 'blockednoreason' );
- }
- $wgOut->addWikiMsg( 'cantcreateaccount-text', $ip, $block_reason, $blocker );
- $wgOut->returnToMain( false );
- }
-
- /**
- * Show the main input form, with an appropriate error message
- * from a previous iteration, if necessary
- * @param $msg String HTML of message received previously
- * @param $msgtype String type of message, usually 'error'
- */
- protected function showMainForm( $msg, $msgtype = 'error' ) {
- global $wgUser, $wgOut, $wgHiddenPrefs, $wgEnableEmail;
- global $wgCookiePrefix, $wgLoginLanguageSelector;
- global $wgAuth, $wgEmailConfirmToEdit, $wgCookieExpiration;
-
- # Parse the error message if we got one
- if( $msg ){
- if( $msgtype == 'error' ){
- $msg = wfMsg( 'loginerror' ) . ' ' . $msg;
- }
- $msg = Html::rawElement(
- 'div',
- array( 'class' => $msgtype . 'box' ),
- $msg
- );
- } else {
- $msg = '';
- }
-
- # Make sure the returnTo strings don't get lost if the
- # user changes language, etc
- $linkq = array();
- if ( !empty( $this->mReturnTo ) ) {
- $linkq['returnto'] = wfUrlencode( $this->mReturnTo );
- if ( !empty( $this->mReturnToQuery ) )
- $linkq['returntoquery'] = wfUrlencode( $this->mReturnToQuery );
- }
-
- # Pass any language selection on to the mode switch link
- if( $wgLoginLanguageSelector && $this->mLanguage )
- $linkq['uselang'] = $this->mLanguage;
-
- $skin = $wgUser->getSkin();
- $link = $skin->link(
- SpecialPage::getTitleFor( 'Userlogin' ),
- wfMsgHtml( 'gotaccountlink' ),
- array(),
- $linkq );
- $link = $wgUser->isLoggedIn()
- ? ''
- : wfMsgWikiHtml( 'gotaccount', $link );
-
- # Prepare language selection links as needed
- $langSelector = $wgLoginLanguageSelector
- ? Html::rawElement(
- 'div',
- array( 'id' => 'languagelinks' ),
- SpecialUserLogin::makeLanguageSelector( $this->getTitle(), $this->mReturnTo ) )
- : '';
-
- # Add a 'send password by email' button if available
- $buttons = '';
- if( $wgEnableEmail && $wgUser->isLoggedIn() ){
- $buttons = Html::element(
- 'input',
- array(
- 'type' => 'submit',
- 'name' => 'wpCreateaccountMail',
- 'value' => wfMsg( 'createaccountmail' ),
- 'id' => 'wpCreateaccountMail',
- )
- );
- }
-
- # Give authentication and captcha plugins a chance to
- # modify the form, by hook or by using $wgAuth
- $wgAuth->modifyUITemplate( $this, 'new' );
- wfRunHooks( 'UserCreateForm', array( &$this ) );
-
- # The most likely use of the hook is to enable domains;
- # check that now, and add fields if necessary
- if( $this->mDomains ){
- $this->mFormFields['Domain']['options'] = $this->mDomains;
- $this->mFormFields['Domain']['default'] = $this->mDomain;
- } else {
- unset( $this->mFormFields['Domain'] );
- }
-
- # Or to switch email on or off
- if( !$wgEnableEmail || !$this->mUseEmail ){
- unset( $this->mFormFields['Email'] );
- } else {
- if( $wgEmailConfirmToEdit ){
- $this->mFormFields['Email']['help-message'] = 'prefs-help-email-required' ;
- $this->mFormFields['Email']['required'] = '';
- } else {
- $this->mFormFields['Email']['help-message'] = 'prefs-help-email';
- }
- }
-
- # Or to play with realname
- if( in_array( 'realname', $wgHiddenPrefs ) || !$this->mUseRealname ){
- unset( $this->mFormFields['Realname'] );
- }
-
- # Or to tweak the 'remember my password' checkbox
- if( !($wgCookieExpiration > 0) || !$this->mUseRemember ){
- # Remove it altogether
- unset( $this->mFormFields['Remember'] );
- } elseif( $wgUser->getOption( 'rememberpassword' ) || $this->mRemember ){
- # Or check it by default
- # FIXME: this doesn't always work?
- $this->mFormFields['Remember']['checked'] = '1';
- }
-
- $form = new HTMLForm( $this->mFormFields, '' );
- $form->setTitle( $this->getTitle() );
- $form->setSubmitText( wfMsg( 'createaccount' ) );
- $form->setSubmitId( 'wpCreateaccount' );
- $form->suppressReset();
- $form->loadData();
-
- $formContents = ''
- . Html::rawElement( 'p', array( 'id' => 'userloginlink' ),
- $link )
- . $this->mFormHeader
- . $langSelector
- . $form->getBody()
- . $form->getButtons()
- . $buttons
- . Html::hidden( 'returnto', $this->mReturnTo )
- . Html::hidden( 'returntoquery', $this->mReturnToQuery )
- ;
-
- $wgOut->setPageTitle( wfMsg( 'createaccount' ) );
- $wgOut->setRobotPolicy( 'noindex,nofollow' );
- $wgOut->setArticleRelated( false );
- $wgOut->disallowUserJs(); # Stop malicious userscripts sniffing passwords
-
- $wgOut->addHTML(
- Html::rawElement(
- 'div',
- array( 'id' => 'loginstart' ),
- wfMsgExt( 'loginstart', array( 'parseinline' ) )
- ) .
- $msg .
- Html::rawElement(
- 'div',
- array( 'id' => 'userloginForm' ),
- $form->wrapForm( $formContents )
- ) .
- Html::rawElement(
- 'div',
- array( 'id' => 'loginend' ),
- wfMsgExt( 'loginend', array( 'parseinline' ) )
- )
- );
-
- }
-
- /**
- * Check if a session cookie is present.
- *
- * This will not pick up a cookie set during _this_ request, but is meant
- * to ensure that the client is returning the cookie which was set on a
- * previous pass through the system.
- *
- * @private
- */
- protected function hasSessionCookie() {
- global $wgDisableCookieCheck, $wgRequest;
- return $wgDisableCookieCheck ? true : $wgRequest->checkSessionCookie();
- }
-
- /**
- * Do a redirect back to the same page, so we can check any
- * new session cookies.
- */
- protected function cookieRedirectCheck() {
- global $wgOut;
-
- $query = array( 'wpCookieCheck' => '1' );
- if ( $this->mReturnTo ) $query['returnto'] = $this->mReturnTo;
- $check = $this->getTitle()->getFullURL( $query );
-
- return $wgOut->redirect( $check );
- }
-
- /**
- * Check the cookies and show errors if they're not enabled.
- * @param $type String action being performed
- */
- protected function onCookieRedirectCheck() {
- if ( !$this->hasSessionCookie() ) {
- return $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array( 'parseinline' ) ) );
- } else {
- return SpecialUserLogin::successfulLogin(
- 'welcomecreate',
- $this->mReturnTo,
- $this->mReturnToQuery );
- }
- }
-
- /**
- * Since the UserCreateForm hook was changed to pass a SpecialPage
- * instead of a QuickTemplate derivative, old extensions might
- * easily try calling these methods expecing them to exist. Tempting
- * though it is to let them have the fatal error, let's at least
- * fail gracefully...
- * @deprecated
- */
- public function set(){
- wfDeprecated( __METHOD__ );
- }
- public function addInputItem(){
- wfDeprecated( __METHOD__ );
- }
-}
$wgOut->addWikiMsg( 'resetpass_success' );
if( !$wgUser->isLoggedIn() ) {
$data = array(
+ 'action' => 'submitlogin',
'wpName' => $this->mUserName,
'wpPassword' => $this->mNewpass,
'returnto' => $wgRequest->getVal( 'returnto' ),
$data['wpRemember'] = 1;
}
$login = new LoginForm( new FauxRequest( $data, true ) );
- $login->attemptLogin();
+ $login->execute();
}
$titleObj = Title::newFromText( $wgRequest->getVal( 'returnto' ) );
if ( !$titleObj instanceof Title ) {
<?php
/**
- * SpecialPage for logging users into the wiki
+ * @file
* @ingroup SpecialPage
*/
-class SpecialUserLogin extends SpecialPage {
+/**
+ * constructor
+ */
+function wfSpecialUserlogin( $par = '' ) {
+ global $wgRequest;
+ if( session_id() == '' ) {
+ wfSetupSession();
+ }
- var $mUsername, $mPassword, $mReturnTo, $mCookieCheck, $mPosted;
- var $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
- var $mRemember, $mDomain, $mLanguage;
- var $mSkipCookieCheck, $mReturnToQuery;
+ $form = new LoginForm( $wgRequest, $par );
+ $form->execute();
+}
- public $mDomains = array();
-
- public $mFormHeader = ''; # Can be filled by hooks etc
- public $mFormFields = array(
- 'Name' => array(
- 'type' => 'text',
- 'label-message' => 'yourname',
- 'id' => 'wpName1',
- 'tabindex' => '1',
- 'size' => '20',
- 'required' => '1',
- ),
- 'Password' => array(
- 'type' => 'password',
- 'label-message' => 'yourpassword',
- 'size' => '20',
- 'id' => 'wpPassword1',
- ),
- 'Domain' => array(
- 'type' => 'select',
- 'id' => 'wpDomain',
- 'label-message' => 'yourdomainname',
- 'options' => null,
- 'default' => null,
- ),
- 'Remember' => array(
- 'type' => 'check',
- 'label-message' => 'remembermypassword',
- 'id' => 'wpRemember',
- )
- );
-
- protected $mLogin; # Login object
-
- public function __construct(){
- parent::__construct( 'Userlogin' );
- }
+/**
+ * implements Special:Login
+ * @ingroup SpecialPage
+ */
+class LoginForm {
- function execute( $par ) {
- global $wgRequest;
- $this->loadQuery();
- $this->mLogin = new Login();
+ const SUCCESS = 0;
+ const NO_NAME = 1;
+ const ILLEGAL = 2;
+ const WRONG_PLUGIN_PASS = 3;
+ const NOT_EXISTS = 4;
+ const WRONG_PASS = 5;
+ const EMPTY_PASS = 6;
+ const RESET_PASS = 7;
+ const ABORTED = 8;
+ const CREATE_BLOCKED = 9;
+ const THROTTLED = 10;
- # Redirect out for account creation, for B/C
- $type = ( $par == 'signup' ) ? $par : $wgRequest->getText( 'type' );
- if( $type == 'signup' ){
- $sp = new SpecialCreateAccount();
- $sp->execute( $par );
- return;
- }
+ var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted;
+ var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
+ var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage;
+ var $mSkipCookieCheck, $mReturnToQuery;
- if ( !is_null( $this->mCookieCheck ) ) {
- $this->onCookieRedirectCheck();
- return;
- } else if( $this->mPosted ) {
- if ( $this->mMailmypassword ) {
- return $this->showMailPage();
- } else {
- return $this->processLogin();
- }
- } else {
- $this->mainLoginForm( '' );
- }
- }
+ private $mExtUser = null;
/**
- * Load member variables from the HTTP request data
- * @param $par String the fragment passed to execute()
+ * Constructor
+ * @param WebRequest $request A WebRequest object passed by reference
*/
- protected function loadQuery(){
- global $wgRequest, $wgAuth, $wgHiddenPrefs, $wgEnableEmail, $wgRedirectOnLogin;
-
- $this->mUsername = $wgRequest->getText( 'wpName' );
- $this->mPassword = $wgRequest->getText( 'wpPassword' );
- $this->mDomain = $wgRequest->getText( 'wpDomain' );
- $this->mLanguage = $wgRequest->getText( 'uselang' );
-
- $this->mReturnTo = $wgRequest->getVal( 'returnto' );
- $this->mReturnToQuery = $wgRequest->getVal( 'returntoquery' );
- $this->mCookieCheck = $wgRequest->getVal( 'wpCookieCheck' );
+ function LoginForm( &$request, $par = '' ) {
+ global $wgAuth, $wgHiddenPrefs, $wgEnableEmail, $wgRedirectOnLogin;
- $this->mMailmypassword = $wgRequest->getCheck( 'wpMailmypassword' )
+ $this->mType = ( $par == 'signup' ) ? $par : $request->getText( 'type' ); # Check for [[Special:Userlogin/signup]]
+ $this->mName = $request->getText( 'wpName' );
+ $this->mPassword = $request->getText( 'wpPassword' );
+ $this->mRetype = $request->getText( 'wpRetype' );
+ $this->mDomain = $request->getText( 'wpDomain' );
+ $this->mReturnTo = $request->getVal( 'returnto' );
+ $this->mReturnToQuery = $request->getVal( 'returntoquery' );
+ $this->mCookieCheck = $request->getVal( 'wpCookieCheck' );
+ $this->mPosted = $request->wasPosted();
+ $this->mCreateaccount = $request->getCheck( 'wpCreateaccount' );
+ $this->mCreateaccountMail = $request->getCheck( 'wpCreateaccountMail' )
+ && $wgEnableEmail;
+ $this->mMailmypassword = $request->getCheck( 'wpMailmypassword' )
&& $wgEnableEmail;
- $this->mRemember = $wgRequest->getCheck( 'wpRemember' );
- $this->mSkipCookieCheck = $wgRequest->getCheck( 'wpSkipCookieCheck' );
- $this->mPosted = $wgRequest->wasPosted();
+ $this->mLoginattempt = $request->getCheck( 'wpLoginattempt' );
+ $this->mAction = $request->getVal( 'action' );
+ $this->mRemember = $request->getCheck( 'wpRemember' );
+ $this->mLanguage = $request->getText( 'uselang' );
+ $this->mSkipCookieCheck = $request->getCheck( 'wpSkipCookieCheck' );
if ( $wgRedirectOnLogin ) {
$this->mReturnTo = $wgRedirectOnLogin;
$this->mReturnToQuery = '';
}
+ if( $wgEnableEmail ) {
+ $this->mEmail = $request->getText( 'wpEmail' );
+ } else {
+ $this->mEmail = '';
+ }
+ if( !in_array( 'realname', $wgHiddenPrefs ) ) {
+ $this->mRealName = $request->getText( 'wpRealName' );
+ } else {
+ $this->mRealName = '';
+ }
+
if( !$wgAuth->validDomain( $this->mDomain ) ) {
$this->mDomain = 'invaliddomain';
}
}
}
+ function execute() {
+ if ( !is_null( $this->mCookieCheck ) ) {
+ $this->onCookieRedirectCheck( $this->mCookieCheck );
+ return;
+ } else if( $this->mPosted ) {
+ if( $this->mCreateaccount ) {
+ return $this->addNewAccount();
+ } else if ( $this->mCreateaccountMail ) {
+ return $this->addNewAccountMailPassword();
+ } else if ( $this->mMailmypassword ) {
+ return $this->mailPassword();
+ } else if ( ( 'submitlogin' == $this->mAction ) || $this->mLoginattempt ) {
+ return $this->processLogin();
+ }
+ }
+ $this->mainLoginForm( '' );
+ }
+
/**
- * Show the main login form
- * @param $msg String a message key for a warning/error message
- * that may have been generated on a previous iteration
+ * @private
*/
- protected function mainLoginForm( $msg, $msgtype = 'error' ) {
- global $wgUser, $wgOut, $wgEnableEmail;
- global $wgCookiePrefix, $wgLoginLanguageSelector;
- global $wgAuth, $wgCookieExpiration;
+ function addNewAccountMailPassword() {
+ global $wgOut;
- # Preload the name field with something if we can
- if ( '' == $this->mUsername ) {
- if ( $wgUser->isLoggedIn() ) {
- $this->mUsername = $wgUser->getName();
- } elseif( isset( $_COOKIE[$wgCookiePrefix.'UserName'] ) ) {
- $this->mUsername = $_COOKIE[$wgCookiePrefix.'UserName'];
- }
- }
- if( $this->mUsername ){
- $this->mFormFields['Name']['default'] = $this->mUsername;
- $this->mFormFields['Password']['autofocus'] = '1';
- } else {
- $this->mFormFields['Name']['autofocus'] = '1';
+ if ('' == $this->mEmail) {
+ $this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) );
+ return;
}
- # Parse the error message if we got one
- if( $msg ){
- if( $msgtype == 'error' ){
- $msg = wfMsg( 'loginerror' ) . ' ' . $msg;
- }
- $msg = Html::rawElement(
- 'div',
- array( 'class' => $msgtype . 'box' ),
- $msg
- );
- } else {
- $msg = '';
- }
+ $u = $this->addNewaccountInternal();
- # Make sure the returnTo strings don't get lost if the
- # user changes language, etc
- $linkq = array();
- if ( !empty( $this->mReturnTo ) ) {
- $linkq['returnto'] = wfUrlencode( $this->mReturnTo );
- if ( !empty( $this->mReturnToQuery ) )
- $linkq['returntoquery'] = wfUrlencode( $this->mReturnToQuery );
+ if ($u == NULL) {
+ return;
}
- # Pass any language selection on to the mode switch link
- if( $wgLoginLanguageSelector && $this->mLanguage )
- $linkq['uselang'] = $this->mLanguage;
+ // Wipe the initial password and mail a temporary one
+ $u->setPassword( null );
+ $u->saveSettings();
+ $result = $this->mailPasswordInternal( $u, false, 'createaccount-title', 'createaccount-text' );
- $skin = $wgUser->getSkin();
- $link = $skin->link(
- SpecialPage::getTitleFor( 'CreateAccount' ),
- wfMsgHtml( 'nologinlink' ),
- array(),
- $linkq );
+ wfRunHooks( 'AddNewAccount', array( $u, true ) );
+ $u->addNewUserLogEntry();
- # Don't show a "create account" link if the user can't
- $link = $wgUser->isAllowed( 'createaccount' ) && !$wgUser->isLoggedIn()
- ? wfMsgWikiHtml( 'nologin', $link )
- : '';
+ $wgOut->setPageTitle( wfMsg( 'accmailtitle' ) );
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
+ $wgOut->setArticleRelated( false );
- # Prepare language selection links as needed
- $langSelector = $wgLoginLanguageSelector
- ? Html::rawElement(
- 'div',
- array( 'id' => 'languagelinks' ),
- self::makeLanguageSelector( $this->getTitle(), $this->mReturnTo ) )
- : '';
-
- # Add a 'mail reset' button if available
- $buttons = '';
- if( $wgEnableEmail && $wgAuth->allowPasswordChange() ){
- $buttons = Html::element(
- 'input',
- array(
- 'type' => 'submit',
- 'name' => 'wpMailmypassword',
- 'value' => wfMsg( 'mailmypassword' ),
- 'id' => 'wpMailmypassword',
- )
- );
- }
-
- # Give authentication and captcha plugins a chance to
- # modify the form, by hook or by using $wgAuth
- $wgAuth->modifyUITemplate( $this, 'login' );
- wfRunHooks( 'UserLoginForm', array( &$this ) );
-
- # The most likely use of the hook is to enable domains;
- # check that now, and add fields if necessary
- if( $this->mDomains ){
- $this->mFormFields['Domain']['options'] = $this->mDomains;
- $this->mFormFields['Domain']['default'] = $this->mDomain;
+ if( WikiError::isError( $result ) ) {
+ $this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) );
} else {
- unset( $this->mFormFields['Domain'] );
+ $wgOut->addWikiMsg( 'accmailtext', $u->getName(), $u->getEmail() );
+ $wgOut->returnToMain( false );
}
-
- # Or to tweak the 'remember my password' checkbox
- if( !($wgCookieExpiration > 0) ){
- # Remove it altogether
- unset( $this->mFormFields['Remember'] );
- } elseif( $wgUser->getOption( 'rememberpassword' ) || $this->mRemember ){
- # Or check it by default
- # FIXME: this doesn't always work?
- $this->mFormFields['Remember']['checked'] = '1';
- }
-
- $form = new HTMLForm( $this->mFormFields, '' );
- $form->setTitle( $this->getTitle() );
- $form->setSubmitText( wfMsg( 'login' ) );
- $form->setSubmitId( 'wpLoginAttempt' );
- $form->suppressReset();
- $form->loadData();
-
- $formContents = ''
- . Html::rawElement( 'p', array( 'id' => 'userloginlink' ),
- $link )
- . Html::rawElement( 'div', array( 'id' => 'userloginprompt' ),
- wfMsgExt( 'loginprompt', array( 'parseinline' ) ) )
- . $this->mFormHeader
- . $langSelector
- . $form->getBody()
- . $form->getButtons()
- . $buttons
- . Xml::hidden( 'returnto', $this->mReturnTo )
- . Xml::hidden( 'returntoquery', $this->mReturnToQuery )
- ;
-
- $wgOut->setPageTitle( wfMsg( 'login' ) );
- $wgOut->setRobotPolicy( 'noindex,nofollow' );
- $wgOut->setArticleRelated( false );
- $wgOut->disallowUserJs(); # Stop malicious userscripts sniffing passwords
-
- $wgOut->addHTML(
- Html::rawElement(
- 'div',
- array( 'id' => 'loginstart' ),
- wfMsgExt( 'loginstart', array( 'parseinline' ) )
- ) .
- $msg .
- Html::rawElement(
- 'div',
- array( 'id' => 'userloginForm' ),
- $form->wrapForm( $formContents )
- ) .
- Html::rawElement(
- 'div',
- array( 'id' => 'loginend' ),
- wfMsgExt( 'loginend', array( 'parseinline' ) )
- )
- );
+ $u = 0;
+ }
- }
/**
- * Check if a session cookie is present.
- *
- * This will not pick up a cookie set during _this_ request, but is meant
- * to ensure that the client is returning the cookie which was set on a
- * previous pass through the system.
- *
* @private
*/
- protected function hasSessionCookie() {
- global $wgDisableCookieCheck, $wgRequest;
- return $wgDisableCookieCheck ? true : $wgRequest->checkSessionCookie();
- }
+ function addNewAccount() {
+ global $wgUser, $wgEmailAuthentication;
- /**
- * Do a redirect back to the same page, so we can check any
- * new session cookies.
- */
- protected function cookieRedirectCheck() {
- global $wgOut;
+ # Create the account and abort if there's a problem doing so
+ $u = $this->addNewAccountInternal();
+ if( $u == NULL )
+ return;
- $query = array( 'wpCookieCheck' => '1');
- if ( $this->mReturnTo ) $query['returnto'] = $this->mReturnTo;
- $check = $this->getTitle()->getFullURL( $query );
+ # If we showed up language selection links, and one was in use, be
+ # smart (and sensible) and save that language as the user's preference
+ global $wgLoginLanguageSelector;
+ if( $wgLoginLanguageSelector && $this->mLanguage )
+ $u->setOption( 'language', $this->mLanguage );
- return $wgOut->redirect( $check );
- }
+ # Send out an email authentication message if needed
+ if( $wgEmailAuthentication && User::isValidEmailAddr( $u->getEmail() ) ) {
+ global $wgOut;
+ $error = $u->sendConfirmationMail();
+ if( WikiError::isError( $error ) ) {
+ $wgOut->addWikiMsg( 'confirmemail_sendfailed', $error->getMessage() );
+ } else {
+ $wgOut->addWikiMsg( 'confirmemail_oncreate' );
+ }
+ }
- /**
- * Check the cookies and show errors if they're not enabled.
- * @param $type String action being performed
- */
- protected function onCookieRedirectCheck() {
- if ( !$this->hasSessionCookie() ) {
- return $this->mainLoginForm( wfMsgExt( 'nocookieslogin', array( 'parseinline' ) ) );
+ # Save settings (including confirmation token)
+ $u->saveSettings();
+
+ # If not logged in, assume the new account as the current one and set
+ # session cookies then show a "welcome" message or a "need cookies"
+ # message as needed
+ if( $wgUser->isAnon() ) {
+ $wgUser = $u;
+ $wgUser->setCookies();
+ wfRunHooks( 'AddNewAccount', array( $wgUser ) );
+ $wgUser->addNewUserLogEntry();
+ if( $this->hasSessionCookie() ) {
+ return $this->successfulCreation();
+ } else {
+ return $this->cookieRedirectCheck( 'new' );
+ }
} else {
- return self::successfulLogin( 'loginsuccess', $this->mReturnTo, $this->mReturnToQuery );
+ # Confirm that the account was created
+ global $wgOut;
+ $self = SpecialPage::getTitleFor( 'Userlogin' );
+ $wgOut->setPageTitle( wfMsgHtml( 'accountcreated' ) );
+ $wgOut->setArticleRelated( false );
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
+ $wgOut->addHTML( wfMsgWikiHtml( 'accountcreatedtext', $u->getName() ) );
+ $wgOut->returnToMain( false, $self );
+ wfRunHooks( 'AddNewAccount', array( $u ) );
+ $u->addNewUserLogEntry();
+ return true;
}
}
/**
- * Produce a bar of links which allow the user to select another language
- * during login/registration but retain "returnto"
- * @param $title Title to use in the link
- * @param $returnTo query string to append
- * @return String HTML for bar
+ * @private
*/
- public static function makeLanguageSelector( $title, $returnTo=false ) {
- global $wgLang;
+ function addNewAccountInternal() {
+ global $wgUser, $wgOut;
+ global $wgEnableSorbs, $wgProxyWhitelist;
+ global $wgMemc, $wgAccountCreationThrottle;
+ global $wgAuth, $wgMinimalPasswordLength;
+ global $wgEmailConfirmToEdit;
- $msg = wfMsgForContent( 'loginlanguagelinks' );
- if( $msg != '' && !wfEmptyMsg( 'loginlanguagelinks', $msg ) ) {
- $langs = explode( "\n", $msg );
- $links = array();
- foreach( $langs as $lang ) {
- $lang = trim( $lang, '* ' );
- $parts = explode( '|', $lang );
- if (count($parts) >= 2) {
- $links[] = SpecialUserLogin::makeLanguageSelectorLink(
- $parts[0], $parts[1], $title, $returnTo );
- }
+ // If the user passes an invalid domain, something is fishy
+ if( !$wgAuth->validDomain( $this->mDomain ) ) {
+ $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+ return false;
+ }
+
+ // If we are not allowing users to login locally, we should be checking
+ // to see if the user is actually able to authenticate to the authenti-
+ // cation server before they create an account (otherwise, they can
+ // create a local account and login as any domain user). We only need
+ // to check this for domains that aren't local.
+ if( 'local' != $this->mDomain && '' != $this->mDomain ) {
+ if( !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists( $this->mName ) || !$wgAuth->authenticate( $this->mName, $this->mPassword ) ) ) {
+ $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+ return false;
}
- return count( $links ) > 0 ? wfMsgHtml( 'loginlanguagelabel', $wgLang->pipeList( $links ) ) : '';
- } else {
- return '';
}
+
+ if ( wfReadOnly() ) {
+ $wgOut->readOnlyPage();
+ return false;
+ }
+
+ # Check permissions
+ if ( !$wgUser->isAllowed( 'createaccount' ) ) {
+ $this->userNotPrivilegedMessage();
+ return false;
+ } elseif ( $wgUser->isBlockedFromCreateAccount() ) {
+ $this->userBlockedMessage();
+ return false;
+ }
+
+ $ip = wfGetIP();
+ if ( $wgEnableSorbs && !in_array( $ip, $wgProxyWhitelist ) &&
+ $wgUser->inSorbsBlacklist( $ip ) )
+ {
+ $this->mainLoginForm( wfMsg( 'sorbs_create_account_reason' ) . ' (' . htmlspecialchars( $ip ) . ')' );
+ return;
+ }
+
+ # Now create a dummy user ($u) and check if it is valid
+ $name = trim( $this->mName );
+ $u = User::newFromName( $name, 'creatable' );
+ if ( is_null( $u ) ) {
+ $this->mainLoginForm( wfMsg( 'noname' ) );
+ return false;
+ }
+
+ if ( 0 != $u->idForName() ) {
+ $this->mainLoginForm( wfMsg( 'userexists' ) );
+ return false;
+ }
+
+ if ( 0 != strcmp( $this->mPassword, $this->mRetype ) ) {
+ $this->mainLoginForm( wfMsg( 'badretype' ) );
+ return false;
+ }
+
+ # check for minimal password length
+ $valid = $u->isValidPassword( $this->mPassword );
+ if ( $valid !== true ) {
+ if ( !$this->mCreateaccountMail ) {
+ $this->mainLoginForm( wfMsgExt( $valid, array( 'parsemag' ), $wgMinimalPasswordLength ) );
+ return false;
+ } else {
+ # do not force a password for account creation by email
+ # set invalid password, it will be replaced later by a random generated password
+ $this->mPassword = null;
+ }
+ }
+
+ # if you need a confirmed email address to edit, then obviously you
+ # need an email address.
+ if ( $wgEmailConfirmToEdit && empty( $this->mEmail ) ) {
+ $this->mainLoginForm( wfMsg( 'noemailtitle' ) );
+ return false;
+ }
+
+ if( !empty( $this->mEmail ) && !User::isValidEmailAddr( $this->mEmail ) ) {
+ $this->mainLoginForm( wfMsg( 'invalidemailaddress' ) );
+ return false;
+ }
+
+ # Set some additional data so the AbortNewAccount hook can be used for
+ # more than just username validation
+ $u->setEmail( $this->mEmail );
+ $u->setRealName( $this->mRealName );
+
+ $abortError = '';
+ if( !wfRunHooks( 'AbortNewAccount', array( $u, &$abortError ) ) ) {
+ // Hook point to add extra creation throttles and blocks
+ wfDebug( "LoginForm::addNewAccountInternal: a hook blocked creation\n" );
+ $this->mainLoginForm( $abortError );
+ return false;
+ }
+
+ if ( $wgAccountCreationThrottle && $wgUser->isPingLimitable() ) {
+ $key = wfMemcKey( 'acctcreate', 'ip', $ip );
+ $value = $wgMemc->get( $key );
+ if ( !$value ) {
+ $wgMemc->set( $key, 0, 86400 );
+ }
+ if ( $value >= $wgAccountCreationThrottle ) {
+ $this->throttleHit( $wgAccountCreationThrottle );
+ return false;
+ }
+ $wgMemc->incr( $key );
+ }
+
+ if( !$wgAuth->addUser( $u, $this->mPassword, $this->mEmail, $this->mRealName ) ) {
+ $this->mainLoginForm( wfMsg( 'externaldberror' ) );
+ return false;
+ }
+
+ return $this->initUser( $u, false );
}
/**
- * Create a language selector link for a particular language
- * Links back to this page preserving type and returnto
- * @param $text Link text
- * @param $lang Language code
- * @param $title Title to link to
- * @param $returnTo String returnto query
+ * Actually add a user to the database.
+ * Give it a User object that has been initialised with a name.
+ *
+ * @param $u User object.
+ * @param $autocreate boolean -- true if this is an autocreation via auth plugin
+ * @return User object.
+ * @private
*/
- public static function makeLanguageSelectorLink( $text, $lang, $title, $returnTo=false ) {
- global $wgUser;
- $attr = array( 'uselang' => $lang );
- if( $returnTo )
- $attr['returnto'] = $returnTo;
- $skin = $wgUser->getSkin();
- return $skin->linkKnown(
- $title,
- htmlspecialchars( $text ),
- array(),
- $attr
- );
+ function initUser( $u, $autocreate ) {
+ global $wgAuth;
+
+ $u->addToDatabase();
+
+ if ( $wgAuth->allowPasswordChange() ) {
+ $u->setPassword( $this->mPassword );
+ }
+
+ $u->setEmail( $this->mEmail );
+ $u->setRealName( $this->mRealName );
+ $u->setToken();
+
+ $wgAuth->initUser( $u, $autocreate );
+
+ if ( $this->mExtUser ) {
+ $this->mExtUser->link( $u->getId() );
+ $email = $this->mExtUser->getPref( 'emailaddress' );
+ if ( $email && !$this->mEmail ) {
+ $u->setEmail( $email );
+ }
+ }
+
+ $u->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
+ $u->saveSettings();
+
+ # Update user count
+ $ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
+ $ssUpdate->doUpdate();
+
+ return $u;
}
/**
- * Display a "login successful" page.
- * @param $msgname String message key to display
- * @param $html String HTML to optionally add
- * @param $returnto Title to returnto
- * @param $returntoQuery String query string for returnto link
+ * Internally authenticate the login request.
+ *
+ * This may create a local account as a side effect if the
+ * authentication plugin allows transparent local account
+ * creation.
+ *
+ * @public
*/
- public static function displaySuccessfulLogin( $msgname, $injected_html='', $returnto=false, $returntoQuery=false ) {
- global $wgOut, $wgUser;
+ function authenticateUserData() {
+ global $wgUser, $wgAuth;
+ if ( '' == $this->mName ) {
+ return self::NO_NAME;
+ }
+
+ global $wgPasswordAttemptThrottle;
- $wgOut->setPageTitle( wfMsg( 'loginsuccesstitle' ) );
- $wgOut->setRobotPolicy( 'noindex,nofollow' );
- $wgOut->setArticleRelated( false );
- $wgOut->addWikiMsg( $msgname, $wgUser->getName() );
- $wgOut->addHTML( $injected_html );
+ $throttleCount = 0;
+ if ( is_array( $wgPasswordAttemptThrottle ) ) {
+ $throttleKey = wfMemcKey( 'password-throttle', wfGetIP(), md5( $this->mName ) );
+ $count = $wgPasswordAttemptThrottle['count'];
+ $period = $wgPasswordAttemptThrottle['seconds'];
+
+ global $wgMemc;
+ $throttleCount = $wgMemc->get( $throttleKey );
+ if ( !$throttleCount ) {
+ $wgMemc->add( $throttleKey, 1, $period ); // start counter
+ } else if ( $throttleCount < $count ) {
+ $wgMemc->incr($throttleKey);
+ } else if ( $throttleCount >= $count ) {
+ return self::THROTTLED;
+ }
+ }
- if ( $returnto ) {
- $wgOut->returnToMain( null, $returnto, $this->mReturnToQuery );
+ // Load $wgUser now, and check to see if we're logging in as the same
+ // name. This is necessary because loading $wgUser (say by calling
+ // getName()) calls the UserLoadFromSession hook, which potentially
+ // creates the user in the database. Until we load $wgUser, checking
+ // for user existence using User::newFromName($name)->getId() below
+ // will effectively be using stale data.
+ if ( $wgUser->getName() === $this->mName ) {
+ wfDebug( __METHOD__.": already logged in as {$this->mName}\n" );
+ return self::SUCCESS;
+ }
+
+ $this->mExtUser = ExternalUser::newFromName( $this->mName );
+
+ # TODO: Allow some magic here for invalid external names, e.g., let the
+ # user choose a different wiki name.
+ $u = User::newFromName( $this->mName );
+ if( is_null( $u ) || !User::isUsableName( $u->getName() ) ) {
+ return self::ILLEGAL;
+ }
+
+ $isAutoCreated = false;
+ if ( 0 == $u->getID() ) {
+ $status = $this->attemptAutoCreate( $u );
+ if ( $status !== self::SUCCESS ) {
+ return $status;
+ } else {
+ $isAutoCreated = true;
+ }
} else {
- $wgOut->returnToMain( null );
+ $u->load();
}
+
+ // Give general extensions, such as a captcha, a chance to abort logins
+ $abort = self::ABORTED;
+ if( !wfRunHooks( 'AbortLogin', array( $u, $this->mPassword, &$abort ) ) ) {
+ return $abort;
+ }
+
+ if (!$u->checkPassword( $this->mPassword )) {
+ if( $u->checkTemporaryPassword( $this->mPassword ) ) {
+ // The e-mailed temporary password should not be used for actu-
+ // al logins; that's a very sloppy habit, and insecure if an
+ // attacker has a few seconds to click "search" on someone's o-
+ // pen mail reader.
+ //
+ // Allow it to be used only to reset the password a single time
+ // to a new value, which won't be in the user's e-mail ar-
+ // chives.
+ //
+ // For backwards compatibility, we'll still recognize it at the
+ // login form to minimize surprises for people who have been
+ // logging in with a temporary password for some time.
+ //
+ // As a side-effect, we can authenticate the user's e-mail ad-
+ // dress if it's not already done, since the temporary password
+ // was sent via e-mail.
+ if( !$u->isEmailConfirmed() ) {
+ $u->confirmEmail();
+ $u->saveSettings();
+ }
+
+ // At this point we just return an appropriate code/ indicating
+ // that the UI should show a password reset form; bot inter-
+ // faces etc will probably just fail cleanly here.
+ $retval = self::RESET_PASS;
+ } else {
+ $retval = '' == $this->mPassword ? self::EMPTY_PASS : self::WRONG_PASS;
+ }
+ } else {
+ $wgAuth->updateUser( $u );
+ $wgUser = $u;
+
+ // Please reset throttle for successful logins, thanks!
+ if($throttleCount) {
+ $wgMemc->delete($throttleKey);
+ }
+
+ if ( $isAutoCreated ) {
+ // Must be run after $wgUser is set, for correct new user log
+ wfRunHooks( 'AuthPluginAutoCreate', array( $wgUser ) );
+ }
+
+ $retval = self::SUCCESS;
+ }
+ wfRunHooks( 'LoginAuthenticateAudit', array( $u, $this->mPassword, $retval ) );
+ return $retval;
}
/**
- * Run any hooks registered for logins, then HTTP redirect to
- * $this->mReturnTo (or Main Page if that's undefined). Formerly we had a
- * nice message here, but that's really not as useful as just being sent to
- * wherever you logged in from. It should be clear that the action was
- * successful, given the lack of error messages plus the appearance of your
- * name in the upper right.
+ * Attempt to automatically create a user on login. Only succeeds if there
+ * is an external authentication method which allows it.
+ * @return integer Status code
*/
- public static function successfulLogin( $message, $returnTo='', $returnToQuery='' ) {
- global $wgUser, $wgOut;
+ function attemptAutoCreate( $user ) {
+ global $wgAuth, $wgUser, $wgAutocreatePolicy;
- # Run any hooks; display injected HTML if any, else redirect
- $injected_html = '';
- wfRunHooks('UserLoginComplete', array(&$wgUser, &$injected_html));
+ if ( $wgUser->isBlockedFromCreateAccount() ) {
+ wfDebug( __METHOD__.": user is blocked from account creation\n" );
+ return self::CREATE_BLOCKED;
+ }
- if( $injected_html !== '' ) {
- SpecialUserLogin::displaySuccessfulLogin( $message, $injected_html );
+ /**
+ * If the external authentication plugin allows it, automatically cre-
+ * ate a new account for users that are externally defined but have not
+ * yet logged in.
+ */
+ if ( $this->mExtUser ) {
+ # mExtUser is neither null nor false, so use the new ExternalAuth
+ # system.
+ if ( $wgAutocreatePolicy == 'never' ) {
+ return self::NOT_EXISTS;
+ }
+ if ( !$this->mExtUser->authenticate( $this->mPassword ) ) {
+ return self::WRONG_PLUGIN_PASS;
+ }
} else {
- $titleObj = Title::newFromText( $returnTo );
- if ( !$titleObj instanceof Title ) {
- $titleObj = Title::newMainPage();
+ # Old AuthPlugin.
+ if ( !$wgAuth->autoCreate() ) {
+ return self::NOT_EXISTS;
+ }
+ if ( !$wgAuth->userExists( $user->getName() ) ) {
+ wfDebug( __METHOD__.": user does not exist\n" );
+ return self::NOT_EXISTS;
+ }
+ if ( !$wgAuth->authenticate( $user->getName(), $this->mPassword ) ) {
+ wfDebug( __METHOD__.": \$wgAuth->authenticate() returned false, aborting\n" );
+ return self::WRONG_PLUGIN_PASS;
}
- $wgOut->redirect( $titleObj->getFullURL( $returnToQuery ) );
}
+
+ wfDebug( __METHOD__.": creating account\n" );
+ $user = $this->initUser( $user, true );
+ return self::SUCCESS;
}
-
- protected function processLogin(){
+ function processLogin() {
global $wgUser, $wgAuth;
- $result = $this->mLogin->attemptLogin();
- switch ( $result ) {
- case Login::SUCCESS:
+
+ switch ( $this->authenticateUserData() ) {
+ case self::SUCCESS:
+ # We've verified now, update the real record
+ if( (bool)$this->mRemember != (bool)$wgUser->getOption( 'rememberpassword' ) ) {
+ $wgUser->setOption( 'rememberpassword', $this->mRemember ? 1 : 0 );
+ $wgUser->saveSettings();
+ } else {
+ $wgUser->invalidateCache();
+ }
+ $wgUser->setCookies();
+
+ // Reset the throttle
+ $key = wfMemcKey( 'password-throttle', wfGetIP(), md5( $this->mName ) );
+ global $wgMemc;
+ $wgMemc->delete( $key );
+
if( $this->hasSessionCookie() || $this->mSkipCookieCheck ) {
- # Replace the language object to provide user interface in
- # correct language immediately on this first page load.
+ /* Replace the language object to provide user interface in
+ * correct language immediately on this first page load.
+ */
global $wgLang, $wgRequest;
$code = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
$wgLang = Language::factory( $code );
- return self::successfulLogin( 'loginsuccess', $this->mReturnTo, $this->mReturnToQuery );
+ return $this->successfulLogin();
} else {
- # Do a redirect check to ensure that the cookies are
- # being retained by the user's browser.
- return $this->cookieRedirectCheck();
+ return $this->cookieRedirectCheck( 'login' );
}
break;
- case Login::NO_NAME:
- case Login::ILLEGAL:
+ case self::NO_NAME:
+ case self::ILLEGAL:
$this->mainLoginForm( wfMsg( 'noname' ) );
break;
- case Login::WRONG_PLUGIN_PASS:
+ case self::WRONG_PLUGIN_PASS:
$this->mainLoginForm( wfMsg( 'wrongpassword' ) );
break;
- case Login::NOT_EXISTS:
+ case self::NOT_EXISTS:
if( $wgUser->isAllowed( 'createaccount' ) ){
$this->mainLoginForm( wfMsgWikiHtml( 'nosuchuser', htmlspecialchars( $this->mName ) ) );
} else {
$this->mainLoginForm( wfMsg( 'nosuchusershort', htmlspecialchars( $this->mName ) ) );
}
break;
- case Login::WRONG_PASS:
+ case self::WRONG_PASS:
$this->mainLoginForm( wfMsg( 'wrongpassword' ) );
break;
- case Login::EMPTY_PASS:
+ case self::EMPTY_PASS:
$this->mainLoginForm( wfMsg( 'wrongpasswordempty' ) );
break;
- case Login::RESET_PASS:
+ case self::RESET_PASS:
$this->resetLoginForm( wfMsg( 'resetpass_announce' ) );
break;
- case Login::CREATE_BLOCKED:
+ case self::CREATE_BLOCKED:
$this->userBlockedMessage();
break;
- case Login::THROTTLED:
+ case self::THROTTLED:
$this->mainLoginForm( wfMsg( 'login-throttled' ) );
break;
default:
}
}
- /**
- * 'Shell out' to Special:ResetPass to get the user to
- * set a new permanent password from a temporary one.
- * @param $error String message
- */
function resetLoginForm( $error ) {
global $wgOut;
$wgOut->addHTML( Xml::element('p', array( 'class' => 'error' ), $error ) );
}
/**
- * Attempt to send the user a password-reset mail, and display
- * the results (good, bad or ugly).
- * @return unknown_type
+ * @private
+ */
+ function mailPassword() {
+ global $wgUser, $wgOut, $wgAuth;
+
+ if ( wfReadOnly() ) {
+ $wgOut->readOnlyPage();
+ return false;
+ }
+
+ if( !$wgAuth->allowPasswordChange() ) {
+ $this->mainLoginForm( wfMsg( 'resetpass_forbidden' ) );
+ return;
+ }
+
+ # Check against blocked IPs
+ # fixme -- should we not?
+ if( $wgUser->isBlocked() ) {
+ $this->mainLoginForm( wfMsg( 'blocked-mailpassword' ) );
+ return;
+ }
+
+ // Check for hooks
+ $error = null;
+ if ( ! wfRunHooks( 'UserLoginMailPassword', array( $this->mName, &$error ) ) ) {
+ $this->mainLoginForm( $error );
+ return;
+ }
+
+ # Check against the rate limiter
+ if( $wgUser->pingLimiter( 'mailpassword' ) ) {
+ $wgOut->rateLimited();
+ return;
+ }
+
+ if ( '' == $this->mName ) {
+ $this->mainLoginForm( wfMsg( 'noname' ) );
+ return;
+ }
+ $u = User::newFromName( $this->mName );
+ if( is_null( $u ) ) {
+ $this->mainLoginForm( wfMsg( 'noname' ) );
+ return;
+ }
+ if ( 0 == $u->getID() ) {
+ $this->mainLoginForm( wfMsgWikiHtml( 'nosuchuser', htmlspecialchars( $u->getName() ) ) );
+ return;
+ }
+
+ # Check against password throttle
+ if ( $u->isPasswordReminderThrottled() ) {
+ global $wgPasswordReminderResendTime;
+ # Round the time in hours to 3 d.p., in case someone is specifying
+ # minutes or seconds.
+ $this->mainLoginForm( wfMsgExt( 'throttled-mailpassword', array( 'parsemag' ),
+ round( $wgPasswordReminderResendTime, 3 ) ) );
+ return;
+ }
+
+ $result = $this->mailPasswordInternal( $u, true, 'passwordremindertitle', 'passwordremindertext' );
+ if( WikiError::isError( $result ) ) {
+ $this->mainLoginForm( wfMsg( 'mailerror', $result->getMessage() ) );
+ } else {
+ $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ), 'success' );
+ }
+ }
+
+
+ /**
+ * @param object user
+ * @param bool throttle
+ * @param string message name of email title
+ * @param string message name of email text
+ * @return mixed true on success, WikiError on failure
+ * @private
+ */
+ function mailPasswordInternal( $u, $throttle = true, $emailTitle = 'passwordremindertitle', $emailText = 'passwordremindertext' ) {
+ global $wgServer, $wgScript, $wgUser, $wgNewPasswordExpiry;
+
+ if ( '' == $u->getEmail() ) {
+ return new WikiError( wfMsg( 'noemail', $u->getName() ) );
+ }
+ $ip = wfGetIP();
+ if( !$ip ) {
+ return new WikiError( wfMsg( 'badipaddress' ) );
+ }
+
+ wfRunHooks( 'User::mailPasswordInternal', array(&$wgUser, &$ip, &$u) );
+
+ $np = $u->randomPassword();
+ $u->setNewpassword( $np, $throttle );
+ $u->saveSettings();
+
+ $m = wfMsgExt( $emailText, array( 'parsemag' ), $ip, $u->getName(), $np,
+ $wgServer . $wgScript, round( $wgNewPasswordExpiry / 86400 ) );
+ $result = $u->sendMail( wfMsg( $emailTitle ), $m );
+
+ return $result;
+ }
+
+
+ /**
+ * Run any hooks registered for logins, then HTTP redirect to
+ * $this->mReturnTo (or Main Page if that's undefined). Formerly we had a
+ * nice message here, but that's really not as useful as just being sent to
+ * wherever you logged in from. It should be clear that the action was
+ * successful, given the lack of error messages plus the appearance of your
+ * name in the upper right.
+ *
+ * @private
+ */
+ function successfulLogin() {
+ global $wgUser, $wgOut;
+
+ # Run any hooks; display injected HTML if any, else redirect
+ $injected_html = '';
+ wfRunHooks('UserLoginComplete', array(&$wgUser, &$injected_html));
+
+ if( $injected_html !== '' ) {
+ $this->displaySuccessfulLogin( 'loginsuccess', $injected_html );
+ } else {
+ $titleObj = Title::newFromText( $this->mReturnTo );
+ if ( !$titleObj instanceof Title ) {
+ $titleObj = Title::newMainPage();
+ }
+ $wgOut->redirect( $titleObj->getFullURL( $this->mReturnToQuery ) );
+ }
+ }
+
+ /**
+ * Run any hooks registered for logins, then display a message welcoming
+ * the user.
+ *
+ * @private
+ */
+ function successfulCreation() {
+ global $wgUser, $wgOut;
+
+ # Run any hooks; display injected HTML
+ $injected_html = '';
+ wfRunHooks('UserLoginComplete', array(&$wgUser, &$injected_html));
+
+ $this->displaySuccessfulLogin( 'welcomecreation', $injected_html );
+ }
+
+ /**
+ * Display a "login successful" page.
*/
- protected function showMailPage(){
+ private function displaySuccessfulLogin( $msgname, $injected_html ) {
+ global $wgOut, $wgUser;
+
+ $wgOut->setPageTitle( wfMsg( 'loginsuccesstitle' ) );
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
+ $wgOut->setArticleRelated( false );
+ $wgOut->addWikiMsg( $msgname, $wgUser->getName() );
+ $wgOut->addHTML( $injected_html );
+
+ if ( !empty( $this->mReturnTo ) ) {
+ $wgOut->returnToMain( null, $this->mReturnTo, $this->mReturnToQuery );
+ } else {
+ $wgOut->returnToMain( null );
+ }
+ }
+
+ /** */
+ function userNotPrivilegedMessage($errors) {
global $wgOut;
- $result = $this->mLogin->mailPassword();
- switch( $result ){
- case Login::MAIL_READ_ONLY :
+ $wgOut->setPageTitle( wfMsg( 'permissionserrors' ) );
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
+ $wgOut->setArticleRelated( false );
+
+ $wgOut->addWikitext( $wgOut->formatPermissionsErrorMessage( $errors, 'createaccount' ) );
+ // Stuff that might want to be added at the end. For example, instruc-
+ // tions if blocked.
+ $wgOut->addWikiMsg( 'cantcreateaccount-nonblock-text' );
+
+ $wgOut->returnToMain( false );
+ }
+
+ /** */
+ function userBlockedMessage() {
+ global $wgOut, $wgUser;
+
+ # Let's be nice about this, it's likely that this feature will be used
+ # for blocking large numbers of innocent people, e.g. range blocks on
+ # schools. Don't blame it on the user. There's a small chance that it
+ # really is the user's fault, i.e. the username is blocked and they
+ # haven't bothered to log out before trying to create an account to
+ # evade it, but we'll leave that to their guilty conscience to figure
+ # out.
+
+ $wgOut->setPageTitle( wfMsg( 'cantcreateaccounttitle' ) );
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
+ $wgOut->setArticleRelated( false );
+
+ $ip = wfGetIP();
+ $blocker = User::whoIs( $wgUser->mBlock->mBy );
+ $block_reason = $wgUser->mBlock->mReason;
+
+ if ( strval( $block_reason ) === '' ) {
+ $block_reason = wfMsg( 'blockednoreason' );
+ }
+ $wgOut->addWikiMsg( 'cantcreateaccount-text', $ip, $block_reason, $blocker );
+ $wgOut->returnToMain( false );
+ }
+
+ /**
+ * @private
+ */
+ function mainLoginForm( $msg, $msgtype = 'error' ) {
+ global $wgUser, $wgOut, $wgHiddenPrefs, $wgEnableEmail;
+ global $wgCookiePrefix, $wgLoginLanguageSelector;
+ global $wgAuth, $wgEmailConfirmToEdit, $wgCookieExpiration;
+
+ $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
+
+ if ( $this->mType == 'signup' ) {
+ // Block signup here if in readonly. Keeps user from
+ // going through the process (filling out data, etc)
+ // and being informed later.
+ if ( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
- case Login::MAIL_PASSCHANGE_FORBIDDEN:
- $this->mainLoginForm( wfMsg( 'resetpass_forbidden' ) );
- return;
- case Login::MAIL_BLOCKED:
- $this->mainLoginForm( wfMsg( 'blocked-mailpassword' ) );
- return;
- case Login::MAIL_PING_THROTTLED:
- $wgOut->rateLimited();
- return;
- case Login::MAIL_PASS_THROTTLED:
- global $wgPasswordReminderResendTime;
- # Round the time in hours to 3 d.p., in case someone
- # is specifying minutes or seconds.
- $this->mainLoginForm( wfMsgExt(
- 'throttled-mailpassword',
- array( 'parsemag' ),
- round( $wgPasswordReminderResendTime, 3 )
- ) );
- return;
- case Login::NO_NAME:
- $this->mainLoginForm( wfMsg( 'noname' ) );
- return;
- case Login::NOT_EXISTS:
- $this->mainLoginForm( wfMsgWikiHtml( 'nosuchuser', htmlspecialchars( $this->mLogin->mUser->getName() ) ) );
- return;
- case Login::MAIL_EMPTY_EMAIL:
- $this->mainLoginForm( wfMsg( 'noemail', $this->mLogin->mUser->getName() ) );
- return;
- case Login::MAIL_BAD_IP:
- $this->mainLoginForm( wfMsg( 'badipaddress' ) );
- return;
- case Login::MAIL_ERROR:
- $this->mainLoginForm( wfMsg( 'mailerror', $this->mLogin->mMailResult->getMessage() ) );
+ } elseif ( $wgUser->isBlockedFromCreateAccount() ) {
+ $this->userBlockedMessage();
return;
- case Login::SUCCESS:
- $this->mainLoginForm( wfMsg( 'passwordsent', $this->mLogin->mUser->getName() ), 'success' );
+ } elseif ( count( $permErrors = $titleObj->getUserPermissionsErrors( 'createaccount', $wgUser, true ) )>0 ) {
+ $wgOut->showPermissionsErrorPage( $permErrors, 'createaccount' );
return;
+ }
+ }
+
+ if ( '' == $this->mName ) {
+ if ( $wgUser->isLoggedIn() ) {
+ $this->mName = $wgUser->getName();
+ } else {
+ $this->mName = isset( $_COOKIE[$wgCookiePrefix.'UserName'] ) ? $_COOKIE[$wgCookiePrefix.'UserName'] : null;
+ }
+ }
+
+ $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
+
+ if ( $this->mType == 'signup' ) {
+ $template = new UsercreateTemplate();
+ $q = 'action=submitlogin&type=signup';
+ $linkq = 'type=login';
+ $linkmsg = 'gotaccount';
+ } else {
+ $template = new UserloginTemplate();
+ $q = 'action=submitlogin&type=login';
+ $linkq = 'type=signup';
+ $linkmsg = 'nologin';
+ }
+
+ if ( !empty( $this->mReturnTo ) ) {
+ $returnto = '&returnto=' . wfUrlencode( $this->mReturnTo );
+ if ( !empty( $this->mReturnToQuery ) )
+ $returnto .= '&returntoquery=' .
+ wfUrlencode( $this->mReturnToQuery );
+ $q .= $returnto;
+ $linkq .= $returnto;
+ }
+
+ # Pass any language selection on to the mode switch link
+ if( $wgLoginLanguageSelector && $this->mLanguage )
+ $linkq .= '&uselang=' . $this->mLanguage;
+
+ $link = '<a href="' . htmlspecialchars ( $titleObj->getLocalUrl( $linkq ) ) . '">';
+ $link .= wfMsgHtml( $linkmsg . 'link' ); # Calling either 'gotaccountlink' or 'nologinlink'
+ $link .= '</a>';
+
+ # Don't show a "create account" link if the user can't
+ if( $this->showCreateOrLoginLink( $wgUser ) )
+ $template->set( 'link', wfMsgWikiHtml( $linkmsg, $link ) );
+ else
+ $template->set( 'link', '' );
+
+ $template->set( 'header', '' );
+ $template->set( 'name', $this->mName );
+ $template->set( 'password', $this->mPassword );
+ $template->set( 'retype', $this->mRetype );
+ $template->set( 'email', $this->mEmail );
+ $template->set( 'realname', $this->mRealName );
+ $template->set( 'domain', $this->mDomain );
+
+ $template->set( 'action', $titleObj->getLocalUrl( $q ) );
+ $template->set( 'message', $msg );
+ $template->set( 'messagetype', $msgtype );
+ $template->set( 'createemail', $wgEnableEmail && $wgUser->isLoggedIn() );
+ $template->set( 'userealname', !in_array( 'realname', $wgHiddenPrefs ) );
+ $template->set( 'useemail', $wgEnableEmail );
+ $template->set( 'emailrequired', $wgEmailConfirmToEdit );
+ $template->set( 'canreset', $wgAuth->allowPasswordChange() );
+ $template->set( 'canremember', ( $wgCookieExpiration > 0 ) );
+ $template->set( 'remember', $wgUser->getOption( 'rememberpassword' ) or $this->mRemember );
+
+ # Prepare language selection links as needed
+ if( $wgLoginLanguageSelector ) {
+ $template->set( 'languages', $this->makeLanguageSelector() );
+ if( $this->mLanguage )
+ $template->set( 'uselang', $this->mLanguage );
+ }
+
+ // Give authentication and captcha plugins a chance to modify the form
+ $wgAuth->modifyUITemplate( $template, $this->mType );
+ if ( $this->mType == 'signup' ) {
+ wfRunHooks( 'UserCreateForm', array( &$template ) );
+ } else {
+ wfRunHooks( 'UserLoginForm', array( &$template ) );
+ }
+
+ $wgOut->setPageTitle( wfMsg( 'userlogin' ) );
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
+ $wgOut->setArticleRelated( false );
+ $wgOut->disallowUserJs(); // just in case...
+ $wgOut->addTemplate( $template );
+ }
+
+ /**
+ * @private
+ */
+ function showCreateOrLoginLink( &$user ) {
+ if( $this->mType == 'signup' ) {
+ return( true );
+ } elseif( $user->isAllowed( 'createaccount' ) ) {
+ return( true );
+ } else {
+ return( false );
+ }
+ }
+
+ /**
+ * Check if a session cookie is present.
+ *
+ * This will not pick up a cookie set during _this_ request, but is meant
+ * to ensure that the client is returning the cookie which was set on a
+ * previous pass through the system.
+ *
+ * @private
+ */
+ function hasSessionCookie() {
+ global $wgDisableCookieCheck, $wgRequest;
+ return $wgDisableCookieCheck ? true : $wgRequest->checkSessionCookie();
+ }
+
+ /**
+ * @private
+ */
+ function cookieRedirectCheck( $type ) {
+ global $wgOut;
+
+ $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
+ $query = array( 'wpCookieCheck' => $type );
+ if ( $this->mReturnTo ) $query['returnto'] = $this->mReturnTo;
+ $check = $titleObj->getFullURL( $query );
+
+ return $wgOut->redirect( $check );
+ }
+
+ /**
+ * @private
+ */
+ function onCookieRedirectCheck( $type ) {
+ if ( !$this->hasSessionCookie() ) {
+ if ( $type == 'new' ) {
+ return $this->mainLoginForm( wfMsgExt( 'nocookiesnew', array( 'parseinline' ) ) );
+ } else if ( $type == 'login' ) {
+ return $this->mainLoginForm( wfMsgExt( 'nocookieslogin', array( 'parseinline' ) ) );
+ } else {
+ # shouldn't happen
+ return $this->mainLoginForm( wfMsg( 'error' ) );
+ }
+ } else {
+ return $this->successfulLogin();
}
}
/**
- * Since the UserLoginForm hook was changed to pass a SpecialPage
- * instead of a QuickTemplate derivative, old extensions might
- * easily try calling this method expecing it to exist. Tempting
- * though it is to let them have the fatal error, let's at least
- * fail gracefully...
- * @deprecated
+ * @private
*/
- public function set(){
- wfDeprecated( __METHOD__ );
+ function throttleHit( $limit ) {
+ $this->mainLoginForm( wfMsgExt( 'acct_creation_throttle_hit', array( 'parseinline' ), $limit ) );
+ }
+
+ /**
+ * Produce a bar of links which allow the user to select another language
+ * during login/registration but retain "returnto"
+ *
+ * @return string
+ */
+ function makeLanguageSelector() {
+ global $wgLang;
+
+ $msg = wfMsgForContent( 'loginlanguagelinks' );
+ if( $msg != '' && !wfEmptyMsg( 'loginlanguagelinks', $msg ) ) {
+ $langs = explode( "\n", $msg );
+ $links = array();
+ foreach( $langs as $lang ) {
+ $lang = trim( $lang, '* ' );
+ $parts = explode( '|', $lang );
+ if (count($parts) >= 2) {
+ $links[] = $this->makeLanguageSelectorLink( $parts[0], $parts[1] );
+ }
+ }
+ return count( $links ) > 0 ? wfMsgHtml( 'loginlanguagelabel', $wgLang->pipeList( $links ) ) : '';
+ } else {
+ return '';
+ }
+ }
+
+ /**
+ * Create a language selector link for a particular language
+ * Links back to this page preserving type and returnto
+ *
+ * @param $text Link text
+ * @param $lang Language code
+ */
+ function makeLanguageSelectorLink( $text, $lang ) {
+ global $wgUser;
+ $self = SpecialPage::getTitleFor( 'Userlogin' );
+ $attr = array( 'uselang' => $lang );
+ if( $this->mType == 'signup' )
+ $attr['type'] = 'signup';
+ if( $this->mReturnTo )
+ $attr['returnto'] = $this->mReturnTo;
+ $skin = $wgUser->getSkin();
+ return $skin->linkKnown(
+ $self,
+ htmlspecialchars( $text ),
+ array(),
+ $attr
+ );
}
}
--- /dev/null
+<?php
+/**
+ * @defgroup Templates Templates
+ * @file
+ * @ingroup Templates
+ */
+if( !defined( 'MEDIAWIKI' ) ) die( -1 );
+
+/**
+ * HTML template for Special:Userlogin form
+ * @ingroup Templates
+ */
+class UserloginTemplate extends QuickTemplate {
+ function execute() {
+ if( $this->data['message'] ) {
+?>
+ <div class="<?php $this->text('messagetype') ?>box">
+ <?php if ( $this->data['messagetype'] == 'error' ) { ?>
+ <h2><?php $this->msg('loginerror') ?></h2>
+ <?php } ?>
+ <?php $this->html('message') ?>
+ </div>
+ <div class="visualClear"></div>
+<?php } ?>
+
+<div id="loginstart"><?php $this->msgWiki( 'loginstart' ); ?></div>
+<div id="userloginForm">
+<form name="userlogin" method="post" action="<?php $this->text('action') ?>">
+ <h2><?php $this->msg('login') ?></h2>
+ <p id="userloginlink"><?php $this->html('link') ?></p>
+ <?php $this->html('header'); /* pre-table point for form plugins... */ ?>
+ <div id="userloginprompt"><?php $this->msgWiki('loginprompt') ?></div>
+ <?php if( @$this->haveData( 'languages' ) ) { ?><div id="languagelinks"><p><?php $this->html( 'languages' ); ?></p></div><?php } ?>
+ <table>
+ <tr>
+ <td class="mw-label"><label for='wpName1'><?php $this->msg('yourname') ?></label></td>
+ <td class="mw-input">
+ <?php
+ echo Html::input( 'wpName', $this->data['name'], 'text', array(
+ 'class' => 'loginText',
+ 'id' => 'wpName1',
+ 'tabindex' => '1',
+ 'size' => '20',
+ 'required'
+ # Can't do + array( 'autofocus' ) because + for arrays in PHP
+ # only works right for associative arrays! Thanks, PHP.
+ ) + ( $this->data['name'] ? array() : array( 'autofocus' => '' ) ) ); ?>
+
+ </td>
+ </tr>
+ <tr>
+ <td class="mw-label"><label for='wpPassword1'><?php $this->msg('yourpassword') ?></label></td>
+ <td class="mw-input">
+ <?php
+ echo Html::input( 'wpPassword', null, 'password', array(
+ 'class' => 'loginPassword',
+ 'id' => 'wpPassword1',
+ 'tabindex' => '2',
+ 'size' => '20'
+ ) + ( $this->data['name'] ? array( 'autofocus' ) : array() ) ); ?>
+
+ </td>
+ </tr>
+ <?php if( $this->data['usedomain'] ) {
+ $doms = "";
+ foreach( $this->data['domainnames'] as $dom ) {
+ $doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
+ }
+ ?>
+ <tr id="mw-user-domain-section">
+ <td class="mw-label"><?php $this->msg( 'yourdomainname' ) ?></td>
+ <td class="mw-input">
+ <select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
+ tabindex="3">
+ <?php echo $doms ?>
+ </select>
+ </td>
+ </tr>
+ <?php }
+ if( $this->data['canremember'] ) { ?>
+ <tr>
+ <td></td>
+ <td class="mw-input">
+ <?php
+ echo Html::input( 'wpRemember', '1', 'checkbox', array(
+ 'tabindex' => '4',
+ 'id' => 'wpRemember'
+ ) + ( $this->data['remember'] ? array( 'checked' ) : array() ) ); ?>
+
+ <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
+ </td>
+ </tr>
+<?php } ?>
+ <tr>
+ <td></td>
+ <td class="mw-submit">
+ <?php
+ echo Html::input( 'wpLoginAttempt', wfMsg( 'login' ), 'submit', array(
+ 'id' => 'wpLoginAttempt',
+ 'tabindex' => '5'
+ ) );
+ if ( $this->data['useemail'] && $this->data['canreset'] ) {
+ echo ' ';
+ echo Html::input( 'wpMailmypassword', wfMsg( 'mailmypassword' ), 'submit', array(
+ 'id' => 'wpMailmypassword',
+ 'tabindex' => '6'
+ ) );
+ } ?>
+
+ </td>
+ </tr>
+ </table>
+<?php if( @$this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
+</form>
+</div>
+<div id="loginend"><?php $this->msgWiki( 'loginend' ); ?></div>
+<?php
+
+ }
+}
+
+/**
+ * @ingroup Templates
+ */
+class UsercreateTemplate extends QuickTemplate {
+ function addInputItem( $name, $value, $type, $msg, $helptext = false ) {
+ $this->data['extraInput'][] = array(
+ 'name' => $name,
+ 'value' => $value,
+ 'type' => $type,
+ 'msg' => $msg,
+ 'helptext' => $helptext,
+ );
+ }
+
+ function execute() {
+ if( $this->data['message'] ) {
+?>
+ <div class="<?php $this->text('messagetype') ?>box">
+ <?php if ( $this->data['messagetype'] == 'error' ) { ?>
+ <h2><?php $this->msg('loginerror') ?></h2>
+ <?php } ?>
+ <?php $this->html('message') ?>
+ </div>
+ <div class="visualClear"></div>
+<?php } ?>
+<div id="userlogin">
+
+<form name="userlogin2" id="userlogin2" method="post" action="<?php $this->text('action') ?>">
+ <h2><?php $this->msg('createaccount') ?></h2>
+ <p id="userloginlink"><?php $this->html('link') ?></p>
+ <?php $this->html('header'); /* pre-table point for form plugins... */ ?>
+ <?php if( @$this->haveData( 'languages' ) ) { ?><div id="languagelinks"><p><?php $this->html( 'languages' ); ?></p></div><?php } ?>
+ <table>
+ <tr>
+ <td class="mw-label"><label for='wpName2'><?php $this->msg('yourname') ?></label></td>
+ <td class="mw-input">
+ <?php
+ echo Html::input( 'wpName', null, 'text', array(
+ 'class' => 'loginText',
+ 'id' => 'wpName2',
+ 'tabindex' => '1',
+ 'size' => '20',
+ 'required',
+ 'autofocus'
+ ) ); ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="mw-label"><label for='wpPassword2'><?php $this->msg('yourpassword') ?></label></td>
+ <td class="mw-input">
+<?php
+ echo Html::input( 'wpPassword', null, 'password', array(
+ 'class' => 'loginPassword',
+ 'id' => 'wpPassword2',
+ 'tabindex' => '2',
+ 'size' => '20'
+ ) + User::passwordChangeInputAttribs() ); ?>
+ </td>
+ </tr>
+ <?php if( $this->data['usedomain'] ) {
+ $doms = "";
+ foreach( $this->data['domainnames'] as $dom ) {
+ $doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
+ }
+ ?>
+ <tr>
+ <td class="mw-label"><?php $this->msg( 'yourdomainname' ) ?></td>
+ <td class="mw-input">
+ <select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
+ tabindex="3">
+ <?php echo $doms ?>
+ </select>
+ </td>
+ </tr>
+ <?php } ?>
+ <tr>
+ <td class="mw-label"><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?></label></td>
+ <td class="mw-input">
+ <?php
+ echo Html::input( 'wpRetype', null, 'password', array(
+ 'class' => 'loginPassword',
+ 'id' => 'wpRetype',
+ 'tabindex' => '4',
+ 'size' => '20'
+ ) + User::passwordChangeInputAttribs() ); ?>
+ </td>
+ </tr>
+ <tr>
+ <?php if( $this->data['useemail'] ) { ?>
+ <td class="mw-label"><label for='wpEmail'><?php $this->msg('youremail') ?></label></td>
+ <td class="mw-input">
+ <?php
+ echo Html::input( 'wpEmail', $this->data['email'], 'email', array(
+ 'class' => 'loginText',
+ 'id' => 'wpEmail',
+ 'tabindex' => '5',
+ 'size' => '20'
+ ) ); ?>
+ <div class="prefsectiontip">
+ <?php if( $this->data['emailrequired'] ) {
+ $this->msgWiki('prefs-help-email-required');
+ } else {
+ $this->msgWiki('prefs-help-email');
+ } ?>
+ </div>
+ </td>
+ <?php } ?>
+ <?php if( $this->data['userealname'] ) { ?>
+ </tr>
+ <tr>
+ <td class="mw-label"><label for='wpRealName'><?php $this->msg('yourrealname') ?></label></td>
+ <td class="mw-input">
+ <input type='text' class='loginText' name="wpRealName" id="wpRealName"
+ tabindex="6"
+ value="<?php $this->text('realname') ?>" size='20' />
+ <div class="prefsectiontip">
+ <?php $this->msgWiki('prefs-help-realname'); ?>
+ </div>
+ </td>
+ <?php } ?>
+ </tr>
+ <?php if( $this->data['canremember'] ) { ?>
+ <tr>
+ <td></td>
+ <td class="mw-input">
+ <input type='checkbox' name="wpRemember"
+ tabindex="7"
+ value="1" id="wpRemember"
+ <?php if( $this->data['remember'] ) { ?>checked="checked"<?php } ?>
+ /> <label for="wpRemember"><?php $this->msg('remembermypassword') ?></label>
+ </td>
+ </tr>
+<?php }
+
+ $tabIndex = 8;
+ if ( isset( $this->data['extraInput'] ) && is_array( $this->data['extraInput'] ) ) {
+ foreach ( $this->data['extraInput'] as $inputItem ) { ?>
+ <tr>
+ <?php
+ if ( !empty( $inputItem['msg'] ) && $inputItem['type'] != 'checkbox' ) {
+ ?><td class="mw-label"><label for="<?php
+ echo htmlspecialchars( $inputItem['name'] ); ?>"><?php
+ $this->msgWiki( $inputItem['msg'] ) ?></label><?php
+ } else {
+ ?><td><?php
+ }
+ ?></td>
+ <td class="mw-input">
+ <input type="<?php echo htmlspecialchars( $inputItem['type'] ) ?>" name="<?php
+ echo htmlspecialchars( $inputItem['name'] ); ?>"
+ tabindex="<?php echo $tabIndex++; ?>"
+ value="<?php
+ if ( $inputItem['type'] != 'checkbox' ) {
+ echo htmlspecialchars( $inputItem['value'] );
+ } else {
+ echo '1';
+ }
+ ?>" id="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
+ <?php
+ if ( $inputItem['type'] == 'checkbox' && !empty( $inputItem['value'] ) )
+ echo 'checked="checked"';
+ ?> /> <?php
+ if ( $inputItem['type'] == 'checkbox' && !empty( $inputItem['msg'] ) ) {
+ ?>
+ <label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"><?php
+ $this->msgHtml( $inputItem['msg'] ) ?></label><?php
+ }
+ if( $inputItem['helptext'] !== false ) {
+ ?>
+ <div class="prefsectiontip">
+ <?php $this->msgWiki( $inputItem['helptext'] ); ?>
+ </div>
+ <?php } ?>
+ </td>
+ </tr>
+<?php
+
+ }
+ }
+?>
+ <tr>
+ <td></td>
+ <td class="mw-submit">
+ <input type='submit' name="wpCreateaccount" id="wpCreateaccount"
+ tabindex="<?php echo $tabIndex++; ?>"
+ value="<?php $this->msg('createaccount') ?>" />
+ <?php if( $this->data['createemail'] ) { ?>
+ <input type='submit' name="wpCreateaccountMail" id="wpCreateaccountMail"
+ tabindex="<?php echo $tabIndex++; ?>"
+ value="<?php $this->msg('createaccountmail') ?>" />
+ <?php } ?>
+ </td>
+ </tr>
+ </table>
+<?php if( @$this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
+</form>
+</div>
+<div id="signupend"><?php $this->msgWiki( 'signupend' ); ?></div>
+<?php
+
+ }
+}
'login' => 'Log in',
'nav-login-createaccount' => 'Log in / create account',
'loginprompt' => 'You must have cookies enabled to log in to {{SITENAME}}.',
-'userlogin' => 'Log in',
+'userlogin' => 'Log in / create account',
'logout' => 'Log out',
'userlogout' => 'Log out',
'notloggedin' => 'Not logged in',
{{Identical|Log in}}",
'nav-login-createaccount' => "Shown to anonymous users in the upper right corner of the page. When you can't create an account, the message {{msg|login}} is shown.",
'loginprompt' => 'A small notice in the log in form.',
-'userlogin' => 'Name of special page [[Special:UserLogin]] where a user can log in.',
+'userlogin' => 'Name of special page [[Special:UserLogin]] where a user can log in or click to create a user account.',
'logout' => '{{Identical|Log out}}',
'userlogout' => '{{Identical|Log out}}',
'notloggedin' => 'This message is displayed in the standard skin when not logged in. The message is placed above the login link in the top right corner of pages.
{{Identical|Not logged in}}',
'nologin' => 'A message shown in the log in form. $1 is a link to the account creation form, and the text of it is "[[MediaWiki:Nologinlink/{{SUBPAGENAME}}|{{int:nologinlink}}]]".',
'nologinlink' => 'Text of the link to the account creation form. Before that link, the message [[MediaWiki:Nologin/{{SUBPAGENAME}}]] appears.',
-'createaccount' => 'The title of Special:CreateAccount, where users can register a new account. Used on Special:SpecialPages, and also on the submit button in the form where you register a new account.',
+'createaccount' => 'Used on the submit button in the form where you register a new account.',
'gotaccount' => 'A message shown in the account creation form. $1 is a link to the log in form, and the text of it is "[[MediaWiki:Gotaccountlink/{{SUBPAGENAME}}|{{int:gotaccountlink}}]]".',
'gotaccountlink' => 'Text of the link to the log in form. Before that link, the message [[MediaWiki:Gotaccount/{{SUBPAGENAME}}]] appears.
table.mw-htmlform-nolabel td.mw-label { width: 0 !important; }
-#wpLoginAttempt, #wpCreateaccount { margin-right:0; }
-
/**
* Image captions
*/
dépôts / lhc / web / wiklou.git / commitdiff