-<?
-
-# Splitting edit page/HTML interface from Article...
-# The actual database and text munging is still in Article,
-# but it should get easier to call those from alternate
-# interfaces.
-
+<?php
+# $Id$
+/**
+ * Contain the EditPage class
+ * @package MediaWiki
+ */
+
+/**
+ * Splitting edit page/HTML interface from Article...
+ * The actual database and text munging is still in Article,
+ * but it should get easier to call those from alternate
+ * interfaces.
+ *
+ * @package MediaWiki
+ */
class EditPage {
var $mArticle;
var $mTitle;
+ # Form values
+ var $save = false, $preview = false;
+ var $minoredit = false, $watchthis = false;
+ var $textbox1 = '', $textbox2 = '', $summary = '';
+ var $edittime = '', $section = '';
+ var $oldid = 0;
+
+ /**
+ * @todo document
+ * @param $article
+ */
function EditPage( $article ) {
$this->mArticle =& $article;
global $wgTitle;
$this->mTitle =& $wgTitle;
}
- # This is the function that gets called for "action=edit".
-
- function edit()
- {
- global $wgOut, $wgUser, $wgWhitelistEdit;
- global $wpTextbox1, $wpSummary, $wpSave, $wpPreview;
- global $wpMinoredit, $wpEdittime, $wpTextbox2;
+ /**
+ * This is the function that gets called for "action=edit".
+ */
+ function edit() {
+ global $wgOut, $wgUser, $wgWhitelistEdit, $wgRequest;
+ // this is not an article
+ $wgOut->setArticleFlag(false);
- $fields = array( "wpTextbox1", "wpSummary", "wpTextbox2" );
- wfCleanFormFields( $fields );
+ $this->importFormData( $wgRequest );
if ( ! $this->mTitle->userCanEdit() ) {
- $wgOut->readOnlyPage( $this->mArticle->getContent(), true );
+ $wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
return;
}
if ( $wgUser->isBlocked() ) {
return;
}
if ( wfReadOnly() ) {
- if( isset( $wpSave ) or isset( $wpPreview ) ) {
- $this->editForm( "preview" );
+ if( $this->save || $this->preview ) {
+ $this->editForm( 'preview' );
} else {
- $wgOut->readOnlyPage( $this->mArticle->getContent() );
+ $wgOut->readOnlyPage( $this->mArticle->getContent( true ) );
}
return;
}
- if ( $_SERVER['REQUEST_METHOD'] != "POST" ) unset( $wpSave );
- if ( isset( $wpSave ) ) {
- $this->editForm( "save" );
- } else if ( isset( $wpPreview ) ) {
- $this->editForm( "preview" );
+ if ( $this->save ) {
+ $this->editForm( 'save' );
+ } else if ( $this->preview ) {
+ $this->editForm( 'preview' );
} else { # First time through
- $this->editForm( "initial" );
+ $this->editForm( 'initial' );
}
}
- # Since there is only one text field on the edit form,
- # pressing <enter> will cause the form to be submitted, but
- # the submit button value won't appear in the query, so we
- # Fake it here before going back to edit(). This is kind of
- # ugly, but it helps some old URLs to still work.
+ /**
+ * @todo document
+ */
+ function importFormData( &$request ) {
+ # These fields need to be checked for encoding.
+ # Also remove trailing whitespace, but don't remove _initial_
+ # whitespace from the text boxes. This may be significant formatting.
+ $this->textbox1 = rtrim( $request->getText( 'wpTextbox1' ) );
+ $this->textbox2 = rtrim( $request->getText( 'wpTextbox2' ) );
+ $this->summary = trim( $request->getText( 'wpSummary' ) );
+
+ $this->edittime = $request->getVal( 'wpEdittime' );
+ if( !preg_match( '/^\d{14}$/', $this->edittime )) $this->edittime = '';
+
+ $this->preview = $request->getCheck( 'wpPreview' );
+ $this->save = $request->wasPosted() && !$this->preview;
+ $this->minoredit = $request->getCheck( 'wpMinoredit' );
+ $this->watchthis = $request->getCheck( 'wpWatchthis' );
+
+ $this->oldid = $request->getInt( 'oldid' );
+
+ # Section edit can come from either the form or a link
+ $this->section = $request->getVal( 'wpSection', $request->getVal( 'section' ) );
+ }
- function submit()
- {
- global $wpSave, $wpPreview;
- if ( ! isset( $wpPreview ) ) { $wpSave = 1; }
+ /**
+ * Since there is only one text field on the edit form,
+ * pressing <enter> will cause the form to be submitted, but
+ * the submit button value won't appear in the query, so we
+ * Fake it here before going back to edit(). This is kind of
+ * ugly, but it helps some old URLs to still work.
+ */
+ function submit() {
+ if( !$this->preview ) $this->save = true;
$this->edit();
}
- # The edit form is self-submitting, so that when things like
- # preview and edit conflicts occur, we get the same form back
- # with the extra stuff added. Only when the final submission
- # is made and all is well do we actually save and redirect to
- # the newly-edited page.
-
- function editForm( $formtype )
- {
+ /**
+ * The edit form is self-submitting, so that when things like
+ * preview and edit conflicts occur, we get the same form back
+ * with the extra stuff added. Only when the final submission
+ * is made and all is well do we actually save and redirect to
+ * the newly-edited page.
+ *
+ * @param string $formtype Type of form either : save, initial or preview
+ */
+ function editForm( $formtype ) {
global $wgOut, $wgUser;
- global $wpTextbox1, $wpSummary, $wpWatchthis;
- global $wpSave, $wpPreview;
- global $wpMinoredit, $wpEdittime, $wpTextbox2, $wpSection;
- global $oldid, $redirect, $section;
- global $wgLang;
- global $wgAllowAnonymousMinor;
-
- if(isset($wpSection)) { $section=$wpSection; } else { $wpSection=$section; }
+ global $wgLang, $wgParser, $wgTitle;
+ global $wgAllowAnonymousMinor;
+ global $wgWhitelistEdit;
+ global $wgSpamRegex, $wgFilterCallback;
$sk = $wgUser->getSkin();
$isConflict = false;
- $wpTextbox1 = rtrim ( $wpTextbox1 ) ; # To avoid text getting longer on each preview
+ // css / js subpages of user pages get a special treatment
+ $isCssJsSubpage = (Namespace::getUser() == $wgTitle->getNamespace() and preg_match("/\\.(css|js)$/", $wgTitle->getText() ));
if(!$this->mTitle->getArticleID()) { # new article
+ $wgOut->addWikiText(wfmsg('newarticletext'));
+ }
- $wgOut->addWikiText(wfmsg("newarticletext"));
-
+ if( Namespace::isTalk( $this->mTitle->getNamespace() ) ) {
+ $wgOut->addWikiText(wfmsg('talkpagetext'));
}
# Attempt submission here. This will check for edit conflicts,
# that edit() already checked just in case someone tries to sneak
# in the back door with a hand-edited submission URL.
- if ( "save" == $formtype ) {
+ if ( 'save' == $formtype ) {
+ # Check for spam
+ if ( $wgSpamRegex && preg_match( $wgSpamRegex, $this->textbox1, $matches ) ) {
+ $this->spamPage ( $matches );
+ return;
+ }
+ if ( $wgFilterCallback && $wgFilterCallback( $this->mTitle, $this->textbox1, $this->section ) ) {
+ # Error messages or other handling should be performed by the filter function
+ return;
+ }
if ( $wgUser->isBlocked() ) {
$this->blockedIPpage();
return;
$wgOut->readOnlyPage();
return;
}
- # If article is new, insert it.
- $aid = $this->mTitle->getArticleID();
+ # If article is new, insert it.
+ $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
if ( 0 == $aid ) {
- # we need to strip Windoze linebreaks because some browsers
- # append them and the string comparison fails
- if ( ( "" == $wpTextbox1 ) ||
- ( wfMsg( "newarticletext" ) == rtrim( preg_replace("/\r/","",$wpTextbox1) ) ) ) {
- $wgOut->redirect( wfLocalUrl(
- $this->mTitle->getPrefixedURL() ) );
+ # Don't save a new article if it's blank.
+ if ( ( '' == $this->textbox1 ) ||
+ ( wfMsg( 'newarticletext' ) == $this->textbox1 ) ) {
+ $wgOut->redirect( $this->mTitle->getFullURL() );
return;
}
- $this->mArticle->insertNewArticle( $wpTextbox1, $wpSummary, $wpMinoredit, $wpWatchthis );
+ $this->mArticle->insertNewArticle( $this->textbox1, $this->summary, $this->minoredit, $this->watchthis );
return;
}
+
# Article exists. Check for edit conflict.
- # Don't check for conflict when appending a comment - this should always work
$this->mArticle->clear(); # Force reload of dates, etc.
- if ( $section!="new" && ( $this->mArticle->getTimestamp() != $wpEdittime ) ) {
+ $this->mArticle->forUpdate( true ); # Lock the article
+
+ if( ( $this->section != 'new' ) &&
+ ($this->mArticle->getTimestamp() != $this->edittime ) ) {
$isConflict = true;
}
- $u = $wgUser->getID();
+ $userid = $wgUser->getID();
- # Supress edit conflict with self
+ $text = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
+ $this->section, $this->textbox1, $this->summary);
+ # Suppress edit conflict with self
- if ( ( 0 != $u ) && ( $this->mArticle->getUser() == $u ) ) {
+ if ( ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
$isConflict = false;
} else {
# switch from section editing to normal editing in edit conflict
if($isConflict) {
- $section="";$wpSection="";
+ # Attempt merge
+ if( $this->mergeChangesInto( $text ) ){
+ // Successful merge! Maybe we should tell the user the good news?
+ $isConflict = false;
+ } else {
+ $this->section = '';
+ $this->textbox1 = $text;
+ }
}
-
}
if ( ! $isConflict ) {
- # All's well: update the article here
- if($this->mArticle->updateArticle( $wpTextbox1, $wpSummary, $wpMinoredit, $wpWatchthis, $wpSection ))
+ # All's well
+ $sectionanchor = '';
+ if( $this->section != '' ) {
+ # Try to get a section anchor from the section source, redirect to edited section if header found
+ # XXX: might be better to integrate this into Article::getTextOfLastEditWithSectionReplacedOrAdded
+ # for duplicate heading checking and maybe parsing
+ $hasmatch = preg_match( "/^ *([=]{1,6})(.*?)(\\1) *\\n/i", $this->textbox1, $matches );
+ # we can't deal with anchors, includes, html etc in the header for now,
+ # headline would need to be parsed to improve this
+ #if($hasmatch and strlen($matches[2]) > 0 and !preg_match( "/[\\['{<>]/", $matches[2])) {
+ if($hasmatch and strlen($matches[2]) > 0) {
+ global $wgInputEncoding;
+ $headline = do_html_entity_decode( $matches[2], ENT_COMPAT, $wgInputEncoding );
+ # strip out HTML
+ $headline = preg_replace( "/<.*?" . ">/","",$headline );
+ $headline = trim( $headline );
+ $sectionanchor = '#'.urlencode( str_replace(' ', '_', $headline ) );
+ $replacearray = array(
+ '%3A' => ':',
+ '%' => '.'
+ );
+ $sectionanchor = str_replace(array_keys($replacearray),array_values($replacearray),$sectionanchor);
+ }
+ }
+
+ # update the article here
+ if($this->mArticle->updateArticle( $text, $this->summary, $this->minoredit, $this->watchthis, '', $sectionanchor ))
return;
else
$isConflict = true;
# First time through: get contents, set time for conflict
# checking, etc.
- if ( "initial" == $formtype ) {
- $wpEdittime = $this->mArticle->getTimestamp();
- $wpTextbox1 = $this->mArticle->getContent(true);
- $wpSummary = "";
+ if ( 'initial' == $formtype ) {
+ $this->edittime = $this->mArticle->getTimestamp();
+ $this->textbox1 = $this->mArticle->getContent( true );
+ $this->summary = '';
+ $this->proxyCheck();
}
- $wgOut->setRobotpolicy( "noindex,nofollow" );
-
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
+
# Enabled article-related sidebar, toplinks, etc.
$wgOut->setArticleRelated( true );
if ( $isConflict ) {
- $s = wfMsg( "editconflict", $this->mTitle->getPrefixedText() );
+ $s = wfMsg( 'editconflict', $this->mTitle->getPrefixedText() );
$wgOut->setPageTitle( $s );
- $wgOut->addHTML( wfMsg( "explainconflict" ) );
+ $wgOut->addHTML( wfMsg( 'explainconflict' ) );
- $wpTextbox2 = $wpTextbox1;
- $wpTextbox1 = $this->mArticle->getContent(true);
- $wpEdittime = $this->mArticle->getTimestamp();
+ $this->textbox2 = $this->textbox1;
+ $this->textbox1 = $this->mArticle->getContent( true );
+ $this->edittime = $this->mArticle->getTimestamp();
} else {
- $s = wfMsg( "editing", $this->mTitle->getPrefixedText() );
+ $s = wfMsg( 'editing', $this->mTitle->getPrefixedText() );
- if($section!="") {
- if($section=="new") {
- $s.=wfMsg("commentedit");
+ if( $this->section != '' ) {
+ if( $this->section == 'new' ) {
+ $s.=wfMsg('commentedit');
} else {
- $s.=wfMsg("sectionedit");
+ $s.=wfMsg('sectionedit');
+ }
+ if(!$this->preview) {
+ $sectitle=preg_match("/^=+(.*?)=+/mi",
+ $this->textbox1,
+ $matches);
+ if( !empty( $matches[1] ) ) {
+ $this->summary = "/* ". trim($matches[1])." */ ";
+ }
}
}
$wgOut->setPageTitle( $s );
- if ( $oldid ) {
+ if ( $this->oldid ) {
$this->mArticle->setOldSubtitle();
- $wgOut->addHTML( wfMsg( "editingold" ) );
+ $wgOut->addHTML( wfMsg( 'editingold' ) );
}
}
if( wfReadOnly() ) {
- $wgOut->addHTML( "<strong>" .
- wfMsg( "readonlywarning" ) .
- "</strong>" );
+ $wgOut->addHTML( '<strong>' .
+ wfMsg( 'readonlywarning' ) .
+ "</strong>" );
+ } else if ( $isCssJsSubpage and 'preview' != $formtype) {
+ $wgOut->addHTML( wfMsg( 'usercssjsyoucanpreview' ));
}
if( $this->mTitle->isProtected() ) {
- $wgOut->addHTML( "<strong>" . wfMsg( "protectedpagewarning" ) .
+ $wgOut->addHTML( '<strong>' . wfMsg( 'protectedpagewarning' ) .
"</strong><br />\n" );
}
- $kblength = (int)(strlen( $wpTextbox1 ) / 1024);
+ $kblength = (int)(strlen( $this->textbox1 ) / 1024);
if( $kblength > 29 ) {
- $wgOut->addHTML( "<strong>" .
- wfMsg( "longpagewarning", $kblength )
- . "</strong>" );
+ $wgOut->addHTML( '<strong>' .
+ wfMsg( 'longpagewarning', $wgLang->formatNum( $kblength ) )
+ . '</strong>' );
}
- $rows = $wgUser->getOption( "rows" );
- $cols = $wgUser->getOption( "cols" );
+ $rows = $wgUser->getOption( 'rows' );
+ $cols = $wgUser->getOption( 'cols' );
- $ew = $wgUser->getOption( "editwidth" );
+ $ew = $wgUser->getOption( 'editwidth' );
if ( $ew ) $ew = " style=\"width:100%\"";
- else $ew = "" ;
-
- $q = "action=submit";
- if ( "no" == $redirect ) { $q .= "&redirect=no"; }
- $action = wfEscapeHTML( wfLocalUrl( $this->mTitle->getPrefixedURL(), $q ) );
-
- $summary = wfMsg( "summary" );
- $subject = wfMsg("subject");
- $minor = wfMsg( "minoredit" );
- $watchthis = wfMsg ("watchthis");
- $save = wfMsg( "savearticle" );
- $prev = wfMsg( "showpreview" );
-
- $cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedURL(),
- wfMsg( "cancel" ) );
- $edithelp = $sk->makeKnownLink( wfMsg( "edithelppage" ),
- wfMsg( "edithelp" ) );
- $copywarn = wfMsg( "copyrightwarning", $sk->makeKnownLink(
- wfMsg( "copyrightpage" ) ) );
-
- $wpTextbox1 = wfEscapeHTML( $wpTextbox1 );
- $wpTextbox2 = wfEscapeHTML( $wpTextbox2 );
- $wpSummary = wfEscapeHTML( $wpSummary );
-
-
- if($wgUser->getOption("showtoolbar")) {
- // prepare toolbar for edit buttons
- $toolbar=$sk->getEditToolbar();
+ else $ew = '';
+
+ $q = 'action=submit';
+ #if ( "no" == $redirect ) { $q .= "&redirect=no"; }
+ $action = $this->mTitle->escapeLocalURL( $q );
+
+ $summary = wfMsg('summary');
+ $subject = wfMsg('subject');
+ $minor = wfMsg('minoredit');
+ $watchthis = wfMsg ('watchthis');
+ $save = wfMsg('savearticle');
+ $prev = wfMsg('showpreview');
+
+ $cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedText(),
+ wfMsg('cancel') );
+ $edithelpurl = $sk->makeUrl( wfMsg( 'edithelppage' ));
+ $edithelp = '<a target="helpwindow" href="'.$edithelpurl.'">'.
+ htmlspecialchars( wfMsg( 'edithelp' ) ).'</a> '.
+ htmlspecialchars( wfMsg( 'newwindow' ) );
+
+ global $wgRightsText;
+ $copywarn = "<div id=\"editpage-copywarn\">\n" .
+ wfMsg( $wgRightsText ? 'copyrightwarning' : 'copyrightwarning2',
+ '[[' . wfMsg( 'copyrightpage' ) . ']]',
+ $wgRightsText ) . "\n</div>";
+
+ if( $wgUser->getOption('showtoolbar') and !$isCssJsSubpage ) {
+ # prepare toolbar for edit buttons
+ $toolbar = $sk->getEditToolbar();
+ } else {
+ $toolbar = '';
}
// activate checkboxes if user wants them to be always active
- if (!$wpPreview && $wgUser->getOption("watchdefault")) $wpWatchthis=1;
- if (!$wpPreview && $wgUser->getOption("minordefault")) $wpMinoredit=1;
-
- // activate checkbox also if user is already watching the page,
- // require wpWatchthis to be unset so that second condition is not
- // checked unnecessarily
- if (!$wpWatchthis && !$wpPreview && $this->mTitle->userIsWatching()) $wpWatchthis=1;
+ if( !$this->preview ) {
+ if( $wgUser->getOption( 'watchdefault' ) ) $this->watchthis = true;
+ if( $wgUser->getOption( 'minordefault' ) ) $this->minoredit = true;
+
+ // activate checkbox also if user is already watching the page,
+ // require wpWatchthis to be unset so that second condition is not
+ // checked unnecessarily
+ if( !$this->watchthis && $this->mTitle->userIsWatching() ) $this->watchthis = true;
+ }
- $minoredithtml = "";
+ $minoredithtml = '';
if ( 0 != $wgUser->getID() || $wgAllowAnonymousMinor ) {
$minoredithtml =
- "<input tabindex=3 type=checkbox value=1 name='wpMinoredit'".($wpMinoredit?" checked":"")." id='wpMinoredit'>".
- "<label for='wpMinoredit'>{$minor}</label>";
+ "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":"").
+ " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />".
+ "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>";
}
-
- $watchhtml = "";
-
- if ( 0 != $wgUser->getID() ) {
- $watchhtml = "<input tabindex=4 type=checkbox name='wpWatchthis'".($wpWatchthis?" checked":"")." id='wpWatchthis'>".
- "<label for='wpWatchthis'>{$watchthis}</label>";
+ $watchhtml = '';
+
+ if ( 0 != $wgUser->getID() ) {
+ $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked='checked'":"").
+ " accesskey='".wfMsg('accesskey-watch')."' id='wpWatchthis' />".
+ "<label for='wpWatchthis' title='".wfMsg('tooltip-watch')."'>{$watchthis}</label>";
}
-
- $checkboxhtml= $minoredithtml . $watchhtml . "<br>";
- if ( "preview" == $formtype) {
+ $checkboxhtml = $minoredithtml . $watchhtml . '<br />';
- $previewhead="<h2>" . wfMsg( "preview" ) . "</h2>\n<p><large><center><font color=\"#cc0000\">" .
- wfMsg( "note" ) . wfMsg( "previewnote" ) . "</font></center></large><P>\n";
+ if ( 'preview' == $formtype) {
+ $previewhead='<h2>' . wfMsg( 'preview' ) . "</h2>\n<p><center><font color=\"#cc0000\">" .
+ wfMsg( 'note' ) . wfMsg( 'previewnote' ) . "</font></center></p>\n";
if ( $isConflict ) {
- $previewhead.="<h2>" . wfMsg( "previewconflict" ) .
- "</h2>\n";
+ $previewhead.='<h2>' . wfMsg( 'previewconflict' ) .
+ "</h2>\n";
}
- $previewtext = wfUnescapeHTML( $wpTextbox1 );
- if($wgUser->getOption("previewontop")) {
- $wgOut->addHTML($previewhead);
- $wgOut->addWikiText( $this->mArticle->preSaveTransform( $previewtext ) ."\n\n");
+ $parserOptions = ParserOptions::newFromUser( $wgUser );
+ $parserOptions->setEditSection( false );
+ $parserOptions->setEditSectionOnRightClick( false );
+
+ # don't parse user css/js, show message about preview
+ # XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here
+
+ if ( $isCssJsSubpage ) {
+ if(preg_match("/\\.css$/", $wgTitle->getText() ) ) {
+ $previewtext = wfMsg('usercsspreview');
+ } else if(preg_match("/\\.js$/", $wgTitle->getText() ) ) {
+ $previewtext = wfMsg('userjspreview');
+ }
+ $parserOutput = $wgParser->parse( $previewtext , $wgTitle, $parserOptions );
+ $wgOut->addHTML( $parserOutput->mText );
+ } else {
+ $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $this->textbox1 ) ."\n\n",
+ $wgTitle, $parserOptions );
+ $previewHTML = $parserOutput->mText;
+
+ if($wgUser->getOption('previewontop')) {
+ $wgOut->addHTML($previewhead);
+ $wgOut->addHTML($previewHTML);
+ }
+ $wgOut->addCategoryLinks($parserOutput->getCategoryLinks());
+ $wgOut->addLanguageLinks($parserOutput->getLanguageLinks());
+ $wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
}
- $wgOut->addHTML( "<br clear=\"all\" />\n" );
}
# if this is a comment, show a subject line at the top, which is also the edit summary.
# Otherwise, show a summary field at the bottom
- if($section=="new") {
-
- $commentsubject="{$subject}: <input tabindex=1 type=text value=\"{$wpSummary}\" name=\"wpSummary\" maxlength=200 size=60><br>";
- } else {
+ $summarytext = htmlspecialchars( $wgLang->recodeForEdit( $this->summary ) ); # FIXME
+ if( $this->section == 'new' ) {
+ $commentsubject="{$subject}: <input tabindex='1' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
+ $editsummary = '';
+ } else {
+ $commentsubject = '';
+ $editsummary="{$summary}: <input tabindex='3' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
+ }
- $editsummary="{$summary}: <input tabindex=3 type=text value=\"{$wpSummary}\" name=\"wpSummary\" maxlength=200 size=60><br>";
+ if( !$this->preview ) {
+ # Don't select the edit box on preview; this interferes with seeing what's going on.
+ $wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' );
}
-
- if( $_GET["action"] == "edit" ) {
- # Don't select the edit box on preview; this interferes with seeing what's going on.
- $wgOut->setOnloadHandler( "document.editform.wpTextbox1.focus()" );
+ # Prepare a list of templates used by this page
+ $db =& wfGetDB( DB_SLAVE );
+ $cur = $db->tableName( 'cur' );
+ $links = $db->tableName( 'links' );
+ $id = $this->mTitle->getArticleID();
+ $sql = "SELECT cur_namespace,cur_title,cur_id ".
+ "FROM $cur,$links WHERE l_to=cur_id AND l_from={$id} and cur_namespace=".NS_TEMPLATE;
+ $res = $db->query( $sql, "EditPage::editform" );
+
+ if ( $db->numRows( $res ) ) {
+ $templates = '<br />'. wfMsg( 'templatesused' ) . '<ul>';
+ while ( $row = $db->fetchObject( $res ) ) {
+ if ( $titleObj = Title::makeTitle( $row->cur_namespace, $row->cur_title ) ) {
+ $templates .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
+ }
+ }
+ $templates .= '</ul>';
+ } else {
+ $templates = '';
}
$wgOut->addHTML( "
{$toolbar}
<form id=\"editform\" name=\"editform\" method=\"post\" action=\"$action\"
enctype=\"application/x-www-form-urlencoded\">
{$commentsubject}
-<textarea tabindex=2 name=\"wpTextbox1\" rows={$rows}
-cols={$cols}{$ew} wrap=\"virtual\">" .
-$wgLang->recodeForEdit( $wpTextbox1 ) .
+<textarea tabindex='1' accesskey=\",\" name=\"wpTextbox1\" rows='{$rows}'
+cols='{$cols}'{$ew}>" .
+htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
"
</textarea>
-<br>{$editsummary}
+<br />{$editsummary}
{$checkboxhtml}
-<input tabindex=5 type=submit value=\"{$save}\" name=\"wpSave\" accesskey=\"s\">
-<input tabindex=6 type=submit value=\"{$prev}\" name=\"wpPreview\" accesskey=\"p\">
-<em>{$cancel}</em> | <em>{$edithelp}</em>
-<br><br>{$copywarn}
-<input type=hidden value=\"{$section}\" name=\"wpSection\">
-<input type=hidden value=\"{$wpEdittime}\" name=\"wpEdittime\">\n" );
+<input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
+" title=\"".wfMsg('tooltip-save')."\"/>
+<input tabindex='6' id='wpPreview' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"".wfMsg('accesskey-preview')."\"".
+" title=\"".wfMsg('tooltip-preview')."\"/>
+<em>{$cancel}</em> | <em>{$edithelp}</em>{$templates}" );
+ $wgOut->addWikiText( $copywarn );
+ $wgOut->addHTML( "
+<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
+<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n" );
if ( $isConflict ) {
+ require_once( "DifferenceEngine.php" );
$wgOut->addHTML( "<h2>" . wfMsg( "yourdiff" ) . "</h2>\n" );
- DifferenceEngine::showDiff( $wpTextbox2, $wpTextbox1,
+ DifferenceEngine::showDiff( $this->textbox2, $this->textbox1,
wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
$wgOut->addHTML( "<h2>" . wfMsg( "yourtext" ) . "</h2>
-<textarea tabindex=6 name=\"wpTextbox2\" rows={$rows} cols={$cols} wrap=virtual>"
-. $wgLang->recodeForEdit( $wpTextbox2 ) .
+<textarea tabindex=6 id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
+. htmlspecialchars( $wgLang->recodeForEdit( $this->textbox2 ) ) .
"
</textarea>" );
}
$wgOut->addHTML( "</form>\n" );
if($formtype =="preview" && !$wgUser->getOption("previewontop")) {
$wgOut->addHTML($previewhead);
- $wgOut->addWikiText( $this->mArticle->preSaveTransform( $previewtext ) );
+ $wgOut->addHTML($previewHTML);
}
-
}
- function blockedIPpage()
- {
- global $wgOut, $wgUser, $wgLang;
+ /**
+ * @todo document
+ */
+ function blockedIPpage() {
+ global $wgOut, $wgUser, $wgLang, $wgIP;
- $wgOut->setPageTitle( wfMsg( "blockedtitle" ) );
- $wgOut->setRobotpolicy( "noindex,nofollow" );
+ $wgOut->setPageTitle( wfMsg( 'blockedtitle' ) );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
$id = $wgUser->blockedBy();
$reason = $wgUser->blockedFor();
- $ip = getenv( "REMOTE_ADDR" );
-
- $name = User::whoIs( $id );
- $link = "[[" . $wgLang->getNsText( Namespace::getUser() ) .
+ $ip = $wgIP;
+
+ if ( is_numeric( $id ) ) {
+ $name = User::whoIs( $id );
+ } else {
+ $name = $id;
+ }
+ $link = '[[' . $wgLang->getNsText( Namespace::getUser() ) .
":{$name}|{$name}]]";
- $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason, $ip ) );
+ $wgOut->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name ) );
$wgOut->returnToMain( false );
}
+ /**
+ * @todo document
+ */
+ function userNotLoggedInPage() {
+ global $wgOut, $wgUser, $wgLang;
+ $wgOut->setPageTitle( wfMsg( 'whitelistedittitle' ) );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
+ $wgOut->setArticleRelated( false );
- function userNotLoggedInPage()
- {
- global $wgOut, $wgUser, $wgLang;
+ $wgOut->addWikiText( wfMsg( 'whitelistedittext' ) );
+ $wgOut->returnToMain( false );
+ }
- $wgOut->setPageTitle( wfMsg( "whitelistedittitle" ) );
- $wgOut->setRobotpolicy( "noindex,nofollow" );
+ /**
+ * @todo document
+ */
+ function spamPage ( $matches = array() )
+ {
+ global $wgOut;
+ $wgOut->setPageTitle( wfMsg( 'spamprotectiontitle' ) );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
- $wgOut->addWikiText( wfMsg( "whitelistedittext" ) );
+ $wgOut->addWikiText( wfMsg( 'spamprotectiontext' ) );
+ if ( isset ( $matches[0] ) ) {
+ $wgOut->addWikiText( wfMsg( 'spamprotectionmatch', "<nowiki>{$matches[0]}</nowiki>" ) );
+ }
$wgOut->returnToMain( false );
}
+ /**
+ * Forks processes to scan the originating IP for an open proxy server
+ * MemCached can be used to skip IPs that have already been scanned
+ */
+ function proxyCheck() {
+ global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath;
+ global $wgIP, $wgUseMemCached, $wgMemc, $wgDBname, $wgProxyMemcExpiry;
+
+ if ( !$wgBlockOpenProxies ) {
+ return;
+ }
+
+ # Get MemCached key
+ $skip = false;
+ if ( $wgUseMemCached ) {
+ $mcKey = $wgDBname.':proxy:ip:'.$wgIP;
+ $mcValue = $wgMemc->get( $mcKey );
+ if ( $mcValue ) {
+ $skip = true;
+ }
+ }
+ # Fork the processes
+ if ( !$skip ) {
+ $title = Title::makeTitle( NS_SPECIAL, 'Blockme' );
+ $iphash = md5( $wgIP . $wgProxyKey );
+ $url = $title->getFullURL( 'ip='.$iphash );
+
+ foreach ( $wgProxyPorts as $port ) {
+ $params = implode( ' ', array(
+ escapeshellarg( $wgProxyScriptPath ),
+ escapeshellarg( $wgIP ),
+ escapeshellarg( $port ),
+ escapeshellarg( $url )
+ ));
+ exec( "php $params &>/dev/null &" );
+ }
+ # Set MemCached key
+ if ( $wgUseMemCached ) {
+ $wgMemc->set( $mcKey, 1, $wgProxyMemcExpiry );
+ }
+ }
+ }
+
+ /**
+ * @access private
+ * @todo document
+ */
+ function mergeChangesInto( &$text ){
+ $fname = 'EditPage::mergeChangesInto';
+ $oldDate = $this->edittime;
+ $dbw =& wfGetDB( DB_MASTER );
+ $obj = $dbw->getArray( 'cur', array( 'cur_text' ), array( 'cur_id' => $this->mTitle->getArticleID() ),
+ $fname, 'FOR UPDATE' );
+
+ $yourtext = $obj->cur_text;
+ $ns = $this->mTitle->getNamespace();
+ $title = $this->mTitle->getDBkey();
+ $obj = $dbw->getArray( 'old',
+ array( 'old_text','old_flags'),
+ array( 'old_namespace' => $ns, 'old_title' => $title,
+ 'old_timestamp' => $dbw->timestamp($oldDate)),
+ $fname );
+ $oldText = Article::getRevisionText( $obj );
+
+ if(wfMerge($oldText, $text, $yourtext, $result)){
+ $text = $result;
+ return true;
+ } else {
+ return false;
+ }
+ }
}
?>
dépôts / lhc / web / wiklou.git / blobdiff