[MediaWiki-commits] [Gerrit] Editing system for pages separated. - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Editing system for pages separated.
..
Editing system for pages separated.
Change-Id: I2ec8b7423b083966e6fd1fb5c73b7f4d194f04b1
---
M ProofreadPage.body.php
M ProofreadPage.php
M includes/index/ProofreadIndexDbConnector.php
A includes/page/EditProofreadPagePage.php
R includes/page/ProofreadPageDbConnector.php
5 files changed, 210 insertions(+), 188 deletions(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 278f2e4..7ed9d26 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -135,7 +135,7 @@
* Query the database to find if the current page is referred in an
Index page.
* @param $title Title
*/
- private static function loadIndex( $title ) {
+ public static function loadIndex( $title ) {
$title->prpIndexPage = null;
$result = ProofreadIndexDbConnector::getRowsFromTitle( $title );
@@ -898,7 +898,7 @@
* Return quality status of the page and username of the proofreader
* Return -1 if the page cannot be parsed
*/
- private static function parse_page( $text, $title ) {
+ public static function parsePage( $text, $title ) {
global $wgUser;
$username = $wgUser->getName();
@@ -934,112 +934,6 @@
.
"$header\n\n\n$body\n$footer";
return array( -1, null, $new_text );
}
-
- /**
-* @param $editpage EditPage
-* @param $request WebRequest
-* @return bool
-*/
- public static function onEditPageImportFormData( $editpage, $request ) {
- $title = $editpage->getTitle();
- // abort if we are not a page
- if ( !$title->inNamespace( self::getPageNamespaceId() ) ) {
- return true;
- }
- if ( !$request->wasPosted() ) {
- return true;
- }
- $editpage->quality = $request->getVal( 'wpQuality' );
- $editpage->username = $editpage->safeUnicodeInput( $request,
'wpProofreader' );
- $editpage->header = $editpage->safeUnicodeInput( $request,
'wpHeaderTextbox' );
- $editpage->footer = $editpage->safeUnicodeInput( $request,
'wpFooterTextbox' );
-
- // we want to keep ordinary spaces at the end of the main
textbox
- $text = rtrim( $request->getText( 'wpTextbox1' ),
"\t\n\r\0\x0B" );
- $editpage->textbox1 = $request->getBool( 'safemode' )
- ? $editpage->unmakesafe( $text )
- : $text;
-
- if( in_array( $editpage->quality, array( '0', '1', '2', '3',
'4' ) ) ) {
- // format the page
- $text = '' .
- '' .
$editpage->header."\n\n\n" .
- $editpage->textbox1 .
- "" . $editpage->footer .
'';
- $editpage->textbox1 = $text;
- } else {
- // replace deprecated template
- $text = $editpage->textbox1;
- $text = preg_replace(
-
"/\{\{PageQuality\|(0|1|2|3|4)(|\|(.*?))\}\}/is",
- "",
- $text
- );
- $editpage->textbox1 = $text;
- }
- return true;
- }
-
- /**
-* Check the format of pages in "Page" namespace.
-*
-* @param $editpage EditPage
-* @return Boolean
-*/
- public static function onEditPageAttemptSave( $editpage ) {
- global $wgOut, $wgUser;
-
- $title = $editpage->mTitle;
-
- // abort if we are not a page
- if ( !$title->inNamespace( self::getPageNamespaceId() ) ) {
- return true;
- }
-
- $text = $editpage->textbox1;
- // parse the page
- list( $q, $username, $ptext ) = self::parse_page( $text, $title
);
- if( $q == -1 ) {
- $editpage->textbox1 = $ptext;
- $q = 1;
- }
-
- // read previous revision, so that I know how much I need to
add to pr_index
- $rev = Revision::newFromTitle( $title, false,
Revision::READ_LATEST );
- if( $rev ) {
- $old_text = $rev->getText();
- list( $old_q, $old_username, $old_ptext ) =
self::parse_page( $old_text, $title );
- if( $old_q != -1 ) {
- // check usernames
-
[MediaWiki-commits] [Gerrit] Editing system for pages separated. - change (mediawiki...ProofreadPage)
Rtdwivedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/69973
Change subject: Editing system for pages separated.
..
Editing system for pages separated.
Change-Id: I2ec8b7423b083966e6fd1fb5c73b7f4d194f04b1
---
M ProofreadPage.body.php
M ProofreadPage.php
A includes/EditProofreadPage.php
3 files changed, 203 insertions(+), 201 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/73/69973/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 4ed4565..75e4306 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -101,24 +101,6 @@
}
/**
-* Set up our custom edition system.
-*
-* @param Article $article being edited
-* @param User $user User performing the edit
-* @return boolean hook return value
-*/
- public static function onCustomEditor( $article, $user ) {
- global $request;
- if ( $article->getTitle()->inNamespace(
self::getIndexNamespaceId() ) ) { //TODO ExternalEditor case
- $editor = new EditProofreadIndexPage( $article );
- $editor->edit();
- return false;
- } else {
- return true;
- }
- }
-
- /**
* Set up our custom parser hooks when initializing parser.
*
* @param Parser $parser
@@ -936,112 +918,6 @@
}
/**
-* @param $editpage EditPage
-* @param $request WebRequest
-* @return bool
-*/
- public static function onEditPageImportFormData( $editpage, $request ) {
- $title = $editpage->getTitle();
- // abort if we are not a page
- if ( !$title->inNamespace( self::getPageNamespaceId() ) ) {
- return true;
- }
- if ( !$request->wasPosted() ) {
- return true;
- }
- $editpage->quality = $request->getVal( 'wpQuality' );
- $editpage->username = $editpage->safeUnicodeInput( $request,
'wpProofreader' );
- $editpage->header = $editpage->safeUnicodeInput( $request,
'wpHeaderTextbox' );
- $editpage->footer = $editpage->safeUnicodeInput( $request,
'wpFooterTextbox' );
-
- // we want to keep ordinary spaces at the end of the main
textbox
- $text = rtrim( $request->getText( 'wpTextbox1' ),
"\t\n\r\0\x0B" );
- $editpage->textbox1 = $request->getBool( 'safemode' )
- ? $editpage->unmakesafe( $text )
- : $text;
-
- if( in_array( $editpage->quality, array( '0', '1', '2', '3',
'4' ) ) ) {
- // format the page
- $text = '' .
- '' .
$editpage->header."\n\n\n" .
- $editpage->textbox1 .
- "" . $editpage->footer .
'';
- $editpage->textbox1 = $text;
- } else {
- // replace deprecated template
- $text = $editpage->textbox1;
- $text = preg_replace(
-
"/\{\{PageQuality\|(0|1|2|3|4)(|\|(.*?))\}\}/is",
- "",
- $text
- );
- $editpage->textbox1 = $text;
- }
- return true;
- }
-
- /**
-* Check the format of pages in "Page" namespace.
-*
-* @param $editpage EditPage
-* @return Boolean
-*/
- public static function onEditPageAttemptSave( $editpage ) {
- global $wgOut, $wgUser;
-
- $title = $editpage->mTitle;
-
- // abort if we are not a page
- if ( !$title->inNamespace( self::getPageNamespaceId() ) ) {
- return true;
- }
-
- $text = $editpage->textbox1;
- // parse the page
- list( $q, $username, $ptext ) = self::parse_page( $text, $title
);
- if( $q == -1 ) {
- $editpage->textbox1 = $ptext;
- $q = 1;
- }
-
- // read previous revision, so that I know how much I need to
add to pr_index
- $rev = Revision::newFromTitle( $title, false,
Revision::READ_LATEST );
- if( $rev ) {
- $old_text = $rev->getText();
- list( $old_q, $old_username, $old_ptext ) =
self::parse_page( $old_text, $title );
- if( $old_q != -1 ) {
- // check usernames
- if( ( $old_q != $q ) &
