$data = $this->getResult()->getData();
if ( isset( $data['warnings'][$this->getModuleName()] ) )
{
- # Don't add duplicate warnings
+ // Don't add duplicate warnings
$warn_regex = preg_quote( $warning, '/' );
if ( preg_match( "/{$warn_regex}(\\n|$)/", $data['warnings'][$this->getModuleName()]['*'] ) )
return;
$oldwarning = $data['warnings'][$this->getModuleName()]['*'];
- # If there is a warning already, append it to the existing one
+ // If there is a warning already, append it to the existing one
$warning = "$oldwarning\n$warning";
$this->getResult()->unsetValue( 'warnings', $this->getModuleName() );
}
}
if ( is_array( $allowedValues ) ) {
- # Check for unknown values
+ // Check for unknown values
$unknown = array_diff( $valuesList, $allowedValues );
if ( count( $unknown ) )
{
else
$this->dieUsage( "Unrecognized value for parameter '$valueName': {$valuesList[0]}", "unknown_$valueName" );
}
- # Now throw them out
+ // Now throw them out
$valuesList = array_intersect( $valuesList, $allowedValues );
}
// Auto-generate a summary, if necessary
if ( is_null( $reason ) )
{
- # Need to pass a throwaway variable because generateReason expects
- # a reference
+ // Need to pass a throwaway variable because generateReason expects
+ // a reference
$hasHistory = false;
$reason = $article->generateReason( $hasHistory );
if ( $reason === false )
if ( !FileDeleteForm::haveDeletableFile( $file, $oldfile, $oldimage ) )
return self::delete( new Article( $title ), $token, $reason );
- if ( is_null( $reason ) ) # Log and RC don't like null reasons
+ if ( is_null( $reason ) ) // Log and RC don't like null reasons
$reason = '';
$status = FileDeleteForm::doDelete( $title, $file, $oldimage, $reason, $suppress );
$params['summary'] = wfMsgForContent( 'undo-summary', $params['undo'], $undoRev->getUserText() );
}
- # See if the MD5 hash checks out
+ // See if the MD5 hash checks out
if ( !is_null( $params['md5'] ) && md5( $toMD5 ) !== $params['md5'] )
$this->dieUsageMsg( array( 'hashcheckfailed' ) );
if ( !is_null( $params['summary'] ) )
$reqArr['wpSummary'] = $params['summary'];
- # Watch out for basetimestamp == ''
- # wfTimestamp() treats it as NOW, almost certainly causing an edit conflict
+ // Watch out for basetimestamp == ''
+ // wfTimestamp() treats it as NOW, almost certainly causing an edit conflict
if ( !is_null( $params['basetimestamp'] ) && $params['basetimestamp'] != '' )
$reqArr['wpEdittime'] = wfTimestamp( TS_MW, $params['basetimestamp'] );
else
if ( !is_null( $params['starttimestamp'] ) && $params['starttimestamp'] != '' )
$reqArr['wpStarttime'] = wfTimestamp( TS_MW, $params['starttimestamp'] );
else
- $reqArr['wpStarttime'] = $reqArr['wpEdittime']; # Fake wpStartime
+ $reqArr['wpStarttime'] = $reqArr['wpEdittime']; // Fake wpStartime
if ( $params['minor'] || ( !$params['notminor'] && $wgUser->getOption( 'minordefault' ) ) )
$reqArr['wpMinoredit'] = '';
$req = new FauxRequest( $reqArr, true );
$ep->importFormData( $req );
- # Run hooks
- # Handle CAPTCHA parameters
+ // Run hooks
+ // Handle CAPTCHA parameters
global $wgRequest;
if ( !is_null( $params['captchaid'] ) )
$wgRequest->setVal( 'wpCaptchaId', $params['captchaid'] );
$this->dieUsageMsg( array( 'hookaborted' ) );
}
- # Do the actual save
+ // Do the actual save
$oldRevId = $articleObj->getRevIdFetched();
$result = null;
- # Fake $wgRequest for some hooks inside EditPage
- # FIXME: This interface SUCKS
+ // Fake $wgRequest for some hooks inside EditPage
+ // FIXME: This interface SUCKS
$oldRequest = $wgRequest;
$wgRequest = $req;
case EditPage::AS_CONFLICT_DETECTED:
$this->dieUsageMsg( array( 'editconflict' ) );
- # case EditPage::AS_SUMMARY_NEEDED: Can't happen since we set wpIgnoreBlankSummary
+ // case EditPage::AS_SUMMARY_NEEDED: Can't happen since we set wpIgnoreBlankSummary
case EditPage::AS_TEXTBOX_EMPTY:
$this->dieUsageMsg( array( 'emptynewsection' ) );
$r['result'] = "Success";
$r['pageid'] = intval( $titleObj->getArticleID() );
$r['title'] = $titleObj->getPrefixedText();
- # HACK: We create a new Article object here because getRevIdFetched()
- # refuses to be run twice, and because Title::getLatestRevId()
- # won't fetch from the master unless we select for update, which we
- # don't want to do.
+ // HACK: We create a new Article object here because getRevIdFetched()
+ // refuses to be run twice, and because Title::getLatestRevId()
+ // won't fetch from the master unless we select for update, which we
+ // don't want to do.
$newArticle = new Article( $titleObj );
$newRevId = $newArticle->getRevIdFetched();
if ( $newRevId == $oldRevId )
break;
case EditPage::AS_END:
- # This usually means some kind of race condition
- # or DB weirdness occurred. Fall through to throw an unknown
- # error.
+ // This usually means some kind of race condition
+ // or DB weirdness occurred. Fall through to throw an unknown
+ // error.
- # This needs fixing higher up, as Article::doEdit should be
- # used rather than Article::updateArticle, so that specific
- # error conditions can be returned
+ // This needs fixing higher up, as Article::doEdit should be
+ // used rather than Article::updateArticle, so that specific
+ // error conditions can be returned
default:
$this->dieUsageMsg( array( 'unknownerror', $retval ) );
}
$text = preg_replace( '/\<(!--.*?--|.*?)\>/', '<span style="color:blue;"><\1></span>', $text );
// identify URLs
$protos = implode( "|", $wgUrlProtocols );
- # This regex hacks around bug 13218 (" included in the URL)
+ // This regex hacks around bug 13218 (" included in the URL)
$text = preg_replace( "#(($protos).*?)(")?([ \\'\"<>\n]|<|>|")#", '<a href="\\1">\\1</a>\\3\\4', $text );
// identify requests to api.php
$text = preg_replace( "#api\\.php\\?[^ \\()<\n\t]+#", '<a href="\\0">\\0</a>', $text );
}
public function getMimeType() {
- # This looks like it should be text/plain, but IE7 is so
- # brain-damaged it tries to parse text/plain as HTML if it
- # contains HTML tags. Using MIME text/text works around this bug
+ // This looks like it should be text/plain, but IE7 is so
+ // brain-damaged it tries to parse text/plain as HTML if it
+ // contains HTML tags. Using MIME text/text works around this bug
return 'text/text';
}
}
public function getMimeType() {
- # This looks like it should be text/plain, but IE7 is so
- # brain-damaged it tries to parse text/plain as HTML if it
- # contains HTML tags. Using MIME text/text works around this bug
+ // This looks like it should be text/plain, but IE7 is so
+ // brain-damaged it tries to parse text/plain as HTML if it
+ // contains HTML tags. Using MIME text/text works around this bug
return 'text/text';
}
* @return bool
*/
function _needLiteral( $value ) {
- # Check whether the string contains # or : or begins with any of:
- # [ - ? , [ ] { } ! * & | > ' " % @ ` ]
- # or is a number or contains newlines
+ // Check whether the string contains # or : or begins with any of:
+ // [ - ? , [ ] { } ! * & | > ' " % @ ` ]
+ // or is a number or contains newlines
return (bool)( gettype( $value ) == "string" &&
( is_numeric( $value ) ||
strpos( $value, "\n" ) ||
if ( $this->mSquidMaxage == - 1 )
{
- # Nobody called setCacheMaxAge(), use the (s)maxage parameters
+ // Nobody called setCacheMaxAge(), use the (s)maxage parameters
$smaxage = $this->getParameter( 'smaxage' );
$maxage = $this->getParameter( 'maxage' );
}
}
}
- # Move the page
+ // Move the page
$hookErr = null;
$retval = $fromTitle->moveTo( $toTitle, true, $params['reason'], !$params['noredirect'] );
if ( $retval !== true )
if ( !$params['noredirect'] || !$wgUser->isAllowed( 'suppressredirect' ) )
$r['redirectcreated'] = '';
- # Move the talk page
+ // Move the talk page
if ( $params['movetalk'] && $fromTalk->exists() && !$fromTitle->isTalkPage() )
{
$retval = $fromTalk->moveTo( $toTalk, true, $params['reason'], !$params['noredirect'] );
}
}
- # Move subpages
+ // Move subpages
if ( $params['movesubpages'] )
{
$r['subpages'] = $this->moveSubpages( $fromTitle, $toTitle,
}
}
- # Watch pages
+ // Watch pages
if ( $params['watch'] || $wgUser->getOption( 'watchmoves' ) )
{
$wgUser->addWatch( $fromTitle );
$db->freeResult( $res );
if ( $this->mPendingRedirectIDs )
{
- # We found pages that aren't in the redirect table
- # Add them
+ // We found pages that aren't in the redirect table
+ // Add them
foreach ( $this->mPendingRedirectIDs as $id => $title )
{
$article = new Article( $title );
$rt = $article->insertRedirect();
if ( !$rt )
- # What the hell. Let's just ignore this
+ // What the hell. Let's just ignore this
continue;
$lb->addObj( $rt );
$this->mRedirectTitles[$title->getPrefixedText()] = $rt->getPrefixedText();
$titleObj = is_string( $title ) ? Title :: newFromText( $title ) : $title;
if ( !$titleObj )
{
- # Handle invalid titles gracefully
+ // Handle invalid titles gracefully
$this->mAllpages[0][$title] = $this->mFakePageId;
$this->mInvalidTitles[$this->mFakePageId] = $title;
$this->mFakePageId--;
{
if ( !is_null( $oldid ) )
{
- # Don't use the parser cache
+ // Don't use the parser cache
$rev = Revision::newFromID( $oldid );
if ( !$rev )
$this->dieUsage( "There is no revision ID $oldid", 'missingrev' );
$pageSet = $this->getPageSet();
$result = $this->getResult();
- # We don't check for a full result set here because we can't be adding
- # more than 380K. The maximum revision size is in the megabyte range,
- # and the maximum result size must be even higher than that.
+ // We don't check for a full result set here because we can't be adding
+ // more than 380K. The maximum revision size is in the megabyte range,
+ // and the maximum result size must be even higher than that.
// Title normalizations
$normValues = array ();
* @return string Page title with underscores
*/
public function titleToKey( $title ) {
- # Don't throw an error if we got an empty string
+ // Don't throw an error if we got an empty string
if ( trim( $title ) == '' )
return '';
$t = Title::newFromText( $title );
* @return string Page title with spaces
*/
public function keyToTitle( $key ) {
- # Don't throw an error if we got an empty string
+ // Don't throw an error if we got an empty string
if ( trim( $key ) == '' )
return '';
$t = Title::newFromDbKey( $key );
- # This really shouldn't happen but we gotta check anyway
+ // This really shouldn't happen but we gotta check anyway
if ( !$t )
$this->dieUsageMsg( array( 'invalidtitle', $key ) );
return $t->getPrefixedText();
list( $ip, $range ) = IP::parseCIDR( $params['ip'] );
if ( $ip && $range )
{
- # We got a CIDR range
+ // We got a CIDR range
if ( $range < 16 )
$this->dieUsage( 'CIDR ranges broader than /16 are not accepted', 'cidrtoobroad' );
$lower = wfBaseConvert( $ip, 10, 16, 8, false );
}
$this->addOption( 'USE INDEX', array( 'categorylinks' => 'cl_from' ) );
- # Don't order by cl_from if it's constant in the WHERE clause
+ // Don't order by cl_from if it's constant in the WHERE clause
if ( count( $this->getPageSet()->getGoodTitles() ) == 1 )
$this->addOption( 'ORDER BY', 'cl_to' );
else
$this->addWhere( 'cl_from=page_id' );
$this->setContinuation( $params['continue'], $params['dir'] );
$this->addWhereFld( 'cl_to', $categoryTitle->getDBkey() );
- # Scanning large datasets for rare categories sucks, and I already told
- # how to have efficient subcategory access :-) ~~~~ (oh well, domas)
+ // Scanning large datasets for rare categories sucks, and I already told
+ // how to have efficient subcategory access :-) ~~~~ (oh well, domas)
global $wgMiserMode;
$miser_ns = array();
if ( $wgMiserMode ) {
$this->addTables( 'externallinks' );
$this->addWhereFld( 'el_from', array_keys( $this->getPageSet()->getGoodTitles() ) );
- # Don't order by el_from if it's constant in the WHERE clause
+ // Don't order by el_from if it's constant in the WHERE clause
if ( count( $this->getPageSet()->getGoodTitles() ) != 1 )
$this->addOption( 'ORDER BY', 'el_from' );
if ( !$fit )
{
if ( count( $pageIds[NS_IMAGE] ) == 1 )
- # The user is screwed. imageinfo can't be solely
- # responsible for exceeding the limit in this case,
- # so set a query-continue that just returns the same
- # thing again. When the violating queries have been
- # out-continued, the result will get through
+ // The user is screwed. imageinfo can't be solely
+ // responsible for exceeding the limit in this case,
+ // so set a query-continue that just returns the same
+ // thing again. When the violating queries have been
+ // out-continued, the result will get through
$this->setContinueEnumParameter( 'start',
wfTimestamp( TS_ISO_8601, $img->getTimestamp() ) );
else
if ( !$fit )
{
if ( count( $pageIds[NS_IMAGE] ) == 1 )
- # See the 'the user is screwed' comment above
+ // See the 'the user is screwed' comment above
$this->setContinueEnumParameter( 'start',
wfTimestamp( TS_ISO_8601, $img->getTimestamp() ) );
else
"il_to >= '$ilto')" );
}
- # Don't order by il_from if it's constant in the WHERE clause
+ // Don't order by il_from if it's constant in the WHERE clause
if ( count( $this->getPageSet()->getGoodTitles() ) == 1 )
$this->addOption( 'ORDER BY', 'il_to' );
else
$a['cascade'] = '';
$this->protections[$row->page_namespace][$row->page_title][] = $a;
- # Also check old restrictions
+ // Also check old restrictions
if ( $this->pageRestrictions[$row->pr_page] ) {
$restrictions = explode( ':', trim( $this->pageRestrictions[$row->pr_page] ) );
foreach ( $restrictions as $restrict ) {
"ll_lang >= '$lllang')" );
}
- # Don't order by ll_from if it's constant in the WHERE clause
+ // Don't order by ll_from if it's constant in the WHERE clause
if ( count( $this->getPageSet()->getGoodTitles() ) == 1 )
$this->addOption( 'ORDER BY', 'll_lang' );
else
"{$this->prefix}_title >= '$pltitle')))" );
}
- # Here's some MySQL craziness going on: if you use WHERE foo='bar'
- # and later ORDER BY foo MySQL doesn't notice the ORDER BY is pointless
- # but instead goes and filesorts, because the index for foo was used
- # already. To work around this, we drop constant fields in the WHERE
- # clause from the ORDER BY clause
+ // Here's some MySQL craziness going on: if you use WHERE foo='bar'
+ // and later ORDER BY foo MySQL doesn't notice the ORDER BY is pointless
+ // but instead goes and filesorts, because the index for foo was used
+ // already. To work around this, we drop constant fields in the WHERE
+ // clause from the ORDER BY clause
$order = array();
if ( count( $this->getPageSet()->getGoodTitles() ) != 1 )
$order[] = "{$this->prefix}_from";
array( 'query', $this->getModuleName() ),
null, $this->extractRowInfo( $row ) );
if ( !$fit )
- # We can't really query-continue a random list.
- # Return an insanely high value so
- # $count < $limit is false
+ // We can't really query-continue a random list.
+ // Return an insanely high value so
+ // $count < $limit is false
return 1E9;
$this->pageIDs[] = $row->page_id;
}
if ( $this->fld_content || !is_null( $this->difftotext ) ) {
global $wgParser;
$text = $revision->getText();
- # Expand templates after getting section content because
- # template-added sections don't count and Parser::preprocess()
- # will have less input
+ // Expand templates after getting section content because
+ // template-added sections don't count and Parser::preprocess()
+ // will have less input
if ( $this->section !== false ) {
$text = $wgParser->getSection( $text, $this->section, false );
if ( $text === false )
' 1) Get data about a set of pages (last revision), by setting titles or pageids parameter.',
' 2) Get revisions for one given page, by using titles/pageids with start/end/limit params.',
' 3) Get data about a set of revisions by setting their IDs with revids parameter.',
- 'All parameters marked as (enum) may only be used with a single page (#2).'
+ 'All parameters marked as (enum) may only be used with a single page (//2).'
);
}
}
if ( !$fit )
{
- # Abuse siprop as a query-continue parameter
- # and set it to all unprocessed props
+ // Abuse siprop as a query-continue parameter
+ // and set it to all unprocessed props
$this->setContinueEnumParameter( 'prop', implode( '|',
array_diff( $params['prop'], $done ) ) );
break;
$this->addWhere( 'rc_user_text != ' . $this->getDB()->addQuotes( $params['excludeuser'] ) );
- # This is an index optimization for mysql, as done in the Special:Watchlist page
+ // This is an index optimization for mysql, as done in the Special:Watchlist page
$this->addWhereIf( "rc_timestamp > ''", !isset ( $params['start'] ) && !isset ( $params['end'] ) && $wgDBtype == 'mysql' );
$this->addOption( 'LIMIT', $params['limit'] + 1 );
if ( !$titleObj->exists() )
$this->dieUsageMsg( array( 'notanarticle' ) );
- # We need to be able to revert IPs, but getCanonicalName rejects them
+ // We need to be able to revert IPs, but getCanonicalName rejects them
$username = User::isIP( $params['user'] )
? $params['user']
: User::getCanonicalName( $params['user'] );
dépôts / lhc / web / wiklou.git / commitdiff