//@{
var $mId, $mName, $mRealName, $mPassword, $mNewpassword, $mNewpassTime,
$mEmail, $mTouched, $mToken, $mEmailAuthenticated,
- $mEmailToken, $mEmailTokenExpires, $mRegistration, $mGroups, $mOptionOverrides;
+ $mEmailToken, $mEmailTokenExpires, $mRegistration, $mGroups, $mOptionOverrides,
+ $mCookiePassword;
//@}
/**
/**
* Load the user table data for this object from the source given by mFrom.
*/
- function load() {
+ public function load() {
if ( $this->mLoadedItems === true ) {
return;
}
/**
* Load user table data, given mId has already been set.
* @return Bool false if the ID does not exist, true otherwise
- * @private
*/
- function loadFromId() {
+ private function loadFromId() {
global $wgMemc;
if ( $this->mId == 0 ) {
$this->loadDefaults();
/**
* Save user data to the shared cache
*/
- function saveToCache() {
+ public function saveToCache() {
$this->load();
$this->loadGroups();
$this->loadOptions();
$wgMemc->set( $key, $data );
}
-
/** @name newFrom*() static factory methods */
//@{
* username is not present in the database, the result will be a user object
* with a name, zero user ID and default settings.
*/
- static function newFromName( $name, $validate = 'valid' ) {
+ public static function newFromName( $name, $validate = 'valid' ) {
if ( $validate === true ) {
$validate = 'valid';
}
* @param $id Int Valid user ID
* @return User The corresponding User object
*/
- static function newFromId( $id ) {
+ public static function newFromId( $id ) {
$u = new User;
$u->mId = $id;
$u->mFrom = 'id';
* @param $code String Confirmation code
* @return User
*/
- static function newFromConfirmationCode( $code ) {
+ public static function newFromConfirmationCode( $code ) {
$dbr = wfGetDB( DB_SLAVE );
$id = $dbr->selectField( 'user', 'user_id', array(
'user_email_token' => md5( $code ),
* ommited.
* @return User
*/
- static function newFromSession( WebRequest $request = null ) {
+ public static function newFromSession( WebRequest $request = null ) {
$user = new User;
$user->mFrom = 'session';
$user->mRequest = $request;
* @param $row Array A row from the user table
* @return User
*/
- static function newFromRow( $row ) {
+ public static function newFromRow( $row ) {
$user = new User;
$user->loadFromRow( $row );
return $user;
* @param $id Int User ID
* @return String The corresponding user's real name
*/
- static function whoIsReal( $id ) {
+ public static function whoIsReal( $id ) {
$dbr = wfGetDB( DB_SLAVE );
return $dbr->selectField( 'user', 'user_real_name', array( 'user_id' => $id ), __METHOD__ );
}
* @param $name String Username
* @return Int|Null The corresponding user's ID, or null if user is nonexistent
*/
- static function idFromName( $name ) {
+ public static function idFromName( $name ) {
$nt = Title::makeTitleSafe( NS_USER, $name );
if( is_null( $nt ) ) {
# Illegal name
* @param $name String to match
* @return Bool
*/
- static function isIP( $name ) {
+ public static function isIP( $name ) {
return preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.(?:xxx|\d{1,3})$/',$name) || IP::isIPv6($name);
}
* @param $name String to match
* @return Bool
*/
- static function isValidUserName( $name ) {
+ public static function isValidUserName( $name ) {
global $wgContLang, $wgMaxNameChars;
if ( $name == ''
* @param $name String to match
* @return Bool
*/
- static function isUsableName( $name ) {
+ public static function isUsableName( $name ) {
global $wgReservedUsernames;
// Must be a valid username, obviously ;)
if ( !self::isValidUserName( $name ) ) {
* @param $name String to match
* @return Bool
*/
- static function isCreatableName( $name ) {
+ public static function isCreatableName( $name ) {
global $wgInvalidUsernameCharacters;
// Ensure that the username isn't longer than 235 bytes, so that
* @param $password String Desired password
* @return Bool
*/
- function isValidPassword( $password ) {
+ public function isValidPassword( $password ) {
//simple boolean wrapper for getPasswordValidity
return $this->getPasswordValidity( $password ) === true;
}
* @param $password String Desired password
* @return mixed: true on success, string or array of error message on failure
*/
- function getPasswordValidity( $password ) {
+ public function getPasswordValidity( $password ) {
global $wgMinimalPasswordLength, $wgContLang;
static $blockedLogins = array(
* - 'usable' Valid for batch processes and login
* - 'creatable' Valid for batch processes, login and account creation
*/
- static function getCanonicalName( $name, $validate = 'valid' ) {
+ public static function getCanonicalName( $name, $validate = 'valid' ) {
# Force usernames to capital
global $wgContLang;
$name = $wgContLang->ucfirst( $name );
* @param $uid Int User ID to check
* @return Int the user's edit count
*/
- static function edits( $uid ) {
+ public static function edits( $uid ) {
wfProfileIn( __METHOD__ );
$dbr = wfGetDB( DB_SLAVE );
// check if the user_editcount field has been initialized
*
* @return String new random password
*/
- static function randomPassword() {
+ public static function randomPassword() {
global $wgMinimalPasswordLength;
$pwchars = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz';
$l = strlen( $pwchars ) - 1;
*
* @note This no longer clears uncached lazy-initialised properties;
* the constructor does that instead.
- * @private
*/
- function loadDefaults( $name = false ) {
+ private function loadDefaults( $name = false ) {
wfProfileIn( __METHOD__ );
$this->mId = 0;
* $this->mId must be set, this is how the user is identified.
*
* @return Bool True if the user exists, false if the user is anonymous
- * @private
*/
- function loadFromDatabase() {
+ private function loadFromDatabase() {
# Paranoia
$this->mId = intval( $this->mId );
*
* @param $row Array Row from the user table to load.
*/
- function loadFromRow( $row ) {
+ public function loadFromRow( $row ) {
$all = true;
if ( isset( $row->user_name ) ) {
/**
* Load the groups from the database if they aren't already loaded.
- * @private
*/
- function loadGroups() {
+ private function loadGroups() {
if ( is_null( $this->mGroups ) ) {
$dbr = wfGetDB( DB_MASTER );
$res = $dbr->select( 'user_groups',
* given source. May be "name", "id", "defaults", "session", or false for
* no reload.
*/
- function clearInstanceCache( $reloadFrom = false ) {
+ public function clearInstanceCache( $reloadFrom = false ) {
$this->mNewtalk = -1;
$this->mDatePreference = null;
$this->mBlockedby = -1; # Unset
*
* @return Array of String options
*/
- static function getDefaultOptions() {
+ public static function getDefaultOptions() {
global $wgNamespacesToBeSearchedDefault, $wgDefaultUserOptions, $wgContLang, $wgDefaultSkin;
$defOpt = $wgDefaultUserOptions;
/**
* Get blocking information
- * @private
* @param $bFromSlave Bool Whether to check the slave database first. To
* improve performance, non-critical checks are done
* against slaves. Check when actually saving should be
* done against master.
*/
- function getBlockedStatus( $bFromSlave = true ) {
+ private function getBlockedStatus( $bFromSlave = true ) {
global $wgProxyWhitelist, $wgUser;
if ( -1 != $this->mBlockedby ) {
* @param $checkWhitelist Bool: whether to check the whitelist first
* @return Bool True if blacklisted.
*/
- function isDnsBlacklisted( $ip, $checkWhitelist = false ) {
+ public function isDnsBlacklisted( $ip, $checkWhitelist = false ) {
global $wgEnableSorbs, $wgEnableDnsBlacklist,
$wgSorbsUrl, $wgDnsBlacklistUrls, $wgProxyWhitelist;
* @param $bases String|Array of Strings: URL of the DNS blacklist
* @return Bool True if blacklisted.
*/
- function inDnsBlacklist( $ip, $bases ) {
+ public function inDnsBlacklist( $ip, $bases ) {
wfProfileIn( __METHOD__ );
$found = false;
* @param $action String Action to enforce; 'edit' if unspecified
* @return Bool True if a rate limiter was tripped
*/
- function pingLimiter( $action = 'edit' ) {
+ public function pingLimiter( $action = 'edit' ) {
# Call the 'PingLimiter' hook
$result = false;
if( !wfRunHooks( 'PingLimiter', array( &$this, $action, $result ) ) ) {
* @param $bFromSlave Bool Whether to check the slave database instead of the master
* @return Bool True if blocked, false otherwise
*/
- function isBlocked( $bFromSlave = true ) { // hacked from false due to horrible probs on site
+ public function isBlocked( $bFromSlave = true ) { // hacked from false due to horrible probs on site
$this->getBlockedStatus( $bFromSlave );
return $this->mBlock instanceof Block && $this->mBlock->prevents( 'edit' );
}
* If user is blocked, return the name of the user who placed the block
* @return String name of blocker
*/
- function blockedBy() {
+ public function blockedBy() {
$this->getBlockedStatus();
return $this->mBlockedby;
}
* If user is blocked, return the specified reason for the block
* @return String Blocking reason
*/
- function blockedFor() {
+ public function blockedFor() {
$this->getBlockedStatus();
return $this->mBlockreason;
}
* If user is blocked, return the ID for the block
* @return Int Block ID
*/
- function getBlockId() {
+ public function getBlockId() {
$this->getBlockedStatus();
return ( $this->mBlock ? $this->mBlock->getId() : false );
}
* @param $ip String IP address, uses current client if none given
* @return Bool True if blocked, false otherwise
*/
- function isBlockedGlobally( $ip = '' ) {
+ public function isBlockedGlobally( $ip = '' ) {
if( $this->mBlockedGlobally !== null ) {
return $this->mBlockedGlobally;
}
*
* @return Bool True if locked, false otherwise
*/
- function isLocked() {
+ public function isLocked() {
if( $this->mLocked !== null ) {
return $this->mLocked;
}
*
* @return Bool True if hidden, false otherwise
*/
- function isHidden() {
+ public function isHidden() {
if( $this->mHideName !== null ) {
return $this->mHideName;
}
* Get the user's ID.
* @return Int The user's ID; 0 if the user is anonymous or nonexistent
*/
- function getId() {
+ public function getId() {
if( $this->mId === null && $this->mName !== null
&& User::isIP( $this->mName ) ) {
// Special case, we know the user is anonymous
* Set the user and reload all fields according to a given ID
* @param $v Int User ID to reload
*/
- function setId( $v ) {
+ public function setId( $v ) {
$this->mId = $v;
$this->clearInstanceCache( 'id' );
}
* Get the user name, or the IP of an anonymous user
* @return String User's name or IP address
*/
- function getName() {
+ public function getName() {
if ( $this->isItemLoaded( 'name', 'only' ) ) {
# Special case optimisation
return $this->mName;
* does not exist.
* @param $str String New user name to set
*/
- function setName( $str ) {
+ public function setName( $str ) {
$this->load();
$this->mName = $str;
}
* Get the user's name escaped by underscores.
* @return String Username escaped by underscores.
*/
- function getTitleKey() {
+ public function getTitleKey() {
return str_replace( ' ', '_', $this->getName() );
}
* Check if the user has new messages.
* @return Bool True if the user has new messages
*/
- function getNewtalk() {
+ public function getNewtalk() {
$this->load();
# Load the newtalk status if it is unloaded (mNewtalk=-1)
* Return the talk page(s) this user has new messages on.
* @return Array of String page URLs
*/
- function getNewMessageLinks() {
+ public function getNewMessageLinks() {
$talks = array();
if( !wfRunHooks( 'UserRetrieveNewTalks', array( &$this, &$talks ) ) )
return $talks;
* Update the 'You have new messages!' status.
* @param $val Bool Whether the user has new messages
*/
- function setNewtalk( $val ) {
+ public function setNewtalk( $val ) {
if( wfReadOnly() ) {
return;
}
* Updates user_touched field, and removes account data from memcached
* for reload on the next hit.
*/
- function invalidateCache() {
+ public function invalidateCache() {
if( wfReadOnly() ) {
return;
}
* Validate the cache for this account.
* @param $timestamp String A timestamp in TS_MW format
*/
- function validateCache( $timestamp ) {
+ public function validateCache( $timestamp ) {
$this->load();
return ( $timestamp >= $this->mTouched );
}
* Get the user touched timestamp
* @return String timestamp
*/
- function getTouched() {
+ public function getTouched() {
$this->load();
return $this->mTouched;
}
* @param $str String New password to set
* @throws PasswordError on failure
*/
- function setPassword( $str ) {
+ public function setPassword( $str ) {
global $wgAuth;
if( $str !== null ) {
*
* @param $str String New password to set
*/
- function setInternalPassword( $str ) {
+ public function setInternalPassword( $str ) {
$this->load();
$this->setToken();
* Get the user's current token.
* @return String Token
*/
- function getToken() {
+ public function getToken() {
$this->load();
return $this->mToken;
}
* Called from loadDefaults() among other places.
*
* @param $token String If specified, set the token to this value
- * @private
*/
- function setToken( $token = false ) {
+ public function setToken( $token = false ) {
global $wgSecretKey, $wgProxyKey;
$this->load();
if ( !$token ) {
* Set the cookie password
*
* @param $str String New cookie password
- * @private
*/
- function setCookiePassword( $str ) {
+ private function setCookiePassword( $str ) {
$this->load();
$this->mCookiePassword = md5( $str );
}
* @param $str String New password to set
* @param $throttle Bool If true, reset the throttle timestamp to the present
*/
- function setNewpassword( $str, $throttle = true ) {
+ public function setNewpassword( $str, $throttle = true ) {
$this->load();
$this->mNewpassword = self::crypt( $str );
if ( $throttle ) {
* $wgPasswordReminderResendTime hours?
* @return Bool
*/
- function isPasswordReminderThrottled() {
+ public function isPasswordReminderThrottled() {
global $wgPasswordReminderResendTime;
$this->load();
if ( !$this->mNewpassTime || !$wgPasswordReminderResendTime ) {
* Get the user's e-mail address
* @return String User's email address
*/
- function getEmail() {
+ public function getEmail() {
$this->load();
wfRunHooks( 'UserGetEmail', array( $this, &$this->mEmail ) );
return $this->mEmail;
* Get the timestamp of the user's e-mail authentication
* @return String TS_MW timestamp
*/
- function getEmailAuthenticationTimestamp() {
+ public function getEmailAuthenticationTimestamp() {
$this->load();
wfRunHooks( 'UserGetEmailAuthenticationTimestamp', array( $this, &$this->mEmailAuthenticated ) );
return $this->mEmailAuthenticated;
* Set the user's e-mail address
* @param $str String New e-mail address
*/
- function setEmail( $str ) {
+ public function setEmail( $str ) {
$this->load();
$this->mEmail = $str;
wfRunHooks( 'UserSetEmail', array( $this, &$this->mEmail ) );
* Get the user's real name
* @return String User's real name
*/
- function getRealName() {
+ public function getRealName() {
if ( !$this->isItemLoaded( 'realname' ) ) {
$this->load();
}
* Set the user's real name
* @param $str String New real name
*/
- function setRealName( $str ) {
+ public function setRealName( $str ) {
$this->load();
$this->mRealName = $str;
}
* @see getBoolOption()
* @see getIntOption()
*/
- function getOption( $oname, $defaultOverride = null, $ignoreHidden = false ) {
+ public function getOption( $oname, $defaultOverride = null, $ignoreHidden = false ) {
global $wgHiddenPrefs;
$this->loadOptions();
* @return Bool User's current value for the option
* @see getOption()
*/
- function getBoolOption( $oname ) {
+ public function getBoolOption( $oname ) {
return (bool)$this->getOption( $oname );
}
-
/**
* Get the user's current setting for a given option, as a boolean value.
*
* @return Int User's current value for the option
* @see getOption()
*/
- function getIntOption( $oname, $defaultOverride=0 ) {
+ public function getIntOption( $oname, $defaultOverride=0 ) {
$val = $this->getOption( $oname );
if( $val == '' ) {
$val = $defaultOverride;
* @param $oname String The option to set
* @param $val mixed New value to set
*/
- function setOption( $oname, $val ) {
+ public function setOption( $oname, $val ) {
$this->load();
$this->loadOptions();
/**
* Reset all options to the site defaults
*/
- function resetOptions() {
+ public function resetOptions() {
$this->mOptions = self::getDefaultOptions();
}
* Get the user's preferred date format.
* @return String User's preferred date format
*/
- function getDatePreference() {
+ public function getDatePreference() {
// Important migration for old data rows
if ( is_null( $this->mDatePreference ) ) {
global $wgLang;
/**
* Get the user preferred stub threshold
*/
- function getStubThreshold() {
+ public function getStubThreshold() {
global $wgMaxArticleSize; # Maximum article size, in Kb
$threshold = intval( $this->getOption( 'stubthreshold' ) );
if ( $threshold > $wgMaxArticleSize * 1024 ) {
* @param $ns int If numeric, get permissions for this namespace
* @return Array of String permission names
*/
- function getRights( $ns = null ) {
+ public function getRights( $ns = null ) {
$key = is_null( $ns ) ? '*' : intval( $ns );
-
+
if ( is_null( $this->mRights ) ) {
$this->mRights = array();
}
-
+
if ( !isset( $this->mRights[$key] ) ) {
$this->mRights[$key] = self::getGroupPermissions( $this->getEffectiveGroups(), $ns );
wfRunHooks( 'UserGetRights', array( $this, &$this->mRights[$key], $ns ) );
// Merge non namespace specific rights
return array_merge( $this->mRights[$key], $this->getRights() );
}
-
+
}
/**
* The implicit * and user groups are not included.
* @return Array of String internal group names
*/
- function getGroups() {
+ public function getGroups() {
$this->load();
return $this->mGroups;
}
* @param $recache Bool Whether to avoid the cache
* @return Array of String internal group names
*/
- function getEffectiveGroups( $recache = false ) {
+ public function getEffectiveGroups( $recache = false ) {
if ( $recache || is_null( $this->mEffectiveGroups ) ) {
wfProfileIn( __METHOD__ );
$this->mEffectiveGroups = $this->getGroups();
*
* @return array Names of the groups the user has belonged to.
*/
- function getFormerGroups() {
+ public function getFormerGroups() {
if( is_null( $this->mFormerGroups ) ) {
$dbr = wfGetDB( DB_MASTER );
$res = $dbr->select( 'user_former_groups',
* Get the user's edit count.
* @return Int
*/
- function getEditCount() {
+ public function getEditCount() {
if( $this->getId() ) {
if ( !isset( $this->mEditCount ) ) {
/* Populate the count, if it has not been populated yet */
* This takes immediate effect.
* @param $group String Name of the group to add
*/
- function addGroup( $group ) {
+ public function addGroup( $group ) {
if( wfRunHooks( 'UserAddGroup', array( $this, &$group ) ) ) {
$dbw = wfGetDB( DB_MASTER );
if( $this->getId() ) {
* This takes immediate effect.
* @param $group String Name of the group to remove
*/
- function removeGroup( $group ) {
+ public function removeGroup( $group ) {
$this->load();
if( wfRunHooks( 'UserRemoveGroup', array( $this, &$group ) ) ) {
$dbw = wfGetDB( DB_MASTER );
* Get whether the user is logged in
* @return Bool
*/
- function isLoggedIn() {
+ public function isLoggedIn() {
return $this->getID() != 0;
}
* Get whether the user is anonymous
* @return Bool
*/
- function isAnon() {
+ public function isAnon() {
return !$this->isLoggedIn();
}
* @todo FIXME: Need to check the old failback system [AV]
* @deprecated since 1.18 Use ->getSkin() in the most relevant outputting context you have
*/
- function getSkin() {
+ public function getSkin() {
return RequestContext::getMain()->getSkin();
}
* @param $title Title of the article to look at
* @return Bool
*/
- function isWatched( $title ) {
+ public function isWatched( $title ) {
$wl = WatchedItem::fromUserTitle( $this, $title );
return $wl->isWatched();
}
* Watch an article.
* @param $title Title of the article to look at
*/
- function addWatch( $title ) {
+ public function addWatch( $title ) {
$wl = WatchedItem::fromUserTitle( $this, $title );
$wl->addWatch();
$this->invalidateCache();
* Stop watching an article.
* @param $title Title of the article to look at
*/
- function removeWatch( $title ) {
+ public function removeWatch( $title ) {
$wl = WatchedItem::fromUserTitle( $this, $title );
$wl->removeWatch();
$this->invalidateCache();
* the next change of the page if it's watched etc.
* @param $title Title of the article to look at
*/
- function clearNotification( &$title ) {
+ public function clearNotification( &$title ) {
global $wgUseEnotif, $wgShowUpdatedMarker;
# Do nothing if the database is locked to writes
* If e-notif e-mails are on, they will receive notification mails on
* the next change of any watched page.
*/
- function clearAllNotifications() {
+ public function clearAllNotifications() {
global $wgUseEnotif, $wgShowUpdatedMarker;
if ( !$wgUseEnotif && !$wgShowUpdatedMarker ) {
$this->setNewtalk( false );
/**
* Set this user's options from an encoded string
* @param $str String Encoded options to import
- * @private
*/
- function decodeOptions( $str ) {
+ private function decodeOptions( $str ) {
if( !$str )
return;
* @param $request WebRequest object to use; $wgRequest will be used if null
* is passed.
*/
- function setCookies( $request = null ) {
+ public function setCookies( $request = null ) {
if ( $request === null ) {
$request = $this->getRequest();
}
/**
* Log this user out.
*/
- function logout() {
+ public function logout() {
if( wfRunHooks( 'UserLogout', array( &$this ) ) ) {
$this->doLogout();
}
/**
* Clear the user's cookies and session, and reset the instance cache.
- * @private
* @see logout()
*/
- function doLogout() {
+ private function doLogout() {
$this->clearInstanceCache( 'defaults' );
$this->getRequest()->setSessionData( 'wsUserID', 0 );
* Save this user's settings into the database.
* @todo Only rarely do all these fields need to be set!
*/
- function saveSettings() {
+ public function saveSettings() {
$this->load();
if ( wfReadOnly() ) { return; }
if ( 0 == $this->mId ) { return; }
* If only this user's username is known, and it exists, return the user ID.
* @return Int
*/
- function idForName() {
+ public function idForName() {
$s = trim( $this->getName() );
if ( $s === '' ) return 0;
*
* @return User object, or null if the username already exists
*/
- static function createNew( $name, $params = array() ) {
+ public static function createNew( $name, $params = array() ) {
$user = new User;
$user->load();
if ( isset( $params['options'] ) ) {
/**
* Add this existing user object to the database
*/
- function addToDatabase() {
+ public function addToDatabase() {
$this->load();
$dbw = wfGetDB( DB_MASTER );
$seqVal = $dbw->nextSequenceValue( 'user_user_id_seq' );
* If this (non-anonymous) user is blocked, block any IP address
* they've successfully logged in from.
*/
- function spreadBlock() {
+ public function spreadBlock() {
wfDebug( __METHOD__ . "()\n" );
$this->load();
if ( $this->mId == 0 ) {
* @deprecated since 1.17 use the ParserOptions object to get the relevant options
* @return String Page rendering hash
*/
- function getPageRenderingHash() {
+ public function getPageRenderingHash() {
global $wgUseDynamicDates, $wgRenderHashAppend, $wgLang, $wgContLang;
if( $this->mHash ){
return $this->mHash;
* Get whether the user is explicitly blocked from account creation.
* @return Bool|Block
*/
- function isBlockedFromCreateAccount() {
+ public function isBlockedFromCreateAccount() {
$this->getBlockedStatus();
if( $this->mBlock && $this->mBlock->prevents( 'createaccount' ) ){
return $this->mBlock;
* Get whether the user is blocked from using Special:Emailuser.
* @return Bool
*/
- function isBlockedFromEmailuser() {
+ public function isBlockedFromEmailuser() {
$this->getBlockedStatus();
return $this->mBlock && $this->mBlock->prevents( 'sendemail' );
}
*
* @return Title: User's personal page title
*/
- function getUserPage() {
+ public function getUserPage() {
return Title::makeTitle( NS_USER, $this->getName() );
}
*
* @return Title: User's talk page title
*/
- function getTalkPage() {
+ public function getTalkPage() {
$title = $this->getUserPage();
return $title->getTalkPage();
}
* anonymous IPs, or the most recently created accounts.
* @return Bool
*/
- function isNewbie() {
+ public function isNewbie() {
return !$this->isAllowed( 'autoconfirmed' );
}
* @param $password String: user password.
* @return Boolean: True if the given password is correct, otherwise False.
*/
- function checkPassword( $password ) {
+ public function checkPassword( $password ) {
global $wgAuth, $wgLegacyEncoding;
$this->load();
* sent by e-mail for password reset operations.
* @return Boolean: True if matches, false otherwise
*/
- function checkTemporaryPassword( $plaintext ) {
+ public function checkTemporaryPassword( $plaintext ) {
global $wgNewPasswordExpiry;
$this->load();
* @param $request WebRequest object to use or null to use $wgRequest
* @return String The new edit token
*/
- function editToken( $salt = '', $request = null ) {
+ public function editToken( $salt = '', $request = null ) {
if ( $request == null ) {
$request = $this->getRequest();
}
* @param $request WebRequest object to use or null to use $wgRequest
* @return Boolean: Whether the token matches
*/
- function matchEditToken( $val, $salt = '', $request = null ) {
+ public function matchEditToken( $val, $salt = '', $request = null ) {
$sessionToken = $this->editToken( $salt, $request );
if ( $val != $sessionToken ) {
wfDebug( "User::matchEditToken: broken session data\n" );
* @param $request WebRequest object to use or null to use $wgRequest
* @return Boolean: Whether the token matches
*/
- function matchEditTokenNoSuffix( $val, $salt = '', $request = null ) {
+ public function matchEditTokenNoSuffix( $val, $salt = '', $request = null ) {
$sessionToken = $this->editToken( $salt, $request );
return substr( $sessionToken, 0, 32 ) == substr( $val, 0, 32 );
}
* @param $type String: message to send, either "created", "changed" or "set"
* @return Status object
*/
- function sendConfirmationMail( $type = 'created' ) {
+ public function sendConfirmationMail( $type = 'created' ) {
global $wgLang;
$expiration = null; // gets passed-by-ref and defined in next line.
$token = $this->confirmationToken( $expiration );
* @param $replyto String Reply-To address
* @return Status
*/
- function sendMail( $subject, $body, $from = null, $replyto = null ) {
+ public function sendMail( $subject, $body, $from = null, $replyto = null ) {
if( is_null( $from ) ) {
global $wgPasswordSender, $wgPasswordSenderName;
$sender = new MailAddress( $wgPasswordSender, $wgPasswordSenderName );
*
* @param[out] &$expiration \mixed Accepts the expiration time
* @return String New token
- * @private
*/
- function confirmationToken( &$expiration ) {
+ private function confirmationToken( &$expiration ) {
global $wgUserEmailConfirmationTokenExpiry;
$now = time();
$expires = $now + $wgUserEmailConfirmationTokenExpiry;
* Return a URL the user can use to confirm their email address.
* @param $token String Accepts the email confirmation token
* @return String New token URL
- * @private
*/
- function confirmationTokenUrl( $token ) {
+ private function confirmationTokenUrl( $token ) {
return $this->getTokenUrl( 'ConfirmEmail', $token );
}
* Return a URL the user can use to invalidate their email address.
* @param $token String Accepts the email confirmation token
* @return String New token URL
- * @private
*/
- function invalidationTokenUrl( $token ) {
+ private function invalidationTokenUrl( $token ) {
return $this->getTokenUrl( 'Invalidateemail', $token );
}
*
* @note Call saveSettings() after calling this function to commit the change.
*/
- function confirmEmail() {
+ public function confirmEmail() {
$this->setEmailAuthenticationTimestamp( wfTimestampNow() );
wfRunHooks( 'ConfirmEmailComplete', array( $this ) );
return true;
* address if it was already confirmed.
*
* @note Call saveSettings() after calling this function to commit the change.
+ * @return true
*/
function invalidateEmail() {
$this->load();
* site configuration?
* @return Bool
*/
- function canSendEmail() {
+ public function canSendEmail() {
global $wgEnableEmail, $wgEnableUserEmail;
if( !$wgEnableEmail || !$wgEnableUserEmail || !$this->isAllowed( 'sendemail' ) ) {
return false;
* site configuration?
* @return Bool
*/
- function canReceiveEmail() {
+ public function canReceiveEmail() {
return $this->isEmailConfirmed() && !$this->getOption( 'disablemail' );
}
*
* @return Bool
*/
- function isEmailConfirmed() {
+ public function isEmailConfirmed() {
global $wgEmailAuthentication;
$this->load();
$confirmed = true;
* Check whether there is an outstanding request for e-mail confirmation.
* @return Bool
*/
- function isEmailConfirmationPending() {
+ public function isEmailConfirmationPending() {
global $wgEmailAuthentication;
return $wgEmailAuthentication &&
!$this->isEmailConfirmed() &&
* @param $groups Array of Strings List of internal group names
* @return Array of Strings List of permission key names for given groups combined
*/
- static function getGroupPermissions( $groups, $ns = null ) {
+ public static function getGroupPermissions( $groups, $ns = null ) {
global $wgGroupPermissions, $wgRevokePermissions;
$rights = array();
-
+
// Grant every granted permission first
foreach( $groups as $group ) {
if( isset( $wgGroupPermissions[$group] ) ) {
$wgGroupPermissions[$group], $ns ) );
}
}
-
+
// Revoke the revoked permissions
foreach( $groups as $group ) {
if( isset( $wgRevokePermissions[$group] ) ) {
- $rights = array_diff( $rights, self::extractRights(
+ $rights = array_diff( $rights, self::extractRights(
$wgRevokePermissions[$group], $ns ) );
}
}
return array_unique( $rights );
}
-
+
/**
* Helper for User::getGroupPermissions
* @param array $list
}
}
}
- return $rights;
+ return $rights;
}
/**
* @param $role String Role to check
* @return Array of Strings List of internal group names with the given permission
*/
- static function getGroupsWithPermission( $role, $ns = null ) {
+ public static function getGroupsWithPermission( $role, $ns = null ) {
global $wgGroupPermissions;
$allowedGroups = array();
foreach ( $wgGroupPermissions as $group => $rights ) {
* @param $group String Internal group name
* @return String Localized descriptive group name
*/
- static function getGroupName( $group ) {
+ public static function getGroupName( $group ) {
$msg = wfMessage( "group-$group" );
return $msg->isBlank() ? $group : $msg->text();
}
* @param $group String Internal group name
* @return String Localized name for group member
*/
- static function getGroupMember( $group ) {
+ public static function getGroupMember( $group ) {
$msg = wfMessage( "group-$group-member" );
return $msg->isBlank() ? $group : $msg->text();
}
* are not included, as they are defined automatically, not in the database.
* @return Array of internal group names
*/
- static function getAllGroups() {
+ public static function getAllGroups() {
global $wgGroupPermissions, $wgRevokePermissions;
return array_diff(
array_merge( array_keys( $wgGroupPermissions ), array_keys( $wgRevokePermissions ) ),
* Get a list of all available permissions.
* @return Array of permission names
*/
- static function getAllRights() {
+ public static function getAllRights() {
if ( self::$mAllRights === false ) {
global $wgAvailableRights;
if ( count( $wgAvailableRights ) ) {
* @param $group String Internal group name
* @return Title|Bool Title of the page if it exists, false otherwise
*/
- static function getGroupPage( $group ) {
+ public static function getGroupPage( $group ) {
$msg = wfMessage( 'grouppage-' . $group )->inContentLanguage();
if( $msg->exists() ) {
$title = Title::newFromText( $msg->text() );
* @param $text String The text of the link
* @return String HTML link to the group
*/
- static function makeGroupLinkHTML( $group, $text = '' ) {
+ public static function makeGroupLinkHTML( $group, $text = '' ) {
if( $text == '' ) {
$text = self::getGroupName( $group );
}
* @param $text String The text of the link
* @return String Wikilink to the group
*/
- static function makeGroupLinkWiki( $group, $text = '' ) {
+ public static function makeGroupLinkWiki( $group, $text = '' ) {
if( $text == '' ) {
$text = self::getGroupName( $group );
}
* 'add-self' => array( addablegroups to self),
* 'remove-self' => array( removable groups from self) )
*/
- static function changeableByGroup( $group ) {
+ public static function changeableByGroup( $group ) {
global $wgAddGroups, $wgRemoveGroups, $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
$groups = array( 'add' => array(), 'remove' => array(), 'add-self' => array(), 'remove-self' => array() );
* 'add-self' => array( addablegroups to self),
* 'remove-self' => array( removable groups from self) )
*/
- function changeableGroups() {
+ public function changeableGroups() {
if( $this->isAllowed( 'userrights' ) ) {
// This group gives the right to modify everything (reverse-
// compatibility with old "userrights lets you change
* Increment the user's edit-count field.
* Will have no effect for anonymous users.
*/
- function incEditCount() {
+ public function incEditCount() {
if( !$this->isAnon() ) {
$dbw = wfGetDB( DB_MASTER );
$dbw->update( 'user',
* @param $right String Right to query
* @return String Localized description of the right
*/
- static function getRightDescription( $right ) {
+ public static function getRightDescription( $right ) {
$key = "right-$right";
$msg = wfMessage( $key );
return $msg->isBlank() ? $right : $msg->text();
* @param $userId String User ID
* @return String Password hash
*/
- static function oldCrypt( $password, $userId ) {
+ public static function oldCrypt( $password, $userId ) {
global $wgPasswordSalt;
if ( $wgPasswordSalt ) {
return md5( $userId . '-' . md5( $password ) );
* If unspecified or false, will generate one automatically
* @return String Password hash
*/
- static function crypt( $password, $salt = false ) {
+ public static function crypt( $password, $salt = false ) {
global $wgPasswordSalt;
$hash = '';
* @param $userId String User ID for old-style password salt
* @return Boolean:
*/
- static function comparePasswords( $hash, $password, $userId = false ) {
+ public static function comparePasswords( $hash, $password, $userId = false ) {
$type = substr( $hash, 0, 3 );
$result = false;
dépôts / lhc / web / wiklou.git / commitdiff