<?php
-
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
require_once('UserMailer.php');
-function wfSpecialUserlogin()
-{
+/**
+ * consutrctor
+ */
+function wfSpecialUserlogin() {
global $wgCommandLineMode;
global $wgRequest;
- if( !$wgCommandLineMode && !isset( $_COOKIE[ini_get("session.name")] ) ) {
+ if( !$wgCommandLineMode && !isset( $_COOKIE[ini_get('session.name')] ) ) {
User::SetupSession();
}
$form->execute();
}
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
class LoginForm {
var $mName, $mPassword, $mRetype, $mReturnto, $mCookieCheck, $mPosted;
var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
var $mLoginattempt, $mRemember, $mEmail;
function LoginForm( &$request ) {
- global $wgLang;
+ global $wgLang, $wgAllowRealName;
$this->mName = $request->getText( 'wpName' );
$this->mPassword = $request->getText( 'wpPassword' );
$this->mRetype = $request->getText( 'wpRetype' );
$this->mReturnto = $request->getVal( 'returnto' );
- $this->mCookieCheck = $request->getVal( "wpCookieCheck" );
+ $this->mCookieCheck = $request->getVal( 'wpCookieCheck' );
$this->mPosted = $request->wasPosted();
$this->mCreateaccount = $request->getCheck( 'wpCreateaccount' );
$this->mCreateaccountMail = $request->getCheck( 'wpCreateaccountMail' );
$this->mAction = $request->getVal( 'action' );
$this->mRemember = $request->getCheck( 'wpRemember' );
$this->mEmail = $request->getText( 'wpEmail' );
- $this->mRealName = $request->getText( 'wpRealName' );
-
+ if ($wgAllowRealName) {
+ $this->mRealName = $request->getText( 'wpRealName' );
+ } else {
+ $this->mRealName = '';
+ }
+
# When switching accounts, it sucks to get automatically logged out
- if( $this->mReturnto == $wgLang->specialPage( "Userlogout" ) ) {
- $this->mReturnto = "";
+ if( $this->mReturnto == $wgLang->specialPage( 'Userlogout' ) ) {
+ $this->mReturnto = '';
}
}
function execute() {
if ( !is_null( $this->mCookieCheck ) ) {
$this->onCookieRedirectCheck( $this->mCookieCheck );
+ return;
} else if( $this->mPosted ) {
if( $this->mCreateaccount ) {
return $this->addNewAccount();
return $this->addNewAccountMailPassword();
} else if ( $this->mMailmypassword ) {
return $this->mailPassword();
- } else if ( ( "submit" == $this->mAction ) || $this->mLoginattempt ) {
+ } else if ( ( 'submit' == $this->mAction ) || $this->mLoginattempt ) {
return $this->processLogin();
}
}
- $this->mainLoginForm( "" );
+ $this->mainLoginForm( '' );
}
- /* private */ function addNewAccountMailPassword()
- {
+ /**
+ * @access private
+ */
+ function addNewAccountMailPassword() {
global $wgOut;
- if ("" == $this->mEmail) {
- $this->mainLoginForm( wfMsg( "noemail", $this->mName ) );
+ if ('' == $this->mEmail) {
+ $this->mainLoginForm( wfMsg( 'noemail', htmlspecialchars( $this->mName ) ) );
return;
}
$u->saveSettings();
$error = $this->mailPasswordInternal($u);
- $wgOut->setPageTitle( wfMsg( "accmailtitle" ) );
- $wgOut->setRobotpolicy( "noindex,nofollow" );
+ $wgOut->setPageTitle( wfMsg( 'accmailtitle' ) );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
- if ( $error === "" ) {
- $wgOut->addWikiText( wfMsg( "accmailtext", $u->getName(), $u->getEmail() ) );
+ if ( $error === '' ) {
+ $wgOut->addWikiText( wfMsg( 'accmailtext', $u->getName(), $u->getEmail() ) );
$wgOut->returnToMain( false );
} else {
- $this->mainLoginForm( wfMsg( "mailerror", $error ) );
+ $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
}
$u = 0;
}
- /* private */ function addNewAccount()
- {
+ /**
+ * @access private
+ */
+ function addNewAccount() {
global $wgUser, $wgOut;
global $wgDeferredUpdateList;
array_push( $wgDeferredUpdateList, $up );
if( $this->hasSessionCookie() ) {
- return $this->successfulLogin( wfMsg( "welcomecreation", $wgUser->getName() ) );
+ return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
} else {
- return $this->cookieRedirectCheck( "new" );
+ return $this->cookieRedirectCheck( 'new' );
}
}
- /* private */ function addNewAccountInternal()
- {
+ /**
+ * @access private
+ */
+ function addNewAccountInternal() {
global $wgUser, $wgOut;
global $wgMaxNameChars;
+ global $wgMemc, $wgAccountCreationThrottle, $wgDBname, $wgIP;
if (!$wgUser->isAllowedToCreateAccount()) {
$this->userNotPrivilegedMessage();
}
if ( 0 != strcmp( $this->mPassword, $this->mRetype ) ) {
- $this->mainLoginForm( wfMsg( "badretype" ) );
+ $this->mainLoginForm( wfMsg( 'badretype' ) );
return;
}
$name = trim( $this->mName );
- if ( ( "" == $name ) ||
+ $u = User::newFromName( $name );
+ if ( is_null( $u ) ||
+ ( '' == $name ) ||
preg_match( "/\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}/", $name ) ||
(strpos( $name, "/" ) !== false) ||
- (strlen( $name ) > $wgMaxNameChars) )
+ (strlen( $name ) > $wgMaxNameChars) ||
+ ucFirst($name) != $u->getName() )
{
- $this->mainLoginForm( wfMsg( "noname" ) );
+ $this->mainLoginForm( wfMsg( 'noname' ) );
return;
}
if ( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
}
- $u = User::newFromName( $name );
if ( 0 != $u->idForName() ) {
- $this->mainLoginForm( wfMsg( "userexists" ) );
+ $this->mainLoginForm( wfMsg( 'userexists' ) );
return;
}
+
+ if ( $wgAccountCreationThrottle ) {
+ $key = $wgDBname.':acctcreate:ip:'.$wgIP;
+ $value = $wgMemc->incr( $key );
+ if ( !$value ) {
+ $wgMemc->set( $key, 1, 86400 );
+ }
+ if ( $value > $wgAccountCreationThrottle ) {
+ $this->throttleHit( $wgAccountCreationThrottle );
+ return;
+ }
+ }
+
$u->addToDatabase();
$u->setPassword( $this->mPassword );
$u->setEmail( $this->mEmail );
if ( $this->mRemember ) { $r = 1; }
else { $r = 0; }
- $u->setOption( "rememberpassword", $r );
+ $u->setOption( 'rememberpassword', $r );
return $u;
}
-
-
- /* private */ function processLogin()
- {
+ /**
+ * @access private
+ */
+ function processLogin() {
global $wgUser;
global $wgDeferredUpdateList;
- if ( "" == $this->mName ) {
- $this->mainLoginForm( wfMsg( "noname" ) );
+ if ( '' == $this->mName ) {
+ $this->mainLoginForm( wfMsg( 'noname' ) );
return;
}
$u = User::newFromName( $this->mName );
+ if( is_null( $u ) ) {
+ $this->mainLoginForm( wfMsg( 'noname' ) );
+ return;
+ }
$id = $u->idForName();
if ( 0 == $id ) {
- $this->mainLoginForm( wfMsg( "nosuchuser", $u->getName() ) );
+ $this->mainLoginForm( wfMsg( 'nosuchuser', $u->getName() ) );
return;
}
$u->setId( $id );
$u->loadFromDatabase();
- $ep = $u->encryptPassword( $this->mPassword );
- if ( 0 != strcmp( $ep, $u->getPassword() ) ) {
- if ( 0 != strcmp( $ep, $u->getNewpassword() ) ) {
- $this->mainLoginForm( wfMsg( "wrongpassword" ) );
- return;
- }
+ if (!$u->checkPassword( $this->mPassword )) {
+ $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
+ return;
}
# We've verified now, update the real record
#
if ( $this->mRemember ) {
$r = 1;
- $u->setCookiePassword( $this->mPassword );
} else {
$r = 0;
}
- $u->setOption( "rememberpassword", $r );
+ $u->setOption( 'rememberpassword', $r );
$wgUser = $u;
$wgUser->setCookies();
array_push( $wgDeferredUpdateList, $up );
if( $this->hasSessionCookie() ) {
- return $this->successfulLogin( wfMsg( "loginsuccess", $wgUser->getName() ) );
+ return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
} else {
- return $this->cookieRedirectCheck( "login" );
+ return $this->cookieRedirectCheck( 'login' );
}
}
- /* private */ function mailPassword()
- {
+ /**
+ * @access private
+ */
+ function mailPassword() {
global $wgUser, $wgDeferredUpdateList, $wgOutputEncoding;
global $wgCookiePath, $wgCookieDomain, $wgDBname;
- if ( "" == $this->mName ) {
- $this->mainLoginForm( wfMsg( "noname" ) );
+ if ( '' == $this->mName ) {
+ $this->mainLoginForm( wfMsg( 'noname' ) );
return;
}
$u = User::newFromName( $this->mName );
+ if( is_null( $u ) ) {
+ $this->mainLoginForm( wfMsg( 'noname' ) );
+ return;
+ }
$id = $u->idForName();
if ( 0 == $id ) {
- $this->mainLoginForm( wfMsg( "nosuchuser", $u->getName() ) );
+ $this->mainLoginForm( wfMsg( 'nosuchuser', $u->getName() ) );
return;
}
$u->setId( $id );
$u->loadFromDatabase();
$error = $this->mailPasswordInternal( $u );
- if ($error === "") {
- $this->mainLoginForm( wfMsg( "passwordsent", $u->getName() ) );
+ if ($error === '') {
+ $this->mainLoginForm( wfMsg( 'passwordsent', $u->getName() ) );
} else {
- $this->mainLoginForm( wfMsg( "mailerror", $error ) );
+ $this->mainLoginForm( wfMsg( 'mailerror', $error ) );
}
}
- /* private */ function mailPasswordInternal( $u )
- {
+ /**
+ * @access private
+ */
+ function mailPasswordInternal( $u ) {
global $wgDeferredUpdateList, $wgOutputEncoding;
global $wgPasswordSender, $wgDBname, $wgIP;
global $wgCookiePath, $wgCookieDomain;
- if ( "" == $u->getEmail() ) {
- $this->mainLoginForm( wfMsg( "noemail", $u->getName() ) );
- return;
+ if ( '' == $u->getEmail() ) {
+ return wfMsg( 'noemail', $u->getName() );
}
$np = User::randomPassword();
$u->setNewpassword( $np );
- setcookie( "{$wgDBname}Password", "", time() - 3600, $wgCookiePath, $wgCookieDomain );
+ setcookie( "{$wgDBname}Token", '', time() - 3600, $wgCookiePath, $wgCookieDomain );
$u->saveSettings();
$ip = $wgIP;
- if ( "" == $ip ) { $ip = "(Unknown)"; }
+ if ( '' == $ip ) { $ip = '(Unknown)'; }
- $m = wfMsg( "passwordremindertext", $ip, $u->getName(), $np );
+ $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np );
- $error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( "passwordremindertitle" ), $m );
-
- return $error;
+ $error = userMailer( $u->getEmail(), $wgPasswordSender, wfMsg( 'passwordremindertitle' ), $m );
+
+ return htmlspecialchars( $error );
}
-
-
-
- /* private */ function successfulLogin( $msg )
- {
+ /**
+ * @access private
+ */
+ function successfulLogin( $msg ) {
global $wgUser;
global $wgDeferredUpdateList;
global $wgOut;
- $wgOut->setPageTitle( wfMsg( "loginsuccesstitle" ) );
- $wgOut->setRobotpolicy( "noindex,nofollow" );
+ $wgOut->setPageTitle( wfMsg( 'loginsuccesstitle' ) );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
- $wgOut->addHTML( $msg );
+ $wgOut->addWikiText( $msg );
$wgOut->returnToMain();
}
- function userNotPrivilegedMessage()
- {
+ function userNotPrivilegedMessage() {
global $wgOut, $wgUser, $wgLang;
- $wgOut->setPageTitle( wfMsg( "whitelistacctitle" ) );
- $wgOut->setRobotpolicy( "noindex,nofollow" );
+ $wgOut->setPageTitle( wfMsg( 'whitelistacctitle' ) );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
- $wgOut->addWikiText( wfMsg( "whitelistacctext" ) );
+ $wgOut->addWikiText( wfMsg( 'whitelistacctext' ) );
$wgOut->returnToMain( false );
}
- /* private */ function mainLoginForm( $err )
- {
+ /**
+ * @access private
+ */
+ function mainLoginForm( $err ) {
global $wgUser, $wgOut, $wgLang;
- global $wgDBname;
-
- $le = wfMsg( "loginerror" );
- $yn = wfMsg( "yourname" );
- $yp = wfMsg( "yourpassword" );
- $ypa = wfMsg( "yourpasswordagain" );
- $rmp = wfMsg( "remembermypassword" );
- $nuo = wfMsg( "newusersonly" );
- $li = wfMsg( "login" );
- $ca = wfMsg( "createaccount" );
- $cam = wfMsg( "createaccountmail" );
- $ye = wfMsg( "youremail" );
- $yrn = wfMsg( "yourrealname" );
- $efl = wfMsg( "emailforlost" );
- $mmp = wfMsg( "mailmypassword" );
- $endText = wfMsg( "loginend" );
-
- if ( $endText = "<loginend>" ) {
- $endText = "";
- }
-
- if ( "" == $this->mName ) {
+ global $wgDBname, $wgAllowRealName;
+
+ $le = wfMsg( 'loginerror' );
+ $yn = wfMsg( 'yourname' );
+ $yp = wfMsg( 'yourpassword' );
+ $ypa = wfMsg( 'yourpasswordagain' );
+ $rmp = wfMsg( 'remembermypassword' );
+ $nuo = wfMsg( 'newusersonly' );
+ $li = wfMsg( 'login' );
+ $ca = wfMsg( 'createaccount' );
+ $cam = wfMsg( 'createaccountmail' );
+ $ye = wfMsg( 'youremail' );
+ if( $wgAllowRealName ) {
+ $yrn = wfMsg( 'yourrealname' );
+ } else {
+ $yrn = '';
+ }
+ $efl = wfMsg( 'emailforlost' );
+ $mmp = wfMsg( 'mailmypassword' );
+ $endText = wfMsg( 'loginend' );
+
+ if ( $endText == '<loginend>' ) {
+ $endText = '';
+ }
+
+ if ( '' == $this->mName ) {
if ( 0 != $wgUser->getID() ) {
$this->mName = $wgUser->getName();
} else {
- $this->mName = @$_COOKIE["{$wgDBname}UserName"];
+ $this->mName = @$_COOKIE[$wgDBname.'UserName'];
}
}
- $wgOut->setPageTitle( wfMsg( "userlogin" ) );
- $wgOut->setRobotpolicy( "noindex,nofollow" );
+ $wgOut->setPageTitle( wfMsg( 'userlogin' ) );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
- if ( "" == $err ) {
- $lp = wfMsg( "loginprompt" );
+ if ( '' == $err ) {
+ $lp = wfMsg( 'loginprompt' );
$wgOut->addHTML( "<h2>$li:</h2>\n<p>$lp</p>" );
} else {
$wgOut->addHTML( "<h2>$le:</h2>\n<font size='+1'
color='red'>$err</font>\n" );
}
- if ( 1 == $wgUser->getOption( "rememberpassword" ) ) {
- $checked = " checked";
+ if ( 1 == $wgUser->getOption( 'rememberpassword' ) ) {
+ $checked = ' checked';
} else {
- $checked = "";
+ $checked = '';
}
- $q = "action=submit";
+ $q = 'action=submit';
if ( !empty( $this->mReturnto ) ) {
- $q .= "&returnto=" . wfUrlencode( $this->mReturnto );
+ $q .= '&returnto=' . wfUrlencode( $this->mReturnto );
}
- $titleObj = Title::makeTitle( NS_SPECIAL, "Userlogin" );
+ $titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
$action = $titleObj->escapeLocalUrl( $q );
- $encName = wfEscapeHTML( $this->mName );
- $encPassword = wfEscapeHTML( $this->mPassword );
- $encRetype = wfEscapeHTML( $this->mRetype );
- $encEmail = wfEscapeHTML( $this->mEmail );
- $encRealName = wfEscapeHTML( $this->mRealName );
+ $encName = htmlspecialchars( $this->mName );
+ $encPassword = htmlspecialchars( $this->mPassword );
+ $encRetype = htmlspecialchars( $this->mRetype );
+ $encEmail = htmlspecialchars( $this->mEmail );
+ $encRealName = htmlspecialchars( $this->mRealName );
if ($wgUser->getID() != 0) {
$cambutton = "<input tabindex='6' type='submit' name=\"wpCreateaccountMail\" value=\"{$cam}\" />";
} else {
- $cambutton = "";
+ $cambutton = '';
}
$wgOut->addHTML( "
<input tabindex='2' type='password' name=\"wpPassword\" value=\"{$encPassword}\" size='20' />
</td>
<td align='left'>
- <input tabindex='7' type='checkbox' name=\"wpRemember\" value=\"1\" id=\"wpRemember\"$checked /><label for=\"wpRemember\">$rmp</label>
+ <input tabindex='4' type='checkbox' name=\"wpRemember\" value=\"1\" id=\"wpRemember\"$checked /><label for=\"wpRemember\">$rmp</label>
</td>
</tr>");
$wgOut->addHTML("<tr><td colspan='3'> </td></tr><tr>
<td align='right'>$ypa:</td>
<td align='left'>
- <input tabindex='4' type='password' name=\"wpRetype\" value=\"{$encRetype}\"
+ <input tabindex='5' type='password' name=\"wpRetype\" value=\"{$encRetype}\"
size='20' />
</td><td>$nuo</td></tr>
<tr>
<td align='right'>$ye:</td>
<td align='left'>
- <input tabindex='6' type='text' name=\"wpEmail\" value=\"{$encEmail}\" size='20' />
- </td>
- <td> </td>
- </tr>
- <tr>
- <td align='right'>$yrn:</td>
- <td align='left'>
- <input tabindex='6' type='text' name=\"wpRealName\" value=\"{$encRealName}\" size='20' />
- </td>
- <td align='left'>
- <input tabindex='7' type='submit' name=\"wpCreateaccount\" value=\"{$ca}\" />
+ <input tabindex='7' type='text' name=\"wpEmail\" value=\"{$encEmail}\" size='20' />
+ </td>");
+
+ if ($wgAllowRealName) {
+ $wgOut->addHTML("<td> </td>
+ </tr><tr>
+ <td align='right'>$yrn:</td>
+ <td align='left'>
+ <input tabindex='8' type='text' name=\"wpRealName\" value=\"{$encRealName}\" size='20' />
+ </td>");
+ }
+
+ $wgOut->addHTML("<td align='left'>
+ <input tabindex='9' type='submit' name=\"wpCreateaccount\" value=\"{$ca}\" />
$cambutton
</td></tr>");
}
-
+
$wgOut->addHTML("
<tr><td colspan='3'> </td></tr><tr>
<td colspan='3' align='left'>
<p>$efl<br />
- <input tabindex='8' type='submit' name=\"wpMailmypassword\" value=\"{$mmp}\" /></p>
+ <input tabindex='10' type='submit' name=\"wpMailmypassword\" value=\"{$mmp}\" /></p>
</td></tr></table>
</form>\n" );
$wgOut->addHTML( $endText );
}
- /* private */ function hasSessionCookie()
- {
+ /**
+ * @access private
+ */
+ function hasSessionCookie() {
global $wgDisableCookieCheck;
- return ( $wgDisableCookieCheck ) ? true : ( "" != $_COOKIE[session_name()] );
+ return ( $wgDisableCookieCheck ) ? true : ( '' != $_COOKIE[session_name()] );
}
- /* private */ function cookieRedirectCheck( $type )
- {
+ /**
+ * @access private
+ */
+ function cookieRedirectCheck( $type ) {
global $wgOut, $wgLang;
- $titleObj = Title::makeTitle( NS_SPECIAL, "Userlogin" );
- $check = $titleObj->getFullURL( "wpCookieCheck=$type" );
+ $titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+ $check = $titleObj->getFullURL( 'wpCookieCheck='.$type );
return $wgOut->redirect( $check );
}
- /* private */ function onCookieRedirectCheck( $type ) {
+ /**
+ * @access private
+ */
+ function onCookieRedirectCheck( $type ) {
global $wgUser;
if ( !$this->hasSessionCookie() ) {
- if ( $type == "new" ) {
- return $this->mainLoginForm( wfMsg( "nocookiesnew" ) );
- } else if ( $type == "login" ) {
- return $this->mainLoginForm( wfMsg( "nocookieslogin" ) );
+ if ( $type == 'new' ) {
+ return $this->mainLoginForm( wfMsg( 'nocookiesnew' ) );
+ } else if ( $type == 'login' ) {
+ return $this->mainLoginForm( wfMsg( 'nocookieslogin' ) );
} else {
# shouldn't happen
- return $this->mainLoginForm( wfMsg( "error" ) );
+ return $this->mainLoginForm( wfMsg( 'error' ) );
}
} else {
- return $this->successfulLogin( wfMsg( "loginsuccess", $wgUser->getName() ) );
+ return $this->successfulLogin( wfMsg( 'loginsuccess', $wgUser->getName() ) );
}
}
+
+ /**
+ * @access private
+ */
+ function throttleHit( $limit ) {
+ global $wgOut;
+
+ $wgOut->addWikiText( wfMsg( 'acct_creation_throttle_hit', $limit ) );
+ }
}
?>
dépôts / lhc / web / wiklou.git / blobdiff