Revision: 49938
Author: siebrand
Date: 2009-04-27 09:02:48 +0000 (Mon, 27 Apr 2009)
Log Message:
-----------
stylize.php and trailing whitespace removed
Modified Paths:
--------------
trunk/extensions/ReplaceText/ReplaceText.i18n.php
trunk/extensions/ReplaceText/ReplaceText.js
trunk/extensions/ReplaceText/ReplaceText.php
trunk/extensions/ReplaceText/ReplaceTextJob.php
trunk/extensions/ReplaceText/SpecialReplaceText.php
Modified: trunk/extensions/ReplaceText/ReplaceText.i18n.php
===================================================================
--- trunk/extensions/ReplaceText/ReplaceText.i18n.php 2009-04-27 08:52:10 UTC
(rev 49937)
+++ trunk/extensions/ReplaceText/ReplaceText.i18n.php 2009-04-27 09:02:48 UTC
(rev 49938)
@@ -510,7 +510,7 @@
'replacetext_replace' => 'Zamjeni',
'replacetext_success' => "'$1' će biti zamijenjen za '$2' na $3
{{PLURAL:$3|stranici|stranice|stranica}}.",
'replacetext_noreplacement' => "Nije pronađena ni jedna stranica koja
sadrži '$1'.",
- 'replacetext_warning' => "Postoji {{PLURAL:$1|$1 stranica koja već
sadrži|$1 stranica koje već sadrže}} zamjenski tekst, '$2'.
+ 'replacetext_warning' => "Postoji {{PLURAL:$1|$1 stranica koja već
sadrži|$1 stranica koje već sadrže}} zamjenski tekst, '$2'.
Ako napravite ovu zamjenu nećete moći odvojiti svoju zamjenu od ovog teksta.
Nastaviti sa zamjenom?",
'replacetext_blankwarning' => 'Zato što je zamjenski tekst prazan, ovaj
postupak se neće moći vratiti; nastaviti?',
'replacetext_continue' => 'Dalje',
@@ -1233,4 +1233,3 @@
'replacetext_cancel' => '(按下 "返回" 按鈕以取消本次操作)',
'replacetext_editsummary' => '取代文字 - 「$1」 取代為 「$2」',
);
-
Modified: trunk/extensions/ReplaceText/ReplaceText.js
===================================================================
--- trunk/extensions/ReplaceText/ReplaceText.js 2009-04-27 08:52:10 UTC (rev
49937)
+++ trunk/extensions/ReplaceText/ReplaceText.js 2009-04-27 09:02:48 UTC (rev
49938)
@@ -9,4 +9,4 @@
form.elements[i].checked = true;
}
}
-}
\ No newline at end of file
+}
Modified: trunk/extensions/ReplaceText/ReplaceText.php
===================================================================
--- trunk/extensions/ReplaceText/ReplaceText.php 2009-04-27 08:52:10 UTC
(rev 49937)
+++ trunk/extensions/ReplaceText/ReplaceText.php 2009-04-27 09:02:48 UTC
(rev 49938)
@@ -19,7 +19,7 @@
* @author Yaron Koren
*/
-if (!defined('MEDIAWIKI')) die();
+if ( !defined( 'MEDIAWIKI' ) ) die();
// credits
$wgExtensionCredits['specialpage'][] = array(
@@ -32,7 +32,7 @@
'descriptionmsg' => 'replacetext-desc',
);
-$rtgIP = dirname(__FILE__) . '/';
+$rtgIP = dirname( __FILE__ ) . '/';
$wgExtensionMessagesFiles['ReplaceText'] = $rtgIP . 'ReplaceText.i18n.php';
$wgExtensionAliasesFiles['ReplaceText'] = $rtgIP . 'ReplaceText.alias.php';
$wgJobClasses['replaceText'] = 'ReplaceTextJob';
Modified: trunk/extensions/ReplaceText/ReplaceTextJob.php
===================================================================
--- trunk/extensions/ReplaceText/ReplaceTextJob.php 2009-04-27 08:52:10 UTC
(rev 49937)
+++ trunk/extensions/ReplaceText/ReplaceTextJob.php 2009-04-27 09:02:48 UTC
(rev 49938)
@@ -25,49 +25,48 @@
return false;
}
- if (array_key_exists('move_page', $this->params)) {
+ if ( array_key_exists( 'move_page', $this->params ) ) {
global $wgUser;
$actual_user = $wgUser;
- $wgUser = User::newFromId($this->params['user_id']);
+ $wgUser = User::newFromId( $this->params['user_id'] );
$cur_page_name = $this->title->getText();
- $new_page_name =
str_replace($this->params['target_str'], $this->params['replacement_str'],
$cur_page_name);
- $new_title = Title::newFromText($new_page_name,
$this->title->getNamespace());
+ $new_page_name = str_replace(
$this->params['target_str'], $this->params['replacement_str'], $cur_page_name );
+ $new_title = Title::newFromText( $new_page_name,
$this->title->getNamespace() );
$reason = $this->params['edit_summary'];
$create_redirect = $this->params['create_redirect'];
- $this->title->moveTo($new_title, true, $reason,
$create_redirect);
+ $this->title->moveTo( $new_title, true, $reason,
$create_redirect );
$wgUser = $actual_user;
} else {
- $article = new Article($this->title);
+ $article = new Article( $this->title );
if ( !$article ) {
$this->error = 'replaceText: Article not found
"' . $this->title->getPrefixedDBkey() . '"';
wfProfileOut( __METHOD__ );
return false;
}
- wfProfileIn( __METHOD__.'-replace' );
+ wfProfileIn( __METHOD__ . '-replace' );
$article_text = $article->fetchContent();
$target_str = $this->params['target_str'];
$replacement_str = $this->params['replacement_str'];
$num_matches;
- $new_text = str_replace($target_str, $replacement_str,
$article_text, $num_matches);
+ $new_text = str_replace( $target_str, $replacement_str,
$article_text, $num_matches );
// if there's at least one replacement, modify the page,
// using the passed-in edit summary
- if ($num_matches > 0) {
+ if ( $num_matches > 0 ) {
// change global $wgUser variable to the one
// specified by the job only for the extent of
this
// replacement
global $wgUser;
$actual_user = $wgUser;
- $wgUser =
User::newFromId($this->params['user_id']);
+ $wgUser = User::newFromId(
$this->params['user_id'] );
$edit_summary = $this->params['edit_summary'];
$flags = EDIT_MINOR;
- $article->doEdit($new_text, $edit_summary,
$flags);
+ $article->doEdit( $new_text, $edit_summary,
$flags );
$wgUser = $actual_user;
}
}
- wfProfileOut( __METHOD__.'-replace' );
+ wfProfileOut( __METHOD__ . '-replace' );
wfProfileOut( __METHOD__ );
return true;
}
}
-
Modified: trunk/extensions/ReplaceText/SpecialReplaceText.php
===================================================================
--- trunk/extensions/ReplaceText/SpecialReplaceText.php 2009-04-27 08:52:10 UTC
(rev 49937)
+++ trunk/extensions/ReplaceText/SpecialReplaceText.php 2009-04-27 09:02:48 UTC
(rev 49938)
@@ -1,6 +1,6 @@
<?php
-if (!defined('MEDIAWIKI')) die();
+if ( !defined( 'MEDIAWIKI' ) ) die();
class ReplaceText extends SpecialPage {
@@ -8,15 +8,15 @@
* Constructor
*/
public function __construct() {
- parent::__construct('ReplaceText', 'replacetext');
- wfLoadExtensionMessages('ReplaceText');
+ parent::__construct( 'ReplaceText', 'replacetext' );
+ wfLoadExtensionMessages( 'ReplaceText' );
}
function execute( $query ) {
global $wgUser, $wgOut;
- if ( ! $wgUser->isAllowed('replacetext') ) {
- $wgOut->permissionRequired('replacetext');
+ if ( ! $wgUser->isAllowed( 'replacetext' ) ) {
+ $wgOut->permissionRequired( 'replacetext' );
return;
}
@@ -49,8 +49,8 @@
function doSpecialReplaceText() {
global $wgUser, $wgOut, $wgRequest, $wgLang;
- $target = $wgRequest->getText('target');
- $replacement = $wgRequest->getText('replacement');
+ $target = $wgRequest->getText( 'target' );
+ $replacement = $wgRequest->getText( 'replacement' );
if ( $target === '' ) {
if ( !$wgRequest->wasPosted() ) $this->showForm(
'replacetext_docu' );
@@ -59,48 +59,48 @@
}
- if ($wgRequest->getCheck('replace')) {
+ if ( $wgRequest->getCheck( 'replace' ) ) {
$replacement_params = array();
$replacement_params['user_id'] = $wgUser->getId();
$replacement_params['target_str'] = $target;
$replacement_params['replacement_str'] = $replacement;
- $replacement_params['edit_summary'] =
wfMsgForContent('replacetext_editsummary', $target, $replacement );
+ $replacement_params['edit_summary'] = wfMsgForContent(
'replacetext_editsummary', $target, $replacement );
$replacement_params['create_redirect'] = false;
- foreach ($wgRequest->getValues() as $key => $value) {
- if ($key == 'create-redirect' && $value == '1')
{
+ foreach ( $wgRequest->getValues() as $key => $value ) {
+ if ( $key == 'create-redirect' && $value == '1'
) {
$replacement_params['create_redirect']
= true;
}
}
$jobs = array();
- foreach ($wgRequest->getValues() as $key => $value) {
- if ($value == '1') {
- if (strpos($key, 'move-') !== false) {
- $title =
Title::newFromId(substr($key, 5));
+ foreach ( $wgRequest->getValues() as $key => $value ) {
+ if ( $value == '1' ) {
+ if ( strpos( $key, 'move-' ) !== false
) {
+ $title = Title::newFromId(
substr( $key, 5 ) );
$replacement_params['move_page'] = true;
} else {
- $title = Title::newFromId($key);
+ $title = Title::newFromId( $key
);
}
- if ($title !== null)
+ if ( $title !== null )
$jobs[] = new ReplaceTextJob(
$title, $replacement_params );
}
}
Job::batchInsert( $jobs );
- $count = $wgLang->formatNum( count($jobs) );
+ $count = $wgLang->formatNum( count( $jobs ) );
$wgOut->addWikiMsg( 'replacetext_success', $target,
$replacement, $count );
// Link back
$wgOut->addHTML( $sk->link( $this->getTitle(),
wfMsgHtml( 'replacetext_return' ) ) );
- } elseif ( $wgRequest->getCheck('target') ) { // very long
elseif, look for "end elseif"
+ } elseif ( $wgRequest->getCheck( 'target' ) ) { // very long
elseif, look for "end elseif"
// display a page to make the user confirm the
replacement, if the
// replacement string is either blank or found
elsewhere on the wiki
// (since undoing the replacement would be difficult in
either case)
- if (!$wgRequest->getCheck('confirm')) {
+ if ( !$wgRequest->getCheck( 'confirm' ) ) {
$message = false;
- if ($replacement === '') {
+ if ( $replacement === '' ) {
$message = 'replacetext_blankwarning';
} else {
$res = $this->doSearchQuery(
$replacement );
@@ -121,21 +121,21 @@
$titles_for_move = array();
$unmoveable_titles = array();
-
+
$res = $this->doSearchQuery( $target );
foreach ( $res as $row ) {
- $title =
Title::makeTitleSafe($row->page_namespace, $row->page_title);
+ $title = Title::makeTitleSafe(
$row->page_namespace, $row->page_title );
$context = $this->extractContext(
$row->old_text, $target );
$found_titles[] = array( $title, $context );
}
- if ( $wgRequest->getCheck('move_pages') ) {
+ if ( $wgRequest->getCheck( 'move_pages' ) ) {
$res = $this->getMoveTitles( $target );
foreach ( $res as $row ) {
- $title =
Title::makeTitleSafe($row->page_namespace, $row->page_title);
+ $title = Title::makeTitleSafe(
$row->page_namespace, $row->page_title );
// see if this move can happen
$new_title = Title::makeTitleSafe(
$row->page_namespace, str_replace( $target, $replacement, $row->page_title ) );
- $err =
$title->isValidMoveOperation($new_title);
- if ( $title->userCanMove(true) &&
!is_array($err) ) {
+ $err = $title->isValidMoveOperation(
$new_title );
+ if ( $title->userCanMove( true ) &&
!is_array( $err ) ) {
$titles_for_move[] = $title;
} else {
$unmoveable_titles[] = $title;
@@ -177,7 +177,7 @@
global $wgOut, $wgLang, $wgScript;
$js = file_get_contents( dirname( __FILE__ ) .
'/ReplaceText.js' );
$js = '<script type="text/javascript">' . $js . '</script>';
- $wgOut->addScript($js);
+ $wgOut->addScript( $js );
$wgOut->addWikiMsg( 'replacetext_choosepages', $target,
$replacement,
$wgLang->formatNum( count( $found_titles ) ) );
@@ -195,18 +195,18 @@
foreach ( $found_titles as $_ ) {
list( $title, $context ) = $_;
$wgOut->addHTML(
- Xml::check( $title->getArticleID(), true) .
+ Xml::check( $title->getArticleID(), true ) .
$skin->makeKnownLinkObj( $title,
$title->getPrefixedText() ) . " - <small>$context</small><br />\n"
);
}
- if ( count($titles_for_move) ) {
+ if ( count( $titles_for_move ) ) {
$wgOut->addHTML( '<br />' );
$wgOut->addWikiMsg( 'replacetext_choosepagesformove',
$wgLang->formatNum( count( $titles_for_move ) ) );
- foreach ($titles_for_move as $title) {
+ foreach ( $titles_for_move as $title ) {
$wgOut->addHTML(
- Xml::check('move-' .
$title->getArticleID(), true) .
- $skin->makeLinkObj( $title,
$title->prefix($title->getText()) ) . "<br />\n"
+ Xml::check( 'move-' .
$title->getArticleID(), true ) .
+ $skin->makeLinkObj( $title,
$title->prefix( $title->getText() ) ) . "<br />\n"
);
}
$wgOut->addHTML(
@@ -216,12 +216,12 @@
$wgOut->addHTML(
'<br />' .
- Xml::submitButton( wfMsg('replacetext_replace') ) .
+ Xml::submitButton( wfMsg( 'replacetext_replace' ) ) .
Xml::hidden( 'replace', 1 )
);
// only show "invert selections" link if there are more than
five pages
- if (count($found_titles) + count($titles_for_move) > 5) {
+ if ( count( $found_titles ) + count( $titles_for_move ) > 5 ) {
$buttonOpts = array(
'type' => 'button',
'value' => wfMsg(
'replacetext_invertselections' ),
@@ -235,14 +235,14 @@
$wgOut->addHTML( '</form>' );
- if (count($unmoveable_titles) > 0) {
+ if ( count( $unmoveable_titles ) > 0 ) {
$wgOut->addWikiMsg( 'replacetext_cannotmove',
$wgLang->formatNum( count( $unmoveable_titles ) ) );
$text = "<ul>\n";
- foreach ($unmoveable_titles as $title) {
+ foreach ( $unmoveable_titles as $title ) {
$text .= "<li>{$skin->makeKnownLinkObj( $title,
$title->getPrefixedText() )}<br />\n";
}
$text .= "</ul>\n";
- $wgOut->addHTML($text);
+ $wgOut->addHTML( $text );
}
}
@@ -264,14 +264,14 @@
}
$cuts = array();
- for ( $i = 0; $i < count($poss); $i++ ) {
+ for ( $i = 0; $i < count( $poss ); $i++ ) {
$index = $poss[$i];
- $len = strlen($target);
+ $len = strlen( $target );
// Merge to the next if possible
- while( isset($poss[$i+1]) ) {
- if ( $poss[$i+1] < $index+$len+$cw*2 ) {
- $len += $poss[$i+1] - $poss[$i];
+ while ( isset( $poss[$i + 1] ) ) {
+ if ( $poss[$i + 1] < $index + $len + $cw * 2 ) {
+ $len += $poss[$i + 1] - $poss[$i];
$i++;
} else {
break; // Can't merge, exit the inner
loop
@@ -281,13 +281,13 @@
}
$context = '';
- foreach ($cuts as $_ ) {
+ foreach ( $cuts as $_ ) {
list( $index, $len, ) = $_;
- $context .= self::convertWhiteSpaceToHTML(
$wgLang->truncate( substr( $text, 0, $index ), -$cw ) );
+ $context .= self::convertWhiteSpaceToHTML(
$wgLang->truncate( substr( $text, 0, $index ), - $cw ) );
$snippet = self::convertWhiteSpaceToHTML( substr(
$text, $index, $len ) );
$targetq = preg_quote( self::convertWhiteSpaceToHTML(
$target ), '/' );
$context .= preg_replace( "/$targetq/i", '<span
class="searchmatch">\0</span>', $snippet );
- $context .= self::convertWhiteSpaceToHTML(
$wgLang->truncate( substr( $text, $index+$len ), $cw ) );
+ $context .= self::convertWhiteSpaceToHTML(
$wgLang->truncate( substr( $text, $index + $len ), $cw ) );
}
return $context;
@@ -298,7 +298,7 @@
$msg = preg_replace( '/^ /m', ' ', $msg );
$msg = preg_replace( '/ $/m', ' ', $msg );
$msg = preg_replace( '/ /', ' ', $msg );
- #$msg = str_replace( "\n", '<br />', $msg );
+ # $msg = str_replace( "\n", '<br />', $msg );
return $msg;
}
@@ -314,7 +314,7 @@
array( 'page_title', 'page_namespace' ),
"page_title like '%$target%'",
__METHOD__,
- array( 'ORDER BY' => 'page_namespace, page_title')
+ array( 'ORDER BY' => 'page_namespace, page_title' )
);
}
@@ -336,4 +336,4 @@
return $dbr->select( $tables, $vars, $conds, __METHOD__ );
}
-}
\ No newline at end of file
+}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
