X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FUser.php;h=3dec040252d7f83e8f318319eb93a281e18d9d8a;hb=267229410a3f4ca64a210322e198b48aebc2b334;hp=2769d431e6297978bfe32ff4ca2495e069afe946;hpb=9ef63ede4954f2c272b06eed4cbabe73b17dd4aa;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/User.php b/includes/User.php index 2769d431e6..3dec040252 100644 --- a/includes/User.php +++ b/includes/User.php @@ -41,58 +41,13 @@ class PasswordError extends MWException { * of the database. */ class User { - /** - * \type{\arrayof{\string}} A list of default user toggles, i.e., boolean user - * preferences that are displayed by Special:Preferences as checkboxes. - * This list can be extended via the UserToggles hook or by - * $wgContLang::getExtraUserToggles(). - * @showinitializer + * Global constants made accessable as class constants so that autoloader + * magic can be used. */ - public static $mToggles = array( - 'highlightbroken', - 'justify', - 'hideminor', - 'extendwatchlist', - 'usenewrc', - 'numberheadings', - 'showtoolbar', - 'editondblclick', - 'editsection', - 'editsectiononrightclick', - 'showtoc', - 'rememberpassword', - 'editwidth', - 'watchcreations', - 'watchdefault', - 'watchmoves', - 'watchdeletion', - 'minordefault', - 'previewontop', - 'previewonfirst', - 'nocache', - 'enotifwatchlistpages', - 'enotifusertalkpages', - 'enotifminoredits', - 'enotifrevealaddr', - 'shownumberswatching', - 'fancysig', - 'externaleditor', - 'externaldiff', - 'showjumplinks', - 'uselivepreview', - 'forceeditsummary', - 'watchlisthideminor', - 'watchlisthidebots', - 'watchlisthideown', - 'watchlisthideanons', - 'watchlisthideliu', - 'ccmeonemails', - 'diffonly', - 'showhiddencats', - 'noconvertlink', - 'norollbackdiff', - ); + const USER_TOKEN_LENGTH = USER_TOKEN_LENGTH; + const MW_USER_VERSION = MW_USER_VERSION; + const EDIT_TOKEN_SUFFIX = EDIT_TOKEN_SUFFIX; /** * \type{\arrayof{\string}} List of member variables which are saved to the @@ -168,6 +123,7 @@ class User { 'reupload', 'reupload-shared', 'rollback', + 'selenium', 'sendemail', 'siteadmin', 'suppressionlog', @@ -229,7 +185,7 @@ class User { * @see newFromSession() * @see newFromRow() */ - function User() { + function __construct() { $this->clearInstanceCache( 'defaults' ); } @@ -345,7 +301,8 @@ class User { * User::getCanonicalName(), except that true is accepted as an alias * for 'valid', for BC. * - * @return \type{User} The User object, or null if the username is invalid. If the + * @return \type{User} The User object, or false if the username is invalid + * (e.g. if it contains illegal characters or is an IP address). If the * username is not present in the database, the result will be a user object * with a name, zero user ID and default settings. */ @@ -354,9 +311,7 @@ class User { $validate = 'valid'; } $name = self::getCanonicalName( $name, $validate ); - if ( WikiError::isError( $name ) ) { - return $name; - } elseif ( $name === false ) { + if ( $name === false ) { return false; } else { # Create unloaded user object @@ -437,7 +392,7 @@ class User { */ static function whoIs( $id ) { $dbr = wfGetDB( DB_SLAVE ); - return $dbr->selectField( 'user', 'user_name', array( 'user_id' => $id ), 'User::whoIs' ); + return $dbr->selectField( 'user', 'user_name', array( 'user_id' => $id ), __METHOD__ ); } /** @@ -601,20 +556,31 @@ class User { * either by batch processes or by user accounts which have * already been created. * - * Additional character blacklisting may be added here - * rather than in isValidUserName() to avoid disrupting - * existing accounts. + * Additional blacklisting may be added here rather than in + * isValidUserName() to avoid disrupting existing accounts. * * @param $name \string String to match * @return \bool True or false */ static function isCreatableName( $name ) { global $wgInvalidUsernameCharacters; - return - self::isUsableName( $name ) && - // Registration-time character blacklisting... - !preg_match( '/[' . preg_quote( $wgInvalidUsernameCharacters, '/' ) . ']/', $name ); + // Ensure that the username isn't longer than 235 bytes, so that + // (at least for the builtin skins) user javascript and css files + // will work. (bug 23080) + if( strlen( $name ) > 235 ) { + wfDebugLog( 'username', __METHOD__ . + ": '$name' invalid due to length" ); + return false; + } + + if( preg_match( '/[' . preg_quote( $wgInvalidUsernameCharacters, '/' ) . ']/', $name ) ) { + wfDebugLog( 'username', __METHOD__ . + ": '$name' invalid due to wgInvalidUsernameCharacters" ); + return false; + } + + return self::isUsableName( $name ); } /** @@ -701,7 +667,7 @@ class User { # with title normalisation, but then it's too late to # check elsewhere if( strpos( $name, '#' ) !== false ) - return new WikiError( 'usernamehasherror' ); + return false; # Clean up name according to title rules $t = ( $validate === 'valid' ) ? @@ -807,7 +773,7 @@ class User { function loadDefaults( $name = false ) { wfProfileIn( __METHOD__ ); - global $wgCookiePrefix; + global $wgRequest; $this->mId = 0; $this->mName = $name; @@ -818,8 +784,8 @@ class User { $this->mOptionOverrides = null; $this->mOptionsLoaded = false; - if ( isset( $_COOKIE[$wgCookiePrefix.'LoggedOut'] ) ) { - $this->mTouched = wfTimestamp( TS_MW, $_COOKIE[$wgCookiePrefix.'LoggedOut'] ); + if( $wgRequest->getCookie( 'LoggedOut' ) !== null ) { + $this->mTouched = wfTimestamp( TS_MW, $wgRequest->getCookie( 'LoggedOut' ) ); } else { $this->mTouched = '0'; # Allow any pages to be cached } @@ -850,7 +816,7 @@ class User { * @return \bool True if the user is logged in, false otherwise. */ private function loadFromSession() { - global $wgMemc, $wgCookiePrefix, $wgExternalAuthType, $wgAutocreatePolicy; + global $wgRequest, $wgExternalAuthType, $wgAutocreatePolicy; $result = null; wfRunHooks( 'UserLoadFromSession', array( $this, &$result ) ); @@ -866,8 +832,8 @@ class User { } } - if ( isset( $_COOKIE["{$wgCookiePrefix}UserID"] ) ) { - $sId = intval( $_COOKIE["{$wgCookiePrefix}UserID"] ); + if ( $wgRequest->getCookie( 'UserID' ) !== null ) { + $sId = intval( $wgRequest->getCookie( 'UserID' ) ); if( isset( $_SESSION['wsUserID'] ) && $sId != $_SESSION['wsUserID'] ) { $this->loadDefaults(); // Possible collision! wfDebugLog( 'loginSessions', "Session user ID ({$_SESSION['wsUserID']}) and @@ -889,8 +855,8 @@ class User { if ( isset( $_SESSION['wsUserName'] ) ) { $sName = $_SESSION['wsUserName']; - } else if ( isset( $_COOKIE["{$wgCookiePrefix}UserName"] ) ) { - $sName = $_COOKIE["{$wgCookiePrefix}UserName"]; + } else if ( $wgRequest->getCookie('UserName') !== null ) { + $sName = $wgRequest->getCookie('UserName'); $_SESSION['wsUserName'] = $sName; } else { $this->loadDefaults(); @@ -904,11 +870,18 @@ class User { return false; } + global $wgBlockDisablesLogin; + if( $wgBlockDisablesLogin && $this->isBlocked() ) { + # User blocked and we've disabled blocked user logins + $this->loadDefaults(); + return false; + } + if ( isset( $_SESSION['wsToken'] ) ) { $passwordCorrect = $_SESSION['wsToken'] == $this->mToken; $from = 'session'; - } else if ( isset( $_COOKIE["{$wgCookiePrefix}Token"] ) ) { - $passwordCorrect = $this->mToken == $_COOKIE["{$wgCookiePrefix}Token"]; + } else if ( $wgRequest->getCookie( 'Token' ) !== null ) { + $passwordCorrect = $this->mToken == $wgRequest->getCookie( 'Token' ); $from = 'cookie'; } else { # No session or persistent login cookie @@ -1074,22 +1047,6 @@ class User { } } - /** - * Get a list of user toggle names - * @return \type{\arrayof{\string}} Array of user toggle names - */ - static function getToggles() { - global $wgContLang, $wgUseRCPatrol; - $extraToggles = array(); - wfRunHooks( 'UserToggles', array( &$extraToggles ) ); - if( $wgUseRCPatrol ) { - $extraToggles[] = 'hidepatrolled'; - $extraToggles[] = 'newpageshidepatrolled'; - $extraToggles[] = 'watchlisthidepatrolled'; - } - return array_merge( self::$mToggles, $extraToggles, $wgContLang->getExtraUserToggles() ); - } - /** * Get blocking information @@ -1147,6 +1104,8 @@ class User { if ( $this->mBlock->load( $ip , $this->mId ) ) { wfDebug( __METHOD__ . ": Found block.\n" ); $this->mBlockedby = $this->mBlock->mBy; + if( $this->mBlockedby == 0 ) + $this->mBlockedby = $this->mBlock->mByName; $this->mBlockreason = $this->mBlock->mReason; $this->mHideName = $this->mBlock->mHideName; $this->mAllowUsertalk = $this->mBlock->mAllowUsertalk; @@ -1253,10 +1212,34 @@ class User { // Deprecated, but kept for backwards-compatibility config return false; } - if( in_array( wfGetIP(), $wgRateLimitsExcludedIPs ) ) { + + wfDebug( "Checking the list of IP addresses excluded from rate limit..\n" ); + + // Read list of IP addresses from MediaWiki namespace + $message = wfMsgForContentNoTrans( 'ratelimit-excluded-ips' ); + $lines = explode( "\n", $message ); + foreach( $lines as $line ) { + // Remove comment lines + $comment = substr( trim( $line ), 0, 1 ); + if ( $comment == '#' || $comment == '' ) { + continue; + } + // Remove additional comments after an IP address + $comment = strpos( $line, '#' ); + if ( $comment > 0 ) { + $line = trim( substr( $line, 0, $comment-1 ) ); + if ( IP::isValid( $line ) ) { + $wgRateLimitsExcludedIPs[] = IP::sanitizeIP( $line ); + } + } + } + + $ip = IP::sanitizeIP( wfGetIP() ); + if( in_array( $ip, $wgRateLimitsExcludedIPs ) ) { // No other good way currently to disable rate limits // for specific IPs. :P // But this is a crappy hack and should die. + wfDebug( "IP $ip matches the list of rate limit excluded IPs\n" ); return false; } return !$this->isAllowed('noratelimit'); @@ -2023,7 +2006,7 @@ class User { if ( $oname == 'skin' ) { # Clear cached skin, so the new one displays immediately in Special:Preferences - unset( $this->mSkin ); + $this->mSkin = null; } // Explicitly NULL values should refer to defaults @@ -2060,6 +2043,20 @@ class User { return $this->mDatePreference; } + /** + * Get the user preferred stub threshold + */ + function getStubThreshold() { + global $wgMaxArticleSize; # Maximum article size, in Kb + $threshold = intval( $this->getOption( 'stubthreshold' ) ); + if ( $threshold > $wgMaxArticleSize * 1024 ) { + # If they have set an impossible value, disable the preference + # so we can use the parser cache again. + $threshold = 0; + } + return $threshold; + } + /** * Get the permissions this user has. * @return \type{\arrayof{\string}} Array of permission names @@ -2142,7 +2139,7 @@ class User { 'ug_user' => $this->getID(), 'ug_group' => $group, ), - 'User::addGroup', + __METHOD__, array( 'IGNORE' ) ); } @@ -2165,8 +2162,7 @@ class User { array( 'ug_user' => $this->getID(), 'ug_group' => $group, - ), - 'User::removeGroup' ); + ), __METHOD__ ); $this->loadGroups(); $this->mGroups = array_diff( $this->mGroups, array( $group ) ); @@ -2244,33 +2240,46 @@ class User { * @return Skin The current skin * @todo FIXME : need to check the old failback system [AV] */ - function &getSkin( $t = null ) { - if ( !isset( $this->mSkin ) ) { - wfProfileIn( __METHOD__ ); - - global $wgHiddenPrefs; - if( !in_array( 'skin', $wgHiddenPrefs ) ) { - # get the user skin - global $wgRequest; - $userSkin = $this->getOption( 'skin' ); - $userSkin = $wgRequest->getVal( 'useskin', $userSkin ); - } else { - # if we're not allowing users to override, then use the default - global $wgDefaultSkin; - $userSkin = $wgDefaultSkin; + function getSkin( $t = null ) { + if ( $t ) { + $skin = $this->createSkinObject(); + $skin->setTitle( $t ); + return $skin; + } else { + if ( ! $this->mSkin ) { + $this->mSkin = $this->createSkinObject(); } - - $this->mSkin =& Skin::newFromKey( $userSkin ); - wfProfileOut( __METHOD__ ); - } - if( $t || !$this->mSkin->getTitle() ) { - if ( !$t ) { + + if ( ! $this->mSkin->getTitle() ) { global $wgOut; $t = $wgOut->getTitle(); + $this->mSkin->setTitle($t); } - $this->mSkin->setTitle( $t ); + + return $this->mSkin; + } + } + + // Creates a Skin object, for getSkin() + private function createSkinObject() { + wfProfileIn( __METHOD__ ); + + global $wgHiddenPrefs; + if( !in_array( 'skin', $wgHiddenPrefs ) ) { + # get the user skin + global $wgRequest; + $userSkin = $this->getOption( 'skin' ); + $userSkin = $wgRequest->getVal( 'useskin', $userSkin ); + } else { + # if we're not allowing users to override, then use the default + global $wgDefaultSkin; + $userSkin = $wgDefaultSkin; } - return $this->mSkin; + + $skin = Skin::newFromKey( $userSkin ); + wfProfileOut( __METHOD__ ); + + return $skin; } /** @@ -2669,11 +2678,12 @@ class User { } // stubthreshold is only included below for completeness, - // it will always be 0 when this function is called by parsercache. + // since it disables the parser cache, its value will always + // be 0 when this function is called by parsercache. $confstr = $this->getOption( 'math' ); - $confstr .= '!' . $this->getOption( 'stubthreshold' ); - if ( $wgUseDynamicDates ) { + $confstr .= '!' . $this->getStubThreshold(); + if ( $wgUseDynamicDates ) { # This is wrong (bug 24714) $confstr .= '!' . $this->getDatePreference(); } $confstr .= '!' . ( $this->getOption( 'numberheadings' ) ? '1' : '' ); @@ -2683,6 +2693,9 @@ class User { $extra = $wgContLang->getExtraHashOptions(); $confstr .= $extra; + // Since the skin could be overloading link(), it should be + // included here but in practice, none of our skins do that. + $confstr .= $wgRenderHashAppend; // Give a chance for extensions to modify the hash, if they have @@ -2721,13 +2734,6 @@ class User { return $this->isAllowed( 'createaccount' ) && !$this->isBlockedFromCreateAccount(); } - /** - * @deprecated - */ - function setLoaded( $loaded ) { - wfDeprecated( __METHOD__ ); - } - /** * Get this user's personal page title. * @@ -2755,11 +2761,11 @@ class User { function getMaxID() { static $res; // cache - if ( isset( $res ) ) + if ( isset( $res ) ) { return $res; - else { + } else { $dbr = wfGetDB( DB_SLAVE ); - return $res = $dbr->selectField( 'user', 'max(user_id)', false, 'User::getMaxID' ); + return $res = $dbr->selectField( 'user', 'max(user_id)', false, __METHOD__ ); } } @@ -2842,7 +2848,7 @@ class User { return EDIT_TOKEN_SUFFIX; } else { if( !isset( $_SESSION['wsEditToken'] ) ) { - $token = $this->generateToken(); + $token = self::generateToken(); $_SESSION['wsEditToken'] = $token; } else { $token = $_SESSION['wsEditToken']; @@ -2860,7 +2866,7 @@ class User { * @param $salt \string Optional salt value * @return \string The new random token */ - function generateToken( $salt = '' ) { + public static function generateToken( $salt = '' ) { $token = dechex( mt_rand() ) . dechex( mt_rand() ); return md5( $token . $salt ); } @@ -2900,9 +2906,10 @@ class User { * Generate a new e-mail confirmation token and send a confirmation/invalidation * mail to the user's given address. * + * @param $changed Boolean: whether the adress changed * @return \types{\bool,\type{WikiError}} True on success, a WikiError object on failure. */ - function sendConfirmationMail() { + function sendConfirmationMail( $changed = false ) { global $wgLang; $expiration = null; // gets passed-by-ref and defined in next line. $token = $this->confirmationToken( $expiration ); @@ -2910,8 +2917,9 @@ class User { $invalidateURL = $this->invalidationTokenUrl( $token ); $this->saveSettings(); + $message = $changed ? 'confirmemail_body_changed' : 'confirmemail_body'; return $this->sendMail( wfMsg( 'confirmemail_subject' ), - wfMsg( 'confirmemail_body', + wfMsg( $message, wfGetIP(), $this->getName(), $url, @@ -2957,7 +2965,7 @@ class User { $now = time(); $expires = $now + 7 * 24 * 60 * 60; $expiration = wfTimestamp( TS_MW, $expires ); - $token = $this->generateToken( $this->mId . $this->mEmail . $expires ); + $token = self::generateToken( $this->mId . $this->mEmail . $expires ); $hash = md5( $token ); $this->load(); $this->mEmailToken = $hash; @@ -3050,8 +3058,8 @@ class User { * @return \bool True if allowed */ function canSendEmail() { - global $wgEnableEmail, $wgEnableUserEmail, $wgUser; - if( !$wgEnableEmail || !$wgEnableUserEmail || !$wgUser->isAllowed( 'sendemail' ) ) { + global $wgEnableEmail, $wgEnableUserEmail; + if( !$wgEnableEmail || !$wgEnableUserEmail || !$this->isAllowed( 'sendemail' ) ) { return false; } $canSend = $this->isEmailConfirmed(); @@ -3188,8 +3196,6 @@ class User { * @return \string Localized descriptive group name */ static function getGroupName( $group ) { - global $wgMessageCache; - $wgMessageCache->loadAllMessages(); $key = "group-$group"; $name = wfMsg( $key ); return $name == '' || wfEmptyMsg( $key, $name ) @@ -3204,8 +3210,6 @@ class User { * @return \string Localized name for group member */ static function getGroupMember( $group ) { - global $wgMessageCache; - $wgMessageCache->loadAllMessages(); $key = "group-$group-member"; $name = wfMsg( $key ); return $name == '' || wfEmptyMsg( $key, $name ) @@ -3262,8 +3266,6 @@ class User { * @return \types{\type{Title},\bool} Title of the page if it exists, false otherwise */ static function getGroupPage( $group ) { - global $wgMessageCache; - $wgMessageCache->loadAllMessages(); $page = wfMsgForContent( 'grouppage-' . $group ); if( !wfEmptyMsg( 'grouppage-' . $group, $page ) ) { $title = Title::newFromText( $page ); @@ -3476,8 +3478,6 @@ class User { * @return \string Localized description of the right */ static function getRightDescription( $right ) { - global $wgMessageCache; - $wgMessageCache->loadAllMessages(); $key = "right-$right"; $name = wfMsg( $key ); return $name == '' || wfEmptyMsg( $key, $name ) @@ -3537,7 +3537,6 @@ class User { * @return \bool */ static function comparePasswords( $hash, $password, $userId = false ) { - $m = false; $type = substr( $hash, 0, 3 ); $result = false; @@ -3560,28 +3559,34 @@ class User { /** * Add a newuser log entry for this user + * * @param $byEmail Boolean: account made by email? + * @param $reason String: user supplied reason */ - public function addNewUserLogEntry( $byEmail = false ) { - global $wgUser, $wgNewUserLog; + public function addNewUserLogEntry( $byEmail = false, $reason = '' ) { + global $wgUser, $wgContLang, $wgNewUserLog; if( empty( $wgNewUserLog ) ) { return true; // disabled } if( $this->getName() == $wgUser->getName() ) { $action = 'create'; - $message = ''; } else { $action = 'create2'; - $message = $byEmail - ? wfMsgForContent( 'newuserlog-byemail' ) - : ''; + if ( $byEmail ) { + if ( $reason === '' ) { + $reason = wfMsgForContent( 'newuserlog-byemail' ); + } else { + $reason = $wgContLang->commaList( array( + $reason, wfMsgForContent( 'newuserlog-byemail' ) ) ); + } + } } $log = new LogPage( 'newusers' ); $log->addEntry( $action, $this->getUserPage(), - $message, + $reason, array( $this->getId() ) ); return true; @@ -3592,8 +3597,8 @@ class User { * Used by things like CentralAuth and perhaps other authplugins. */ public function addNewUserLogEntryAutoCreate() { - global $wgNewUserLog; - if( empty( $wgNewUserLog ) ) { + global $wgNewUserLog, $wgLogAutocreatedAccounts; + if( !$wgNewUserLog || !$wgLogAutocreatedAccounts ) { return true; // disabled } $log = new LogPage( 'newusers', false ); @@ -3602,7 +3607,6 @@ class User { } protected function loadOptions() { - global $wgCookiePrefix; $this->load(); if ( $this->mOptionsLoaded || !$this->getId() ) return; @@ -3631,11 +3635,6 @@ class User { $this->mOptionOverrides[$row->up_property] = $row->up_value; $this->mOptions[$row->up_property] = $row->up_value; } - - //null skin if User::mId is loaded out of session data without persistant credentials - if ( !isset( $_SESSION['wsToken'] ) && !isset( $_COOKIE["{$wgCookiePrefix}Token"] ) ) - $this->mOptions['skin'] = null; - } $this->mOptionsLoaded = true; @@ -3702,6 +3701,10 @@ class User { * * Obviously, you still need to do server-side checking. * + * NOTE: A combination of bugs in various browsers means that this function + * actually just returns array() unconditionally at the moment. May as + * well keep it around for when the browser bugs get fixed, though. + * * @return array Array of HTML attributes suitable for feeding to * Html::element(), directly or indirectly. (Don't feed to Xml::*()! * That will potentially output invalid XHTML 1.0 Transitional, and will @@ -3716,7 +3719,14 @@ class User { # Note that the pattern requirement will always be satisfied if the # input is empty, so we need required in all cases. - $ret = array( 'required' ); + # + # FIXME (bug 23769): This needs to not claim the password is required + # if e-mail confirmation is being used. Since HTML5 input validation + # is b0rked anyway in some browsers, just return nothing. When it's + # re-enabled, fix this code to not output required for e-mail + # registration. + #$ret = array( 'required' ); + $ret = array(); # We can't actually do this right now, because Opera 9.6 will print out # the entered password visibly in its error message! When other @@ -3734,4 +3744,92 @@ class User { return $ret; } + + /** + * Format the user message using a hook, a template, or, failing these, a static format. + * @param $subject String the subject of the message + * @param $text String the content of the message + * @param $signature String the signature, if provided. + */ + static protected function formatUserMessage( $subject, $text, $signature ) { + if ( wfRunHooks( 'FormatUserMessage', + array( $subject, &$text, $signature ) ) ) { + + $signature = empty($signature) ? "~~~~~" : "{$signature} ~~~~~"; + + $template = Title::newFromText( wfMsgForContent( 'usermessage-template' ) ); + if ( !$template + || $template->getNamespace() !== NS_TEMPLATE + || !$template->exists() ) { + $text = "\n== $subject ==\n\n$text\n\n-- $signature"; + } else { + $text = '{{'. $template->getText() + . " | subject=$subject | body=$text | signature=$signature }}"; + } + } + + return $text; + } + + /** + * Leave a user a message + * @param $subject String the subject of the message + * @param $text String the message to leave + * @param $signature String Text to leave in the signature + * @param $summary String the summary for this change, defaults to + * "Leave system message." + * @param $editor User The user leaving the message, defaults to + * "{{MediaWiki:usermessage-editor}}" + * @param $flags Int default edit flags + * + * @return boolean true if it was successful + */ + public function leaveUserMessage( $subject, $text, $signature = "", + $summary = null, $editor = null, $flags = 0 ) { + if ( !isset( $summary ) ) { + $summary = wfMsgForContent( 'usermessage-summary' ); + } + + if ( !isset( $editor ) ) { + $editor = User::newFromName( wfMsgForContent( 'usermessage-editor' ) ); + if ( !$editor->isLoggedIn() ) { + $editor->addToDatabase(); + } + } + + $article = new Article( $this->getTalkPage() ); + wfRunHooks( 'SetupUserMessageArticle', + array( $this, &$article, $subject, $text, $signature, $summary, $editor ) ); + + + $text = self::formatUserMessage( $subject, $text, $signature ); + $flags = $article->checkFlags( $flags ); + + if ( $flags & EDIT_UPDATE ) { + $text = $article->getContent() . $text; + } + + $dbw = wfGetDB( DB_MASTER ); + $dbw->begin(); + + try { + $status = $article->doEdit( $text, $summary, $flags, false, $editor ); + } catch ( DBQueryError $e ) { + $status = Status::newFatal("DB Error"); + } + + if ( $status->isGood() ) { + // Set newtalk with the right user ID + $this->setNewtalk( true ); + wfRunHooks( 'AfterUserMessage', + array( $this, $article, $summary, $text, $signature, $summary, $editor ) ); + $dbw->commit(); + } else { + // The article was concurrently created + wfDebug( __METHOD__ . ": Error ".$status->getWikiText() ); + $dbw->rollback(); + } + + return $status->isGood(); + } }