* @static
*/
function newFromName( $name ) {
- $u = new User();
-
# Force usernames to capital
global $wgContLang;
$name = $wgContLang->ucfirst( $name );
-
+
# Clean up name according to title rules
$t = Title::newFromText( $name );
if( is_null( $t ) ) {
return null;
}
-
+
# Reject various classes of invalid names
$canonicalName = $t->getText();
+ global $wgAuth;
+ $canonicalName = $wgAuth->getCanonicalName( $t->getText() );
+
if( !User::isValidUserName( $canonicalName ) ) {
return null;
}
-
+
+ $u = new User();
$u->setName( $canonicalName );
- $u->setId( $u->idFromName( $t->getText() ) );
+ $u->setId( $u->idFromName( $canonicalName ) );
return $u;
}
-
+
/**
* Factory method to fetch whichever use has a given email confirmation code.
* This code is generated when an account is created or its e-mail address
return null;
}
}
-
+
/**
- * Serialze sleep function, for better cache efficiency and avoidance of
+ * Serialze sleep function, for better cache efficiency and avoidance of
* silly "incomplete type" errors when skins are cached
*/
function __sleep() {
return array( 'mId', 'mName', 'mPassword', 'mEmail', 'mNewtalk',
- 'mEmailAuthenticated', 'mRights', 'mOptions', 'mDataLoaded',
- 'mNewpassword', 'mBlockedby', 'mBlockreason', 'mTouched',
+ 'mEmailAuthenticated', 'mRights', 'mOptions', 'mDataLoaded',
+ 'mNewpassword', 'mBlockedby', 'mBlockreason', 'mTouched',
'mToken', 'mRealName', 'mHash', 'mGroups' );
}
*/
function whoIs( $id ) {
$dbr =& wfGetDB( DB_SLAVE );
- return $dbr->selectField( 'user', 'user_name', array( 'user_id' => $id ) );
+ return $dbr->selectField( 'user', 'user_name', array( 'user_id' => $id ), 'User::whoIs' );
}
/**
*/
function whoIsReal( $id ) {
$dbr =& wfGetDB( DB_SLAVE );
- return $dbr->selectField( 'user', 'user_real_name', array( 'user_id' => $id ) );
+ return $dbr->selectField( 'user', 'user_real_name', array( 'user_id' => $id ), 'User::whoIsReal' );
}
/**
/**
* does the string match an anonymous IPv4 address?
*
+ * Note: We match \d{1,3}\.\d{1,3}\.\d{1,3}\.xxx as an anonymous IP
+ * address because the usemod software would "cloak" anonymous IP
+ * addresses like this, if we allowed accounts like this to be created
+ * new users could get the old edits of these anonymous users.
+ *
+ * @bug 3631
+ *
* @static
* @param string $name Nickname of a user
* @return bool
*/
function isIP( $name ) {
- return preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/",$name);
+ return preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.(?:xxx|\d{1,3})$/",$name);
/*return preg_match("/^
(?:[01]?\d{1,2}|2(:?[0-4]\d|5[0-5]))\.
(?:[01]?\d{1,2}|2(:?[0-4]\d|5[0-5]))\.
*/
function isValidUserName( $name ) {
global $wgContLang, $wgMaxNameChars;
-
+
if ( $name == ''
|| User::isIP( $name )
|| strpos( $name, '/' ) !== false
|| strlen( $name ) > $wgMaxNameChars
|| $name != $wgContLang->ucfirst( $name ) )
return false;
+
+ // Ensure that the name can't be misresolved as a different title,
+ // such as with extra namespace keys at the start.
+ $parsed = Title::newFromText( $name );
+ if( is_null( $parsed )
+ || $parsed->getNamespace()
+ || strcmp( $name, $parsed->getPrefixedText() ) )
+ return false;
else
return true;
}
return strlen( $password ) >= $wgMinimalPasswordLength;
}
- /**
- * does the string match roughly an email address ?
+ /**
+ * Does the string match roughly an email address ?
+ *
+ * There used to be a regular expression here, it got removed because it
+ * rejected valid addresses. Actually just check if there is '@' somewhere
+ * in the given address.
*
* @todo Check for RFC 2822 compilance
* @bug 959
* @return bool
*/
function isValidEmailAddr ( $addr ) {
- # There used to be a regular expression here, it got removed because it
- # rejected valid addresses.
return ( trim( $addr ) != '' ) &&
(false !== strpos( $addr, '@' ) );
}
+ /**
+ * Count the number of edits of a user
+ *
+ * @param int $uid The user ID to check
+ * @return int
+ */
+ function edits( $uid ) {
+ $fname = 'User::edits';
+
+ $dbr =& wfGetDB( DB_SLAVE );
+ return $dbr->selectField(
+ 'revision', 'count(*)',
+ array( 'rev_user' => $uid ),
+ $fname
+ );
+ }
+
/**
* probably return a random password
* @return string probably a random password
$n++;
$fname = 'User::loadDefaults' . $n;
wfProfileIn( $fname );
-
- global $wgContLang, $wgIP, $wgDBname;
+
+ global $wgContLang, $wgDBname;
global $wgNamespacesToBeSearchedDefault;
$this->mId = 0;
$this->mNewtalk = -1;
- $this->mName = $wgIP;
+ $this->mName = false;
$this->mRealName = $this->mEmail = '';
$this->mEmailAuthenticated = null;
$this->mPassword = $this->mNewpassword = '';
$this->mRights = array();
$this->mGroups = array();
$this->mOptions = User::getDefaultOptions();
-
+
foreach( $wgNamespacesToBeSearchedDefault as $nsnum => $val ) {
$this->mOptions['searchNs'.$nsnum] = $val;
}
wfProfileOut( $fname );
}
-
+
/**
* Combine the language default options with any site-specific options
* and add the default language variants.
*/
global $wgContLang, $wgDefaultUserOptions;
$defOpt = $wgDefaultUserOptions + $wgContLang->getDefaultUserOptions();
-
+
/**
* default language setting
*/
$variant = $wgContLang->getPreferredVariant();
$defOpt['variant'] = $variant;
$defOpt['language'] = $variant;
-
+
return $defOpt;
}
-
+
/**
* Get a given default option value.
*
* And it's cheaper to check slave first, then master if needed, than master always.
*/
function getBlockedStatus( $bFromSlave = true ) {
- global $wgIP, $wgBlockCache, $wgProxyList, $wgEnableSorbs, $wgProxyWhitelist;
+ global $wgBlockCache, $wgProxyList, $wgEnableSorbs, $wgProxyWhitelist;
- if ( -1 != $this->mBlockedby ) { return; }
+ if ( -1 != $this->mBlockedby ) {
+ wfDebug( "User::getBlockedStatus: already loaded.\n" );
+ return;
+ }
- $this->mBlockedby = 0;
+ $fname = 'User::getBlockedStatus';
+ wfProfileIn( $fname );
+ wfDebug( "$fname: checking...\n" );
- # User blocking
- if ( $this->mId ) {
- $block = new Block();
- $block->forUpdate( $bFromSlave );
- if ( $block->load( $wgIP , $this->mId ) ) {
- $this->mBlockedby = $block->mBy;
- $this->mBlockreason = $block->mReason;
+ $this->mBlockedby = 0;
+ $ip = wfGetIP();
+
+ # User/IP blocking
+ $block = new Block();
+ $block->forUpdate( $bFromSlave );
+ if ( $block->load( $ip , $this->mId ) ) {
+ wfDebug( "$fname: Found block.\n" );
+ $this->mBlockedby = $block->mBy;
+ $this->mBlockreason = $block->mReason;
+ if ( $this->isLoggedIn() ) {
$this->spreadBlock();
}
+ } else {
+ wfDebug( "$fname: No block.\n" );
}
- # IP/range blocking
+ # Range blocking
if ( !$this->mBlockedby ) {
# Check first against slave, and optionally from master.
- $block = $wgBlockCache->get( $wgIP, true );
+ wfDebug( "$fname: Checking range blocks\n" );
+ $block = $wgBlockCache->get( $ip, true );
if ( !$block && !$bFromSlave )
{
# Not blocked: check against master, to make sure.
$wgBlockCache->clearLocal( );
- $block = $wgBlockCache->get( $wgIP, false );
+ $block = $wgBlockCache->get( $ip, false );
}
if ( $block !== false ) {
$this->mBlockedby = $block->mBy;
}
# Proxy blocking
- if ( !$this->isSysop() && !in_array( $wgIP, $wgProxyWhitelist ) ) {
-
+ if ( !$this->isSysop() && !in_array( $ip, $wgProxyWhitelist ) ) {
+
# Local list
- if ( array_key_exists( $wgIP, $wgProxyList ) ) {
+ if ( array_key_exists( $ip, $wgProxyList ) ) {
$this->mBlockedby = wfMsg( 'proxyblocker' );
$this->mBlockreason = wfMsg( 'proxyblockreason' );
}
# DNSBL
if ( !$this->mBlockedby && $wgEnableSorbs && !$this->getID() ) {
- if ( $this->inSorbsBlacklist( $wgIP ) ) {
+ if ( $this->inSorbsBlacklist( $ip ) ) {
$this->mBlockedby = wfMsg( 'sorbs' );
$this->mBlockreason = wfMsg( 'sorbsreason' );
}
}
}
+
+ # Extensions
+ wfRunHooks( 'GetBlockedStatus', array( &$this ) );
+
+ wfProfileOut( $fname );
}
function inSorbsBlacklist( $ip ) {
return $wgEnableSorbs &&
$this->inDnsBlacklist( $ip, 'http.dnsbl.sorbs.net.' );
}
-
+
function inOpmBlacklist( $ip ) {
global $wgEnableOpm;
return $wgEnableOpm &&
$this->inDnsBlacklist( $ip, 'opm.blitzed.org.' );
}
-
+
function inDnsBlacklist( $ip, $base ) {
$fname = 'User::inDnsBlacklist';
wfProfileIn( $fname );
-
+
$found = false;
$host = '';
-
+
if ( preg_match( '/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/', $ip, $m ) ) {
# Make hostname
for ( $i=4; $i>=1; $i-- ) {
# Send query
$ipList = gethostbynamel( $host );
-
+
if ( $ipList ) {
wfDebug( "Hostname $host is {$ipList[0]}, it's a proxy says $base!\n" );
$found = true;
wfProfileOut( $fname );
return $found;
}
-
+
/**
* Primitive rate limits: enforce maximum actions per time period
* to put a brake on flooding.
// goddam cabal
return false;
}
-
- global $wgMemc, $wgIP, $wgDBname, $wgRateLimitLog;
+
+ global $wgMemc, $wgDBname, $wgRateLimitLog;
$fname = 'User::pingLimiter';
+ wfProfileIn( $fname );
+
$limits = $wgRateLimits[$action];
$keys = array();
$id = $this->getId();
-
+ $ip = wfGetIP();
+
if( isset( $limits['anon'] ) && $id == 0 ) {
$keys["$wgDBname:limiter:$action:anon"] = $limits['anon'];
}
-
+
if( isset( $limits['user'] ) && $id != 0 ) {
$keys["$wgDBname:limiter:$action:user:$id"] = $limits['user'];
}
$keys["$wgDBname:limiter:$action:user:$id"] = $limits['newbie'];
}
if( isset( $limits['ip'] ) ) {
- $keys["mediawiki:limiter:$action:ip:$wgIP"] = $limits['ip'];
+ $keys["mediawiki:limiter:$action:ip:$ip"] = $limits['ip'];
}
- if( isset( $limits['subnet'] ) && preg_match( '/^(\d+\.\d+\.\d+)\.\d+$/', $wgIP, $matches ) ) {
+ if( isset( $limits['subnet'] ) && preg_match( '/^(\d+\.\d+\.\d+)\.\d+$/', $ip, $matches ) ) {
$subnet = $matches[1];
$keys["mediawiki:limiter:$action:subnet:$subnet"] = $limits['subnet'];
}
}
-
+
$triggered = false;
foreach( $keys as $key => $limit ) {
list( $max, $period ) = $limit;
}
} else {
wfDebug( "$fname: adding record for $key $summary\n" );
- $wgMemc->add( $key, 1, IntVal( $period ) );
+ $wgMemc->add( $key, 1, intval( $period ) );
}
$wgMemc->incr( $key );
}
-
+
+ wfProfileOut( $fname );
return $triggered;
}
-
+
/**
* Check if user is blocked
* @return bool True if blocked, false otherwise
*/
- function isBlocked( $bFromSlave = false ) {
+ function isBlocked( $bFromSlave = true ) { // hacked from false due to horrible probs on site
+ wfDebug( "User::isBlocked: enter\n" );
$this->getBlockedStatus( $bFromSlave );
return $this->mBlockedby !== 0;
}
-
+
+ /**
+ * Check if user is blocked from editing a particular article
+ */
+ function isBlockedFrom( $title, $bFromSlave = false ) {
+ global $wgBlockAllowsUTEdit;
+ $fname = 'User::isBlockedFrom';
+ wfProfileIn( $fname );
+ wfDebug( "$fname: enter\n" );
+
+ if ( $wgBlockAllowsUTEdit && $title->getText() === $this->getName() &&
+ $title->getNamespace() == NS_USER_TALK )
+ {
+ $blocked = false;
+ wfDebug( "$fname: self-talk page, ignoring any blocks\n" );
+ } else {
+ wfDebug( "$fname: asking isBlocked()\n" );
+ $blocked = $this->isBlocked( $bFromSlave );
+ }
+ wfProfileOut( $fname );
+ return $blocked;
+ }
+
/**
* Get name of blocker
* @return string name of blocker
$this->getBlockedStatus();
return $this->mBlockedby;
}
-
+
/**
* Get blocking reason
* @return string Blocking reason
}
/**
- * Read datas from session
+ * Create a new user object using data from session
* @static
*/
function loadFromSession() {
return new User();
}
} else if ( isset( $_COOKIE["{$wgDBname}UserID"] ) ) {
- $sId = IntVal( $_COOKIE["{$wgDBname}UserID"] );
+ $sId = intval( $_COOKIE["{$wgDBname}UserID"] );
$_SESSION['wsUserID'] = $sId;
} else {
return new User();
function loadFromDatabase() {
global $wgCommandLineMode;
$fname = "User::loadFromDatabase";
-
- # Counter-intuitive, breaks various things, use User::setLoaded() if you want to suppress
+
+ # Counter-intuitive, breaks various things, use User::setLoaded() if you want to suppress
# loading in a command line script, don't assume all command line scripts need it like this
#if ( $this->mDataLoaded || $wgCommandLineMode ) {
if ( $this->mDataLoaded ) {
}
# Paranoia
- $this->mId = IntVal( $this->mId );
+ $this->mId = intval( $this->mId );
/** Anonymous user */
if( !$this->mId ) {
$this->mDataLoaded = true;
return;
} # the following stuff is for non-anonymous users only
-
+
$dbr =& wfGetDB( DB_SLAVE );
$s = $dbr->selectRow( 'user', array( 'user_name','user_password','user_newpassword','user_email',
'user_email_authenticated',
'user_real_name','user_options','user_touched', 'user_token' ),
array( 'user_id' => $this->mId ), $fname );
-
+
if ( $s !== false ) {
$this->mName = $s->user_name;
$this->mEmail = $s->user_email;
function getName() {
$this->loadFromDatabase();
+ if ( $this->mName === false ) {
+ $this->mName = wfGetIP();
+ }
return $this->mName;
}
$this->mName = $str;
}
-
+
/**
* Return the title dbkey form of the name, for eg user pages.
* @return string
function getTitleKey() {
return str_replace( ' ', '_', $this->getName() );
}
-
+
function getNewtalk() {
global $wgUseEnotif;
$fname = 'User::getNewtalk';
$this->loadFromDatabase();
-
+
# Load the newtalk status if it is unloaded (mNewtalk=-1)
if( $this->mNewtalk == -1 ) {
$this->mNewtalk = 0; # reset talk page status
# entire User object stored in there.
if( !$this->mId ) {
global $wgDBname, $wgMemc;
- $key = "$wgDBname:newtalk:ip:{$this->mName}";
+ $key = "$wgDBname:newtalk:ip:" . $this->getName();
$newtalk = $wgMemc->get( $key );
if( is_integer( $newtalk ) ) {
$this->mNewtalk = $newtalk ? 1 : 0;
return (bool)$this->mNewtalk;
}
- }
-
+ }
+
$dbr =& wfGetDB( DB_SLAVE );
if ( $wgUseEnotif ) {
$res = $dbr->select( 'watchlist',
array( 'wl_title' => $this->getTitleKey(),
'wl_namespace' => NS_USER_TALK,
'wl_user' => $this->mId,
- 'wl_notificationtimestamp != 0' ),
+ 'wl_notificationtimestamp ' . $dbr->notNullTimestamp() ),
'User::getNewtalk' );
if( $dbr->numRows($res) > 0 ) {
$this->mNewtalk = 1;
}
$dbr->freeResult( $res );
} else {
- $res = $dbr->select( 'user_newtalk', 1, array( 'user_ip' => $this->mName ), $fname );
+ $res = $dbr->select( 'user_newtalk', 1, array( 'user_ip' => $this->getName() ), $fname );
$this->mNewtalk = $dbr->numRows( $res ) > 0 ? 1 : 0;
$dbr->freeResult( $res );
}
-
+
if( !$this->mId ) {
$wgMemc->set( $key, $this->mNewtalk, time() ); // + 1800 );
}
return ($timestamp >= $this->mTouched);
}
- /**
- * Salt a password.
- * Will only be salted if $wgPasswordSalt is true
- * @param string Password.
- * @return string Salted password or clear password.
- */
- function addSalt( $p ) {
- global $wgPasswordSalt;
- if($wgPasswordSalt)
- return md5( "{$this->mId}-{$p}" );
- else
- return $p;
- }
-
/**
* Encrypt a password.
* It can eventuall salt a password @see User::addSalt()
* @param string $p clear Password.
- * @param string Encrypted password.
+ * @return string Encrypted password.
*/
function encryptPassword( $p ) {
- return $this->addSalt( md5( $p ) );
+ return wfEncryptPassword( $this->mId, $p );
}
# Set the password and reset the random token
}
}
-
+
function setCookiePassword( $str ) {
$this->loadFromDatabase();
$this->mCookiePassword = md5( $str );
}
return array_merge( $base, $this->getGroups() );
}
-
+
/**
* Remove the user from the given group.
* This takes immediate effect.
),
'User::addGroup',
array( 'IGNORE' ) );
-
+
$this->mGroups = array_merge( $this->mGroups, array( $group ) );
$this->mRights = User::getGroupPermissions( $this->getEffectiveGroups() );
-
+
$this->invalidateCache();
$this->saveSettings();
}
-
+
/**
* Remove the user from the given group.
* This takes immediate effect.
'ug_group' => $group,
),
'User::removeGroup' );
-
+
$this->mGroups = array_diff( $this->mGroups, array( $group ) );
$this->mRights = User::getGroupPermissions( $this->getEffectiveGroups() );
-
+
$this->invalidateCache();
$this->saveSettings();
}
function isLoggedIn() {
return( $this->getID() != 0 );
}
-
+
/**
* A more legible check for anonymousness.
* Returns true if the user is an anonymous visitor.
function isAnon() {
return !$this->isLoggedIn();
}
-
+
/**
* Check if a user is sysop
- * Die with backtrace. Use User:isAllowed() instead.
* @deprecated
*/
function isSysop() {
* @todo FIXME : need to check the old failback system [AV]
*/
function &getSkin() {
- global $IP;
+ global $IP, $wgRequest;
if ( ! isset( $this->mSkin ) ) {
$fname = 'User::getSkin';
wfProfileIn( $fname );
-
+
# get all skin names available
$skinNames = Skin::getSkinNames();
-
+
# get the user skin
$userSkin = $this->getOption( 'skin' );
+ $userSkin = $wgRequest->getText('useskin', $userSkin);
if ( $userSkin == '' ) { $userSkin = 'standard'; }
if ( !isset( $skinNames[$userSkin] ) ) {
# Grab the skin class and initialise it. Each skin checks for PHPTal
# and will not load if it's not enabled.
require_once( $IP.'/skins/'.$sn.'.php' );
-
+
# Check if we got if not failback to default skin
$className = 'Skin'.$sn;
if( !class_exists( $className ) ) {
/**#@+
* @param string $title Article title to look at
*/
-
+
/**
* Check watched status of an article
* @return bool True if article is watched
if ($userid==0) {
return;
}
-
- // Only update the timestamp if the page is being watched.
+
+ // Only update the timestamp if the page is being watched.
// The query to find out if it is watched is cached both in memcached and per-invocation,
// and when it does have to be executed, it can be on a slave
// If this is the user's newtalk page, we always update the timestamp
if ($title->getNamespace() == NS_USER_TALK &&
- $title->getText() == $wgUser->getName())
+ $title->getText() == $wgUser->getName())
{
$watched = true;
} elseif ( $this->getID() == $wgUser->getID() ) {
} else {
$watched = true;
}
-
- // If the page is watched by the user (or may be watched), update the timestamp on any
+
+ // If the page is watched by the user (or may be watched), update the timestamp on any
// any matching rows
if ( $watched ) {
$dbw =& wfGetDB( DB_MASTER );
$success = $dbw->update( 'watchlist',
array( /* SET */
- 'wl_notificationtimestamp' => 0
+ 'wl_notificationtimestamp' => NULL
), array( /* WHERE */
'wl_title' => $title->getDBkey(),
'wl_namespace' => $title->getNamespace(),
);
}
}
-
+
/**#@-*/
/**
return;
}
if( $currentUser != 0 ) {
-
+
$dbw =& wfGetDB( DB_MASTER );
$success = $dbw->update( 'watchlist',
array( /* SET */
$_SESSION['wsUserID'] = $this->mId;
setcookie( $wgDBname.'UserID', $this->mId, $exp, $wgCookiePath, $wgCookieDomain );
- $_SESSION['wsUserName'] = $this->mName;
- setcookie( $wgDBname.'UserName', $this->mName, $exp, $wgCookiePath, $wgCookieDomain );
+ $_SESSION['wsUserName'] = $this->getName();
+ setcookie( $wgDBname.'UserName', $this->getName(), $exp, $wgCookiePath, $wgCookieDomain );
$_SESSION['wsToken'] = $this->mToken;
if ( 1 == $this->getOption( 'rememberpassword' ) ) {
* It will clean the session cookie
*/
function logout() {
- global $wgCookiePath, $wgCookieDomain, $wgDBname, $wgIP;
+ global $wgCookiePath, $wgCookieDomain, $wgDBname;
$this->loadDefaults();
$this->setLoaded( true );
if ( wfReadOnly() ) { return; }
$this->saveNewtalk();
if ( 0 == $this->mId ) { return; }
-
+
$dbw =& wfGetDB( DB_MASTER );
$dbw->update( 'user',
array( /* SET */
);
$wgMemc->delete( "$wgDBname:user:id:$this->mId" );
}
-
+
/**
* Save value of new talk flag.
*/
function saveNewtalk() {
global $wgDBname, $wgMemc, $wgUseEnotif;
-
+
$fname = 'User::saveNewtalk';
$changed = false;
if( !$this->mId ) {
# Anon users have a separate memcache space for newtalk
# since they don't store their own info. Trim...
- $wgMemc->delete( "$wgDBname:newtalk:ip:{$this->mName}" );
+ $wgMemc->delete( "$wgDBname:newtalk:ip:" . $this->getName() );
}
}
} else {
$key = false;
} else {
$field = 'user_ip';
- $value = $this->mName;
- $key = "$wgDBname:newtalk:ip:$this->mName";
+ $value = $this->getName();
+ $key = "$wgDBname:newtalk:ip:$value";
}
-
+
$dbr =& wfGetDB( DB_SLAVE );
$dbw =& wfGetDB( DB_MASTER );
# Update user_touched, so that newtalk notifications in the client cache are invalidated
if ( $changed && $this->getID() ) {
- $dbw->update('user',
+ $dbw->update('user',
/*SET*/ array( 'user_touched' => $this->mTouched ),
/*WHERE*/ array( 'user_id' => $this->getID() ),
$fname);
$fname = 'User::idForName';
$gotid = 0;
- $s = trim( $this->mName );
+ $s = trim( $this->getName() );
if ( 0 == strcmp( '', $s ) ) return 0;
$dbr =& wfGetDB( DB_SLAVE );
}
function spreadBlock() {
- global $wgIP;
# If the (non-anonymous) user is blocked, this function will block any IP address
# that they successfully log on from.
$fname = 'User::spreadBlock';
}
# Check if this IP address is already blocked
- $ipblock = Block::newFromDB( $wgIP );
+ $ipblock = Block::newFromDB( wfGetIP() );
if ( $ipblock->isValid() ) {
+ # If the user is already blocked. Then check if the autoblock would
+ # excede the user block. If it would excede, then do nothing, else
+ # prolong block time
+ if ($userblock->mExpiry &&
+ ($userblock->mExpiry < Block::getAutoblockExpiry($ipblock->mTimestamp))) {
+ return;
+ }
# Just update the timestamp
$ipblock->updateTimestamp();
return;
}
# Make a new block object with the desired properties
- wfDebug( "Autoblocking {$this->mName}@{$wgIP}\n" );
- $ipblock->mAddress = $wgIP;
+ wfDebug( "Autoblocking {$this->mName}@" . wfGetIP() . "\n" );
+ $ipblock->mAddress = wfGetIP();
$ipblock->mUser = 0;
$ipblock->mBy = $userblock->mBy;
$ipblock->mReason = wfMsg( 'autoblocker', $this->getName(), $userblock->mReason );
$confstr = $this->getOption( 'math' );
$confstr .= '!' . $this->getOption( 'stubthreshold' );
- $confstr .= '!' . $this->getOption( 'editsection' );
$confstr .= '!' . $this->getOption( 'date' );
$confstr .= '!' . $this->getOption( 'numberheadings' );
$confstr .= '!' . $this->getOption( 'language' );
}
function isAllowedToCreateAccount() {
- return $this->isAllowed( 'createaccount' );
+ return $this->isAllowed( 'createaccount' ) && !$this->isBlocked();
}
/**
* @access public
*/
function getUserPage() {
- return Title::makeTitle( NS_USER, $this->mName );
+ return Title::makeTitle( NS_USER, $this->getName() );
}
-
+
/**
* Get this user's talk page title.
*
*/
function getMaxID() {
$dbr =& wfGetDB( DB_SLAVE );
- return $dbr->selectField( 'user', 'max(user_id)', false );
+ return $dbr->selectField( 'user', 'max(user_id)', false, 'User::getMaxID' );
}
/**
if( strlen( $password ) < $wgMinimalPasswordLength ) {
return false;
}
-
+
if( $wgAuth->authenticate( $this->getName(), $password ) ) {
return true;
} elseif( $wgAuth->strict() ) {
}
return false;
}
-
+
/**
* Initialize (if necessary) and return a session token value
* which can be used in edit forms to show that the user's
}
return md5( $token . $salt );
}
-
+
/**
* Generate a hex-y looking random token for various uses.
* Could be made more cryptographically sure if someone cares.
$token = dechex( mt_rand() ) . dechex( mt_rand() );
return md5( $token . $salt );
}
-
+
/**
* Check given value against the token value stored in the session.
* A match should confirm that the form was submitted from the
* @access public
*/
function matchEditToken( $val, $salt = '' ) {
+ global $wgMemc;
+
+/*
+ if ( !isset( $_SESSION['wsEditToken'] ) ) {
+ $logfile = '/home/wikipedia/logs/session_debug/session.log';
+ $mckey = memsess_key( session_id() );
+ $uname = @posix_uname();
+ $msg = "wsEditToken not set!\n" .
+ 'apache server=' . $uname['nodename'] . "\n" .
+ 'session_id = ' . session_id() . "\n" .
+ '$_SESSION=' . var_export( $_SESSION, true ) . "\n" .
+ '$_COOKIE=' . var_export( $_COOKIE, true ) . "\n" .
+ "mc get($mckey) = " . var_export( $wgMemc->get( $mckey ), true ) . "\n\n\n";
+
+ @error_log( $msg, 3, $logfile );
+ }
+*/
return ( $val == $this->editToken( $salt ) );
}
-
+
/**
* Generate a new e-mail confirmation token and send a confirmation
* mail to the user's given address.
* @return mixed True on success, a WikiError object on failure.
*/
function sendConfirmationMail() {
- global $wgIP, $wgContLang;
+ global $wgContLang;
$url = $this->confirmationTokenUrl( $expiration );
return $this->sendMail( wfMsg( 'confirmemail_subject' ),
wfMsg( 'confirmemail_body',
- $wgIP,
+ wfGetIP(),
$this->getName(),
$url,
$wgContLang->timeanddate( $expiration, false ) ) );
}
-
+
/**
* Send an e-mail to this user's account. Does not check for
* confirmed status or validity.
global $wgPasswordSender;
$from = $wgPasswordSender;
}
-
+
require_once( 'UserMailer.php' );
$error = userMailer( $this->getEmail(), $from, $subject, $body );
-
+
if( $error == '' ) {
return true;
} else {
return new WikiError( $error );
}
}
-
+
/**
* Generate, store, and return a new e-mail confirmation code.
* A hash (unsalted since it's used as a key) is stored.
*/
function confirmationToken( &$expiration ) {
$fname = 'User::confirmationToken';
-
+
$now = time();
$expires = $now + 7 * 24 * 60 * 60;
$expiration = wfTimestamp( TS_MW, $expires );
-
+
$token = $this->generateToken( $this->mId . $this->mEmail . $expires );
$hash = md5( $token );
-
+
$dbw =& wfGetDB( DB_MASTER );
$dbw->update( 'user',
array( 'user_email_token' => $hash,
'user_email_token_expires' => $dbw->timestamp( $expires ) ),
array( 'user_id' => $this->mId ),
$fname );
-
+
return $token;
}
-
+
/**
* Generate and store a new e-mail confirmation token, and return
* the URL the user can use to confirm.
$title = Title::makeTitle( NS_SPECIAL, 'Confirmemail/' . $token );
return $title->getFullUrl();
}
-
+
/**
* Mark the e-mail address confirmed and save.
*/
$this->saveSettings();
return true;
}
-
+
/**
* Is this user allowed to send e-mails within limits of current
* site configuration?
function canSendEmail() {
return $this->isEmailConfirmed();
}
-
+
/**
* Is this user allowed to receive e-mails within limits of current
* site configuration?
function canReceiveEmail() {
return $this->canSendEmail() && !$this->getOption( 'disablemail' );
}
-
+
/**
* Is this user's e-mail address valid-looking and confirmed within
* limits of the current site configuration?
return false;
return true;
}
-
+
/**
* @param array $groups list of groups
* @return array list of permission key names for given groups combined
return $name;
}
}
-
+
/**
* Return the set of defined explicit groups.
* The * and 'user' groups are not included.
dépôts / lhc / web / wiklou.git / blobdiff